depends: libxcb_util_image: cleanup patch

diff --git a/contrib/depends/packages/libxcb_util_image.mk b/contrib/depends/packages/libxcb_util_image.mk
index d04d3fb3cb5d6f8cdba9917f659693ac9aa3ff29..7dd0517c979b3e443ac36ccd006bbb8e751811ef 100644 (file)
--- a/contrib/depends/packages/libxcb_util_image.mk
+++ b/contrib/depends/packages/libxcb_util_image.mk
@@ -4,7 +4,6 @@ $(package)_download_path=https://xcb.freedesktop.org/dist
 $(package)_file_name=xcb-util-image-$($(package)_version).tar.xz
 $(package)_sha256_hash=ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d
 $(package)_dependencies=libxcb libxcb_util
-$(package)_patches = no-tests.patch
 
 define $(package)_set_vars
 $(package)_config_opts=--disable-shared --disable-devel-docs --without-doxygen
@@ -12,9 +11,7 @@ $(package)_config_opts+= --disable-dependency-tracking --enable-option-checking
 endef
 
 define $(package)_preprocess_cmds
-  rm -rf test && \
-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
-  patch -p1 -i $($(package)_patch_dir)/no-tests.patch
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
 endef
 
 define $(package)_config_cmds
@@ -22,11 +19,11 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  $(MAKE)
+  $(MAKE) -C image
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+  $(MAKE) DESTDIR=$($(package)_staging_dir) -C image install
 endef
 
 define $(package)_postprocess_cmds

diff --git a/contrib/depends/patches/libxcb_util_image/no-tests.patch b/contrib/depends/patches/libxcb_util_image/no-tests.patch
deleted file mode 100644 (file)
index 5f54ea8..0000000
--- a/contrib/depends/patches/libxcb_util_image/no-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 03316e8..b5c6f49 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -361,7 +361,7 @@ top_srcdir = @top_srcdir@
- xcbincludedir = @xcbincludedir@
- ACLOCAL_AMFLAGS = -I m4
- MAINTAINERCLEANFILES = ChangeLog INSTALL
--SUBDIRS = image test
-+SUBDIRS = image
- EXTRA_DIST = autogen.sh README.md
- all: config.h
-       $(MAKE) $(AM_MAKEFLAGS) all-recursive
-diff --git a/configure b/configure
-index 3756ffc..46fcbc4 100755
---- a/configure
-+++ b/configure
-@@ -19952,7 +19952,7 @@ printf "%s\n" "yes" >&6; }
- 
- fi
- 
--ac_config_files="$ac_config_files Makefile image/Makefile test/Makefile image/xcb-image.pc"
-+ac_config_files="$ac_config_files Makefile image/Makefile image/xcb-image.pc"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -20980,7 +20980,6 @@ do
-     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-     "image/Makefile") CONFIG_FILES="$CONFIG_FILES image/Makefile" ;;
--    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-     "image/xcb-image.pc") CONFIG_FILES="$CONFIG_FILES image/xcb-image.pc" ;;
- 
-   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;