From 852fb8dde328113438345d409727f1e56f55e1d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Wed, 9 Jun 2021 00:44:37 +0200 Subject: [PATCH 1/3] New package: highway-1.0.3 --- srcpkgs/highway/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/highway/template diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template new file mode 100644 index 000000000000..2c127bd3a278 --- /dev/null +++ b/srcpkgs/highway/template @@ -0,0 +1,22 @@ +# Template file for 'highway' +pkgname=highway +version=1.0.3 +revision=1 +build_style=cmake +configure_args="-DHWY_SYSTEM_GTEST=ON -DHWY_ENABLE_EXAMPLES=OFF" +makedepends="libatomic-devel" +checkdepends="gtest-devel" +short_desc="C++ library providing portable SIMD/vector intrinsics" +maintainer="Joshua Krämer " +license="Apache-2.0" +homepage="https://github.com/google/highway" +distfiles="https://github.com/google/highway/archive/${version}.tar.gz" +checksum=566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e + +if [ -z "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_TESTING=OFF" +fi + +case "$XBPS_TARGET_MACHINE" in + armv7*) configure_args+=" -DHWY_CMAKE_ARM7=ON" ;; +esac From e769c76d82358cf6597dea94183ba78710c99e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Wed, 9 Jun 2021 01:52:29 +0200 Subject: [PATCH 2/3] New package: libjxl-0.8.1 --- common/shlibs | 3 ++ srcpkgs/libjxl-devel | 1 + srcpkgs/libjxl-plugins | 1 + srcpkgs/libjxl-tools | 1 + srcpkgs/libjxl/template | 79 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+) create mode 120000 srcpkgs/libjxl-devel create mode 120000 srcpkgs/libjxl-plugins create mode 120000 srcpkgs/libjxl-tools create mode 100644 srcpkgs/libjxl/template diff --git a/common/shlibs b/common/shlibs index ce31638c1c9e..8b719e495cdf 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4238,3 +4238,6 @@ libdate-tz.so.3 chrono-date-3.0.1_1 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1 +libjxl.so.0.8 libjxl-0.8.1_1 +libjxl_dec.so.0.8 libjxl-0.8.1_1 +libjxl_threads.so.0.8 libjxl-0.8.1_1 diff --git a/srcpkgs/libjxl-devel b/srcpkgs/libjxl-devel new file mode 120000 index 000000000000..ddc1abf827d9 --- /dev/null +++ b/srcpkgs/libjxl-devel @@ -0,0 +1 @@ +libjxl \ No newline at end of file diff --git a/srcpkgs/libjxl-plugins b/srcpkgs/libjxl-plugins new file mode 120000 index 000000000000..ddc1abf827d9 --- /dev/null +++ b/srcpkgs/libjxl-plugins @@ -0,0 +1 @@ +libjxl \ No newline at end of file diff --git a/srcpkgs/libjxl-tools b/srcpkgs/libjxl-tools new file mode 120000 index 000000000000..ddc1abf827d9 --- /dev/null +++ b/srcpkgs/libjxl-tools @@ -0,0 +1 @@ +libjxl \ No newline at end of file diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template new file mode 100644 index 000000000000..75a62f2a3180 --- /dev/null +++ b/srcpkgs/libjxl/template @@ -0,0 +1,79 @@ +# Template file for 'libjxl' +pkgname=libjxl +version=0.8.1 +revision=1 +build_style=cmake +configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF + -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_PLUGINS=ON" +hostmakedepends="tar pkg-config asciidoc" +makedepends="brotli-devel highway libpng-devel giflib-devel libjpeg-turbo-devel + libopenexr-devel libwebp-devel gdk-pixbuf-devel gimp-devel" +checkdepends="gtest-devel xdg-utils" +short_desc="JPEG XL image format reference implementation" +maintainer="Joshua Krämer " +license="BSD-3-Clause, custom:Patent grant" +homepage="https://jpeg.org/jpegxl/" +_testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759 +_skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318 +distfiles="https://github.com/libjxl/libjxl/archive/v${version}.tar.gz + https://github.com/libjxl/testdata/archive/${_testdata_hash}.tar.gz>testdata-${_testdata_hash}.tar.gz + https://skia.googlesource.com/skcms/+archive/${_skcms_hash}.tar.gz>skcms-${_skcms_hash}.tar.gz" +checksum="60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56 + 64658d3341bff2976899cb8b140242ffa4de1cd41aed507dfec4aa9e7e05ca24 + @8feb1e33c38ca13f91a0d5bd8ce25f976eb239edf38f49e6db8895ae9f1e833c" +skip_extraction="testdata-${_testdata_hash}.tar.gz skcms-${_skcms_hash}.tar.gz" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LIBS="-latomic" +fi + +if [ -z "$XBPS_CHECK_PKGS" ]; then + configure_args+=" -DBUILD_TESTING=OFF" +fi + +case "$XBPS_TARGET_MACHINE" in + # armv7*) configure_args+=" -DJPEGXL_FORCE_NEON=ON" ;; + armv7*) broken="https://github.com/libjxl/libjxl/issues/1748" ;; +esac + +post_extract() { + cd ${XBPS_SRCDISTDIR}/libjxl-${version} + tar -xf testdata-${_testdata_hash}.tar.gz --strip-components=1 -C ${wrksrc}/testdata + tar -xf skcms-${_skcms_hash}.tar.gz -C ${wrksrc}/third_party/skcms +} + +post_install() { + vlicense LICENSE + vlicense PATENTS +} + +libjxl-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision} highway brotli-devel" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} + +libjxl-tools_package() { + short_desc+=" - tools" + pkg_install() { + vmove usr/bin + vmove usr/share/man/man1 + } +} + +libjxl-plugins_package() { + short_desc+=" - plugins" + depends="desktop-file-utils" + pkg_install() { + vmove usr/lib/gdk-pixbuf-2.0 + vmove usr/lib/gimp + vmove usr/share/mime + vmove usr/share/thumbnailers + } +} From 18d198352828babdaece354ef6c6d014bb1f6214 Mon Sep 17 00:00:00 2001 From: Joshua Date: Wed, 30 Mar 2022 21:23:16 +0200 Subject: [PATCH 3/3] kimageformats: enable JPEG XL support --- srcpkgs/kimageformats/template | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index 3f3145d7fd8d..f383ab7503d4 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,15 +1,24 @@ # Template file for 'kimageformats' pkgname=kimageformats version=5.103.0 -revision=1 +revision=2 build_style=cmake configure_args="-DKIMAGEFORMATS_HEIF=ON" hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools pkg-config" -makedepends="karchive-devel libopenexr-devel libheif-devel" +makedepends="karchive-devel libopenexr-devel libheif-devel + $(vopt_if jpegxl libjxl-devel)" short_desc="KDE Plugins to allow QImage to support extra file formats" maintainer="John " license="LGPL-2.0-or-later" homepage="https://invent.kde.org/frameworks/kimageformats" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=dd7dc417aacc9dfe74745e4dfd9750129051c36502fa1cd18b92c4035d721e7e + +build_options="jpegxl" +desc_option_jpegxl="JPEG XL support" + +case "$XBPS_TARGET_MACHINE" in + armv7*) ;; + *) build_options_default="jpegxl" +esac