From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70835158087 for ; Thu, 28 Oct 2021 20:56:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5244BE092B; Thu, 28 Oct 2021 20:56:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39766E092C for ; Thu, 28 Oct 2021 20:56:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93207343CC3 for ; Thu, 28 Oct 2021 20:56:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D3261A2 for ; Thu, 28 Oct 2021 20:56:39 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1635434260.400f0eff377b6e277dfa241da87f256dfdb8c5fd.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/libjxl/files/libjxl-0.6-system-libs.patch X-VCS-Directories: media-libs/libjxl/files/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 400f0eff377b6e277dfa241da87f256dfdb8c5fd X-VCS-Branch: master Date: Thu, 28 Oct 2021 20:56:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dc3b6b25-5642-4722-a308-b58f9838539b X-Archives-Hash: 60bab274df33afc9528f2f19c0806a1e commit: 400f0eff377b6e277dfa241da87f256dfdb8c5fd Author: Alessandro Barbieri gmail com> AuthorDate: Thu Oct 28 15:17:40 2021 +0000 Commit: Haelwenn Monnier hacktivis 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 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