summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD24
2 files changed, 23 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4143377155d4..467d2b289846 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.r545.g2b5e77c
+ pkgver = 0.3.7.r736.gba1932b0
pkgrel = 1
url = https://jpeg.org/jpegxl/
arch = x86_64
@@ -23,15 +23,18 @@ pkgbase = libjxl-git
makedepends = doxygen
makedepends = graphviz
makedepends = xdg-utils
- makedepends = highway
+ makedepends = highway-git
+ options = !lto
source = git+https://github.com/libjxl/libjxl.git
source = git+https://github.com/google/brotli.git
- source = git+https://github.com/lvandeve/lodepng.git
source = git+https://github.com/mm2/Little-CMS.git
source = git+https://github.com/google/googletest.git
source = git+https://github.com/webmproject/sjpeg.git
source = git+https://skia.googlesource.com/skcms.git
source = git+https://github.com/google/highway.git
+ source = git+https://github.com/glennrp/libpng.git
+ source = git+https://github.com/madler/zlib.git
+ sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
@@ -43,14 +46,14 @@ pkgbase = libjxl-git
pkgname = libjxl-git
depends = brotli
+ depends = giflib
+ depends = gperftools
+ depends = libjpeg-turbo
+ depends = libpng
+ depends = openexr
optdepends = gdk-pixbuf2: for gdk-pixbuf loader
- optdepends = giflib: for CLI tools
optdepends = gimp: for gimp plugin
- optdepends = gperftools: for CLI tools
optdepends = java-runtime: for JNI bindings
- optdepends = libjpeg-turbo: for CLI tools
- optdepends = libpng: for CLI tools
- optdepends = openexr: for CLI tools
provides = libjxl
provides = libjpeg-xl-git
provides = libjxl.so
diff --git a/PKGBUILD b/PKGBUILD
index 38883ad6400a..61c029317c31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=libjxl-git
pkgname=('libjxl-git' 'libjxl-doc-git')
-pkgver=0.3.7.r545.g2b5e77c
+pkgver=0.3.7.r736.gba1932b0
pkgrel=1
pkgdesc='JPEG XL image format reference implementation (git version)'
arch=('x86_64')
@@ -11,15 +11,17 @@ license=('BSD')
makedepends=('git' 'cmake' 'clang' 'brotli' 'gdk-pixbuf2' 'giflib' 'gimp'
'gperftools' 'libjpeg-turbo' 'libpng' 'openexr' 'gtest'
'java-environment' 'python' 'asciidoc' 'doxygen' 'graphviz'
- 'xdg-utils' 'highway')
+ 'xdg-utils' 'highway-git')
+options=('!lto')
source=('git+https://github.com/libjxl/libjxl.git'
'git+https://github.com/google/brotli.git'
- 'git+https://github.com/lvandeve/lodepng.git'
'git+https://github.com/mm2/Little-CMS.git'
'git+https://github.com/google/googletest.git'
'git+https://github.com/webmproject/sjpeg.git'
'git+https://skia.googlesource.com/skcms.git'
- 'git+https://github.com/google/highway.git')
+ 'git+https://github.com/google/highway.git'
+ 'git+https://github.com/glennrp/libpng.git'
+ 'git+https://github.com/madler/zlib.git')
sha256sums=('SKIP'
'SKIP'
'SKIP'
@@ -27,17 +29,19 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
'SKIP')
prepare() {
git -C libjxl submodule init
git -C libjxl config --local submodule.third_party/brotli.url "${srcdir}/brotli"
- git -C libjxl config --local submodule.third_party/lodepng.url "${srcdir}/lodepng"
git -C libjxl config --local submodule.third_party/lcms.url "${srcdir}/Little-CMS"
git -C libjxl config --local submodule.third_party/googletest.url "${srcdir}/googletest"
git -C libjxl config --local submodule.third_party/sjpeg.url "${srcdir}/sjpeg"
git -C libjxl config --local submodule.third_party/skcms.url "${srcdir}/skcms"
git -C libjxl config --local submodule.third_party/highway.url "${srcdir}/highway"
+ git -C libjxl config --local submodule.third_party/libpng.url "${srcdir}/libpng"
+ git -C libjxl config --local submodule.third_party/zlib.url "${srcdir}/zlib"
git -C libjxl submodule update
}
@@ -61,6 +65,7 @@ build() {
-DJPEGXL_FORCE_SYSTEM_BROTLI:BOOL='true' \
-DJPEGXL_FORCE_SYSTEM_GTEST:BOOL='true' \
-DJPEGXL_FORCE_SYSTEM_HWY:BOOL='true' \
+ -DJPEGXL_BUNDLE_LIBPNG:BOOL='NO' \
-Wno-dev
make -C build all doc
}
@@ -70,15 +75,10 @@ check() {
}
package_libjxl-git() {
- depends=('brotli')
+ depends=('brotli' 'giflib' 'gperftools' 'libjpeg-turbo' 'libpng' 'openexr')
optdepends=('gdk-pixbuf2: for gdk-pixbuf loader'
- 'giflib: for CLI tools'
'gimp: for gimp plugin'
- 'gperftools: for CLI tools'
- 'java-runtime: for JNI bindings'
- 'libjpeg-turbo: for CLI tools'
- 'libpng: for CLI tools'
- 'openexr: for CLI tools')
+ 'java-runtime: for JNI bindings')
provides=('libjxl' 'libjpeg-xl-git' 'libjxl.so' 'libjxl_threads.so')
conflicts=('libjxl' 'libjpeg-xl-git')
replaces=('libjpeg-xl-git')