summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2021-06-06 01:33:51 +0000
committerDaniel Bermond2021-06-06 01:33:51 +0000
commit62280b90087a90413f6e02a5c13f8f3a59753148 (patch)
tree3beeff4654e3786e451e56ac1468b2c86746f05c
parentcacd1bcc6f375831fdf19761780ced790c79ca9c (diff)
downloadaur-62280b90087a90413f6e02a5c13f8f3a59753148.tar.gz
Use highway from system
highway on-tree dependency was updated to 0.12.2[1]. This version has headers in different directories than 0.12.0. References ---------- https://github.com/libjxl/libjxl/commit/f1565bf35089431ccab975f7971b794f118a8713
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD7
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 82fa02fdb365..844cbca0e3c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libjxl-git
pkgdesc = JPEG XL image format reference implementation (git version)
- pkgver = 0.3.7.r72.g82c14cd
+ pkgver = 0.3.7.r80.g848cf98
pkgrel = 1
url = https://jpeg.org/jpegxl/
arch = x86_64
@@ -25,6 +25,7 @@ pkgbase = libjxl-git
makedepends = doxygen
makedepends = graphviz
makedepends = java-environment
+ makedepends = highway
source = git+https://github.com/libjxl/libjxl.git
source = git+https://github.com/google/brotli.git
source = git+https://github.com/lvandeve/lodepng.git
diff --git a/PKGBUILD b/PKGBUILD
index 1c5be6bceacd..b45ec303f676 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=libjxl-git
pkgname=('libjxl-git' 'libjxl-doc-git')
-pkgver=0.3.7.r72.g82c14cd
+pkgver=0.3.7.r80.g848cf98
pkgrel=1
pkgdesc='JPEG XL image format reference implementation (git version)'
arch=('x86_64')
@@ -11,7 +11,7 @@ license=('BSD')
makedepends=('git' 'cmake' 'clang' 'brotli' 'gdk-pixbuf2' 'giflib' 'gimp'
'libjpeg-turbo' 'libpng' 'openexr' 'zlib' 'libgl' 'freeglut'
'gtest' 'gmock' 'python' 'asciidoc' 'doxygen' 'graphviz'
- 'java-environment')
+ 'java-environment' 'highway')
source=('git+https://github.com/libjxl/libjxl.git'
'git+https://github.com/google/brotli.git'
'git+https://github.com/lvandeve/lodepng.git'
@@ -67,7 +67,7 @@ build() {
-DJPEGXL_ENABLE_GIMP_SAVING:BOOL='ON' \
-DJPEGXL_FORCE_SYSTEM_BROTLI:BOOL='true' \
-DJPEGXL_FORCE_SYSTEM_GTEST:BOOL='true' \
- -DJPEGXL_FORCE_SYSTEM_HWY:BOOL='false' \
+ -DJPEGXL_FORCE_SYSTEM_HWY:BOOL='true' \
-DJPEGXL_WARNINGS_AS_ERRORS:BOOL='false' \
-Wno-dev
make -C build all doc
@@ -92,7 +92,6 @@ package_libjxl-git() {
make -C build DESTDIR="$pkgdir" install
install -D -m755 build/tools/libjxl_jni.so -t "${pkgdir}/usr/lib"
install -D -m644 libjxl/{LICENSE,PATENTS} -t "${pkgdir}/usr/share/licenses/${pkgname}"
- rm -r "${pkgdir}/usr"/{include/{contrib,hwy},lib/{pkgconfig/,}libhwy*}
}
package_libjxl-doc-git() {