diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-04-18 12:04:39 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-18 12:04:39 +0100 |
| commit | 2d01b3d133c0fbf17de8d7b47905585af88bd6e4 (patch) | |
| tree | f74eb9a3d16ed25f8c15b825f4d28b759ae99a42 /media-libs/libjxl | |
| parent | 97bacba3ead078e5db8b87ab651a3ffa7d82f60f (diff) | |
gentoo auto-resync : 18:04:2024 - 12:04:39
Diffstat (limited to 'media-libs/libjxl')
| -rw-r--r-- | media-libs/libjxl/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index 50de8b6184b3..20adcc5184ee 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -1,6 +1,5 @@ AUX libjxl-0.8.2-backport-pr2596.patch 2017 BLAKE2B 3155febe7e02fc34dfdf692821028e16f97272f751176ef22126151e8edf18e2c7d9da88d9bc8334cd4737d36037a5a04eb7360a41fde39605db62942c52e62c SHA512 4f8cd6f2a70077b8e52b084a4c76f5a029e3e13e578d28bb2d9d3470ae89fa6867d541bacd079bd55b76eb17a1c2f3d845715fc0d4c9e2a199618d8a6871d1a1 AUX libjxl-0.8.2-backport-pr2617.patch 2853 BLAKE2B edeafa5bfa85f9868d98f4ee38be2dd4a5d747517e6aec59688d5314f1b6ede74bc3d20a11d08e3e2e2e87e8da987730a8a8cafcecce69369fdfa7bcb8ef2828 SHA512 ad8ddbe50d23895a3127d11bf36832ad1a1762e9b54bacc5f4d881accb5c81801618254b9b56afc4b145a7fb19bab8ca739974ff3bcb498e7db812d3a6cf004d -AUX libjxl-0.9.1-backport-pr3138.patch 1775 BLAKE2B 3bc8ec83f1104fabec0966dffd85719ed6eea5c89a10d7ffc490aaf767815dbfd7c6543a0058664b16a8d52cafb53b3137414403dbb5db844a0ae9366fe4b6bd SHA512 0a9262008daa2d118c4eab85102de8f05b265f3a3a8f45088f28ef844fd7c93740a69aa6a1d93bc5d1808c3158527d8b9b8c4543256c1a2988e8a03bff19486a AUX libjxl-0.9.1-backport-pr3143.patch 1065 BLAKE2B acc6ab904994f42cffe19296966587dbbf316289277d91e1a17cd635161b51eed770ab95fc682d93b8693d50def9bb205290c3eb534effdfdc2cd057db36647c SHA512 d5eeca764e13175eb64ba5ee47a9bf03080d0830395ba9b626b7144674a5ce8fbb694705a4d2c55f3b52507a59c5793e21e9c99dded65803857a0859a1f9f466 DIST libjxl-0.10.2.tar.gz 1912303 BLAKE2B 9677d0d35d877ce269c9958accfbb5ee55d446dc0e8fa64df9323c1db3993613752803aae63a48c18eeb72ae91c2a044a1fab0a83ddf28fdf8395ddb67a72414 SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e DIST libjxl-0.8.2.tar.gz 1612062 BLAKE2B 2b5e65cde6c85881c5f26f676afec825c974f6919c3cc3f056ca4a9679162e89f2de35ab7d0b2a60782d39eca1f4ddad779f8d25d3f520417f6d9dea71e854db SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887 diff --git a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch b/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch deleted file mode 100644 index 0da0a9ba8ab8..000000000000 --- a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3138.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/libjxl/libjxl/issues/3137 -https://github.com/libjxl/libjxl/pull/3138 - -From 5e5dda47aee0a6f480984cf13cfc2be0044316e4 Mon Sep 17 00:00:00 2001 -From: Moritz Firsching <firsching@google.com> -Date: Mon, 15 Jan 2024 13:43:01 +0100 -Subject: [PATCH] disable tooling test when not JPEGXL_ENABLE_TOOLS - ---- - tools/conformance/CMakeLists.txt | 25 ++++++++++++++----------- - 1 file changed, 14 insertions(+), 11 deletions(-) - -diff --git a/tools/conformance/CMakeLists.txt b/tools/conformance/CMakeLists.txt -index 5766612abf9..36249048c59 100644 ---- a/tools/conformance/CMakeLists.txt -+++ b/tools/conformance/CMakeLists.txt -@@ -4,15 +4,18 @@ - # license that can be found in the LICENSE file. - - if(BUILD_TESTING AND CMAKE_EXECUTABLE_SUFFIX STREQUAL "") --# Script to validate the tooling. --find_program (BASH_PROGRAM bash) --if(BASH_PROGRAM) -- add_test( -- NAME conformance_tooling_test -- COMMAND -- ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/tooling_test.sh -- ${CMAKE_BINARY_DIR} ${JPEGXL_TEST_DATA_PATH}) -- # Skip the test if dependencies are not available. -- set_tests_properties(conformance_tooling_test PROPERTIES SKIP_RETURN_CODE 254) --endif() -+ # Script to validate the tooling. -+ # Only add it when djxl being build. -+ if(JPEGXL_ENABLE_TOOLS) -+ find_program (BASH_PROGRAM bash) -+ if(BASH_PROGRAM) -+ add_test( -+ NAME conformance_tooling_test -+ COMMAND -+ ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/tooling_test.sh -+ ${CMAKE_BINARY_DIR} ${JPEGXL_TEST_DATA_PATH}) -+ # Skip the test if dependencies are not available. -+ set_tests_properties(conformance_tooling_test PROPERTIES SKIP_RETURN_CODE 254) -+ endif() # BASH_PROGRAM -+ endif() # JPEGXL_ENABLE_TOOLS - endif() # BUILD_TESTING |