Update patches to match latest upstream changes

5 files changed, 15 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9479a1daa96..5c13128cfd3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libjpeg-xl-git
 	pkgdesc = JPEG XL image format reference implementation (git version)
-	pkgver = r6.g50bbf27
+	pkgver = r14.g519b856
 	pkgrel = 1
 	url = https://jpeg.org/jpegxl/
 	arch = x86_64
@@ -36,9 +36,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 = 010-libjpeg-xl-git-remove-werror.patch
-	source = 020-libjpeg-xl-git-fix-headers-install-path.patch
-	source = 030-libjpeg-xl-git-fix-highway-build.patch
+	source = 010-libjpeg-xl-git-fix-headers-install-path.patch
+	source = 020-libjpeg-xl-git-fix-highway-build.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -48,9 +47,8 @@ pkgbase = libjpeg-xl-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 1688c7e887a771801af60c915c793c285ee5318c15c76fd5ba06e2b0918adf47
-	sha256sums = 86868318bd3252d689e51aecf1e2a480cf2e2ef3fb2c238171a6cb3a2cdf6506
-	sha256sums = 322ea656cceda16567caff9093acbcd398f055878d47340a7695deac1ce6902b
+	sha256sums = f8d4950895f71b9709dd3b6399be6f87474051a7ac0addb608676e7ffe9f19da
+	sha256sums = 27e9e0e9e1017c57b3da8602062cc578da8036737ab62b96ff511311b35212d6
 
 pkgname = libjpeg-xl-git
 
diff --git a/020-libjpeg-xl-git-fix-headers-install-path.patch b/010-libjpeg-xl-git-fix-headers-install-path.patch
index e70c92983038..4c5c487160cf 100644
--- a/020-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
-@@ -451,9 +451,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/010-libjpeg-xl-git-remove-werror.patch b/010-libjpeg-xl-git-remove-werror.patch
deleted file mode 100644
index 3c9aa933c25c..000000000000
--- a/010-libjpeg-xl-git-remove-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -151,10 +151,6 @@ add_compile_options(
-   -Wall
- )
- 
--if (NOT WIN32)
--add_compile_options(-Werror)
--endif ()
--
- include(GNUInstallDirs)
- 
- set(CMAKE_CXX_STANDARD 11)
diff --git a/030-libjpeg-xl-git-fix-highway-build.patch b/020-libjpeg-xl-git-fix-highway-build.patch
index 7ef65a97cc58..b7bdabe820f5 100644
--- a/030-libjpeg-xl-git-fix-highway-build.patch
+++ b/020-libjpeg-xl-git-fix-highway-build.patch
@@ -1,6 +1,6 @@
 --- a/third_party/highway/CMakeLists.txt
 +++ b/third_party/highway/CMakeLists.txt
-@@ -66,6 +66,9 @@ set(HWY_FLAGS
+@@ -77,6 +77,9 @@ set(HWY_FLAGS
    -Wnon-virtual-dtor
    -Woverloaded-virtual
    -Wvla
diff --git a/PKGBUILD b/PKGBUILD
index 2e75f622595e..7c64e3b322db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=libjpeg-xl-git
-pkgver=r6.g50bbf27
+pkgver=r14.g519b856
 pkgrel=1
 pkgdesc='JPEG XL image format reference implementation (git version)'
 arch=('x86_64')
@@ -27,9 +27,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'
-        '010-libjpeg-xl-git-remove-werror.patch'
-        '020-libjpeg-xl-git-fix-headers-install-path.patch'
-        '030-libjpeg-xl-git-fix-highway-build.patch')
+        '010-libjpeg-xl-git-fix-headers-install-path.patch'
+        '020-libjpeg-xl-git-fix-highway-build.patch')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -39,9 +38,8 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '1688c7e887a771801af60c915c793c285ee5318c15c76fd5ba06e2b0918adf47'
-            '86868318bd3252d689e51aecf1e2a480cf2e2ef3fb2c238171a6cb3a2cdf6506'
-            '322ea656cceda16567caff9093acbcd398f055878d47340a7695deac1ce6902b')
+            'f8d4950895f71b9709dd3b6399be6f87474051a7ac0addb608676e7ffe9f19da'
+            '27e9e0e9e1017c57b3da8602062cc578da8036737ab62b96ff511311b35212d6')
 
 prepare() {
     local _mingw_commit
@@ -58,9 +56,8 @@ prepare() {
     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-highway-build.patch"
+    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"
 }
 
 pkgver() {
@@ -75,6 +72,7 @@ build() {
         -DJPEGXL_ENABLE_FUZZERS:BOOL='false' \
         -DJPEGXL_ENABLE_PLUGINS:BOOL='false' \
         -DJPEGXL_ENABLE_VIEWERS:BOOL='false' \
+        -DJPEGXL_WARNINGS_AS_ERRORS:BOOL='false' \
         -Wno-dev
     make -C build
 }