Re: [PR PATCH] [Updated] New packages: highway, libjxl, qt-jpegxl-image-plugin

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/joshuakraemer/void-packages jpeg-xl
https://github.com/void-linux/void-packages/pull/31397

New packages: highway, libjxl, qt-jpegxl-image-plugin
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

These packages provide support for the JPEG XL image format.

A patch file from https://github.com/void-linux/void-packages/pull/31397.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jpeg-xl-31397.patch --]
[-- Type: text/x-diff, Size: 11867 bytes --]

From 6fdb5a3f9d41eba2cde5fb7ca33bd26bb13ad5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 9 Jun 2021 00:44:37 +0200
Subject: [PATCH 1/6] New package: highway-1.0.1

---
 srcpkgs/highway/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/highway/template

diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template
new file mode 100644
index 000000000000..8871cccc8def
--- /dev/null
+++ b/srcpkgs/highway/template
@@ -0,0 +1,23 @@
+# Template file for 'highway'
+pkgname=highway
+version=1.0.1
+revision=1
+build_style=cmake
+configure_args="-DHWY_SYSTEM_GTEST=ON -DHWY_ENABLE_EXAMPLES=OFF"
+makedepends="libatomic-devel"
+short_desc="C++ library providing portable SIMD/vector intrinsics"
+maintainer="Joshua Krämer <joshua@kraemer.link>"
+license="Apache-2.0"
+homepage="https://github.com/google/highway"
+distfiles="https://github.com/google/highway/archive/${version}.tar.gz"
+checksum=7ca6af7dc2e3e054de9e17b9dfd88609a7fd202812b1c216f43cc41647c97311
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	makedepends+=" gtest-devel"
+else
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	armv7*) broken="https://github.com/google/highway/issues/834"
+esac

From 55d47a12e6a5dccd040400df0b06d2c19249826e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 9 Jun 2021 01:52:29 +0200
Subject: [PATCH 2/6] New package: libjxl-0.7.0

---
 common/shlibs           |  2 ++
 srcpkgs/libjxl-devel    |  1 +
 srcpkgs/libjxl-plugins  |  1 +
 srcpkgs/libjxl-tools    |  1 +
 srcpkgs/libjxl/template | 79 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 84 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 504d29f4cb98..5ccd9d2cd265 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4225,3 +4225,5 @@ libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
 libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
 libdate-tz.so.3 chrono-date-3.0.1_1
+libjxl.so.0.7 libjxl-0.7.0_1
+libjxl_threads.so.0.7 libjxl-0.7.0_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..60c229bc666c
--- /dev/null
+++ b/srcpkgs/libjxl/template
@@ -0,0 +1,79 @@
+# Template file for 'libjxl'
+pkgname=libjxl
+version=0.7.0
+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"
+short_desc="JPEG XL image format reference implementation"
+maintainer="Joshua Krämer <joshua@kraemer.link>"
+license="BSD-3-Clause, custom:Patent grant"
+homepage="https://jpeg.org/jpegxl/"
+_testdata_hash=d81acaca8e037d9514f3211045c77e7467bcb814
+_skcms_hash=64374756e03700d649f897dbd98c95e78c30c7da
+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="3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e
+ 1a4d4be37f9a4dd69134832665fda8a772eeb95cbcdaa79d9b1850c23ae50521
+ @a69230c7b6f03a178c93abc6edc832c040d6e198340193b27c3d04afecf8f617"
+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 [ "$XBPS_CHECK_PKGS" ]; then
+	makedepends+=" gtest-devel xdg-utils"
+else
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	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 60c4e673b8eb4b7ff0ccc1b26729877225038576 Mon Sep 17 00:00:00 2001
From: Joshua <joshua@kraemer.link>
Date: Wed, 30 Mar 2022 21:23:16 +0200
Subject: [PATCH 3/6] kimageformats: enable JPEG XL support

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index e48144056dd5..5a8d5358717b 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.101.0
-revision=2
+revision=3
 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 libjxl-devel"
 short_desc="KDE Plugins to allow QImage to support extra file formats"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"

From d1d1868c06a35eb76b7614c15c965378be5aef8c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 10 Feb 2023 13:46:35 -0500
Subject: [PATCH 4/6] fixup! New package: highway-1.0.1

---
 srcpkgs/highway/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template
index 8871cccc8def..2c127bd3a278 100644
--- a/srcpkgs/highway/template
+++ b/srcpkgs/highway/template
@@ -1,23 +1,22 @@
 # Template file for 'highway'
 pkgname=highway
-version=1.0.1
+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 <joshua@kraemer.link>"
 license="Apache-2.0"
 homepage="https://github.com/google/highway"
 distfiles="https://github.com/google/highway/archive/${version}.tar.gz"
-checksum=7ca6af7dc2e3e054de9e17b9dfd88609a7fd202812b1c216f43cc41647c97311
+checksum=566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	makedepends+=" gtest-devel"
-else
+if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	armv7*) broken="https://github.com/google/highway/issues/834"
+	armv7*) configure_args+=" -DHWY_CMAKE_ARM7=ON" ;;
 esac

From be3bdb52eac3ad690afb0fe5c4fe41139fd0f9d8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 10 Feb 2023 13:46:45 -0500
Subject: [PATCH 5/6] fixup! New package: libjxl-0.7.0

---
 srcpkgs/libjxl/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template
index 60c229bc666c..a5c64ff87429 100644
--- a/srcpkgs/libjxl/template
+++ b/srcpkgs/libjxl/template
@@ -1,6 +1,6 @@
 # Template file for 'libjxl'
 pkgname=libjxl
-version=0.7.0
+version=0.8.1
 revision=1
 build_style=cmake
 configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF
@@ -8,6 +8,7 @@ configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF
 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 <joshua@kraemer.link>"
 license="BSD-3-Clause, custom:Patent grant"
@@ -17,9 +18,9 @@ _skcms_hash=64374756e03700d649f897dbd98c95e78c30c7da
 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="3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e
+checksum="60f43921ad3209c9e180563025eda0c0f9b1afac51a2927b9ff59fff3950dc56
  1a4d4be37f9a4dd69134832665fda8a772eeb95cbcdaa79d9b1850c23ae50521
- @a69230c7b6f03a178c93abc6edc832c040d6e198340193b27c3d04afecf8f617"
+ d3d40b99b52d2140c474f8a17063ef9ad929717400ab13a78f3c65ad24298b45"
 skip_extraction="testdata-${_testdata_hash}.tar.gz skcms-${_skcms_hash}.tar.gz"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -27,14 +28,13 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LIBS="-latomic"
 fi
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	makedepends+=" gtest-devel xdg-utils"
-else
+if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=OFF"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	armv7*) broken="https://github.com/libjxl/libjxl/issues/1748"
+	# armv7*) configure_args+=" -DJPEGXL_FORCE_NEON=ON" ;;
+	armv7*) broken="https://github.com/libjxl/libjxl/issues/1748" ;;
 esac
 
 post_extract() {

From 12bdafbe90cdb9b27c58499492d86830c5ea4298 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 10 Feb 2023 13:46:57 -0500
Subject: [PATCH 6/6] fixup! kimageformats: enable JPEG XL support

---
 srcpkgs/kimageformats/template | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 5a8d5358717b..15efcb73f20a 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -6,10 +6,19 @@ 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 libjxl-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 <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=ae19b07141fdf977035e6decc50fa45855c0e635f57333a2443d3c24464c625f
+
+build_options="jpegxl"
+desc_option_jpegxl="jpegxl support"
+
+case "$XBPS_TARGET_MACHINE" in
+	armv7*) ;;
+	*) build_options_default="jpegxl"
+esac