libjxl-system-libs.patch

   1 --- libjxl-0.6.1/third_party/CMakeLists.txt.orig        2021-10-29 20:48:36.000000000 +0200
   2 +++ libjxl-0.6.1/third_party/CMakeLists.txt     2022-04-09 22:33:00.068024829 +0200
   3 @@ -113,15 +113,6 @@ else()
   4    endif()  # JPEGXL_DEP_LICENSE_DIR
   5  endif()
   6
   7 -# lodepng
   8 -if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lodepng/lodepng.h" )
   9 -  message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
  10 -          "build dependencies.")
  11 -endif()
  12 -include(lodepng.cmake)
  13 -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE"
  14 -               ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY)
  15 -
  16  # brotli
  17  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR
  18      JPEGXL_FORCE_SYSTEM_BROTLI)
  19 @@ -191,33 +182,3 @@ else()
  20    endif()  # BROTLI_EMSCRIPTEN
  21  endif()
  22
  23 -# *cms
  24 -if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
  25 -  if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/skcms/skcms.h" )
  26 -    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
  27 -            "build dependencies.")
  28 -  endif()
  29 -  include(skcms.cmake)
  30 -  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
  31 -                 ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
  32 -endif ()
  33 -if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
  34 -  if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" )
  35 -    message(SEND_ERROR "Please run git submodule update --init")
  36 -  endif()
  37 -  include(lcms2.cmake)
  38 -  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
  39 -                 ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
  40 -endif()
  41 -
  42 -# sjpeg
  43 -if (JPEGXL_ENABLE_SJPEG)
  44 -  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/CMakeLists.txt")
  45 -    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
  46 -            "build dependencies.")
  47 -  endif()
  48 -  include(sjpeg.cmake)
  49 -  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/COPYING"
  50 -                 ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
  51 -endif ()
  52 -
  53 --- libjxl-0.6.1/lib/jxl.cmake.orig     2022-04-09 22:33:20.914578560 +0200
  54 +++ libjxl-0.6.1/lib/jxl.cmake  2022-04-09 22:38:53.016112745 +0200
  55 @@ -387,17 +387,6 @@ if (JPEGXL_ENABLE_PROFILER)
  56  target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
  57  endif()
  58
  59 -#TODO(lode): don't depend on CMS for the core library
  60 -if (JPEGXL_ENABLE_SKCMS)
  61 -  target_include_directories(jxl_enc-obj PRIVATE
  62 -    $<TARGET_PROPERTY:skcms,INCLUDE_DIRECTORIES>
  63 -  )
  64 -else ()
  65 -  target_include_directories(jxl_enc-obj PRIVATE
  66 -    $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
  67 -  )
  68 -endif ()
  69 -
  70  # Headers for exporting/importing public headers
  71  include(GenerateExportHeader)
  72  set_target_properties(jxl_dec-obj PROPERTIES
  73 @@ -436,9 +425,6 @@ set(JPEGXL_INTERNAL_OBJECTS
  74    $<TARGET_OBJECTS:jxl_enc-obj>
  75    $<TARGET_OBJECTS:jxl_dec-obj>
  76  )
  77 -if (JPEGXL_ENABLE_SKCMS AND JPEGXL_BUNDLE_SKCMS)
  78 -  list(APPEND JPEGXL_INTERNAL_OBJECTS $<TARGET_OBJECTS:skcms-obj>)
  79 -endif()
  80
  81  # Private static library. This exposes all the internal functions and is used
  82  # for tests.
  83 --- libjxl-0.6.1/plugins/gdk-pixbuf/CMakeLists.txt.orig 2021-10-29 20:48:36.000000000 +0200
  84 +++ libjxl-0.6.1/plugins/gdk-pixbuf/CMakeLists.txt      2022-04-10 18:01:27.734885664 +0200
  85 @@ -23,7 +23,7 @@ set_target_properties(pixbufloader-jxl P
  86
  87  # Note: This only needs the decoder library, but we don't install the decoder
  88  # shared library.
  89 -target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms-interface PkgConfig::Gdk-Pixbuf)
  90 +target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms PkgConfig::Gdk-Pixbuf)
  91
  92  pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
  93  install(TARGETS pixbufloader-jxl LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}")