media-libs/jasper: test fixes

Some test fixes I noticed when looking at bug #907259 and bug #922074. * Patch out `which` usage (jasper-software/jasper#369). * Depend on openjpeg for tests for the opj2_compress and opj2_decompress binaries. Bug: https://bugs.gentoo.org/907259 Bug: https://bugs.gentoo.org/922074 Closes: #34794 Signed-off-by: Sam James <[email protected]>
gentoo · Jan 14, 2024 · 8fca8b4 · 8fca8b4
1 parent 9f763e4
commit 8fca8b4
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
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
@@ -0,0 +1,34 @@
+https://github.com/jasper-software/jasper/pull/369
+
+From de3e9d43224977cda178df609d09e222674200e6 Mon Sep 17 00:00:00 2001
+From: Sam James <[email protected]>
+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 <[email protected]>
+---
+ 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
@@ -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
@@ -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=(