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

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

[-- Attachment #1: Type: text/plain, Size: 783 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.

closes #40552

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: 6656 bytes --]

From ee4c8ed9e53f32870d65f78566dadcce5864d21b 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/3] New package: highway-1.0.4

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

diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template
new file mode 100644
index 000000000000..47c51ec1d616
--- /dev/null
+++ b/srcpkgs/highway/template
@@ -0,0 +1,19 @@
+# Template file for 'highway'
+pkgname=highway
+version=1.0.4
+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"
+changelog="https://raw.githubusercontent.com/google/highway/master/debian/changelog"
+distfiles="https://github.com/google/highway/archive/${version}.tar.gz"
+checksum=faccd343935c9e98afd1016e9d20e0b8b89d908508d1af958496f8c2d3004ac2
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=OFF"
+fi

From cee031a6ed211b05b55fe8685496066c39cd2ae3 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/3] New package: libjxl-0.8.2

---
 common/shlibs           |  3 ++
 srcpkgs/libjxl-devel    |  1 +
 srcpkgs/libjxl-plugins  |  1 +
 srcpkgs/libjxl-tools    |  1 +
 srcpkgs/libjxl/template | 75 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 81 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 c293ac460c08..b34887a091f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,6 @@ libplayerctl.so.2 playerctl-2.4.1_1
 libwireplumber-0.4.so.0 wireplumber-0.4.14_1
 libjodycode.so.2 libjodycode-2.0.1_1
 libgsoapssl++-2.8.124.so gsoap-2.8.124_1
+libjxl.so.0.8 libjxl-0.8.2_1
+libjxl_dec.so.0.8 libjxl-0.8.2_1
+libjxl_threads.so.0.8 libjxl-0.8.2_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..8aa7c970accb
--- /dev/null
+++ b/srcpkgs/libjxl/template
@@ -0,0 +1,75 @@
+# Template file for 'libjxl'
+pkgname=libjxl
+version=0.8.2
+revision=1
+_testdata_hash=d6168ffb9e1cc24007e64b65dd84d822ad1fc759
+_skcms_hash=b25b07b4b07990811de121c0356155b2ba0f4318
+build_style=cmake
+build_wrksrc="libjxl-${version}"
+configure_args="-DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF
+ -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_PLUGINS=ON -DJPEGXL_VERSION=${version}"
+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"
+homepage="https://jpeg.org/jpegxl/"
+changelog="https://raw.githubusercontent.com/libjxl/libjxl/main/CHANGELOG.md"
+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="c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420
+ 64658d3341bff2976899cb8b140242ffa4de1cd41aed507dfec4aa9e7e05ca24
+ @8feb1e33c38ca13f91a0d5bd8ce25f976eb239edf38f49e6db8895ae9f1e833c"
+skip_extraction="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
+
+post_extract() {
+	mv "testdata-${_testdata_hash}"/* "${build_wrksrc}/testdata/"
+	bsdtar -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/skcms-${_skcms_hash}.tar.gz" -C "${build_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 dad2f8f6947138fbda44e9377ca2cc07c392bfb5 Mon Sep 17 00:00:00 2001
From: Joshua <joshua@kraemer.link>
Date: Wed, 30 Mar 2022 21:23:16 +0200
Subject: [PATCH 3/3] kimageformats: enable JPEG XL support

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

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 21dd21420fac..5224bd2c3358 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,13 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
 version=5.107.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 libraw-devel libavif-devel"
+makedepends="karchive-devel libopenexr-devel libheif-devel libraw-devel libavif-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"