commit: bbc113ccb3f235f2e55b2a77a61021157ee2710f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Oct 4 12:02:52 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 4 17:36:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc113cc
media-libs/libjpeg-turbo: drop 3.0.0 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/libjpeg-turbo/Manifest | 1 - .../files/libjpeg-turbo-3.0.0-tests.patch | 97 --------------- .../libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild | 132 --------------------- 3 files changed, 230 deletions(-) diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index d17c810ba46b..f99eebaf36b3 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,4 +1,3 @@ DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff SHA512 86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6 -DIST libjpeg-turbo-3.0.0.tar.gz 2799663 BLAKE2B 9a4b74aad81c2999ab7f3cd7d8695e1132edda141f4cc8a57e671f42cad4ac16b66b0f19cf4b874b61a82c008287ad88cd81d85547c195ed30456e29cb505285 SHA512 2307a2e240faf5b3119cdc5cf6a0255813d74591d4a4201fd2374940683cb9de90cb5926367e633f3624b27edd292209c7cd3c38d64522716e83fc81361289b4 DIST libjpeg-turbo-3.0.3.tar.gz 2832827 BLAKE2B 9d141dadd0dce970bf857b51352c57a8e15180438abd7d6d66f9dfd24e23889add8c6c89120b84026e40ab61611516b0567984bd1db37e9c45b41917cf32e9a6 SHA512 7c3a6660e7a54527eaa40929f5cc3d519842ffb7e961c32630ae7232b71ecaa19e89dbf5600c61038f0c5db289b607c2316fe9b6b03d482d770bcac29288d129 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 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 deleted file mode 100644 index 303223fdd6b3..000000000000 --- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-3.0.0-tests.patch +++ /dev/null @@ -1,97 +0,0 @@ -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 <[email protected]> -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 deleted file mode 100644 index c1b081629167..000000000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib java-pkg-opt-2 - -DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" -HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"; -SRC_URI=" - https://downloads.sourceforge.net/${PN}/${P}.tar.gz - mirror://gentoo/libjpeg8_8d-2.debian.tar.gz -" - -LICENSE="BSD IJG ZLIB" -SLOT="0/0.2" -if [[ $(ver_cut 3) -lt 90 ]] ; then - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~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 )" -COMMON_DEPEND=" - !media-libs/jpeg:0 - !media-libs/jpeg:62 -" -DEPEND=" - ${COMMON_DEPEND} - java? ( >=virtual/jdk-1.8:*[-headless-awt] ) -" -RDEPEND=" - ${COMMON_DEPEND} - java? ( >=virtual/jre-1.8:* ) -" -BDEPEND=" - amd64? ( ${ASM_DEPEND} ) - x86? ( ${ASM_DEPEND} ) - amd64-linux? ( ${ASM_DEPEND} ) - x86-linux? ( ${ASM_DEPEND} ) - x64-macos? ( ${ASM_DEPEND} ) -" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) - -PATCHES=( - "${FILESDIR}"/${P}-tests.patch -) - -src_prepare() { - local FILE - ln -snf ../debian/extra/*.c . || die - - for FILE in ../debian/extra/*.c; do - FILE=${FILE##*/} - cat >> CMakeLists.txt <<-EOF || die - add_executable(${FILE%.c} ${FILE}) - install(TARGETS ${FILE%.c}) - EOF - done - - cmake_src_prepare - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - if multilib_is_native_abi && use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - local mycmakeargs=( - -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_STATIC="$(usex static-libs)" - -DWITH_JAVA="$(multilib_native_usex java)" - ) - - # Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #792810 - if use arm || use arm64; then - mycmakeargs+=( - -DWITH_SIMD=$(usex cpu_flags_arm_neon) - -DNEON_INTRINSICS=$(usex cpu_flags_arm_neon) - ) - fi - - # We should tell the test suite which floating-point flavor we are - # expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597 - # For now, mark loong as fp-contract. - if use loong; then - mycmakeargs+=( - -DFLOATTEST=fp-contract - ) - fi - - # Mostly for Prefix, ensure that we use our yasm if installed and - # not pick up host-provided nasm - if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then - mycmakeargs+=( - -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - if multilib_is_native_abi && use java ; then - rm -rf "${ED}"/usr/classes || die - java-pkg_dojar java/turbojpeg.jar - fi -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - local -a DOCS=( README.md ChangeLog.md ) - einstalldocs - - newdoc "${WORKDIR}"/debian/changelog changelog.debian - dobin "${WORKDIR}"/debian/extra/exifautotran - doman "${WORKDIR}"/debian/extra/*.[0-9]* - - docinto html - dodoc -r "${S}"/doc/html/. - - if use java; then - docinto html/java - dodoc -r "${S}"/java/doc/. - newdoc "${S}"/java/README README.java - fi -}
