pool/libjxl
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Refresh 0001-Remove-LCMS-mutex.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/graphics/libjxl?expand=0&rev=19
This commit is contained in:
Jan Engelhardt 2023-04-17 07:36:54 +00:00 committed by Git OBS Bridge
parent fe5c293730
commit 9846309532
3 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
0001-Remove-LCMS-mutex.patch
View File

@ -13,113 +13,105 @@ Requires mm2/Little-CMS@68ee2ff, which is released in LCMS v2.13.
LCMS submodule was updated to version 2.13.1 instead. LCMS submodule was updated to version 2.13.1 instead.
--- ---
lib/jxl/enc_color_management.cc | 15 --------------- lib/jxl/enc_color_management.cc | 15 +++++++++++++++
third_party/CMakeLists.txt | 2 +- third_party/CMakeLists.txt | 2 +-
third_party/lcms | 2 +- third_party/lcms2.cmake | 14 --------------
third_party/lcms2.cmake | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 15 deletions(-)
4 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/lib/jxl/enc_color_management.cc b/lib/jxl/enc_color_management.cc Index: libjxl-0.8.1/lib/jxl/enc_color_management.cc
index 419a2b6b68..0a7e21f3ba 100644 ===================================================================
--- a/lib/jxl/enc_color_management.cc --- libjxl-0.8.1.orig/lib/jxl/enc_color_management.cc
+++ b/lib/jxl/enc_color_management.cc +++ libjxl-0.8.1/lib/jxl/enc_color_management.cc
@@ -18,7 +18,6 @@ @@ -18,6 +18,7 @@
#include <array> #include <array>
#include <atomic> #include <atomic>
#include <memory> #include <memory>
-#include <mutex> +#include <mutex>
#include <string> #include <string>
#include <utility> #include <utility>
@@ -307,14 +306,6 @@ int DoColorSpaceTransform(void* t, size_t thread, const float* buf_src, @@ -308,6 +309,14 @@ int DoColorSpaceTransform(void* t, size_
// Define to 1 on OS X as a workaround for older LCMS lacking MD5. // Define to 1 on OS X as a workaround for older LCMS lacking MD5.
#define JXL_CMS_OLD_VERSION 0 #define JXL_CMS_OLD_VERSION 0
-// cms functions (even *THR) are not thread-safe, except cmsDoTransform. +// cms functions (even *THR) are not thread-safe, except cmsDoTransform.
-// To ensure all functions are covered without frequent lock-taking nor risk of +// To ensure all functions are covered without frequent lock-taking nor risk of
-// recursive lock, we lock in the top-level APIs. +// recursive lock, we lock in the top-level APIs.
-static std::mutex& LcmsMutex() { +static std::mutex& LcmsMutex() {
- static std::mutex m; + static std::mutex m;
- return m; + return m;
-} +}
- +
#if JPEGXL_ENABLE_SKCMS #if JPEGXL_ENABLE_SKCMS
JXL_MUST_USE_RESULT CIExy CIExyFromXYZ(const float XYZ[3]) { JXL_MUST_USE_RESULT CIExy CIExyFromXYZ(const float XYZ[3]) {
@@ -816,9 +807,6 @@ Status ApplyHlgOotf(JxlCms* t, float* JXL_RESTRICT buf, size_t xsize, @@ -871,6 +880,9 @@ bool ApplyCICP(const uint8_t color_prima
} // namespace } // namespace
-// All functions that call lcms directly (except ColorSpaceTransform::Run) must +// All functions that call lcms directly (except ColorSpaceTransform::Run) must
-// lock LcmsMutex(). +// lock LcmsMutex().
- +
Status ColorEncoding::SetFieldsFromICC() { Status ColorEncoding::SetFieldsFromICC() {
// In case parsing fails, mark the ColorEncoding as invalid. // In case parsing fails, mark the ColorEncoding as invalid.
SetColorSpace(ColorSpace::kUnknown); SetColorSpace(ColorSpace::kUnknown);
@@ -858,7 +846,6 @@ Status ColorEncoding::SetFieldsFromICC() { @@ -917,6 +929,7 @@ Status ColorEncoding::SetFieldsFromICC()
rendering_intent = static_cast<RenderingIntent>(rendering_intent32); DetectTransferFunction(profile, this);
#else // JPEGXL_ENABLE_SKCMS #else // JPEGXL_ENABLE_SKCMS
- std::lock_guard<std::mutex> guard(LcmsMutex()); + std::lock_guard<std::mutex> guard(LcmsMutex());
const cmsContext context = GetContext(); const cmsContext context = GetContext();
Profile profile; Profile profile;
@@ -920,7 +907,6 @@ void JxlCmsDestroy(void* cms_data) { @@ -984,6 +997,7 @@ void JxlCmsDestroy(void* cms_data) {
if (cms_data == nullptr) return; if (cms_data == nullptr) return;
JxlCms* t = reinterpret_cast<JxlCms*>(cms_data); JxlCms* t = reinterpret_cast<JxlCms*>(cms_data);
#if !JPEGXL_ENABLE_SKCMS #if !JPEGXL_ENABLE_SKCMS
- std::lock_guard<std::mutex> guard(LcmsMutex()); + std::lock_guard<std::mutex> guard(LcmsMutex());
TransformDeleter()(t->lcms_transform); TransformDeleter()(t->lcms_transform);
#endif #endif
delete t; delete t;
@@ -957,7 +943,6 @@ void* JxlCmsInit(void* init_data, size_t num_threads, size_t xsize, @@ -1020,6 +1034,7 @@ void* JxlCmsInit(void* init_data, size_t
return nullptr; return nullptr;
} }
#else // JPEGXL_ENABLE_SKCMS #else // JPEGXL_ENABLE_SKCMS
- std::lock_guard<std::mutex> guard(LcmsMutex()); + std::lock_guard<std::mutex> guard(LcmsMutex());
const cmsContext context = GetContext(); const cmsContext context = GetContext();
Profile profile_src, profile_dst; Profile profile_src, profile_dst;
if (!DecodeProfile(context, c_src.ICC(), &profile_src)) { if (!DecodeProfile(context, c_src.ICC(), &profile_src)) {
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt Index: libjxl-0.8.1/third_party/CMakeLists.txt
index afefbaa80b..095d5a5430 100644 ===================================================================
--- a/third_party/CMakeLists.txt --- libjxl-0.8.1.orig/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt +++ libjxl-0.8.1/third_party/CMakeLists.txt
@@ -146,7 +146,7 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) @@ -111,7 +111,7 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE
endif () endif ()
if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS) if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" OR JPEGXL_FORCE_SYSTEM_LCMS2 ) if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" OR JPEGXL_FORCE_SYSTEM_LCMS2 )
- find_package(LCMS2 2.10) - find_package(LCMS2 2.13)
+ find_package(LCMS2 2.13) + find_package(LCMS2 2.10)
if ( NOT LCMS2_FOUND ) if ( NOT LCMS2_FOUND )
message(FATAL_ERROR "Please install lcms2 or run git submodule update --init") message(FATAL_ERROR "Please install lcms2 or run git submodule update --init")
endif () endif ()
#diff --git a/third_party/lcms b/third_party/lcms Index: libjxl-0.8.1/third_party/lcms2.cmake
#index 65c63bf549..233004ae26 160000 ===================================================================
#--- a/third_party/lcms --- libjxl-0.8.1.orig/third_party/lcms2.cmake
#+++ b/third_party/lcms +++ libjxl-0.8.1/third_party/lcms2.cmake
#@@ -1 +1 @@ @@ -60,18 +60,4 @@ target_compile_definitions(lcms2
#-Subproject commit 65c63bf549d78253c14b30b3d62cb668bbbe612c
#+Subproject commit 233004ae26b238b2831ff60eea9e753b99d97906
diff --git a/third_party/lcms2.cmake b/third_party/lcms2.cmake
index 906e777305..c33f877659 100644
--- a/third_party/lcms2.cmake
+++ b/third_party/lcms2.cmake
@@ -60,4 +60,18 @@ target_compile_definitions(lcms2
target_compile_definitions(lcms2 target_compile_definitions(lcms2
PUBLIC "-DCMS_NO_REGISTER_KEYWORD=1") PUBLIC "-DCMS_NO_REGISTER_KEYWORD=1")
+# Ensure that a thread safe alternative of gmtime is used in LCMS -# Ensure that a thread safe alternative of gmtime is used in LCMS
+include(CheckSymbolExists) -include(CheckSymbolExists)
+check_symbol_exists(gmtime_r "time.h" HAVE_GMTIME_R) -check_symbol_exists(gmtime_r "time.h" HAVE_GMTIME_R)
+if (HAVE_GMTIME_R) -if (HAVE_GMTIME_R)
+ target_compile_definitions(lcms2 - target_compile_definitions(lcms2
+ PUBLIC "-DHAVE_GMTIME_R=1") - PUBLIC "-DHAVE_GMTIME_R=1")
+else() -else()
+ check_symbol_exists(gmtime_s "time.h" HAVE_GMTIME_S) - check_symbol_exists(gmtime_s "time.h" HAVE_GMTIME_S)
+ if (HAVE_GMTIME_S) - if (HAVE_GMTIME_S)
+ target_compile_definitions(lcms2 - target_compile_definitions(lcms2
+ PUBLIC "-DHAVE_GMTIME_S=1") - PUBLIC "-DHAVE_GMTIME_S=1")
+ endif() - endif()
+endif() -endif()
+ -
set_property(TARGET lcms2 PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET lcms2 PROPERTY POSITION_INDEPENDENT_CODE ON)

5
libjxl.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 17 07:36:23 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Refresh 0001-Remove-LCMS-mutex.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 10 08:14:35 UTC 2023 - Dirk Müller <dmueller@suse.com> Fri Feb 10 08:14:35 UTC 2023 - Dirk Müller <dmueller@suse.com>

6
libjxl.spec
View File

@ -71,10 +71,14 @@ Command-line utilities to convert from/to JPEG XL.
%prep %prep
%setup -q %setup -q
%if %{pkg_vcmp liblcms2-2 < 2.13}
# libjxl 0.7.0 requires lcms2 >= 2.13, so if we have an older version # libjxl 0.7.0 requires lcms2 >= 2.13, so if we have an older version
# (as in SLE15/Leap) just reverse the patch that adds that dependency # (as in SLE15/Leap) just reverse the patch that adds that dependency
%if %{pkg_vcmp liblcms2-2 < 2.13}
%patch0 -p1 -R %patch0 -p1 -R
%else
# Make sure patch at least applies
%patch0 -p1 -R
%patch0 -p1
%endif %endif
%build %build