* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-06-04 7:59 Andrew Ammerlaan
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Ammerlaan @ 2021-06-04 7:59 UTC (permalink / raw
To: gentoo-commits
commit: a20176cd61568a0a0569990e9ddac86f218afec5
Author: Daniel Novomesky <dnovomesky <AT> gmail <DOT> com>
AuthorDate: Thu Jun 3 11:25:54 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 11:25:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a20176cd
media-libs/libjxl: renamed package
Old name was media-libs/jpeg-xl
New github repo is used now, instead of gitlab
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Daniel Novomesky <dnovomesky <AT> gmail.com>
media-libs/libjxl/libjxl-9999.ebuild | 50 ++++++++++++++++++++++++++++++++++++
media-libs/libjxl/metadata.xml | 8 ++++++
2 files changed, 58 insertions(+)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
new file mode 100644
index 000000000..cfb733563
--- /dev/null
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit xdg cmake git-r3
+
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl"
+
+EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="app-arch/brotli
+ sys-libs/zlib
+ media-libs/libpng
+ virtual/jpeg
+ virtual/opengl
+ media-libs/freeglut
+ media-libs/giflib
+ media-libs/openexr
+ dev-util/google-perftools
+ x11-misc/shared-mime-info
+ dev-qt/qtwidgets
+ dev-qt/qtx11extras
+"
+
+BDEPEND=""
+
+RDEPEND="${DEPEND}"
+
+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
+
+ -DJPEGXL_ENABLE_EXAMPLES=ON
+ -DJPEGXL_ENABLE_VIEWERS=ON
+ -DJPEGXL_ENABLE_PLUGINS=ON
+ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
new file mode 100644
index 000000000..d9a1e3c6e
--- /dev/null
+++ b/media-libs/libjxl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dnovomesky@gmail.com</email>
+ <name>Daniel Novomesky</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
2021-07-24 15:55 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
@ 2021-07-24 15:58 ` Andrew Ammerlaan
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Ammerlaan @ 2021-07-24 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 154f03b592b7468e39b1cf24ced044cd66613036
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 24 15:54:54 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 24 15:54:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=154f03b5
media-libs/libjxl: add missing slot operator
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
media-libs/libjxl/libjxl-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index cfb733563..21dbcb9ab 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="app-arch/brotli
virtual/opengl
media-libs/freeglut
media-libs/giflib
- media-libs/openexr
+ media-libs/openexr:=
dev-util/google-perftools
x11-misc/shared-mime-info
dev-qt/qtwidgets
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-09-15 7:50 Arthur Zamarin
0 siblings, 0 replies; 12+ messages in thread
From: Arthur Zamarin @ 2021-09-15 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 782b6adc08d93ba1f48ced6ac35d7945d262a756
Author: Daniel Novomesky <dnovomesky <AT> gmail <DOT> com>
AuthorDate: Sun Sep 12 11:58:01 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 11:58:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=782b6adc
media-libs/libjxl: use system-wide dev-cpp/highway
instead of the bundled dependency.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Daniel Novomesky <dnovomesky <AT> gmail.com>
media-libs/libjxl/libjxl-9999.ebuild | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 21dbcb9ab..2ad6c4626 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -26,6 +26,9 @@ DEPEND="app-arch/brotli
x11-misc/shared-mime-info
dev-qt/qtwidgets
dev-qt/qtx11extras
+ dev-cpp/gtest
+ dev-cpp/highway
+ media-libs/lcms
"
BDEPEND=""
@@ -40,10 +43,13 @@ src_configure() {
-DJPEGXL_ENABLE_SJPEG=OFF
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+ -DJPEGXL_ENABLE_SKCMS=ON
-DJPEGXL_ENABLE_EXAMPLES=ON
-DJPEGXL_ENABLE_VIEWERS=ON
-DJPEGXL_ENABLE_PLUGINS=ON
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+ -DJPEGXL_FORCE_SYSTEM_HWY=ON
+ -DJPEGXL_FORCE_SYSTEM_GTEST=ON
)
cmake_src_configure
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-10-27 6:18 Florian Schmaus
0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2021-10-27 6:18 UTC (permalink / raw
To: gentoo-commits
commit: cf9492e82b413e84024dc0d03cb22c2c22acb0a5
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Oct 26 16:45:16 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 16:45:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf9492e8
media-libs/libjxl: remove static lib, add todo
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-libs/libjxl/libjxl-0.6.ebuild | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-libs/libjxl/libjxl-0.6.ebuild b/media-libs/libjxl/libjxl-0.6.ebuild
index 52c54ec86..afd6ae0c0 100644
--- a/media-libs/libjxl/libjxl-0.6.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers"
+IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #java
RDEPEND="
app-arch/brotli
@@ -23,7 +23,6 @@ RDEPEND="
sys-libs/zlib
virtual/jpeg
- !skcms? ( media-libs/lcms )
openexr? ( media-libs/openexr:= )
plugins? (
dev-libs/glib:2
@@ -35,6 +34,7 @@ RDEPEND="
x11-misc/shared-mime-info
)
sjpeg? ( media-libs/sjpeg:= )
+ !skcms? ( media-libs/lcms )
skcms? ( media-libs/skcms:= )
tcmalloc? ( dev-util/google-perftools )
viewers? ( media-libs/lcms )
@@ -85,3 +85,9 @@ src_configure() {
cmake_src_configure
}
+
+src_install() {
+ cmake_src_install
+ find "${D}" -name '*.a' -delete || die
+ #TODO: install documentation
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-10-28 20:56 Haelwenn Monnier
0 siblings, 0 replies; 12+ messages in thread
From: Haelwenn Monnier @ 2021-10-28 20:56 UTC (permalink / raw
To: gentoo-commits
commit: b9e2f79ecb5fd0e323c8a03f084fb703d617cc9a
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Oct 28 14:32:29 2021 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu Oct 28 14:32:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b9e2f79e
media-libs/libjxl: install more stuff
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../{libjxl-0.6-r1.ebuild => libjxl-0.6-r2.ebuild} | 47 ++++++++++++++++++----
media-libs/libjxl/metadata.xml | 1 +
2 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/media-libs/libjxl/libjxl-0.6-r1.ebuild b/media-libs/libjxl/libjxl-0.6-r2.ebuild
similarity index 73%
rename from media-libs/libjxl/libjxl-0.6-r1.ebuild
rename to media-libs/libjxl/libjxl-0.6-r2.ebuild
index d8cf76855..0637e43b0 100644
--- a/media-libs/libjxl/libjxl-0.6-r1.ebuild
+++ b/media-libs/libjxl/libjxl-0.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten
+IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten fuzzers
CDEPEND="
app-arch/brotli
@@ -69,6 +69,8 @@ PATCHES=( "${FILESDIR}/${P}-system-libs.patch" )
REQUIRED_USE="tcmalloc? ( abi_x86_64 )"
DOCS=( AUTHORS README.md SECURITY.md PATENTS CONTRIBUTORS CHANGELOG.md )
+CMAKE_IN_SOURCE_BUILD=1
+
src_prepare() {
# remove bundled libs cmake
rm third_party/*.cmake || die
@@ -111,13 +113,44 @@ src_install() {
cmake_src_install
einstalldocs
#TODO: install documentation
+ exeinto "/usr/libexec/${PN}"
+ if use examples; then
+ doexe {en,de}code_oneshot
+ dobin jxlinfo
+ fi
pushd "${BUILD_DIR}/tools" || die
- exeinto "/usr/libexe/${PN}"
- doexe conformance/djxl_conformance tests/libjxl_test
- use devtools && doexe box/box_list
- use viewers && doexe comparison_viewer/compare_{codec,image}s flicker_test/flicker_test viewer/viewe
- use benchmark && doexe benchmark_xl
insinto "/usr/share/${PN}"
- use java && doins *.jar
+ doins progressive_saliency.conf example_tree.txt
+ if use java; then
+ dolib.so libjxl_jni.so
+ rm libjxl_jni.so || die
+ doins *.jar
+ fi
+ if use benchmark; then
+ docinto "/usr/share/doc/${PF}/benchmark/hm"
+ dodoc benchmark/hm/README.md
+ else
+ rm -r benchmark || die
+ fi
+ # remove non executable or non .m files
+ find . -type f \! -name '*.m' \! -executable -delete || die
+ # delete empty dirs
+ find . -type d -empty -print -delete || die
+ mkdir -p "${ED}/usr/libexec/${PN}/tools/" || die
+ # install tools
+ cp -r . "${ED}/usr/libexec/${PN}/tools/" || die
+
+ # keep in /usr/bin only the executables with jxl in the name
+ rm -f "${ED}"/usr/libexec/${PN}/tools/*jxl* || die
+ rm -f "${ED}"/usr/bin{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die
+
find "${D}" -name '*.a' -delete || die
}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index ac9483923..5c6f84710 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="benchmark">Build JPEGXL benchmark tools</flag>
<flag name="devtools">Build JPEGXL developer tools</flag>
+ <!--<flag name="fuzzers">Build the fuzzers</flag>-->
<flag name="openexr">Build JPEGXL with support for OpenEXR</flag>
<flag name="plugins">Build third-party plugins to support JPEG XL in other applications</flag>
<flag name="sjpeg">Build JPEGXL with support for encoding with sjpeg</flag>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-10-28 20:56 Haelwenn Monnier
0 siblings, 0 replies; 12+ messages in thread
From: Haelwenn Monnier @ 2021-10-28 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 1e36af049f567042d7b64f5b9f7c429cdc9e988f
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Oct 28 15:21:06 2021 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu Oct 28 15:21:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1e36af04
media-libs/libjxl: fix path
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-libs/libjxl/libjxl-0.6-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libjxl/libjxl-0.6-r2.ebuild b/media-libs/libjxl/libjxl-0.6-r2.ebuild
index 0637e43b0..e2918d5b2 100644
--- a/media-libs/libjxl/libjxl-0.6-r2.ebuild
+++ b/media-libs/libjxl/libjxl-0.6-r2.ebuild
@@ -142,7 +142,7 @@ src_install() {
# keep in /usr/bin only the executables with jxl in the name
rm -f "${ED}"/usr/libexec/${PN}/tools/*jxl* || die
- rm -f "${ED}"/usr/bin{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die
+ rm -f "${ED}"/usr/bin/{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die
find "${D}" -name '*.a' -delete || die
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-11-08 13:02 Andrew Ammerlaan
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Ammerlaan @ 2021-11-08 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 7cbfbce6fd49ed807e3b8d690c2e6be22cdfcda3
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Nov 6 13:11:38 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 13:12:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7cbfbce6
media-libs/libjxl: install missing lib, no runpaths
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-libs/libjxl/libjxl-0.6.1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-libs/libjxl/libjxl-0.6.1.ebuild b/media-libs/libjxl/libjxl-0.6.1.ebuild
index 2ac499ef3..4ca7f7ae5 100644
--- a/media-libs/libjxl/libjxl-0.6.1.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.1.ebuild
@@ -95,6 +95,7 @@ src_configure() {
-DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
-DBUILD_SHARED_LIBS=ON
+ -DCMAKE_SKIP_RPATH=ON
-DJPEGXL_BUNDLE_SKCMS=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_FUZZERS=OFF
@@ -111,6 +112,7 @@ src_configure() {
src_install() {
cmake_src_install
+ dolib.so libjxl_dec.so*
einstalldocs
#TODO: install documentation
exeinto "/usr/libexec/${PN}"
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-11-08 13:02 Andrew Ammerlaan
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Ammerlaan @ 2021-11-08 13:02 UTC (permalink / raw
To: gentoo-commits
commit: fd7b9099b103ed4b880d41491a5559ab9f709ecb
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Fri Nov 5 08:29:16 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 08:29:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd7b9099
media-libs/libjxl: add 0.6.1
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-libs/libjxl/Manifest | 1 +
media-libs/libjxl/libjxl-0.6.1.ebuild | 156 ++++++++++++++++++++++++++++++++++
2 files changed, 157 insertions(+)
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 63de49120..fc7f70713 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1 +1,2 @@
+DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
DIST libjxl-0.6.tar.gz 16953410 BLAKE2B 8941987f6d31096a7286f9d98cdcc16e5fe338e6b3d966343f97fc5b5b932ec92c994fab5781448aa7d96324e5c9ce5c83754b01cf6e752d0702ce9fc0a2087f SHA512 934c86d079c7a1f5382fad158efac225b9d1b27e551ea85ea7ec43e7ffd5cba85ddbfa35658b242a9f9c9589decf245568349abfa8a4fe12898af78d51608852
diff --git a/media-libs/libjxl/libjxl-0.6.1.ebuild b/media-libs/libjxl/libjxl-0.6.1.ebuild
new file mode 100644
index 000000000..2ac499ef3
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.6.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake java-pkg-opt-2
+
+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"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten fuzzers
+
+CDEPEND="
+ app-arch/brotli
+ dev-cpp/highway:=
+ media-libs/libpng
+ media-libs/lodepng:=
+ media-libs/giflib
+ sys-libs/zlib
+
+ benchmark? (
+ media-libs/libavif
+ media-libs/libwebp
+ virtual/jpeg
+ )
+ openexr? ( media-libs/openexr:= )
+ plugins? (
+ dev-libs/glib:2
+ media-gfx/gimp
+ media-libs/babl
+ media-libs/gegl
+ media-libs/skcms:=
+ x11-libs/gdk-pixbuf
+ x11-misc/shared-mime-info
+ )
+ sjpeg? ( media-libs/sjpeg:= )
+ !skcms? ( media-libs/lcms )
+ skcms? ( media-libs/skcms:= )
+ tcmalloc? ( dev-util/google-perftools )
+ viewers? (
+ dev-qt/qtconcurrent
+ dev-qt/qtwidgets
+ dev-qt/qtx11extras
+ media-libs/lcms
+ x11-libs/libxcb
+ )
+"
+RDEPEND="
+ ${CDEPEND}
+ java? ( virtual/jre:1.8 )
+"
+DEPEND="
+ ${CDEPEND}
+ dev-cpp/gtest
+ kde-frameworks/extra-cmake-modules
+ java? ( virtual/jdk:1.8 )
+ plugins? ( x11-misc/xdg-utils )
+"
+BDEPEND="
+ virtual/pkgconfig
+ man? ( app-text/asciidoc )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6-system-libs.patch" )
+REQUIRED_USE="tcmalloc? ( abi_x86_64 )"
+DOCS=( AUTHORS README.md SECURITY.md PATENTS CONTRIBUTORS CHANGELOG.md )
+
+CMAKE_IN_SOURCE_BUILD=1
+
+src_prepare() {
+ # remove bundled libs cmake
+ rm third_party/*.cmake || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DJPEGXL_ENABLE_BENCHMARK=$(usex benchmark)
+ -DJPEGXL_ENABLE_DEVTOOLS=$(usex devtools)
+ -DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+ -DJPEGXL_ENABLE_JNI=$(usex java)
+ -DJPEGXL_ENABLE_MANPAGES=$(usex man)
+ -DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+ -DJPEGXL_ENABLE_PLUGINS=$(usex plugins)
+ -DJPEGXL_ENABLE_PROFILER=$(usex profile)
+ -DJPEGXL_ENABLE_SJPEG=$(usex sjpeg)
+ -DJPEGXL_ENABLE_SKCMS=$(usex skcms)
+ -DJPEGXL_ENABLE_TCMALLOC=$(usex tcmalloc)
+ -DJPEGXL_ENABLE_TOOLS=$(usex tools)
+ -DJPEGXL_ENABLE_VIEWERS=$(usex viewers)
+ -DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
+
+ -DBUILD_SHARED_LIBS=ON
+ -DJPEGXL_BUNDLE_SKCMS=OFF
+ -DJPEGXL_ENABLE_COVERAGE=OFF
+ -DJPEGXL_ENABLE_FUZZERS=OFF
+ -DJPEGXL_ENABLE_TRANSCODE_JPEG=ON
+ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+ -DJPEGXL_FORCE_SYSTEM_GTEST=ON
+ -DJPEGXL_FORCE_SYSTEM_HWY=ON
+ -DJPEGXL_STATIC=OFF
+ -DJPEGXL_WARNINGS_AS_ERRORS=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ einstalldocs
+ #TODO: install documentation
+ exeinto "/usr/libexec/${PN}"
+ if use examples; then
+ doexe {en,de}code_oneshot
+ dobin jxlinfo
+ fi
+ pushd "${BUILD_DIR}/tools" || die
+ insinto "/usr/share/${PN}"
+ doins progressive_saliency.conf example_tree.txt
+ if use java; then
+ dolib.so libjxl_jni.so
+ rm libjxl_jni.so || die
+ doins *.jar
+ fi
+ if use benchmark; then
+ docinto "/usr/share/doc/${PF}/benchmark/hm"
+ dodoc benchmark/hm/README.md
+ else
+ rm -r benchmark || die
+ fi
+ # remove non executable or non .m files
+ find . -type f \! -name '*.m' \! -executable -delete || die
+ # delete empty dirs
+ find . -type d -empty -print -delete || die
+ mkdir -p "${ED}/usr/libexec/${PN}/tools/" || die
+ # install tools
+ cp -r . "${ED}/usr/libexec/${PN}/tools/" || die
+
+ # keep in /usr/bin only the executables with jxl in the name
+ rm -f "${ED}"/usr/libexec/${PN}/tools/*jxl* || die
+ rm -f "${ED}"/usr/bin/{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die
+
+ find "${D}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-11-08 13:02 Andrew Ammerlaan
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Ammerlaan @ 2021-11-08 13:02 UTC (permalink / raw
To: gentoo-commits
commit: f0851b795852c7801efc34358df67ce501987b18
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Nov 6 13:12:34 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 13:12:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f0851b79
media-libs/libjxl: drop 0.6-r2
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
media-libs/libjxl/Manifest | 1 -
media-libs/libjxl/libjxl-0.6-r2.ebuild | 156 ---------------------------------
2 files changed, 157 deletions(-)
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index fc7f70713..4d30078bf 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,2 +1 @@
DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
-DIST libjxl-0.6.tar.gz 16953410 BLAKE2B 8941987f6d31096a7286f9d98cdcc16e5fe338e6b3d966343f97fc5b5b932ec92c994fab5781448aa7d96324e5c9ce5c83754b01cf6e752d0702ce9fc0a2087f SHA512 934c86d079c7a1f5382fad158efac225b9d1b27e551ea85ea7ec43e7ffd5cba85ddbfa35658b242a9f9c9589decf245568349abfa8a4fe12898af78d51608852
diff --git a/media-libs/libjxl/libjxl-0.6-r2.ebuild b/media-libs/libjxl/libjxl-0.6-r2.ebuild
deleted file mode 100644
index e2918d5b2..000000000
--- a/media-libs/libjxl/libjxl-0.6-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake java-pkg-opt-2
-
-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"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten fuzzers
-
-CDEPEND="
- app-arch/brotli
- dev-cpp/highway:=
- media-libs/libpng
- media-libs/lodepng:=
- media-libs/giflib
- sys-libs/zlib
-
- benchmark? (
- media-libs/libavif
- media-libs/libwebp
- virtual/jpeg
- )
- openexr? ( media-libs/openexr:= )
- plugins? (
- dev-libs/glib:2
- media-gfx/gimp
- media-libs/babl
- media-libs/gegl
- media-libs/skcms:=
- x11-libs/gdk-pixbuf
- x11-misc/shared-mime-info
- )
- sjpeg? ( media-libs/sjpeg:= )
- !skcms? ( media-libs/lcms )
- skcms? ( media-libs/skcms:= )
- tcmalloc? ( dev-util/google-perftools )
- viewers? (
- dev-qt/qtconcurrent
- dev-qt/qtwidgets
- dev-qt/qtx11extras
- media-libs/lcms
- x11-libs/libxcb
- )
-"
-RDEPEND="
- ${CDEPEND}
- java? ( virtual/jre:1.8 )
-"
-DEPEND="
- ${CDEPEND}
- dev-cpp/gtest
- kde-frameworks/extra-cmake-modules
- java? ( virtual/jdk:1.8 )
- plugins? ( x11-misc/xdg-utils )
-"
-BDEPEND="
- virtual/pkgconfig
- man? ( app-text/asciidoc )
-"
-
-PATCHES=( "${FILESDIR}/${P}-system-libs.patch" )
-REQUIRED_USE="tcmalloc? ( abi_x86_64 )"
-DOCS=( AUTHORS README.md SECURITY.md PATENTS CONTRIBUTORS CHANGELOG.md )
-
-CMAKE_IN_SOURCE_BUILD=1
-
-src_prepare() {
- # remove bundled libs cmake
- rm third_party/*.cmake || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DJPEGXL_ENABLE_BENCHMARK=$(usex benchmark)
- -DJPEGXL_ENABLE_DEVTOOLS=$(usex devtools)
- -DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
- -DJPEGXL_ENABLE_JNI=$(usex java)
- -DJPEGXL_ENABLE_MANPAGES=$(usex man)
- -DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
- -DJPEGXL_ENABLE_PLUGINS=$(usex plugins)
- -DJPEGXL_ENABLE_PROFILER=$(usex profile)
- -DJPEGXL_ENABLE_SJPEG=$(usex sjpeg)
- -DJPEGXL_ENABLE_SKCMS=$(usex skcms)
- -DJPEGXL_ENABLE_TCMALLOC=$(usex tcmalloc)
- -DJPEGXL_ENABLE_TOOLS=$(usex tools)
- -DJPEGXL_ENABLE_VIEWERS=$(usex viewers)
- -DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
-
- -DBUILD_SHARED_LIBS=ON
- -DJPEGXL_BUNDLE_SKCMS=OFF
- -DJPEGXL_ENABLE_COVERAGE=OFF
- -DJPEGXL_ENABLE_FUZZERS=OFF
- -DJPEGXL_ENABLE_TRANSCODE_JPEG=ON
- -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
- -DJPEGXL_FORCE_SYSTEM_GTEST=ON
- -DJPEGXL_FORCE_SYSTEM_HWY=ON
- -DJPEGXL_STATIC=OFF
- -DJPEGXL_WARNINGS_AS_ERRORS=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- einstalldocs
- #TODO: install documentation
- exeinto "/usr/libexec/${PN}"
- if use examples; then
- doexe {en,de}code_oneshot
- dobin jxlinfo
- fi
- pushd "${BUILD_DIR}/tools" || die
- insinto "/usr/share/${PN}"
- doins progressive_saliency.conf example_tree.txt
- if use java; then
- dolib.so libjxl_jni.so
- rm libjxl_jni.so || die
- doins *.jar
- fi
- if use benchmark; then
- docinto "/usr/share/doc/${PF}/benchmark/hm"
- dodoc benchmark/hm/README.md
- else
- rm -r benchmark || die
- fi
- # remove non executable or non .m files
- find . -type f \! -name '*.m' \! -executable -delete || die
- # delete empty dirs
- find . -type d -empty -print -delete || die
- mkdir -p "${ED}/usr/libexec/${PN}/tools/" || die
- # install tools
- cp -r . "${ED}/usr/libexec/${PN}/tools/" || die
-
- # keep in /usr/bin only the executables with jxl in the name
- rm -f "${ED}"/usr/libexec/${PN}/tools/*jxl* || die
- rm -f "${ED}"/usr/bin/{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die
-
- find "${D}" -name '*.a' -delete || die
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2021-11-08 13:02 Andrew Ammerlaan
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Ammerlaan @ 2021-11-08 13:02 UTC (permalink / raw
To: gentoo-commits
commit: a1e6d327b496762cdd58faa0aeba52354bba3c2d
Author: Daniel Novomesky <dnovomesky <AT> gmail <DOT> com>
AuthorDate: Mon Nov 8 09:03:57 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 8 09:03:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1e6d327
media-libs/libjxl: update live ebuild
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Novomesky <dnovomesky <AT> gmail.com>
media-libs/libjxl/libjxl-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 138b32865..9fbcd8bee 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=ON
+ -DBUILD_SHARED_LIBS=ON
-DJPEGXL_ENABLE_BENCHMARK=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_FUZZERS=OFF
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2022-01-02 14:51 Andrew Ammerlaan
0 siblings, 0 replies; 12+ messages in thread
From: Andrew Ammerlaan @ 2022-01-02 14:51 UTC (permalink / raw
To: gentoo-commits
commit: f613f7b211f1d46a7611bfc33b0045f8932f3aaf
Author: Daniel Novomesky <dnovomesky <AT> gmail <DOT> com>
AuthorDate: Sat Jan 1 17:22:45 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 1 17:23:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f613f7b2
media-libs/libjxl: depend on dev-cpp/gflags
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Novomesky <dnovomesky <AT> gmail.com>
media-libs/libjxl/libjxl-9999.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index 2fafeb9c7..1745e4ba0 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -24,6 +24,7 @@ DEPEND="app-arch/brotli
media-libs/openexr:=
dev-util/google-perftools
x11-misc/shared-mime-info
+ dev-cpp/gflags
dev-cpp/gtest
dev-cpp/highway
media-libs/lcms
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/
@ 2022-03-23 16:14 Ronny Gutbrod
0 siblings, 0 replies; 12+ messages in thread
From: Ronny Gutbrod @ 2022-03-23 16:14 UTC (permalink / raw
To: gentoo-commits
commit: f2c9a6b86f8078b4b721126fa4f3b5545a9c6677
Author: Daniel Novomesky <dnovomesky <AT> gmail <DOT> com>
AuthorDate: Fri Mar 18 15:02:24 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Fri Mar 18 15:02:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f2c9a6b8
media-libs/libjxl: multilib support in live ebuild
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Novomesky <dnovomesky <AT> gmail.com>
media-libs/libjxl/libjxl-9999.ebuild | 46 +++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
index c77bf8e49..3bd059b1f 100644
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-inherit cmake git-r3 xdg
+CMAKE_ECLASS=cmake
+inherit cmake-multilib git-r3 xdg
DESCRIPTION="JPEG XL image format reference implementation"
HOMEPAGE="https://github.com/libjxl/libjxl"
@@ -15,14 +16,14 @@ LICENSE="BSD"
SLOT="0"
IUSE="examples gdk-pixbuf gimp210 openexr"
-DEPEND="app-arch/brotli
- dev-cpp/gflags
- >=dev-cpp/highway-0.16.0
- media-libs/giflib
- media-libs/libpng
+DEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
+ dev-cpp/gflags[${MULTILIB_USEDEP}]
+ >=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
+ media-libs/giflib[${MULTILIB_USEDEP}]
+ media-libs/libpng[${MULTILIB_USEDEP}]
openexr? ( media-libs/openexr:= )
- sys-libs/zlib
- virtual/jpeg
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg[${MULTILIB_USEDEP}]
x11-misc/shared-mime-info
gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
@@ -32,7 +33,7 @@ BDEPEND=""
RDEPEND="${DEPEND}"
-src_configure() {
+multilib_src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=ON
-DBUILD_TESTING=OFF
@@ -43,12 +44,7 @@ src_configure() {
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-DJPEGXL_ENABLE_SKCMS=ON
- -DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
- -DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
-DJPEGXL_ENABLE_VIEWERS=OFF
- -DJPEGXL_ENABLE_PLUGINS=ON
- -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
- -DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-DJPEGXL_FORCE_SYSTEM_HWY=ON
-DJPEGXL_ENABLE_DOXYGEN=OFF
@@ -57,12 +53,30 @@ src_configure() {
-DJPEGXL_ENABLE_TCMALLOC=OFF
)
+ if multilib_is_native_abi; then
+ mycmakeargs+=(
+ -DJPEGXL_ENABLE_TOOLS=ON
+ -DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+ -DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+ -DJPEGXL_ENABLE_PLUGINS=ON
+ -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
+ -DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
+ )
+ else
+ mycmakeargs+=(
+ -DJPEGXL_ENABLE_TOOLS=OFF
+ -DJPEGXL_ENABLE_EXAMPLES=OFF
+ -DJPEGXL_ENABLE_OPENEXR=OFF
+ -DJPEGXL_ENABLE_PLUGINS=OFF
+ )
+ fi
+
cmake_src_configure
}
-src_install() {
+multilib_src_install() {
cmake_src_install
- if use examples; then
+ if use examples && multilib_is_native_abi; then
dobin "${BUILD_DIR}/jxlinfo"
fi
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-03-23 16:15 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-08 13:02 [gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-03-23 16:14 Ronny Gutbrod
2022-01-02 14:51 Andrew Ammerlaan
2021-11-08 13:02 Andrew Ammerlaan
2021-11-08 13:02 Andrew Ammerlaan
2021-11-08 13:02 Andrew Ammerlaan
2021-10-28 20:56 Haelwenn Monnier
2021-10-28 20:56 Haelwenn Monnier
2021-10-27 6:18 Florian Schmaus
2021-09-15 7:50 Arthur Zamarin
2021-07-24 15:55 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-07-24 15:58 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-06-04 7:59 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox