Gentoo Archives: gentoo-commits

From: Haelwenn Monnier <contact@×××××××××.me>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/files/
Date: Thu, 28 Oct 2021 20:56:48
Message-Id: 1635434260.400f0eff377b6e277dfa241da87f256dfdb8c5fd.lanodan@gentoo
1 commit: 400f0eff377b6e277dfa241da87f256dfdb8c5fd
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Thu Oct 28 15:17:40 2021 +0000
4 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
5 CommitDate: Thu Oct 28 15:17:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=400f0eff
7
8 media-libs/libjxl: scrub patch
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 .../libjxl/files/libjxl-0.6-system-libs.patch | 24 +++++++++++-----------
13 1 file changed, 12 insertions(+), 12 deletions(-)
14
15 diff --git a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
16 index 3a7aa9194..8b8d0a269 100644
17 --- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
18 +++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
19 @@ -1,5 +1,5 @@
20 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
21 -+++ libjxl-0.6/lib/jxl.cmake
22 +--- a/lib/jxl.cmake
23 ++++ b/lib/jxl.cmake
24 @@ -387,17 +387,6 @@
25 target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
26 endif()
27 @@ -18,8 +18,8 @@
28 # Headers for exporting/importing public headers
29 include(GenerateExportHeader)
30 set_target_properties(jxl_dec-obj PROPERTIES
31 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl_extras.cmake
32 -+++ libjxl-0.6/lib/jxl_extras.cmake
33 +--- a/lib/jxl_extras.cmake
34 ++++ b/lib/jxl_extras.cmake
35 @@ -92,7 +92,7 @@
36 endif ()
37
38 @@ -34,8 +34,8 @@
39 endif() # OpenEXR_FOUND
40 endif() # JPEGXL_ENABLE_OPENEXR
41 +
42 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
43 -+++ libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
44 +--- a/plugins/gdk-pixbuf/CMakeLists.txt
45 ++++ b/plugins/gdk-pixbuf/CMakeLists.txt
46 @@ -23,7 +23,7 @@
47
48 # Note: This only needs the decoder library, but we don't install the decoder
49 @@ -45,8 +45,8 @@
50
51 pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
52 install(TARGETS pixbufloader-jxl LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}")
53 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
54 -+++ libjxl-0.6/third_party/CMakeLists.txt
55 +--- a/third_party/CMakeLists.txt
56 ++++ b/third_party/CMakeLists.txt
57 @@ -113,15 +113,6 @@
58 endif() # JPEGXL_DEP_LICENSE_DIR
59 endif()
60 @@ -98,8 +98,8 @@
61 - ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
62 -endif ()
63 -
64 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/tools/comparison_viewer/CMakeLists.txt
65 -+++ libjxl-0.6/tools/comparison_viewer/CMakeLists.txt
66 +--- a/tools/comparison_viewer/CMakeLists.txt
67 ++++ b/tools/comparison_viewer/CMakeLists.txt
68 @@ -24,9 +24,6 @@
69 image_loading.cc
70 image_loading.h
71 @@ -110,8 +110,8 @@
72 target_link_libraries(image_loading PUBLIC
73 Qt5::Widgets
74 jxl-static
75 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/tools/viewer/CMakeLists.txt
76 -+++ libjxl-0.6/tools/viewer/CMakeLists.txt
77 +--- a/tools/viewer/CMakeLists.txt
78 ++++ b/tools/viewer/CMakeLists.txt
79 @@ -26,10 +26,6 @@
80 viewer_window.h
81 viewer_window.ui