From 78754950ffa3aaba0f48b1ca1d505caa4a3dfbfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Oct 2022 13:17:38 +0100 Subject: gentoo auto-resync : 04:10:2022 - 13:17:38 --- media-libs/Manifest.gz | Bin 66287 -> 66295 bytes media-libs/libsdl2/Manifest | 3 +- ...libsdl2-2.24.0-fix-build-without-joystick.patch | 32 +++++++ media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild | 1 + media-libs/netpbm/Manifest | 2 +- media-libs/netpbm/netpbm-10.86.34.ebuild | 2 +- media-libs/tiff/Manifest | 1 + media-libs/tiff/tiff-4.4.0-r1.ebuild | 97 +++++++++++++++++++++ 8 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch create mode 100644 media-libs/tiff/tiff-4.4.0-r1.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index da7b9557d05a..eb2f0b32b4c6 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 05758d5026c9..83a2fa528282 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,6 +1,7 @@ AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4 AUX libsdl2-2.24.0-clang-15-configure.patch 768 BLAKE2B f21f01da86fed778f5ef88cfc692b0588d1ea6de1bd05c0f6d1b9b480175c79a1f7bcc62cca123beb387f174fcf70676997f1e37b6b2baef59143b9222db0d5d SHA512 7d1822a05fae900f572809ba7de7a46cffaa03be7ec2f6d4b1cfa3b164a468ad7c4bea2606da32598519d2f8abb0d9bfcc3268f2cb7858de784244dbe0a68804 AUX libsdl2-2.24.0-cmake-target-fixes.patch 6489 BLAKE2B 3703cae1f4220d6ca7899a2a1b61c083f560db30996f032eb6570f80e7b0bb3969b2c929ec104d461297502d5e46a8ae0a34d38f04d76b274894d124aa486905 SHA512 43710fa7d5321b688b2bd65460fff77d16943ff25280b7ba25c2676112db8e1ce9daeb2c144d41ed5473dcb4b38ad0a91686859949ff4a10ed4bea8769188b15 +AUX libsdl2-2.24.0-fix-build-without-joystick.patch 1263 BLAKE2B 9421e7056496fb46393b53e0d7da85ae0169e5dc769fc5b2be045127eaab13d69ab5d5e00f1a4f2c2223e03bc2cf58fe17f377dad39f35afcccd7ef4f69a94df SHA512 2c24c90503b62c30bd3aa47285d4cbb6372beacc5561390ad998a44fd5342a50ade2983e0731a3a63696c03f5b348ae711ea6e8ab59d5ada64afd0079e5d6d22 DIST SDL2-2.24.0.tar.gz 7520541 BLAKE2B 9d5bf061a66dc6443f3c6bcdd1be15926fcb4e4c0ec99497b409e84c78027c14059338d482bced3bf16b22b9b268e263b718ad3fbcd5642d247d9dc98a601602 SHA512 5735bfc7b22f1780f80cc89f62a14ca809fe1280298d172f92dde74400db1f5378f8d3eae8834e886d3ca4f5ae6f1074d66c5c956613cf9e0cce961738514212 -EBUILD libsdl2-2.24.0-r2.ebuild 6464 BLAKE2B 0a23c1356dae43988311889f2775beeadb899def9729953aacb54af8eb664c22bf3e06fecb5ebecf7b904541ecb17da30bed9d0d062ec12e1c86106c58b1aad4 SHA512 c1c64049f309b8e26bcb6c293069f7a0baf6f4bcf40a9fd466f1584657ff0d618dd9277e722f7eed1011a4e47ee4a7747771f09798f9ae6dd69d9c70cee380d7 +EBUILD libsdl2-2.24.0-r2.ebuild 6517 BLAKE2B f809229345e39e0c4a0946526181475d18e45dd06c9a74f8df7529afe40cc87af2fe17dfa0256f7ea255be7a49858eaf6ee29b887250817d94c0ce268afe8c86 SHA512 84f2aa5a22dad410e09a86cafb71ec9edbc110f07b9c7a980ce0c5ee77009fbcd48f27e4ba494d909d2a211064a42adf13744d12bf9ecb72b6375a7f46d13281 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1 diff --git a/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch new file mode 100644 index 000000000000..0370f66ef8c9 --- /dev/null +++ b/media-libs/libsdl2/files/libsdl2-2.24.0-fix-build-without-joystick.patch @@ -0,0 +1,32 @@ +# https://github.com/libsdl-org/SDL/commit/71fb91f7e43c5f046a037bf5ca59214d93fe2d51 +From 71fb91f7e43c5f046a037bf5ca59214d93fe2d51 Mon Sep 17 00:00:00 2001 +From: Cameron Gutman +Date: Mon, 26 Sep 2022 21:38:09 -0500 +Subject: [PATCH] evdev: Fix build with libudev and joystick subsystem disabled + +--- + src/core/linux/SDL_evdev_capabilities.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/core/linux/SDL_evdev_capabilities.h b/src/core/linux/SDL_evdev_capabilities.h +index 26fa7400485b..990ebe01b872 100644 +--- a/src/core/linux/SDL_evdev_capabilities.h ++++ b/src/core/linux/SDL_evdev_capabilities.h +@@ -25,8 +25,6 @@ + #ifndef SDL_evdev_capabilities_h_ + #define SDL_evdev_capabilities_h_ + +-#if HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) +- + #include + + /* A device can be any combination of these classes */ +@@ -53,8 +51,6 @@ extern int SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)], + unsigned long bitmask_key[NBITS(KEY_MAX)], + unsigned long bitmask_rel[NBITS(REL_MAX)]); + +-#endif /* HAVE_LIBUDEV_H || defined(SDL_JOYSTICK_LINUX) */ +- + #endif /* SDL_evdev_capabilities_h_ */ + + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild index df06e35c7b52..481ce62c0cdf 100644 --- a/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild +++ b/media-libs/libsdl2/libsdl2-2.24.0-r2.ebuild @@ -97,6 +97,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.0.16-static-libs.patch "${FILESDIR}"/${PN}-2.24.0-clang-15-configure.patch "${FILESDIR}"/${P}-cmake-target-fixes.patch + "${FILESDIR}"/${P}-fix-build-without-joystick.patch ) S="${WORKDIR}/${MY_P}" diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 59e1b837f85f..e2a8ba0d1f40 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -6,5 +6,5 @@ AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5 DIST netpbm-10.86.33.tar.xz 3696704 BLAKE2B 57657d69e235ee9babefce6e44e7ac35ac9b67c38797cee140488afe268687e4030158280c1064f8111891b9114106420314cdbce1b8be8d7dd45204a07aa5b0 SHA512 b0a555276e26d171705e93bdc26d33869fa611e01728d935edd0a7b96815db4f9ff264d7d6cecccc751b0bbfd639b14316f1ab576b1182b755e0f1832d8f43ca DIST netpbm-10.86.34.tar.xz 3698852 BLAKE2B 7ea0e93450fb0bdf50b1b498468dd32350f20c8e993cda3e0ffa942dcdeab775a532a4771b10c55c862340964a4520f51ea4916c20051d5140dbb0a9ce373860 SHA512 bbb4dc685a44c0d7733808edd938b1205891ae5cf312218ef717bf63053513058251a659e3cf9acc762b0aeec8da3fc8e8a05e1442591c87f5a1dce7f63ee870 EBUILD netpbm-10.86.33.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc -EBUILD netpbm-10.86.34.ebuild 6056 BLAKE2B d9f4109dd96128f1de18010ebb080e5dca5e3a85066b94d5af645ce2ccd7b81dc9133d7d5498ecaba84c08025ce9f5110473feff8747daf681aa82097a040e05 SHA512 9a286556e902e75dd88534f6c4740fc6807cc36b8307172daa501bd088701cd06b977a4a85f0bfa7d17e067e4c29e3a0dc71252041edc4100aefa52bdcd55596 +EBUILD netpbm-10.86.34.ebuild 6048 BLAKE2B d910c8a535e954db53376f7bd15eba900873de1763320e4e5a183974de2edeea978fa64750ff53740c43121739fa3f36d003ec549beaf142c2d5959e00f26c2a SHA512 f9c97f4e8c55590caa6f54110f244c643e70d2534d802c196e67f994af6f551e9974f1aef193a0e2c5b1ef675e5984ad0bd13914c7eda9ec36d182377cfb66cc MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d diff --git a/media-libs/netpbm/netpbm-10.86.34.ebuild b/media-libs/netpbm/netpbm-10.86.34.ebuild index 6bcdb4345f40..8b60df263a57 100644 --- a/media-libs/netpbm/netpbm-10.86.34.ebuild +++ b/media-libs/netpbm/netpbm-10.86.34.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml" BDEPEND=" diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index 2ad8774996ef..b4e4dfb9f9ff 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -3,5 +3,6 @@ DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175 DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9 DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c EBUILD tiff-4.3.0.ebuild 2056 BLAKE2B 424dba5d1ffb1699a268dabb5498fe6a46a21b70123bc1cba04b5e9bcb637151b4ff49262f9a53adf95766293a4a2c7d9bfaeb192c92e083ae5cefa21931a436 SHA512 09d81e358ed7af8dd65c73dfb8c857e5d48d7cdaf764a5a5fbcfe400133915d074a2c6c15bb0a617d0fdd271f10de20402a807a4e265dfc96dbe65af8b016bb3 +EBUILD tiff-4.4.0-r1.ebuild 2836 BLAKE2B dbf76350331330d17c0b9da1ba07e46b199afa7d5b72c079d6d1d0f55e589d83055be0f5ef47567a90816f156589c50318a4d38a9cf30e89953e5534b9245e7b SHA512 080c5df137bcb521c9dab08d32c63fb0dd1bf296814525e10156acf8f8f21ca1292c317fcdc9e454deb52d57b5e1b621d8601028d92c181a398892823cc3a9c5 EBUILD tiff-4.4.0.ebuild 2749 BLAKE2B 2972cee88d4e4f9ae3a612338e4c3c8f01fde2f6ac1f9185dabe23ac9ff9e1932abd306a226167a50864c5bf17daf82ef39513c68c0cad5e998ba48ce5d029cb SHA512 c345cfaad0670f8dbe1ffb413fdd40943628c75c526bf2626331aebd95e346f422f7c3d7db1734c35340ebbb5b1868ef025e8861ad6481e55c80feb69f909c8c MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469 diff --git a/media-libs/tiff/tiff-4.4.0-r1.ebuild b/media-libs/tiff/tiff-4.4.0-r1.ebuild new file mode 100644 index 000000000000..10db9528acb3 --- /dev/null +++ b/media-libs/tiff/tiff-4.4.0-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION="$(ver_cut 1-3)" + +# Release signer can vary per version but not clear if others will be doing +# them in future, so gone with Even Rouault for now as he does other geosci +# stuff too like PROJ, GDAL. Previous release manager of TIFF was +# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying +# who made releases. +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc +inherit multilib-minimal verify-sig libtool flag-o-matic + +MY_P="${P/_rc/rc}" +DESCRIPTION="Tag Image File Format (TIFF) library" +HOMEPAGE="http://libtiff.maptools.org" +SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz" +SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )" +S="${WORKDIR}/${PN}-$(ver_cut 1-3)" + +LICENSE="libtiff" +SLOT="0" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd" +RESTRICT="!test? ( test )" + +# bug #483132 +REQUIRED_USE="test? ( jpeg )" + +RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/tiffconf.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-4.4.0_rc1-skip-thumbnail-test.patch +) + +src_prepare() { + default + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --without-x + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable cxx) + $(use_enable jbig) + $(use_enable jpeg) + $(use_enable lzma) + $(use_enable static-libs static) + $(use_enable webp) + $(use_enable zlib) + $(use_enable zstd) + ) + + append-lfs-flags + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + # Remove components (like tools) that are irrelevant for the multilib + # build which we only want libraries for. + # TODO: upstream options to disable these properly + if ! multilib_is_native_abi ; then + sed -i \ + -e 's/ tools//' \ + -e 's/ contrib//' \ + -e 's/ man//' \ + -e 's/ html//' \ + Makefile || die + fi +} + +multilib_src_test() { + if ! multilib_is_native_abi ; then + emake -C tools + fi + + emake check +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die +} -- cgit v1.2.3