libjxl-system-libs.patch

   1 --- libjxl-0.8.1/third_party/CMakeLists.txt.orig        2023-03-05 22:20:51.206401583 +0100
   2 +++ libjxl-0.8.1/third_party/CMakeLists.txt     2023-03-06 19:40:16.610527695 +0100
   3 @@ -100,15 +100,6 @@
   4  endif()
   5
   6  # *cms
   7 -if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
   8 -  if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/skcms/skcms.h" )
   9 -    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
  10 -            "build dependencies.")
  11 -  endif()
  12 -  include(skcms.cmake)
  13 -  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
  14 -                 ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
  15 -endif ()
  16  if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
  17    if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" OR JPEGXL_FORCE_SYSTEM_LCMS2 )
  18      find_package(LCMS2 2.13)
  19 @@ -167,14 +158,3 @@
  20                     ${PROJECT_BINARY_DIR}/LICENSE.libpng COPYONLY)
  21    endif()  # JPEGXL_DEP_LICENSE_DIR
  22  endif()
  23 -
  24 -# sjpeg
  25 -if (JPEGXL_ENABLE_SJPEG)
  26 -  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/CMakeLists.txt")
  27 -    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
  28 -            "build dependencies.")
  29 -  endif()
  30 -  include(sjpeg.cmake)
  31 -  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/COPYING"
  32 -                 ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
  33 -endif ()
  34 --- libjxl-0.8.1/lib/jxl.cmake.orig     2023-02-03 13:15:36.000000000 +0100
  35 +++ libjxl-0.8.1/lib/jxl.cmake  2023-03-06 19:41:57.656646948 +0100
  36 @@ -453,17 +453,6 @@
  37  target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
  38  endif()
  39
  40 -#TODO(lode): don't depend on CMS for the core library
  41 -if (JPEGXL_ENABLE_SKCMS)
  42 -  target_include_directories(jxl_enc-obj PRIVATE
  43 -    $<TARGET_PROPERTY:skcms,INCLUDE_DIRECTORIES>
  44 -  )
  45 -else ()
  46 -  target_include_directories(jxl_enc-obj PRIVATE
  47 -    $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
  48 -  )
  49 -endif ()
  50 -
  51  # Generate version.h
  52  configure_file("jxl/version.h.in" "include/jxl/version.h")
  53
  54 @@ -505,9 +494,6 @@
  55    $<TARGET_OBJECTS:jxl_enc-obj>
  56    $<TARGET_OBJECTS:jxl_dec-obj>
  57  )
  58 -if (JPEGXL_ENABLE_SKCMS AND JPEGXL_BUNDLE_SKCMS)
  59 -  list(APPEND JPEGXL_INTERNAL_OBJECTS $<TARGET_OBJECTS:skcms-obj>)
  60 -endif()
  61
  62  # Private static library. This exposes all the internal functions and is used
  63  # for tests.
  64 --- libjxl-0.8.1/plugins/gdk-pixbuf/CMakeLists.txt.orig 2023-03-06 19:40:46.967029907 +0100
  65 +++ libjxl-0.8.1/plugins/gdk-pixbuf/CMakeLists.txt      2023-03-06 19:42:39.186421962 +0100
  66 @@ -23,7 +23,7 @@
  67
  68  # Note: This only needs the decoder library, but we don't install the decoder
  69  # shared library.
  70 -target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms-interface PkgConfig::Gdk-Pixbuf)
  71 +target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms PkgConfig::Gdk-Pixbuf)
  72
  73  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDK_PIXBUF_MODULEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
  74  install(TARGETS pixbufloader-jxl DESTINATION "${GDK_PIXBUF_MODULEDIR}")