From d8a50857c27d3253561374390ac9ed8c1b65d9bc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 14 Jan 2024 19:16:40 +0000 Subject: gentoo auto-resync : 14:01:2024 - 19:16:40 --- media-libs/Manifest.gz | Bin 69164 -> 69164 bytes media-libs/jasper/Manifest | 5 +-- .../jasper/files/jasper-4.1.2-which-hunt.patch | 34 +++++++++++++++++++++ media-libs/jasper/jasper-4.1.2.ebuild | 10 ++++-- media-libs/jasper/jasper-9999.ebuild | 10 ++++-- 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 media-libs/jasper/files/jasper-4.1.2-which-hunt.patch (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index ecae2766f064..721911bda03c 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest index 79ee5fe31095..e72e4e90ce51 100644 --- a/media-libs/jasper/Manifest +++ b/media-libs/jasper/Manifest @@ -1,8 +1,9 @@ +AUX jasper-4.1.2-which-hunt.patch 1155 BLAKE2B 21f0080fb7590f53d69e9d94fe4a01aee3aaa1656179b234936fe8383ac256ac13a77e7764c4060075a9812ff25b91ab0abc6c9ef1f5332a36022f7016d46191 SHA512 d934547efc455442ba12a2936214c2ac91c6e49d0e749647b2101ad0de9de13184d9e44ed841679ea3812e67e9d61df9ed28a2b2fc4dfccacbc8cd3395a1acd2 DIST jasper-4.0.0.tar.gz 1975127 BLAKE2B d4d8ae3324f3753e999adee57c215b89fa0ddeb3d945f10de15459a7d6566f1de9cbcd27a418bcc3c128bc138fff7e3f1cc157b6750d2d7dc1216f8e8cbc8bea SHA512 dc03434870e85b1fdbdf41a3e07ce5a8044c8d225717d3d7a5969d45e3bd716bfb2abc4b4e0b8cec2f4071a7520c5d3e48939dba0cabe6d192eacd593de0c563 DIST jasper-4.1.1.tar.gz 1979438 BLAKE2B 7f72c7f5633b7b0b119733ea7cdaa51684d3593ea19de21ae45f036ac79245b418b4f72a90f4b7d458b38ea480f008a8b67a74a0c4f440c9d86f76419e04e712 SHA512 a15c196d7e448fb3c8b6512793d4b430e58ba6adf343b46392cac0880ae8c385cd75b43dd566c4a25baab983089cb95c00ae538dc0b84282cc98f2a9ce398d43 DIST jasper-4.1.2.tar.gz 1982427 BLAKE2B 36f1e5abb90f6e684ab9b9479e3f28318c75e1f1cd71dfa9f84f00fca2e04ebec393b48ceec1db02d2777cb09fbf0f425cef017958aec1c7f6fd66277c370baa SHA512 ab3cc1e2a4b4232510eba89d03363ed1a9f74ee981e2e7eeef21d185dbc12f2efa5cc0e281c5d20adf1d3d0f95a44f7b0ece8fd304e26bdcd1ff352dbf398367 EBUILD jasper-4.0.0.ebuild 1275 BLAKE2B 520815966ee03cd1ec9272ce4b79712f0902555bbcf33d01397cbaf8ef9765a28077aa64a8da73549afa5c21a07b219152674127c665aebf72f763376c8dcca1 SHA512 c8c467d32fd70ed767e6e7063796738473bcad8fa4a1789446be1392c3970edcaef880132e4b8ad2178d2be985b92311e12fb20c242dc3c2df8a851bf4c2cc9b EBUILD jasper-4.1.1.ebuild 1275 BLAKE2B 520815966ee03cd1ec9272ce4b79712f0902555bbcf33d01397cbaf8ef9765a28077aa64a8da73549afa5c21a07b219152674127c665aebf72f763376c8dcca1 SHA512 c8c467d32fd70ed767e6e7063796738473bcad8fa4a1789446be1392c3970edcaef880132e4b8ad2178d2be985b92311e12fb20c242dc3c2df8a851bf4c2cc9b -EBUILD jasper-4.1.2.ebuild 1275 BLAKE2B 520815966ee03cd1ec9272ce4b79712f0902555bbcf33d01397cbaf8ef9765a28077aa64a8da73549afa5c21a07b219152674127c665aebf72f763376c8dcca1 SHA512 c8c467d32fd70ed767e6e7063796738473bcad8fa4a1789446be1392c3970edcaef880132e4b8ad2178d2be985b92311e12fb20c242dc3c2df8a851bf4c2cc9b -EBUILD jasper-9999.ebuild 1275 BLAKE2B 520815966ee03cd1ec9272ce4b79712f0902555bbcf33d01397cbaf8ef9765a28077aa64a8da73549afa5c21a07b219152674127c665aebf72f763376c8dcca1 SHA512 c8c467d32fd70ed767e6e7063796738473bcad8fa4a1789446be1392c3970edcaef880132e4b8ad2178d2be985b92311e12fb20c242dc3c2df8a851bf4c2cc9b +EBUILD jasper-4.1.2.ebuild 1395 BLAKE2B 665d82838bc751ddc086f13267c7e596fd60f39ef83afe7160f18163dd53da082d82a2717f063032090aea6e6af6eaac380edbe95f4c9d061033f149b5ad391b SHA512 8f6dbebb7866197cfeadd0721a647f79918457cd64b2c6c77f35f952263466c01e71bd9da863df665cb14b96bd58d51716f05bb060016bf81cebf48ef3c23ff7 +EBUILD jasper-9999.ebuild 1395 BLAKE2B 665d82838bc751ddc086f13267c7e596fd60f39ef83afe7160f18163dd53da082d82a2717f063032090aea6e6af6eaac380edbe95f4c9d061033f149b5ad391b SHA512 8f6dbebb7866197cfeadd0721a647f79918457cd64b2c6c77f35f952263466c01e71bd9da863df665cb14b96bd58d51716f05bb060016bf81cebf48ef3c23ff7 MISC metadata.xml 705 BLAKE2B 1ec5282be2bb47e2aec8ff90ce6838c7d21675141450f9c4e1d7b00a61129c3dc01f987f4c31d442caed3121f4bae85a83078fa46f5a2dd05d41ab40e8c3adcd SHA512 69cf7881e582eb205283ad2ffdf6823f2dc6ce0200f88d8bb5cd31b983fb57c19b261e4f56fa95ae2aa1515d2eb34a805729d75585a671a36a782e37ea98c9d7 diff --git a/media-libs/jasper/files/jasper-4.1.2-which-hunt.patch b/media-libs/jasper/files/jasper-4.1.2-which-hunt.patch new file mode 100644 index 000000000000..e04255a714ee --- /dev/null +++ b/media-libs/jasper/files/jasper-4.1.2-which-hunt.patch @@ -0,0 +1,34 @@ +https://github.com/jasper-software/jasper/pull/369 + +From de3e9d43224977cda178df609d09e222674200e6 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 14 Jan 2024 05:49:55 +0000 +Subject: [PATCH] test: run_test_3: drop use of `which` + +`which` is non-portable (not part of POSIX) and distributions like Debian and +Gentoo are looking to remove it from their base set of packages. + +Switch to `type -P` instead given `test/bin/run_test_3` already has a Bash +shebang. + +Signed-off-by: Sam James +--- + test/bin/run_test_3 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/bin/run_test_3 b/test/bin/run_test_3 +index fad80412..5bc9da93 100755 +--- a/test/bin/run_test_3 ++++ b/test/bin/run_test_3 +@@ -36,8 +36,8 @@ set_source_and_build_dirs || panic "cannot set source and build directories" + + #$CMDDIR/rundectests jasper || exit 1 + +-oj_compress=$(which opj2_compress) || oj_compress="" +-oj_decompress=$(which opj2_decompress) || oj_decompress="" ++oj_compress=$(type -P opj2_compress) || oj_compress="" ++oj_decompress=$(type -P opj2_decompress) || oj_decompress="" + + run_test="$cmd_dir/run_codec_test" + + diff --git a/media-libs/jasper/jasper-4.1.2.ebuild b/media-libs/jasper/jasper-4.1.2.ebuild index 335732079920..6540d3819942 100644 --- a/media-libs/jasper/jasper-4.1.2.ebuild +++ b/media-libs/jasper/jasper-4.1.2.ebuild @@ -19,7 +19,8 @@ fi LICENSE="JasPer2.0" SLOT="0/7" -IUSE="doc heif jpeg opengl" +IUSE="doc heif jpeg opengl test" +RESTRICT="!test? ( test )" RDEPEND=" heif? ( media-libs/libheif:= ) @@ -37,7 +38,12 @@ BDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base - )" + ) + test? ( media-libs/openjpeg )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1.2-which-hunt.patch +) src_configure() { local mycmakeargs=( diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild index 335732079920..6540d3819942 100644 --- a/media-libs/jasper/jasper-9999.ebuild +++ b/media-libs/jasper/jasper-9999.ebuild @@ -19,7 +19,8 @@ fi LICENSE="JasPer2.0" SLOT="0/7" -IUSE="doc heif jpeg opengl" +IUSE="doc heif jpeg opengl test" +RESTRICT="!test? ( test )" RDEPEND=" heif? ( media-libs/libheif:= ) @@ -37,7 +38,12 @@ BDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base - )" + ) + test? ( media-libs/openjpeg )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1.2-which-hunt.patch +) src_configure() { local mycmakeargs=( -- cgit v1.2.3