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

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

[Florian Schmaus]

commit:     8bc9e05a060428324fcb989f28b9712144d0e9d6
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Oct 26 16:37:37 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 16:37:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bc9e05a

media-libs/libjxl: scrub patch

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-libs/libjxl/files/libjxl-0.6-system-libs.patch | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
index 6aa776078..8ca51d6f8 100644
--- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
+++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
@@ -1,6 +1,5 @@
-diff '--color=auto' -ru /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake libjxl-0.6/lib/jxl.cmake
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake	2021-10-04 20:02:44.000000000 +0200
-+++ libjxl-0.6/lib/jxl.cmake	2021-10-26 16:20:37.332839340 +0200
+--- a/lib/jxl.cmake
++++ b/lib/jxl.cmake
 @@ -387,17 +387,6 @@
  target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
  endif()
@@ -19,9 +18,8 @@ diff '--color=auto' -ru /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/l
  # Headers for exporting/importing public headers
  include(GenerateExportHeader)
  set_target_properties(jxl_dec-obj PROPERTIES
-diff '--color=auto' -ru /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt	2021-10-26 15:59:28.124828026 +0200
-+++ libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt	2021-10-26 16:24:08.540453940 +0200
+--- a/plugins/gdk-pixbuf/CMakeLists.txt
++++ b/plugins/gdk-pixbuf/CMakeLists.txt
 @@ -23,7 +23,7 @@
  
  # Note: This only needs the decoder library, but we don't install the decoder
@@ -31,9 +29,8 @@ diff '--color=auto' -ru /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/p
  
  pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
  install(TARGETS pixbufloader-jxl LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}")
-diff '--color=auto' -ru /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt libjxl-0.6/third_party/CMakeLists.txt
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt	2021-10-26 15:59:28.123828010 +0200
-+++ libjxl-0.6/third_party/CMakeLists.txt	2021-10-26 16:13:51.758212796 +0200
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
 @@ -113,15 +113,6 @@
    endif()  # JPEGXL_DEP_LICENSE_DIR
  endif()

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

[Haelwenn Monnier]

commit:     400f0eff377b6e277dfa241da87f256dfdb8c5fd
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Oct 28 15:17:40 2021 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu Oct 28 15:17:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=400f0eff

media-libs/libjxl: scrub patch

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 .../libjxl/files/libjxl-0.6-system-libs.patch      | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
index 3a7aa9194..8b8d0a269 100644
--- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
+++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
@@ -1,5 +1,5 @@
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
-+++ libjxl-0.6/lib/jxl.cmake
+--- a/lib/jxl.cmake
++++ b/lib/jxl.cmake
 @@ -387,17 +387,6 @@
  target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
  endif()
@@ -18,8 +18,8 @@
  # Headers for exporting/importing public headers
  include(GenerateExportHeader)
  set_target_properties(jxl_dec-obj PROPERTIES
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl_extras.cmake
-+++ libjxl-0.6/lib/jxl_extras.cmake
+--- a/lib/jxl_extras.cmake
++++ b/lib/jxl_extras.cmake
 @@ -92,7 +92,7 @@
  endif ()
  
@@ -34,8 +34,8 @@
  endif() # OpenEXR_FOUND
  endif() # JPEGXL_ENABLE_OPENEXR
 +
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
-+++ libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
+--- a/plugins/gdk-pixbuf/CMakeLists.txt
++++ b/plugins/gdk-pixbuf/CMakeLists.txt
 @@ -23,7 +23,7 @@
  
  # Note: This only needs the decoder library, but we don't install the decoder
@@ -45,8 +45,8 @@
  
  pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
  install(TARGETS pixbufloader-jxl LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}")
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
-+++ libjxl-0.6/third_party/CMakeLists.txt
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
 @@ -113,15 +113,6 @@
    endif()  # JPEGXL_DEP_LICENSE_DIR
  endif()
@@ -98,8 +98,8 @@
 -                 ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
 -endif ()
 -
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/tools/comparison_viewer/CMakeLists.txt
-+++ libjxl-0.6/tools/comparison_viewer/CMakeLists.txt
+--- a/tools/comparison_viewer/CMakeLists.txt
++++ b/tools/comparison_viewer/CMakeLists.txt
 @@ -24,9 +24,6 @@
    image_loading.cc
    image_loading.h
@@ -110,8 +110,8 @@
  target_link_libraries(image_loading PUBLIC
    Qt5::Widgets
    jxl-static
---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/tools/viewer/CMakeLists.txt
-+++ libjxl-0.6/tools/viewer/CMakeLists.txt
+--- a/tools/viewer/CMakeLists.txt
++++ b/tools/viewer/CMakeLists.txt
 @@ -26,10 +26,6 @@
    viewer_window.h
    viewer_window.ui