From 0735b7c70f35339a20b45aee2a0a0ad80d118550 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Jul 2023 04:15:42 +0100 Subject: gentoo auto-resync : 07:07:2023 - 04:15:41 --- media-libs/libjpeg-turbo/Manifest | 3 +- .../files/libjpeg-turbo-3.0.0-tests.patch | 97 ++++++++++++++++++++++ .../libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild | 10 ++- 3 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch (limited to 'media-libs/libjpeg-turbo') diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index 84cfb13a97f9..39ae9284222d 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,3 +1,4 @@ +AUX libjpeg-turbo-3.0.0-tests.patch 4077 BLAKE2B 437adbca7b2689508fbe8e025a1d30b706984e082167c855164bcb250829b9231a29df2117db0cb006f86e9ca9e29ece85707e2047f60483da40ef58c6d7d026 SHA512 c17c81ab4130bcb193ecc0754d00916d53ce6be9cdf6f04f6457c125951263c3a085d2baf440ec988feaf5fc45b593db59def096b3f988e9b704690394e2923e DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972 SHA512 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70 DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff SHA512 86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6 @@ -6,5 +7,5 @@ DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70 EBUILD libjpeg-turbo-2.1.3.ebuild 3135 BLAKE2B fc8a7318c20e87410236f28ce3e93cae7c706db44f0244f34e9e939ea515e66736661180f55a946d85eb1bb73b90b8b6e683a94930f4bed547c6c8b50527a1fd SHA512 529864d47d0b1e984c747c9e37ba1fdaf767de7174859cd49690f8b142a81461fd04848794a6a1b45bac51cf05360222998c573c32a43aa82ffc45cb312da097 EBUILD libjpeg-turbo-2.1.4.ebuild 3120 BLAKE2B e3d070e19bbe3e2bd308ddd062e3a4a96d627655e5602579b34090cce05706bd699e343e91e5ffeb2bdc4eed3c43d6eaa10890601fa3a23694e8f593f2eb088e SHA512 b607bf5308c23b64d9fbd77d9015227d7b58a228a0e3d9a40353ba061582a8284c3430873a9282417a360f9e55acdfd8af50b56596b9394739d5120441614b5d EBUILD libjpeg-turbo-2.1.5.1.ebuild 3136 BLAKE2B 3eddebb52183591f3d5f15d6bc2bc28cf090d91c265efc4a214e41d0f6af771fe9a15ca2c773052c3de5926a9b1b6a31ccafec678a1201b6fcabf91df0f68f02 SHA512 61ed92cbde855620a86b0894d2bbd3921c87056cd9c258e7f3c1754044d3e1457a26f71a12792702c2d9c27b5faae3130e580b48c65ce1d0f9914b368ab979fd -EBUILD libjpeg-turbo-3.0.0.ebuild 3222 BLAKE2B 5f3ffe678653a96a80c5d7cb42d6154605af62ef42415e048b91aab5de225c7eeefde7c0d602d420ce77205285dbfc6d308f5ab71c33eac5bc38a91bc5972655 SHA512 1f80923632cc791616bef974c6c8e4e18522d3ebe32e40ccc015577dca5f3f65c8d94850439fac37d373e2f66521dd349bae44d633892fad6793e052c32aeac7 +EBUILD libjpeg-turbo-3.0.0.ebuild 3264 BLAKE2B 3134aab2ce14478c684a09c76a97c6218bfab95d4ca37bec20c62271ed55cd74e67f0473fa1a39e74f2c167df583ad8a8805986956d440a71f6690751589f623 SHA512 06b8de3485769b80121f7a8beaf0b71e71156639c8b7a162d2391e3897eb39dff47429aab451bc416de996f30312af5ea3a2395690a889e562b9ba58153e3faf MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1 diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch new file mode 100644 index 000000000000..303223fdd6b3 --- /dev/null +++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch @@ -0,0 +1,97 @@ +https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705 +https://github.com/libjpeg-turbo/libjpeg-turbo/commit/035ea386d1b6a99a8a1e2ab57cc1fc903569136c + +From 035ea386d1b6a99a8a1e2ab57cc1fc903569136c Mon Sep 17 00:00:00 2001 +From: DRC +Date: Thu, 6 Jul 2023 12:04:22 -0400 +Subject: [PATCH] Build: Fix regression test concurrency issues + +- The example-*bit-*-decompress test must run after the + example-*bit-*-compress test, since the latter generates + testout*-example.jpg. + +- Add -static to the filenames of all output files generated by the + "static" regression tests, to avoid conflicts with the "shared" + regression tests. + +- Add the PID to the filenames of all files generated by the tjunittest + packed-pixel image I/O tests. + +- Check the return value of MD5File() in tjunittest to avoid a segfault + if the file doesn't exist. (Prior to the fix described above, that + could occur if two instances of tjunittest ran concurrently from the + same directory with the same -bmp and -precision arguments.) + +Fixes #705 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1004,7 +1004,7 @@ foreach(libtype ${TEST_LIBTYPES}) + + if(sample_bits EQUAL 12) + set(tjbench tjbench12) +- set(testout testout12) ++ set(testout testout12${suffix}) + + set(MD5_PPM_GRAY_TILE 2f799249148b1a9d0e61fa4408f6c397) + set(MD5_PPM_420_8x8_TILE b25684e1af37be504ee3fd137757353f) +@@ -1024,7 +1024,7 @@ foreach(libtype ${TEST_LIBTYPES}) + set(MD5_PPM_444_TILE 2f571a032e4dbc8ef40f75219d336b0b) + else() + set(tjbench tjbench) +- set(testout testout) ++ set(testout testout${suffix}) + + set(MD5_PPM_GRAY_TILE 2c3b567086e6ca0c5e6d34ad8d6f6fe8) + set(MD5_PPM_420_8x8_TILE efca1bdf0226df01777137778cf986ec) +@@ -1160,7 +1160,7 @@ foreach(libtype ${TEST_LIBTYPES}) + set(cjpeg cjpeg12) + set(djpeg djpeg12) + set(jpegtran jpegtran12) +- set(testout testout12) ++ set(testout testout12${suffix}) + + set(TESTORIG testorig12.jpg) + set(MD5_JPEG_RGB_ISLOW 9d7369207c520d37f2c1cbfcb82b2964) +@@ -1222,7 +1222,7 @@ foreach(libtype ${TEST_LIBTYPES}) + set(cjpeg cjpeg) + set(djpeg djpeg) + set(jpegtran jpegtran) +- set(testout testout) ++ set(testout testout${suffix}) + + set(TESTORIG testorig.jpg) + set(MD5_JPEG_RGB_ISLOW 1d44a406f61da743b5fd31c0a9abdca3) +@@ -1632,6 +1632,8 @@ foreach(libtype ${TEST_LIBTYPES}) + add_test(example-${sample_bits}bit-${libtype}-decompress + ${CMAKE_CROSSCOMPILING_EMULATOR} example${suffix} decompress + ${EXAMPLE_12BIT_ARG} ${testout}-example.jpg ${testout}-example.ppm) ++ set_tests_properties(example-${sample_bits}bit-${libtype}-decompress ++ PROPERTIES DEPENDS example-${sample_bits}bit-${libtype}-compress) + add_test(example-${sample_bits}bit-${libtype}-decompress-cmp + ${CMAKE_CROSSCOMPILING_EMULATOR} ${MD5CMP} ${MD5_PPM_EXAMPLE_DECOMPRESS} + ${testout}-example.ppm) +--- a/tjunittest.c ++++ b/tjunittest.c +@@ -977,8 +977,8 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf, + THROW("Could not allocate memory"); + initBitmap(buf, width, pitch, height, pf, bottomUp); + +- SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s.%s", precision, pixFormatStr[pf], +- align, bottomUp ? "bu" : "td", ext); ++ SNPRINTF(filename, 80, "test_bmp%d_%s_%d_%s_%d.%s", precision, pixFormatStr[pf], ++ align, bottomUp ? "bu" : "td", getpid(), ext); + if (precision == 8) { + TRY_TJ(handle, tj3SaveImage8(handle, filename, (unsigned char *)buf, width, + pitch, height, pf)); +@@ -990,6 +990,10 @@ static int doBmpTest(const char *ext, int width, int align, int height, int pf, + width, pitch, height, pf)); + } + md5sum = MD5File(filename, md5buf); ++ if (!md5sum) { ++ printf("\n Could not determine MD5 sum of %s\n", filename); ++ retval = -1; goto bailout; ++ } + if (strcasecmp(md5sum, md5ref)) + THROW_MD5(filename, md5sum, md5ref); + + diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild index 73e3b4200ffa..c8b5b6c08fce 100644 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild @@ -15,9 +15,9 @@ SRC_URI=" LICENSE="BSD IJG ZLIB" SLOT="0/0.2" # Unkeyworded for test failures: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705 -#if [[ $(ver_cut 3) -lt 90 ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" -#fi +if [[ $(ver_cut 3) -lt 90 ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" +fi IUSE="cpu_flags_arm_neon java static-libs" ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" @@ -43,6 +43,10 @@ BDEPEND=" MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) +PATCHES=( + "${FILESDIR}"/${P}-tests.patch +) + src_prepare() { local FILE ln -snf ../debian/extra/*.c . || die -- cgit v1.2.3