Match latest upstream changes: update git submodules and fix build

1 files changed, 30 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ccf28c85aa0b..0d68e716e8a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=libjpeg-xl-git
-pkgver=r3.g0709f3a
-pkgrel=4
+pkgver=r4.gf84edfb
+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=('gperftools: for CLI tools'
-            'libwebp: for CLI tools'
+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' 'libwebp' 'openexr' 'gtest' 'python' 'freeglut'
-             'gperftools')
+makedepends=('git' 'cmake' 'clang' 'giflib' 'gperftools' 'libjpeg-turbo'
+             'libpng' 'openexr' 'zlib' 'libgl' 'freeglut' 'gtest' 'python')
 provides=('libjpeg-xl')
 conflicts=('libjpeg-xl')
 source=('git+https://gitlab.com/wg1/jpeg-xl.git'
@@ -23,10 +25,11 @@ source=('git+https://gitlab.com/wg1/jpeg-xl.git'
         'git+https://github.com/google/brunsli.git'
         'git+https://github.com/webmproject/sjpeg.git'
         'git+https://skia.googlesource.com/skcms.git'
+        'git+https://github.com/meganz/mingw-std-threads.git'
         '010-libjpeg-xl-git-remove-werror.patch'
         '020-libjpeg-xl-git-fix-headers-install-path.patch'
         '030-libjpeg-xl-git-fix-gdk-pixbuf-install-path.patch'
-        '040-libjpeg-xl-git-disable-avx2-avx512.patch')
+        '040-libjpeg-xl-git-fix-highway-build.patch')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -35,31 +38,31 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'f75738bb1041e1bf9104ca6156b2269f73e4503508803de183e57110b232bbfd'
-            'ac5e30fb0a9034a935a463a3eaaec4b369fef6cf6e270cc85cce09e1f26f67c0'
-            '5d7df9a9cfc15183915b522bfa1360e0c9034c24c7630c0da43df35326b53c3c'
-            'f94bdd66242ca0d9a9c32905fecdf43e9041eb36ac1d88dc2a1e7cc701a440aa')
+            'SKIP'
+            '0f538f216f7fca8611efd5d638b521eb2c3b1fb716720afb371f034b3165c90c'
+            'c2ea669a2afd94b6582921c893e0b382cd632c12d0a9c2358f955fd6cccffdc3'
+            '1666790b92321fbf5859abe50c7355c91b0eddd7381529f35f052e71913c3bf0'
+            '4011b3dccad3954d7090c8ab70e615ef23ba29958b888e88ecd85d76eaba7372')
 
 prepare() {
-    cd jpeg-xl
-    git submodule init
-    git config --local submodule.third_party/brotli.url "${srcdir}/brotli"
-    git config --local submodule.third_party/lodepng.url "${srcdir}/lodepng"
-    git config --local submodule.third_party/lcms.url "${srcdir}/Little-CMS"
-    git config --local submodule.third_party/googletest.url "${srcdir}/googletest"
-    git config --local submodule.third_party/brunsli.url "${srcdir}/brunsli"
-    git config --local submodule.third_party/sjpeg.url "${srcdir}/sjpeg"
-    git config --local submodule.third_party/skcms.url "${srcdir}/skcms"
-    git submodule update
-    patch -Np1 -i "${srcdir}/010-libjpeg-xl-git-remove-werror.patch"
-    patch -Np1 -i "${srcdir}/020-libjpeg-xl-git-fix-headers-install-path.patch"
-    patch -Np1 -i "${srcdir}/030-libjpeg-xl-git-fix-gdk-pixbuf-install-path.patch"
-    patch -Np1 -i "${srcdir}/040-libjpeg-xl-git-disable-avx2-avx512.patch"
+    git -C jpeg-xl submodule init
+    git -C jpeg-xl config --local submodule.third_party/brotli.url "${srcdir}/brotli"
+    git -C jpeg-xl config --local submodule.third_party/lodepng.url "${srcdir}/lodepng"
+    git -C jpeg-xl config --local submodule.third_party/lcms.url "${srcdir}/Little-CMS"
+    git -C jpeg-xl config --local submodule.third_party/googletest.url "${srcdir}/googletest"
+    git -C jpeg-xl config --local submodule.third_party/brunsli.url "${srcdir}/brunsli"
+    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 submodule update
+    patch -d jpeg-xl -Np1 -i "${srcdir}/010-libjpeg-xl-git-remove-werror.patch"
+    patch -d jpeg-xl -Np1 -i "${srcdir}/020-libjpeg-xl-git-fix-headers-install-path.patch"
+    patch -d jpeg-xl -Np1 -i "${srcdir}/030-libjpeg-xl-git-fix-gdk-pixbuf-install-path.patch"
+    patch -d jpeg-xl -Np1 -i "${srcdir}/040-libjpeg-xl-git-fix-highway-build.patch"
 }
 
 pkgver() {
-    cd jpeg-xl
-    printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    printf 'r%s.g%s' "$(git -C jpeg-xl rev-list --count HEAD)" "$(git -C jpeg-xl rev-parse --short HEAD)"
 }
 
 build() {