summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2022-04-02 11:24:35 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2022-04-02 11:24:35 -0400
commitf01075d28a4b61ef0311b968332ea276f5496d80 (patch)
tree7f14404f45946d028cc53eb1de895d2c1fd921c8
parent8f9a1379b12f43da62aed30ebac3abc73c08142a (diff)
downloadgentoo-overlay-f01075d28a4b61ef0311b968332ea276f5496d80.tar.xz
gentoo-overlay-f01075d28a4b61ef0311b968332ea276f5496d80.zip
media-libs/libjxl: drop
-rw-r--r--media-libs/libjxl/Manifest3
-rw-r--r--media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch71
-rw-r--r--media-libs/libjxl/libjxl-0.6.1-r2.ebuild130
-rw-r--r--media-libs/libjxl/libjxl-9999.ebuild114
-rw-r--r--media-libs/libjxl/metadata.xml16
5 files changed, 0 insertions, 334 deletions
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
deleted file mode 100644
index 68460a8..0000000
--- a/media-libs/libjxl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
-DIST lodepng-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz 240079 BLAKE2B 08240bd72d22f789bc0e06ed1d641fbca21ca674697880d4f004e4e76bb1b6cf595e931d2447544d896c79576e942db3cbdcca91d717f4ad8ddcfbd6c5bdc97e SHA512 50a515f1f15122fa017637be30df0db05980d07f8891f16b0b68697ef0df797176bbe005df623e9f2dbb68b750b0a87e69c3cef215c7bf15187d00491c4023c7
-DIST skcms-64374756e03700d649f897dbd98c95e78c30c7da.tar.gz 9181180 BLAKE2B e57083e6add95f60944f098c60ea61be26a159f96dfa70256277495bfa1dfee0210d8f4aee7e7156b8808b4681f74a7a7c8dec7193b969234728d4200697e901 SHA512 524e8796400d0b230149ef93db09ef04847f45d34f67717deb0291ecfeb9ee6ad55549c3473835da87e62e1982b5e0e1071fa4792a6e121d9908216fa5b7422c
diff --git a/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch b/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch
deleted file mode 100644
index c8baf7d..0000000
--- a/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 134f1876473d9463332711a834e2ddc70fa7e38c Mon Sep 17 00:00:00 2001
-From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
-Date: Thu, 7 Oct 2021 14:07:35 -0400
-Subject: [PATCH] Run RoundtripAnimationPatches only if gif enabled
-
----
- lib/jxl/jxl_test.cc | 42 +++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/lib/jxl/jxl_test.cc b/lib/jxl/jxl_test.cc
-index aaf1f4e..815ec7c 100644
---- a/lib/jxl/jxl_test.cc
-+++ b/lib/jxl/jxl_test.cc
-@@ -1336,6 +1336,27 @@ TEST(JxlTest, RoundtripLosslessAnimation) {
- 5e-4);
- }
-
-+TEST(JxlTest, RoundtripAnimationPatches) {
-+ ThreadPool* pool = nullptr;
-+ const PaddedBytes orig = ReadTestData("jxl/animation_patches.gif");
-+ CodecInOut io;
-+ ASSERT_TRUE(SetFromBytes(Span<const uint8_t>(orig), &io, pool));
-+ ASSERT_EQ(2u, io.frames.size());
-+
-+ CompressParams cparams;
-+ cparams.patches = Override::kOn;
-+ DecompressParams dparams;
-+ CodecInOut io2;
-+ // 40k with no patches, 27k with patch frames encoded multiple times.
-+ EXPECT_LE(Roundtrip(&io, cparams, dparams, pool, &io2), 24000u);
-+
-+ EXPECT_EQ(io2.frames.size(), io.frames.size());
-+ // >10 with broken patches
-+ EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params,
-+ /*distmap=*/nullptr, pool),
-+ 2.0);
-+}
-+
- #endif // JPEGXL_ENABLE_GIF
-
- #if JPEGXL_ENABLE_JPEG
-@@ -1629,26 +1650,5 @@ TEST(JxlTest, RoundtripProgressive) {
- 4.0f);
- }
-
--TEST(JxlTest, RoundtripAnimationPatches) {
-- ThreadPool* pool = nullptr;
-- const PaddedBytes orig = ReadTestData("jxl/animation_patches.gif");
-- CodecInOut io;
-- ASSERT_TRUE(SetFromBytes(Span<const uint8_t>(orig), &io, pool));
-- ASSERT_EQ(2u, io.frames.size());
--
-- CompressParams cparams;
-- cparams.patches = Override::kOn;
-- DecompressParams dparams;
-- CodecInOut io2;
-- // 40k with no patches, 27k with patch frames encoded multiple times.
-- EXPECT_LE(Roundtrip(&io, cparams, dparams, pool, &io2), 24000u);
--
-- EXPECT_EQ(io2.frames.size(), io.frames.size());
-- // >10 with broken patches
-- EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params,
-- /*distmap=*/nullptr, pool),
-- 2.0);
--}
--
- } // namespace
- } // namespace jxl
---
-2.33.0
-
diff --git a/media-libs/libjxl/libjxl-0.6.1-r2.ebuild b/media-libs/libjxl/libjxl-0.6.1-r2.ebuild
deleted file mode 100644
index 8870574..0000000
--- a/media-libs/libjxl/libjxl-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2 xdg-utils
-
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
- EGIT_SUBMODULES=(third_party/lodepng third_party/skcms)
-else
- LODEPNG_COMMIT="48e5364ef48ec2408f44c727657ac1b6703185f8"
- SKCMS_COMMIT="64374756e03700d649f897dbd98c95e78c30c7da"
- SRC_URI="
- https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz
- https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${SKCMS_COMMIT}.tar.gz
- "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/7"
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="apng doc gdk-pixbuf gif gimp java +jpeg +man openexr static-libs test +tools viewers"
-
-RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
- <dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
- apng? (
- media-libs/libpng[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
- gdk-pixbuf? ( x11-libs/gdk-pixbuf )
- gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
- gimp? ( media-gfx/gimp:0/2 )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr:= )
- viewers? (
- dev-qt/qtwidgets
- dev-qt/qtx11extras
- )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
- man? ( app-text/asciidoc )
- viewers? ( kde-frameworks/extra-cmake-modules )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jdk-1.8:* )
-"
-
-PATCHES=(
- "${FILESDIR}/roundtripanimationpatches-ifdef-gif.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- tar -xf ${DISTDIR}/${P}.tar.gz || die
- tar -xf ${DISTDIR}/lodepng-${LODEPNG_COMMIT}.tar.gz || die
- rmdir ${P}/third_party/lodepng || die
- mv lodepng-${LODEPNG_COMMIT} ${P}/third_party/lodepng || die
- tar -C ${P}/third_party/skcms -xf ${DISTDIR}/skcms-${SKCMS_COMMIT}.tar.gz || die
- fi
-}
-
-src_prepare() {
- use gdk-pixbuf || sed -i -e '/(gdk-pixbuf)/s/^/#/' plugins/CMakeLists.txt || die
- use gimp || sed -i -e '/(gimp)/s/^/#/' plugins/CMakeLists.txt || die
- cmake_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
- -DJPEGXL_ENABLE_BENCHMARK=OFF
- -DJPEGXL_ENABLE_COVERAGE=OFF
- -DJPEGXL_ENABLE_EXAMPLES=OFF
- -DJPEGXL_ENABLE_FUZZERS=OFF
- -DJPEGXL_ENABLE_TOOLS=$(multilib_native_usex tools)
- -DJPEGXL_ENABLE_JNI=$(multilib_native_usex java)
- -DJPEGXL_ENABLE_MANPAGES=$(multilib_native_usex man)
- -DJPEGXL_ENABLE_OPENEXR=$(multilib_native_usex openexr)
- -DJPEGXL_ENABLE_PLUGINS=$(multilib_is_native_abi && echo ON || echo OFF) # USE=gdk-pixbuf, USE=gimp handled in src_prepare
- -DJPEGXL_ENABLE_SJPEG=OFF
- -DJPEGXL_ENABLE_SKCMS=ON
- -DJPEGXL_ENABLE_TCMALLOC=OFF
- -DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers)
-
- -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(multilib_native_usex apng OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(multilib_native_usex gif OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(multilib_native_usex jpeg OFF ON)
- )
-
- cmake_src_configure
-}
-
-multilib_src_test() {
- # DecodeTest.PixelTestWithICCProfileLossy: https://github.com/libjxl/libjxl/issues/500
- # RobustStatisticsTest: https://github.com/libjxl/libjxl/issues/698
- local myctestargs=(
- -E '^DecodeTest\.PixelTestWithICCProfileLossy$|^RobustStatisticsTest\.'
- )
- cmake_src_test
-}
-
-multilib_src_install() {
- cmake_src_install
- if ! use static-libs; then
- rm "${ED}"/usr/lib*/*.a || die
- fi
- if use java && multilib_is_native_abi; then
- java-pkg_doso tools/libjxl_jni.so
- fi
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
deleted file mode 100644
index 6745919..0000000
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2 xdg-utils
-
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
- EGIT_SUBMODULES=(third_party/skcms)
-else
- SKCMS_COMMIT="64374756e03700d649f897dbd98c95e78c30c7da"
- SRC_URI="
- https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${SKCMS_COMMIT}.tar.gz
- "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/0.7"
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="doc gdk-pixbuf gif gimp java +jpeg +png +man openexr static-libs test +tools viewers"
-
-RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
- dev-cpp/highway[${MULTILIB_USEDEP}]
- gdk-pixbuf? ( x11-libs/gdk-pixbuf )
- gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
- gimp? ( media-gfx/gimp:0/2 )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr:= )
- png? (
- media-libs/libpng[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
- tools? ( dev-cpp/gflags:= )
- viewers? (
- dev-qt/qtwidgets
- dev-qt/qtx11extras
- )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
- man? ( app-text/asciidoc )
- viewers? ( kde-frameworks/extra-cmake-modules )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jdk-1.8:* )
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- tar -xf ${DISTDIR}/${P}.tar.gz || die
- tar -C ${P}/third_party/skcms -xf ${DISTDIR}/skcms-${SKCMS_COMMIT}.tar.gz || die
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
- -DJPEGXL_ENABLE_BENCHMARK=OFF
- -DJPEGXL_ENABLE_COVERAGE=OFF
- -DJPEGXL_ENABLE_EXAMPLES=OFF
- -DJPEGXL_ENABLE_FUZZERS=OFF
- -DJPEGXL_ENABLE_TOOLS=$(multilib_native_usex tools)
- -DJPEGXL_ENABLE_JNI=$(multilib_native_usex java)
- -DJPEGXL_ENABLE_MANPAGES=$(multilib_native_usex man)
- -DJPEGXL_ENABLE_OPENEXR=$(multilib_native_usex openexr)
- -DJPEGXL_ENABLE_PLUGINS=$(multilib_is_native_abi && echo ON || echo OFF)
- -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(multilib_native_usex gdk-pixbuf)
- -DJPEGXL_ENABLE_PLUGIN_GIMP210=$(multilib_native_usex gimp)
- -DJPEGXL_ENABLE_PLUGIN_MIME=ON
- -DJPEGXL_ENABLE_SJPEG=OFF
- -DJPEGXL_ENABLE_SKCMS=ON
- -DJPEGXL_ENABLE_TCMALLOC=OFF
- -DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers)
-
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(multilib_native_usex gif OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(multilib_native_usex jpeg OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(multilib_native_usex png OFF ON)
- )
-
- cmake_src_configure
-}
-
-multilib_src_install() {
- cmake_src_install
- if ! use static-libs; then
- rm "${ED}"/usr/lib*/*.a || die
- fi
- if use java && multilib_is_native_abi; then
- java-pkg_doso tools/libjxl_jni.so
- fi
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
deleted file mode 100644
index 11f6fe3..0000000
--- a/media-libs/libjxl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>alex_y_xu@yahoo.ca</email>
- <name>Alex Xu (Hello71)</name>
- </maintainer>
- <use>
- <flag name="apng">APNG support</flag>
- <flag name="doc">Doxygen API documentation</flag>
- <flag name="gdk-pixbuf">gdk-pixbuf plugin</flag>
- <flag name="jpeg">JPEG v1 support in tools. Note that reconstructed JPEG files are supported regardless of this option.</flag>
- <flag name="tools">Tool programs (cjxl, djxl)</flag>
- <flag name="viewers">Viewer programs</flag>
- </use>
-</pkgmetadata>