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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 476C9158042 for ; Fri, 15 Nov 2024 22:06:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DCF1E08CA; Fri, 15 Nov 2024 22:06:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 745A6E08CA for ; Fri, 15 Nov 2024 22:06:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AAEAA33BE3B for ; Fri, 15 Nov 2024 22:06:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 468C71915 for ; Fri, 15 Nov 2024 22:06:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1731708365.a95b6a5dfc6f79047992bdbbb823ca7840742600.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjxl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libjxl/Manifest media-libs/libjxl/libjxl-0.10.3.ebuild media-libs/libjxl/libjxl-0.8.3.ebuild X-VCS-Directories: media-libs/libjxl/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a95b6a5dfc6f79047992bdbbb823ca7840742600 X-VCS-Branch: master Date: Fri, 15 Nov 2024 22:06:16 +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: 4cb525f0-265f-44e7-8641-3def7bf87f82 X-Archives-Hash: debf75ddba2430c66209e7bff851112a commit: a95b6a5dfc6f79047992bdbbb823ca7840742600 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 15 20:40:28 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 15 22:06:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95b6a5d media-libs/libjxl: drop 0.8.3, 0.10.3 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libjxl/Manifest | 3 - media-libs/libjxl/libjxl-0.10.3.ebuild | 115 --------------------------------- media-libs/libjxl/libjxl-0.8.3.ebuild | 94 --------------------------- 3 files changed, 212 deletions(-) diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index 27130d4f33c7..06a0f514db3a 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -1,5 +1,2 @@ -DIST libjxl-0.10.3.tar.gz 1912351 BLAKE2B 4432ecf34ac03d9ce8fc814835c7ee31fcc1e516b95e347dcb201a6996e1ffaadbd2e78a6a235ee1c4ff5121af495b8bc621e6738e2d03a8eb1639fb397e5246 SHA512 5ece482f4c5f0312e87e020f921525622a6d3f1a3834f3cd8666638fc8d0fba8cd072ef58f7b153dc17ca19071ebae2fbad7b08e6d440c2669f4f1b35888a7d4 DIST libjxl-0.11.0.tar.gz 1873614 BLAKE2B 60f038c35f921e1d6cfaab62ec92c15fa8b0bb9369724bdbaf25fb72559670de6f2e86bf1fb7d37158e1d046d46d20610b574e2288f86d4bae52fdc2c51e3b76 SHA512 a3648a5f046cae36b3272c46525d002d490f781f44647d4d8318f0b773dd9b7902582ced5636af3489f1d6a44e3baf8ad2e5ab47d26869d16b01607d90e14053 -DIST libjxl-0.8.3.tar.gz 1612441 BLAKE2B d1c3b108c67d0a3a63ce50cdc7305b6853b182ec6c210d499e15120fbb858dada23997a4a0eb545f936e02230ed773506b066f24e19cce1f99aedaafd2bd7803 SHA512 f7fb4b2b0fd2459bec86918371369e80de59549c8dc24ff5c83546f564e54c81ea6a72720af151e3f9b64ef326f3ec8a5a6e0023b7fe2de14b056e501af579ef -DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f DIST libjxl-testdata-ff8d743aaba05b3014f17e5475e576242fa979fc.tar.gz 69105882 BLAKE2B a80fce437b810e7b99b4c7bd106ec7eba01a1eeddc90e1b82cb8d75f3ca194c357ef8e7b7e1e9da65aa39dc2cd11d32cb6de8558188c5258c7446d58787603ff SHA512 0d237e706fd8d001a9cb245b685e8e39085416daedec019c348ccc64cf15a34cecdb0c245f94f57507f5934e487ee5157f51f59bb6a000f5899862c582336384 diff --git a/media-libs/libjxl/libjxl-0.10.3.ebuild b/media-libs/libjxl/libjxl-0.10.3.ebuild deleted file mode 100644 index 28d788eb5bc6..000000000000 --- a/media-libs/libjxl/libjxl-0.10.3.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib gnome2-utils - -# This changes frequently. Please check the testdata submodule when bumping. -TESTDATA_COMMIT="ff8d743aaba05b3014f17e5475e576242fa979fc" -DESCRIPTION="JPEG XL image format reference implementation" -HOMEPAGE="https://github.com/libjxl/libjxl/" -SRC_URI=" - https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - test? ( - https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz - -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86" -IUSE="+gdk-pixbuf gif jpeg openexr +png test" -REQUIRED_USE="test? ( png )" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/brotli:=[${MULTILIB_USEDEP}] - >=dev-cpp/highway-1.0.7[${MULTILIB_USEDEP}] - >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] - gdk-pixbuf? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - ) - gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - openexr? ( media-libs/openexr:= ) - png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${DEPEND} - >=x11-misc/shared-mime-info-2.2 -" -DEPEND+=" - test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) -" - -multilib_src_configure() { - local mycmakeargs=( - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_WARNINGS_AS_ERRORS=OFF - - -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) - -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) - - -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_VIEWERS=OFF - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_FORCE_SYSTEM_GTEST=ON - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON - -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_JNI=OFF - -DJPEGXL_ENABLE_JPEGLI=OFF - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF - -DJPEGXL_ENABLE_TCMALLOC=OFF - -DJPEGXL_ENABLE_EXAMPLES=OFF - -DBUILD_TESTING=$(usex test ON OFF) - ) - - if use test; then - mycmakeargs+=( - -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" - ) - fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=ON - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) - -DJPEGXL_ENABLE_PLUGINS=ON - -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) - -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF - -DJPEGXL_ENABLE_PLUGIN_MIME=OFF - ) - else - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - find "${ED}" -name '*.a' -delete || die -} - -pkg_postinst() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} - -pkg_postrm() { - use gdk-pixbuf && multilib_foreach_abi gnome2_gdk_pixbuf_update -} diff --git a/media-libs/libjxl/libjxl-0.8.3.ebuild b/media-libs/libjxl/libjxl-0.8.3.ebuild deleted file mode 100644 index 98201c404d7e..000000000000 --- a/media-libs/libjxl/libjxl-0.8.3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -# This changes frequently. Please check the testdata submodule when bumping. -TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759" -DESCRIPTION="JPEG XL image format reference implementation" -HOMEPAGE="https://github.com/libjxl/libjxl" -SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz - -> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc x86" -IUSE="gif jpeg openexr +png test" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/brotli:=[${MULTILIB_USEDEP}] - >=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}] - >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] - gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - openexr? ( media-libs/openexr:= ) - png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${DEPEND} - >=x11-misc/shared-mime-info-2.2 -" -DEPEND+=" - test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.8.2-backport-pr2596.patch" - "${FILESDIR}/${PN}-0.8.2-backport-pr2617.patch" -) - -multilib_src_configure() { - local mycmakeargs=( - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_WARNINGS_AS_ERRORS=OFF - - -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(usex !gif) - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) - -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) - - -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_VIEWERS=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_FORCE_SYSTEM_GTEST=ON - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON - -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_JNI=OFF - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF - -DJPEGXL_ENABLE_TCMALLOC=OFF - -DJPEGXL_ENABLE_EXAMPLES=OFF - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=ON - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) - -DBUILD_TESTING=$(usex test ON OFF) - ) - use test && - mycmakeargs+=( -DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}" ) - else - mycmakeargs+=( - -DJPEGXL_ENABLE_TOOLS=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF - -DBUILD_TESTING=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - find "${ED}" -name '*.a' -delete || die -}