Fix many weird things

2 files changed, 54 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecdae5300ee4..0c96a3f8f126 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libjxl-metrics-git
 	pkgdesc = JPEG XL image format reference implementation with butteraugli and ssimulacra (git version)
-	pkgver = v0.3.7.1143.g6612139f
+	pkgver = v0.7.base.0.g980c90f6
 	pkgrel = 1
 	url = https://jpeg.org/jpegxl/
 	arch = x86_64
@@ -8,39 +8,44 @@ pkgbase = libjxl-metrics-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = clang
-	makedepends = brotli
-	makedepends = gdk-pixbuf2
+	makedepends = lld
 	makedepends = giflib
-	makedepends = gimp
 	makedepends = gperftools
-	makedepends = libjpeg-turbo
-	makedepends = libpng
 	makedepends = openexr
-	makedepends = gflags
-	makedepends = gtest
-	makedepends = java-environment
+	makedepends = libjpeg-turbo
 	makedepends = python
 	makedepends = asciidoc
-	makedepends = doxygen
 	makedepends = graphviz
 	makedepends = xdg-utils
-	makedepends = highway
+	makedepends = gflags
+	makedepends = zlib
+	makedepends = doxygen
+	depends = brotli
+	depends = highway
+	depends = gtest
+	depends = libpng
+	depends = lcms2
 	optdepends = gdk-pixbuf2: for gdk-pixbuf loader
-	optdepends = gimp: for gimp plugin
+	optdepends = gimp: for building gimp jxl plugin
+	optdepends = java-environment: for building FNI Java wrapper
+	optdepends = libwebp: for webp benchmarking
+	optdepends = libavif: for avif benchmarking
 	provides = libjxl
 	provides = libjxl-git
 	provides = libjxl.so
 	provides = libjxl_threads.so
 	provides = libjxl-doc
 	provides = libjxl-doc-git
+	provides = butteraugli-git
+	provides = ssimulacra
 	conflicts = libjxl
 	conflicts = libjxl-git
 	conflicts = libjxl-doc
 	conflicts = libjxl-doc-git
-	replaces = libjxl-git
-	replaces = libjxl-doc-git
+	conflicts = butteraugli-git
+	conflicts = ssimulacra
 	options = !lto
-	source = git+https://github.com/libjxl/libjxl.git
+	source = git+https://github.com/libjxl/libjxl.git#commit=980c90f65f41066cc4959b4eb80eba906867103b
 	source = git+https://github.com/google/brotli.git
 	source = git+https://github.com/mm2/Little-CMS.git
 	source = git+https://github.com/google/googletest.git
diff --git a/PKGBUILD b/PKGBUILD
index fe298b37058c..2419edb9411a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,35 @@
 # Maintainer:  Joshua Holmer <jholmer.in@gmail.com>
 
 pkgname=libjxl-metrics-git
-pkgver=v0.3.7.1143.g6612139f
+pkgver=v0.7.base.0.g980c90f6
 pkgrel=1
 pkgdesc="JPEG XL image format reference implementation with butteraugli and ssimulacra (git version)"
 arch=('x86_64')
 url='https://jpeg.org/jpegxl/'
 license=('BSD')
-makedepends=('git' 'cmake' 'clang' 'brotli' 'gdk-pixbuf2' 'giflib' 'gimp'
-    'gperftools' 'libjpeg-turbo' 'libpng' 'openexr' 'gflags'
-    'gtest' 'java-environment' 'python' 'asciidoc' 'doxygen'
-    'graphviz' 'xdg-utils' 'highway')
-provides=('libjxl' 'libjxl-git' 'libjxl.so' 'libjxl_threads.so' 'libjxl-doc' 'libjxl-doc-git')
-conflicts=('libjxl' 'libjxl-git' 'libjxl-doc' 'libjxl-doc-git')
-replaces=('libjxl-git' 'libjxl-doc-git')
-optdepends=('gdk-pixbuf2: for gdk-pixbuf loader'
-    'gimp: for gimp plugin')
+depends=('brotli' 'highway' 'gtest' 'libpng' 'lcms2')
+makedepends=(
+    'git' 'cmake' 'clang' 'lld' 'giflib' 'gperftools' 'openexr' 'libjpeg-turbo'
+    'python' 'asciidoc' 'graphviz' 'xdg-utils' 'gflags' 'zlib' 'doxygen'
+)
+provides=(
+    'libjxl' 'libjxl-git' 'libjxl.so' 'libjxl_threads.so' 'libjxl-doc'
+    'libjxl-doc-git' 'butteraugli-git' 'ssimulacra'
+)
+conflicts=(
+    'libjxl' 'libjxl-git' 'libjxl-doc' 'libjxl-doc-git' 'butteraugli-git'
+    'ssimulacra'
+)
+optdepends=(
+    'gdk-pixbuf2: for gdk-pixbuf loader'
+    'gimp: for building gimp jxl plugin'
+    'java-environment: for building FNI Java wrapper'
+    'libwebp: for webp benchmarking'
+    'libavif: for avif benchmarking'
+)
 options=('!lto')
-source=('git+https://github.com/libjxl/libjxl.git'
+source=(
+    'git+https://github.com/libjxl/libjxl.git#commit=980c90f65f41066cc4959b4eb80eba906867103b'
     'git+https://github.com/google/brotli.git'
     'git+https://github.com/mm2/Little-CMS.git'
     'git+https://github.com/google/googletest.git'
@@ -26,8 +38,9 @@ source=('git+https://github.com/libjxl/libjxl.git'
     'git+https://github.com/google/highway.git'
     'git+https://github.com/glennrp/libpng.git'
     'git+https://github.com/madler/zlib.git'
-    'git+https://github.com/gflags/gflags.git')
-sha256sums=('SKIP'
+    'git+https://github.com/gflags/gflags.git'
+)
+sha256sums=(
     'SKIP'
     'SKIP'
     'SKIP'
@@ -36,7 +49,9 @@ sha256sums=('SKIP'
     'SKIP'
     'SKIP'
     'SKIP'
-    'SKIP')
+    'SKIP'
+    'SKIP'
+)
 
 prepare() {
     git -C libjxl submodule init
@@ -64,24 +79,24 @@ build() {
     export CFLAGS="${COMMON_FLAGS}" CXXFLAGS="${COMMON_FLAGS}"
 
     cmake -B build -S libjxl \
+        -DBUILD_TESTING=0 \
         -DCMAKE_BUILD_TYPE='Release' \
         -DCMAKE_INSTALL_PREFIX='/usr' \
+        -DJPEGXL_INSTALL_JARDIR='/usr/share/java' \
         -DCMAKE_C_COMPILER="${CC}" \
         -DCMAKE_CXX_COMPILER="${CXX}" \
         -DCMAKE_C_FLAGS="${CFLAGS}" \
         -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
         -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-        -DBUILD_SHARED_LIBS=1 \
-        -DBUILD_TESTING=0 \
-        -DJPEGXL_ENABLE_FUZZERS=0 \
         -DJPEGXL_ENABLE_DEVTOOLS=1 \
-        -DJPEGXL_ENABLE_BENCHMARK=0 \
         -DJPEGXL_ENABLE_EXAMPLES=0 \
+        -DJPEGXL_ENABLE_PLUGINS=1 \
+        -DJPEGXL_ENABLE_FUZZERS=0 \
         -DJPEGXL_FORCE_SYSTEM_BROTLI=1 \
+        -DJPEGXL_FORCE_SYSTEM_LCMS2=1 \
         -DJPEGXL_FORCE_SYSTEM_GTEST=1 \
         -DJPEGXL_FORCE_SYSTEM_HWY=1 \
         -DJPEGXL_BUNDLE_LIBPNG=0 \
-        -DJPEGXL_BUNDLE_GFLAGS=0 \
         -Wno-dev
     make -C build all doc -j $(nproc)
 }