Match latest upstream changes. Add documentation package.

3 files changed, 55 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90e2d96b17a0..49424e37a5e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libjpeg-xl-git
 	pkgdesc = JPEG XL image format reference implementation (git version)
-	pkgver = r22.g849ebf6
+	pkgver = r24.gc8ce59f
 	pkgrel = 1
 	url = https://jpeg.org/jpegxl/
 	arch = x86_64
@@ -19,14 +19,7 @@ pkgbase = libjpeg-xl-git
 	makedepends = gtest
 	makedepends = python
 	makedepends = doxygen
-	depends = gcc-libs
-	optdepends = giflib: for CLI tools
-	optdepends = gperftools: for CLI tools
-	optdepends = libjpeg-turbo: for CLI tools
-	optdepends = libpng: for CLI tools
-	optdepends = openexr: for CLI tools
-	provides = libjpeg-xl
-	conflicts = libjpeg-xl
+	makedepends = graphviz
 	source = git+https://gitlab.com/wg1/jpeg-xl.git
 	source = git+https://github.com/google/brotli.git
 	source = git+https://github.com/lvandeve/lodepng.git
@@ -36,6 +29,8 @@ pkgbase = libjpeg-xl-git
 	source = git+https://github.com/webmproject/sjpeg.git
 	source = git+https://skia.googlesource.com/skcms.git
 	source = git+https://github.com/meganz/mingw-std-threads.git
+	source = git+https://github.com/veluca93/IQA-optimization.git
+	source = git+https://github.com/Netflix/vmaf.git
 	source = 010-libjpeg-xl-git-fix-headers-install-path.patch
 	source = 020-libjpeg-xl-git-fix-highway-build.patch
 	sha256sums = SKIP
@@ -47,8 +42,24 @@ pkgbase = libjpeg-xl-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 96560239a5c9761728b8eddcb721d8e3556d32df178ca8a40da3c18613e6b99e
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = f8d4950895f71b9709dd3b6399be6f87474051a7ac0addb608676e7ffe9f19da
 	sha256sums = 287f18dfe7a75c75527e879c5a4470239153cc74dd76d459aed20db1062fdc47
 
 pkgname = libjpeg-xl-git
+	depends = gcc-libs
+	optdepends = giflib: for CLI tools
+	optdepends = gperftools: for CLI tools
+	optdepends = libjpeg-turbo: for CLI tools
+	optdepends = libpng: for CLI tools
+	optdepends = openexr: for CLI tools
+	provides = libjpeg-xl
+	conflicts = libjpeg-xl
+
+pkgname = libjpeg-xl-doc-git
+	pkgdesc = JPEG XL image format reference implementation (documentation) (git version)
+	arch = any
+	provides = libjpeg-xl-doc
+	conflicts = libjpeg-xl-doc
 
diff --git a/010-libjpeg-xl-git-fix-headers-install-path.patch b/010-libjpeg-xl-git-fix-headers-install-path.patch
index cc196a1d28a1..4c5c487160cf 100644
--- a/010-libjpeg-xl-git-fix-headers-install-path.patch
+++ b/010-libjpeg-xl-git-fix-headers-install-path.patch
@@ -1,6 +1,6 @@
 --- a/jpegxl.cmake
 +++ b/jpegxl.cmake
-@@ -446,9 +446,9 @@ endif()  # APPLE
+@@ -447,9 +447,9 @@ endif()  # APPLE
  install(TARGETS jpegxl
    DESTINATION ${CMAKE_INSTALL_LIBDIR})
  install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/jpegxl
diff --git a/PKGBUILD b/PKGBUILD
index 5297cdd5d7a3..7298ada40620 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,16 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
-pkgname=libjpeg-xl-git
-pkgver=r22.g849ebf6
+pkgbase=libjpeg-xl-git
+pkgname=('libjpeg-xl-git' 'libjpeg-xl-doc-git')
+pkgver=r24.gc8ce59f
 pkgrel=1
 pkgdesc='JPEG XL image format reference implementation (git version)'
 arch=('x86_64')
 url='https://jpeg.org/jpegxl/'
 license=('Apache')
-depends=('gcc-libs')
-optdepends=('giflib: for CLI tools'
-            'gperftools: for CLI tools'
-            'libjpeg-turbo: for CLI tools'
-            'libpng: for CLI tools'
-            'openexr: for CLI tools')
 makedepends=('git' 'cmake' 'clang' 'giflib' 'gperftools' 'libjpeg-turbo'
              'libpng' 'openexr' 'zlib' 'libgl' 'freeglut' 'gtest' 'python'
-             'doxygen')
-provides=('libjpeg-xl')
-conflicts=('libjpeg-xl')
+             'doxygen' 'graphviz')
 source=('git+https://gitlab.com/wg1/jpeg-xl.git'
         'git+https://github.com/google/brotli.git'
         'git+https://github.com/lvandeve/lodepng.git'
@@ -27,6 +20,8 @@ source=('git+https://gitlab.com/wg1/jpeg-xl.git'
         'git+https://github.com/webmproject/sjpeg.git'
         'git+https://skia.googlesource.com/skcms.git'
         'git+https://github.com/meganz/mingw-std-threads.git'
+        'git+https://github.com/veluca93/IQA-optimization.git'
+        'git+https://github.com/Netflix/vmaf.git'
         '010-libjpeg-xl-git-fix-headers-install-path.patch'
         '020-libjpeg-xl-git-fix-highway-build.patch')
 sha256sums=('SKIP'
@@ -38,7 +33,9 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '96560239a5c9761728b8eddcb721d8e3556d32df178ca8a40da3c18613e6b99e'
+            'SKIP'
+            'SKIP'
+            'f8d4950895f71b9709dd3b6399be6f87474051a7ac0addb608676e7ffe9f19da'
             '287f18dfe7a75c75527e879c5a4470239153cc74dd76d459aed20db1062fdc47')
 
 prepare() {
@@ -55,6 +52,8 @@ prepare() {
     git -C jpeg-xl config --local submodule.third_party/sjpeg.url "${srcdir}/sjpeg"
     git -C jpeg-xl config --local submodule.third_party/skcms.url "${srcdir}/skcms"
     git -C jpeg-xl config --local submodule.third_party/mingw-std-threads.url "${srcdir}/mingw-std-threads"
+    git -C jpeg-xl config --local submodule.third_party/IQA-optimization.url "${srcdir}/IQA-optimization"
+    git -C jpeg-xl config --local submodule.third_party/vmaf.url "${srcdir}/vmaf"
     git -C jpeg-xl submodule update
     patch -d jpeg-xl -Np1 -i "${srcdir}/010-libjpeg-xl-git-fix-headers-install-path.patch"
     patch -d jpeg-xl -Np1 -i "${srcdir}/020-libjpeg-xl-git-fix-highway-build.patch"
@@ -74,17 +73,36 @@ build() {
         -DJPEGXL_ENABLE_VIEWERS:BOOL='false' \
         -DJPEGXL_WARNINGS_AS_ERRORS:BOOL='false' \
         -Wno-dev
-    make -C build
+    make -C build all doc
 }
 
 check() {
     make -C build test
 }
 
-package() {
+package_libjpeg-xl-git() {
+    depends=('gcc-libs')
+    optdepends=('giflib: for CLI tools'
+                'gperftools: for CLI tools'
+                'libjpeg-turbo: for CLI tools'
+                'libpng: for CLI tools'
+                'openexr: for CLI tools')
+    provides=('libjpeg-xl')
+    conflicts=('libjpeg-xl')
+    
     make -C build DESTDIR="$pkgdir" install
     install -D -m644 jpeg-xl/plugins/mime/image-jxl.xml -t "${pkgdir}/usr/share/mime/packages"
-    rm "${pkgdir}/usr/bin/"{cbrunsli,butteraugli_main,decode_and_encode,epf_main,fuzzer_corpus,ssimulacra_main,xyb_range}
+    rm "${pkgdir}/usr/bin/"{butteraugli_main,decode_and_encode,epf_main,fuzzer_corpus,ssimulacra_main,xyb_range}
     rm "${pkgdir}/usr/lib/"{libhwy.a,pkgconfig/libhwy{,-test}.pc}
     rm -r "${pkgdir}/usr/include/hwy"
 }
+
+package_libjpeg-xl-doc-git() {
+    pkgdesc="$(sed 's/\((git version)\)/(documentation) \1/' <<< "$pkgdesc")"
+    arch=('any')
+    provides=('libjpeg-xl-doc')
+    conflicts=('libjpeg-xl-doc')
+    
+    mkdir -p "${pkgdir}/usr/share/doc"
+    cp -a build/html "${pkgdir}/usr/share/doc/libjpeg-xl"
+}