From 98b8b54de4642be73086ed60f07fee11bc1d3f6a 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.1 --- srcpkgs/highway/patches/armv7-fix.patch | 40 +++++++++++++++++++++++++ srcpkgs/highway/patches/armv7-fpu.patch | 13 ++++++++ srcpkgs/highway/template | 17 +++++++++++ 3 files changed, 70 insertions(+) create mode 100644 srcpkgs/highway/patches/armv7-fix.patch create mode 100644 srcpkgs/highway/patches/armv7-fpu.patch create mode 100644 srcpkgs/highway/template diff --git a/srcpkgs/highway/patches/armv7-fix.patch b/srcpkgs/highway/patches/armv7-fix.patch new file mode 100644 index 000000000000..9696ff4a8197 --- /dev/null +++ b/srcpkgs/highway/patches/armv7-fix.patch @@ -0,0 +1,40 @@ +From b09d551afc2b3295096ded1d32ae51fda596570b Mon Sep 17 00:00:00 2001 +From: Jan Wassenberg +Date: Tue, 6 Sep 2022 07:24:46 -0700 +Subject: [PATCH] fix for armv7 compiled with default vfpv3. Refs #834 + +PiperOrigin-RevId: 472452069 +--- + hwy/ops/arm_neon-inl.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/hwy/ops/arm_neon-inl.h b/hwy/ops/arm_neon-inl.h +index e1aa4c0..7c7e272 100644 +--- a/hwy/ops/arm_neon-inl.h ++++ b/hwy/ops/arm_neon-inl.h +@@ -22,16 +22,18 @@ + #include + #include + +-#include "hwy/base.h" // before HWY_DIAGNOSTICS ++#include "hwy/ops/shared-inl.h" ++ ++HWY_BEFORE_NAMESPACE(); + ++// Must come after HWY_BEFORE_NAMESPACE so that the intrinsics are compiled with ++// the same target attribute as our code, see #834. + HWY_DIAGNOSTICS(push) + HWY_DIAGNOSTICS_OFF(disable : 4701, ignored "-Wuninitialized") + #include + HWY_DIAGNOSTICS(pop) + +-#include "hwy/ops/shared-inl.h" +- +-HWY_BEFORE_NAMESPACE(); ++// Must come after arm_neon.h. + namespace hwy { + namespace HWY_NAMESPACE { + +-- +2.38.0 + diff --git a/srcpkgs/highway/patches/armv7-fpu.patch b/srcpkgs/highway/patches/armv7-fpu.patch new file mode 100644 index 000000000000..4521da49a633 --- /dev/null +++ b/srcpkgs/highway/patches/armv7-fpu.patch @@ -0,0 +1,13 @@ +diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h +index c118960..f42babf 100644 +--- a/hwy/ops/set_macros-inl.h ++++ b/hwy/ops/set_macros-inl.h +@@ -230,7 +230,7 @@ + // Can use pragmas instead of -march compiler flag + #if HWY_HAVE_RUNTIME_DISPATCH + #if HWY_ARCH_ARM_V7 +-#define HWY_TARGET_STR "+neon-vfpv4" ++#define HWY_TARGET_STR "+vfpv3" + #else + #define HWY_TARGET_STR "+crypto" + #endif // HWY_ARCH_ARM_V7 diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template new file mode 100644 index 000000000000..d3d264dfe4c3 --- /dev/null +++ b/srcpkgs/highway/template @@ -0,0 +1,17 @@ +# 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="gtest-devel libatomic-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=7ca6af7dc2e3e054de9e17b9dfd88609a7fd202812b1c216f43cc41647c97311 + +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DBUILD_TESTING=OFF" +fi From a403cec27c8e1b53b4b1ee77487fb46826a083f2 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.7.0 --- common/shlibs | 2 ++ srcpkgs/libjxl-devel | 1 + srcpkgs/libjxl-plugins | 1 + srcpkgs/libjxl-tools | 1 + srcpkgs/libjxl/template | 70 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 75 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 02780902e137..f519077a77c3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4186,3 +4186,5 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.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..0a178e4423d2 --- /dev/null +++ b/srcpkgs/libjxl/template @@ -0,0 +1,70 @@ +# 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 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=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" +fi + +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="libjxl>=${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 + } +} + +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 d71eb78830d18e3a8721a2037af140f4e42409cf 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template index 8af5fe7f53e7..19eb5c6a227d 100644 --- a/srcpkgs/kimageformats/template +++ b/srcpkgs/kimageformats/template @@ -1,12 +1,12 @@ # Template file for 'kimageformats' pkgname=kimageformats version=5.98.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 libjxl-devel" short_desc="KDE Plugins to allow QImage to support extra file formats" maintainer="John " license="LGPL-2.0-or-later"