Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/files/
Date: Wed, 27 Oct 2021 06:18:14
Message-Id: 1635266257.8bc9e05a060428324fcb989f28b9712144d0e9d6.flow@gentoo
1 commit: 8bc9e05a060428324fcb989f28b9712144d0e9d6
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Tue Oct 26 16:37:37 2021 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 26 16:37:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bc9e05a
7
8 media-libs/libjxl: scrub patch
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 media-libs/libjxl/files/libjxl-0.6-system-libs.patch | 15 ++++++---------
13 1 file changed, 6 insertions(+), 9 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 6aa776078..8ca51d6f8 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,6 +1,5 @@
20 -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
21 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake 2021-10-04 20:02:44.000000000 +0200
22 -+++ libjxl-0.6/lib/jxl.cmake 2021-10-26 16:20:37.332839340 +0200
23 +--- a/lib/jxl.cmake
24 ++++ b/lib/jxl.cmake
25 @@ -387,17 +387,6 @@
26 target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
27 endif()
28 @@ -19,9 +18,8 @@ diff '--color=auto' -ru /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/l
29 # Headers for exporting/importing public headers
30 include(GenerateExportHeader)
31 set_target_properties(jxl_dec-obj PROPERTIES
32 -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
33 ---- /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
34 -+++ libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt 2021-10-26 16:24:08.540453940 +0200
35 +--- a/plugins/gdk-pixbuf/CMakeLists.txt
36 ++++ b/plugins/gdk-pixbuf/CMakeLists.txt
37 @@ -23,7 +23,7 @@
38
39 # Note: This only needs the decoder library, but we don't install the decoder
40 @@ -31,9 +29,8 @@ diff '--color=auto' -ru /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/p
41
42 pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
43 install(TARGETS pixbufloader-jxl LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}")
44 -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
45 ---- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt 2021-10-26 15:59:28.123828010 +0200
46 -+++ libjxl-0.6/third_party/CMakeLists.txt 2021-10-26 16:13:51.758212796 +0200
47 +--- a/third_party/CMakeLists.txt
48 ++++ b/third_party/CMakeLists.txt
49 @@ -113,15 +113,6 @@
50 endif() # JPEGXL_DEP_LICENSE_DIR
51 endif()