[gentoo-commits] repo/gentoo:master commit in: media-libs/libjxl/files/, media-libs/libjxl/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjxl/files/, media-libs/libjxl/
@ 2022-03-27 14:00 Yixun Lan
  0 siblings, 0 replies; 3+ messages in thread
From: Yixun Lan @ 2022-03-27 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     5cdf389fd2bdffd38450020639614522c63c2b82
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 04:22:30 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 13:59:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cdf389f

media-libs/libjxl: use -pthread to fix missing atomic issue

Due to there is no 1, 2byte atomic instruction in 64bit RISC-V hardware,
the software layer have to emulate relavant function in atomic library

Let's explicitly pass -pthread here to work around pthread builtin since
glibc version 2.34
as the "-pthread" option will pull in libatomic for machines like RISC-V

Closes: https://bugs.gentoo.org/836125
Upstream: https://github.com/libjxl/libjxl/issues/1283
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 media-libs/libjxl/files/libjxl-0.7.0-pthread.patch | 40 ++++++++++++++++++++++
 media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild  |  2 ++
 2 files changed, 42 insertions(+)

diff --git a/media-libs/libjxl/files/libjxl-0.7.0-pthread.patch b/media-libs/libjxl/files/libjxl-0.7.0-pthread.patch
new file mode 100644
index 000000000000..ea64e5805479
--- /dev/null
+++ b/media-libs/libjxl/files/libjxl-0.7.0-pthread.patch
@@ -0,0 +1,40 @@
+
+Due to there is no 1, 2byte atomic instruction in 64bit RISC-V hardware,
+the software layer have to emulate relavant function in atomic library
+
+Let's explicitly pass -pthread here to work around pthread builtin since glibc version 2.34
+as the "-pthread" option will pull in libatomic for machines like RISC-V
+
+the command of "gcc dumpspecs | grep pthread" will show accordingly in RISC-V:
+pthread:--push-state --as-needed -latomic --pop-state
+
+https://bugs.gentoo.org/836125
+https://github.com/libjxl/libjxl/issues/1283
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4df740b..59c7f03 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,6 +190,9 @@ endif()  # JPEGXL_STATIC
+ # Threads
+ set(THREADS_PREFER_PTHREAD_FLAG YES)
+ find_package(Threads REQUIRED)
++if(CMAKE_USE_PTHREADS_INIT)
++	target_link_libraries(Threads::Threads INTERFACE -pthread)
++endif()
+ 
+ if(JPEGXL_STATIC)
+   if (MINGW)
+diff --git a/tools/conformance/CMakeLists.txt b/tools/conformance/CMakeLists.txt
+index bd25b1c..d125dc5 100644
+--- a/tools/conformance/CMakeLists.txt
++++ b/tools/conformance/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ # license that can be found in the LICENSE file.
+ 
+ add_executable(djxl_conformance djxl_conformance.cc)
+-target_link_libraries(djxl_conformance jxl_dec)
++target_link_libraries(djxl_conformance jxl_dec -pthread)
+ 
+ if(BUILD_TESTING AND CMAKE_EXECUTABLE_SUFFIX STREQUAL "")
+ # Script to validate the tooling.

diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
index 1afe0678670a..f16373af5651 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
@@ -30,6 +30,8 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-0.7.0-pthread.patch" )
+
 S="${WORKDIR}/libjxl-libjxl-3f8e77f"
 
 multilib_src_configure() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjxl/files/, media-libs/libjxl/
@ 2022-05-14  1:02 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-05-14  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     f4d5c2477709118c9d59c90ccc49d540a7dd69cd
Author:     Daniel Novomesky <dnovomesky <AT> gmail <DOT> com>
AuthorDate: Wed May 11 16:02:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 01:02:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d5c247

media-libs/libjxl: version bump to 20220511 snapshot

- Drop old 0.7.0_pre20220311
- Depend on media-libs/libjpeg-turbo instead virtual/jpeg
- -DCMAKE_SKIP_RPATH=ON is no longer needed

Closes: https://bugs.gentoo.org/843629
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Novomesky <dnovomesky <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25447
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libjxl/Manifest                         |   2 +-
 media-libs/libjxl/files/libjxl-0.7.0-atomic.patch  | 136 ---------------------
 ...0311.ebuild => libjxl-0.7.0_pre20220511.ebuild} |  31 ++---
 media-libs/libjxl/libjxl-9999.ebuild               |   3 +-
 4 files changed, 10 insertions(+), 162 deletions(-)

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 2614d99687a0..a6ca3a295453 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,2 +1,2 @@
-DIST libjxl-0.7.0_pre20220311.tar.gz 17322724 BLAKE2B a3cf970ea3db67e0890e94a5c74ea66610d4fed608fa3d079e6934a1d5f2bdc3ef4264c1df85e4b4efcd22c060087c712009f6c4a6b69a41f6e96ff3674c6de5 SHA512 f3e46ddea462b31de6df3c615c3cd628adc58c7ff41588e2ec4cc8929590c9272603a66ed4620b9ba550d85b3d1a6da3f51b1c4f8650ef8901347fea8af5d474
 DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242
+DIST libjxl-0.7.0_pre20220511.tar.gz 1488860 BLAKE2B 63cc0d8161eb83efbae9c4ef238ec7300a8354ee7e030fafb96efca9c50216edfaf45bf276403df41a1bf4add533cb7031074c62faafc2f8d2e499290525f332 SHA512 605299cd4294c524b703bd163c083cb04c1f247aab5a6756d2e68482dab98c8d9585f248c03290e67c6cadf8692ead0c00abce7162d8dd7bf26b2cd4bfd1f736

diff --git a/media-libs/libjxl/files/libjxl-0.7.0-atomic.patch b/media-libs/libjxl/files/libjxl-0.7.0-atomic.patch
deleted file mode 100644
index 44d76fcfb10f..000000000000
--- a/media-libs/libjxl/files/libjxl-0.7.0-atomic.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-include following patches :
-
-fde214c5f4dc5ffd0360401a68df33182edf9226 Refactor c11/atomic patch for riscv64
-326711f86719e6ce7b0422a7970ce8f8b1598f25 Make sure to list Threads::Threads in JPEGXL_DEC_INTERNAL_LIBS
-b12bb7a5f37d6bcaf134cfab7828ae08c4a0e60d Remove duplicate reference to hwy library
-87fe7c16e1fb2e21b6a1dca26782950ae1559d99 libjxl implementation rely on c11 atomics
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc1bbac..cce9748 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -191,6 +191,15 @@ endif()  # JPEGXL_STATIC
- set(THREADS_PREFER_PTHREAD_FLAG YES)
- find_package(Threads REQUIRED)
- 
-+# These settings are important to drive check_cxx_source_compiles
-+# See CMP0067 (min cmake version is 3.10 anyway)
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_EXTENSIONS OFF)
-+set(CMAKE_CXX_STANDARD_REQUIRED YES)
-+
-+# Atomics
-+find_package(Atomics REQUIRED)
-+
- if(JPEGXL_STATIC)
-   if (MINGW)
-     # In MINGW libstdc++ uses pthreads directly. When building statically a
-@@ -298,10 +307,6 @@ endif ()  # !MSVC
- 
- include(GNUInstallDirs)
- 
--set(CMAKE_CXX_STANDARD 11)
--set(CMAKE_CXX_EXTENSIONS OFF)
--set(CMAKE_CXX_STANDARD_REQUIRED YES)
--
- add_subdirectory(third_party)
- 
- # Copy the JXL license file to the output build directory.
-diff --git a/cmake/FindAtomics.cmake b/cmake/FindAtomics.cmake
-new file mode 100644
-index 0000000..9a6cdc3
---- /dev/null
-+++ b/cmake/FindAtomics.cmake
-@@ -0,0 +1,53 @@
-+# Original issue:
-+# * https://gitlab.kitware.com/cmake/cmake/-/issues/23021#note_1098733
-+#
-+# For reference:
-+# * https://gcc.gnu.org/wiki/Atomic/GCCMM
-+#
-+# riscv64 specific:
-+# * https://lists.debian.org/debian-riscv/2022/01/msg00009.html
-+#
-+# ATOMICS_FOUND        - system has c++ atomics
-+# ATOMICS_LIBRARIES    - libraries needed to use c++ atomics
-+
-+include(CheckCXXSourceCompiles)
-+
-+# RISC-V only has 32-bit and 64-bit atomic instructions. GCC is supposed
-+# to convert smaller atomics to those larger ones via masking and
-+# shifting like LLVM, but it’s a known bug that it does not. This means
-+# anything that wants to use atomics on 1-byte or 2-byte types needs
-+# -latomic, but not 4-byte or 8-byte (though it does no harm).
-+set(atomic_code
-+    "
-+     #include <atomic>
-+     #include <cstdint>
-+     std::atomic<uint8_t> n8 (0); // riscv64
-+     std::atomic<uint64_t> n64 (0); // armel, mipsel, powerpc
-+     int main() {
-+       ++n8;
-+       ++n64;
-+       return 0;
-+     }")
-+
-+check_cxx_source_compiles("${atomic_code}" ATOMICS_LOCK_FREE_INSTRUCTIONS)
-+
-+if(ATOMICS_LOCK_FREE_INSTRUCTIONS)
-+  set(ATOMICS_FOUND TRUE)
-+  set(ATOMICS_LIBRARIES)
-+else()
-+  set(CMAKE_REQUIRED_LIBRARIES "-latomic")
-+  check_cxx_source_compiles("${atomic_code}" ATOMICS_IN_LIBRARY)
-+  set(CMAKE_REQUIRED_LIBRARIES)
-+  if(ATOMICS_IN_LIBRARY)
-+    set(ATOMICS_LIBRARY atomic)
-+    include(FindPackageHandleStandardArgs)
-+    find_package_handle_standard_args(Atomics DEFAULT_MSG ATOMICS_LIBRARY)
-+    set(ATOMICS_LIBRARIES ${ATOMICS_LIBRARY})
-+    unset(ATOMICS_LIBRARY)
-+  else()
-+    if(Atomics_FIND_REQUIRED)
-+      message(FATAL_ERROR "Neither lock free instructions nor -latomic found.")
-+    endif()
-+  endif()
-+endif()
-+unset(atomic_code)
-diff --git a/lib/jxl.cmake b/lib/jxl.cmake
-index 97dfd73..8f69894 100644
---- a/lib/jxl.cmake
-+++ b/lib/jxl.cmake
-@@ -346,6 +346,8 @@ set(JPEGXL_DEC_INTERNAL_LIBS
-   brotlidec-static
-   brotlicommon-static
-   hwy
-+  Threads::Threads
-+  ${ATOMICS_LIBRARIES}
- )
- 
- if(JPEGXL_ENABLE_PROFILER)
-@@ -355,7 +357,6 @@ endif()
- set(JPEGXL_INTERNAL_LIBS
-   ${JPEGXL_DEC_INTERNAL_LIBS}
-   brotlienc-static
--  Threads::Threads
- )
- 
- # strips the -static suffix from all the elements in LIST
-@@ -467,7 +468,7 @@ add_library(jxl_dec-static STATIC
-   $<TARGET_OBJECTS:jxl_dec-obj>
- )
- target_link_libraries(jxl_dec-static
--  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_DEC_INTERNAL_LIBS} hwy)
-+  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_DEC_INTERNAL_LIBS})
- target_include_directories(jxl_dec-static PUBLIC
-   "${PROJECT_SOURCE_DIR}"
-   "${CMAKE_CURRENT_SOURCE_DIR}/include"
-@@ -488,7 +489,7 @@ endif()
- # to do, remove $<TARGET_OBJECTS:jxl_dec-obj> here and depend on jxl_dec-static
- add_library(jxl-static STATIC ${JPEGXL_INTERNAL_OBJECTS})
- target_link_libraries(jxl-static
--  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_INTERNAL_LIBS} hwy)
-+  PUBLIC ${JPEGXL_COVERAGE_FLAGS} ${JPEGXL_INTERNAL_LIBS})
- target_include_directories(jxl-static PUBLIC
-   "${PROJECT_SOURCE_DIR}"
-   "${CMAKE_CURRENT_SOURCE_DIR}/include"

diff --git a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220511.ebuild
similarity index 69%
rename from media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
rename to media-libs/libjxl/libjxl-0.7.0_pre20220511.ebuild
index 9c909deddbe6..5ab1265c2bf0 100644
--- a/media-libs/libjxl/libjxl-0.7.0_pre20220311.ebuild
+++ b/media-libs/libjxl/libjxl-0.7.0_pre20220511.ebuild
@@ -3,40 +3,35 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
-inherit cmake-multilib xdg
+inherit cmake-multilib
 
 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
 
-SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/3f8e77fcfabe8ca8ddee6be4e662de525667c570 -> ${P}.tar.gz"
+SRC_URI="https://api.github.com/repos/libjxl/libjxl/tarball/105bf1a20be35c2d0d7dd302c008f3669c2f998c -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples openexr"
+IUSE="openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	dev-cpp/gflags:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
-	media-libs/lcms:=[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.13:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	>=x11-misc/shared-mime-info-2.2
 	openexr? ( media-libs/openexr:= )
 "
-
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.7.0-atomic.patch" )
-
-S="${WORKDIR}/libjxl-libjxl-3f8e77f"
+S="${WORKDIR}/libjxl-libjxl-105bf1a"
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_TESTING=OFF
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
 		-DJPEGXL_ENABLE_COVERAGE=OFF
@@ -54,18 +49,17 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_MANPAGES=OFF
 		-DJPEGXL_ENABLE_JNI=OFF
 		-DJPEGXL_ENABLE_TCMALLOC=OFF
+		-DJPEGXL_ENABLE_EXAMPLES=OFF
 	)
 
 	if multilib_is_native_abi; then
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
 			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
 		)
 	else
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_EXAMPLES=OFF
 			-DJPEGXL_ENABLE_OPENEXR=OFF
 		)
 	fi
@@ -76,14 +70,5 @@ multilib_src_configure() {
 multilib_src_install() {
 	cmake_src_install
 
-	if multilib_is_native_abi; then
-		if use examples; then
-			dobin "${BUILD_DIR}/jxlinfo"
-		fi
-
-		insinto /usr/share/mime/packages
-		doins -r "${S}"/plugins/mime/image-jxl.xml
-	fi
-
 	find "${D}" -name '*.a' -delete || die
 }

diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 87e4061707c8..88ff53d84586 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	media-libs/giflib:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg[${MULTILIB_USEDEP}]
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	gdk-pixbuf? (
 		dev-libs/glib:2
@@ -34,7 +34,6 @@ RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_TESTING=OFF
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
 		-DJPEGXL_ENABLE_COVERAGE=OFF


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/libjxl/files/, media-libs/libjxl/
@ 2024-10-04 21:40 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     6a04be1d2a60b9c9723206f36a025a4897c038f5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 17:46:21 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 21:40:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a04be1d

media-libs/libjxl: drop 0.9.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/libjxl/Manifest                         |   1 -
 .../files/libjxl-0.8.2-backport-pr2596.patch       |  50 ---------
 .../files/libjxl-0.8.2-backport-pr2617.patch       |  60 -----------
 .../files/libjxl-0.9.1-backport-pr3143.patch       |  23 ----
 media-libs/libjxl/libjxl-0.9.3.ebuild              | 119 ---------------------
 5 files changed, 253 deletions(-)

diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 4a62b88722a9..27130d4f33c7 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,6 +1,5 @@
 DIST libjxl-0.10.3.tar.gz 1912351 BLAKE2B 4432ecf34ac03d9ce8fc814835c7ee31fcc1e516b95e347dcb201a6996e1ffaadbd2e78a6a235ee1c4ff5121af495b8bc621e6738e2d03a8eb1639fb397e5246 SHA512 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4
 DIST libjxl-0.11.0.tar.gz 1873614 BLAKE2B 60f038c35f921e1d6cfaab62ec92c15fa8b0bb9369724bdbaf25fb72559670de6f2e86bf1fb7d37158e1d046d46d20610b574e2288f86d4bae52fdc2c51e3b76 SHA512 a3648a5f046cae36b3272c46525d002d490f781f44647d4d8318f0b773dd9b7902582ced5636af3489f1d6a44e3baf8ad2e5ab47d26869d16b01607d90e14053
 DIST libjxl-0.8.3.tar.gz 1612441 BLAKE2B d1c3b108c67d0a3a63ce50cdc7305b6853b182ec6c210d499e15120fbb858dada23997a4a0eb545f936e02230ed773506b066f24e19cce1f99aedaafd2bd7803 SHA512 f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef
-DIST libjxl-0.9.3.tar.gz 1873236 BLAKE2B eb3811ef4fc64bb5df2e06b6b86cbc1b5dbe6eb9728e5ad5a8b791be57359eb63442722cdf629b006be518bf575409b93758d7ec0376a596de4405fb7686b7f2 SHA512 8aace2d8c0ece9db64a1620a10581ddc5a450543db64d44f864eaa5d3b8b3f0466c501fed5d58abdbf6eb5f90af25f6370c33718847bd070e851a02b560f541e
 DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f
 DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384

diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch
deleted file mode 100644
index 43448a01c473..000000000000
--- a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2596.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://bugs.gentoo.org/908939
-https://github.com/libjxl/libjxl/issues/2433
-https://github.com/libjxl/libjxl/pull/2596
-
-From 6a5cd1ff847e7b18ba8b87fcc11ada17dccb0692 Mon Sep 17 00:00:00 2001
-From: Sami Boukortt <sboukortt@google.com>
-Date: Thu, 22 Jun 2023 12:26:25 +0200
-Subject: [PATCH] Make sure to read the rendering intent before the CICP tag
-
-The code that reads the CICP tag exits the function if it succeeds, but
-it should not skip reading the rendering intent, so make sure to have
-already done it by that point.
----
- lib/jxl/enc_color_management.cc | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/lib/jxl/enc_color_management.cc b/lib/jxl/enc_color_management.cc
-index 752e3e02c0..2b519d152e 100644
---- a/lib/jxl/enc_color_management.cc
-+++ b/lib/jxl/enc_color_management.cc
-@@ -982,6 +982,14 @@ Status ColorEncoding::SetFieldsFromICC() {
-   Profile profile;
-   JXL_RETURN_IF_ERROR(DecodeProfile(context, icc_, &profile));
- 
-+  const cmsUInt32Number rendering_intent32 =
-+      cmsGetHeaderRenderingIntent(profile.get());
-+  if (rendering_intent32 > 3) {
-+    return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
-+  }
-+  // ICC and RenderingIntent have the same values (0..3).
-+  rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
-+
-   static constexpr size_t kCICPSize = 12;
-   static constexpr auto kCICPSignature =
-       static_cast<cmsTagSignature>(0x63696370);
-@@ -993,14 +1001,6 @@ Status ColorEncoding::SetFieldsFromICC() {
-     return true;
-   }
- 
--  const cmsUInt32Number rendering_intent32 =
--      cmsGetHeaderRenderingIntent(profile.get());
--  if (rendering_intent32 > 3) {
--    return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
--  }
--  // ICC and RenderingIntent have the same values (0..3).
--  rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
--
-   SetColorSpace(ColorSpaceFromProfile(profile));
-   if (cmsGetColorSpace(profile.get()) == cmsSigCmykData) {
-     cmyk_ = true;

diff --git a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch b/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch
deleted file mode 100644
index af9345867473..000000000000
--- a/media-libs/libjxl/files/libjxl-0.8.2-backport-pr2617.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/908939
-https://github.com/libjxl/libjxl/issues/2433
-https://github.com/libjxl/libjxl/pull/2617
-
-From d9637bd803bf9fadc00aa01cea7becfff1e00e1f Mon Sep 17 00:00:00 2001
-From: Sami Boukortt <sboukortt@google.com>
-Date: Mon, 26 Jun 2023 15:06:17 +0200
-Subject: [PATCH] Fix decode_test with lcms2
-
-Co-authored-by: Zoltan Szabadka <szabadka@google.com>
-Co-authored-by: Luca Versari <veluca@google.com>
----
- lib/jxl/decode_test.cc | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/lib/jxl/decode_test.cc b/lib/jxl/decode_test.cc
-index 44ead99ec6..bbb7bda39c 100644
---- a/lib/jxl/decode_test.cc
-+++ b/lib/jxl/decode_test.cc
-@@ -3734,13 +3734,18 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
-       jxl::Span<const uint8_t>(codestream.data(), codestream.size()));
-   ASSERT_EQ(br.ReadFixedBits<16>(), 0x0AFF);
-   jxl::CodecMetadata metadata;
--  EXPECT_TRUE(ReadSizeHeader(&br, &metadata.size));
--  EXPECT_TRUE(ReadImageMetadata(&br, &metadata.m));
-+  ASSERT_TRUE(ReadSizeHeader(&br, &metadata.size));
-+  ASSERT_TRUE(ReadImageMetadata(&br, &metadata.m));
-   streampos->basic_info =
-       add_offset(br.TotalBitsConsumed() / jxl::kBitsPerByte);
-   metadata.transform_data.nonserialized_xyb_encoded = metadata.m.xyb_encoded;
--  EXPECT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
--  EXPECT_TRUE(br.JumpToByteBoundary());
-+  ASSERT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
-+  if (metadata.m.color_encoding.WantICC()) {
-+    jxl::PaddedBytes icc;
-+    ASSERT_TRUE(jxl::ReadICC(&br, &icc));
-+    ASSERT_TRUE(metadata.m.color_encoding.SetICCRaw(std::move(icc)));
-+  }
-+  ASSERT_TRUE(br.JumpToByteBoundary());
-   bool has_preview = metadata.m.have_preview;
-   while (br.TotalBitsConsumed() < br.TotalBytes() * jxl::kBitsPerByte) {
-     FramePositions p;
-@@ -3750,7 +3755,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
-       frame_header.nonserialized_is_preview = true;
-       has_preview = false;
-     }
--    EXPECT_TRUE(ReadFrameHeader(&br, &frame_header));
-+    ASSERT_TRUE(ReadFrameHeader(&br, &frame_header));
-     p.header_end =
-         add_offset(jxl::DivCeil(br.TotalBitsConsumed(), jxl::kBitsPerByte));
-     jxl::FrameDimensions frame_dim = frame_header.ToFrameDimensions();
-@@ -3760,7 +3765,7 @@ void AnalyzeCodestream(const jxl::PaddedBytes& data,
-         frame_header.passes.num_passes, /*has_ac_global=*/true);
-     std::vector<uint64_t> section_offsets;
-     std::vector<uint32_t> section_sizes;
--    EXPECT_TRUE(ReadGroupOffsets(toc_entries, &br, &section_offsets,
-+    ASSERT_TRUE(ReadGroupOffsets(toc_entries, &br, &section_offsets,
-                                  &section_sizes, &groups_total_size));
-     EXPECT_EQ(br.TotalBitsConsumed() % jxl::kBitsPerByte, 0);
-     size_t sections_start = br.TotalBitsConsumed() / jxl::kBitsPerByte;

diff --git a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch b/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch
deleted file mode 100644
index 06c1498f3fea..000000000000
--- a/media-libs/libjxl/files/libjxl-0.9.1-backport-pr3143.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0bfdf5c5429dbb866142bd75e4877794dc723b25 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <dnovomesky@gmail.com>
-Date: Mon, 15 Jan 2024 17:18:33 +0100
-Subject: [PATCH] plugins: use JPEGXL_TEST_DATA_PATH instead of hard-coded
- path.
-
----
- plugins/gdk-pixbuf/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/gdk-pixbuf/CMakeLists.txt b/plugins/gdk-pixbuf/CMakeLists.txt
-index 7b53b98c665..12c1a83753e 100644
---- a/plugins/gdk-pixbuf/CMakeLists.txt
-+++ b/plugins/gdk-pixbuf/CMakeLists.txt
-@@ -74,7 +74,7 @@ if(BUILD_TESTING AND NOT CMAKE_CROSSCOMPILING)
-         COMMAND
-           ${XVFB_PROGRAM_PREFIX} $<TARGET_FILE:pixbufloader_test>
-           "${CMAKE_CURRENT_SOURCE_DIR}/loaders_test.cache"
--          "${CMAKE_SOURCE_DIR}/testdata/jxl/blending/cropped_traffic_light.jxl"
-+          "${JPEGXL_TEST_DATA_PATH}/jxl/blending/cropped_traffic_light.jxl"
-         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       )
-       set_tests_properties(pixbufloader_test_jxl PROPERTIES SKIP_RETURN_CODE 254)

diff --git a/media-libs/libjxl/libjxl-0.9.3.ebuild b/media-libs/libjxl/libjxl-0.9.3.ebuild
deleted file mode 100644
index d2a844f6cf81..000000000000
--- a/media-libs/libjxl/libjxl-0.9.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib gnome2-utils
-
-# This changes frequently.  Please check the testdata submodule when bumping.
-TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc"
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl/"
-SRC_URI="
-	https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	test? (
-		https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
-			-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz
-	)
-"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86"
-IUSE="+gdk-pixbuf gif jpeg openexr +png test"
-REQUIRED_USE="test? ( png )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/brotli:=[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}]
-	gdk-pixbuf? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-	)
-	gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	>=x11-misc/shared-mime-info-2.2
-"
-DEPEND+="
-	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.1-backport-pr3143.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DJPEGXL_ENABLE_BENCHMARK=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_SJPEG=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif)
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-
-		-DJPEGXL_ENABLE_SKCMS=OFF
-		-DJPEGXL_ENABLE_VIEWERS=OFF
-		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
-		-DJPEGXL_FORCE_SYSTEM_HWY=ON
-		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
-		-DJPEGXL_ENABLE_DOXYGEN=OFF
-		-DJPEGXL_ENABLE_MANPAGES=OFF
-		-DJPEGXL_ENABLE_JNI=OFF
-		-DJPEGXL_ENABLE_JPEGLI=OFF
-		-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
-		-DJPEGXL_ENABLE_TCMALLOC=OFF
-		-DJPEGXL_ENABLE_EXAMPLES=OFF
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
-			-DJPEGXL_ENABLE_PLUGINS=ON
-			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
-			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
-			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_OPENEXR=OFF
-			-DJPEGXL_ENABLE_PLUGINS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	find "${ED}" -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-10-04 21:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-04 21:40 [gentoo-commits] repo/gentoo:master commit in: media-libs/libjxl/files/, media-libs/libjxl/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-05-14  1:02 Sam James
2022-03-27 14:00 Yixun Lan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox