Match latest upstream changes

7 files changed, 37 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40ea7c1365ab..c9479a1daa96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libjpeg-xl-git
 	pkgdesc = JPEG XL image format reference implementation (git version)
-	pkgver = r4.gf84edfb
-	pkgrel = 2
+	pkgver = r6.g50bbf27
+	pkgrel = 1
 	url = https://jpeg.org/jpegxl/
 	arch = x86_64
 	license = Apache
@@ -18,6 +18,7 @@ pkgbase = libjpeg-xl-git
 	makedepends = freeglut
 	makedepends = gtest
 	makedepends = python
+	makedepends = doxygen
 	depends = gcc-libs
 	optdepends = giflib: for CLI tools
 	optdepends = gperftools: for CLI tools
@@ -37,8 +38,7 @@ pkgbase = libjpeg-xl-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-gdk-pixbuf-install-path.patch
-	source = 040-libjpeg-xl-git-fix-highway-build.patch
+	source = 030-libjpeg-xl-git-fix-highway-build.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -48,10 +48,9 @@ pkgbase = libjpeg-xl-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 0f538f216f7fca8611efd5d638b521eb2c3b1fb716720afb371f034b3165c90c
-	sha256sums = c2ea669a2afd94b6582921c893e0b382cd632c12d0a9c2358f955fd6cccffdc3
-	sha256sums = 1666790b92321fbf5859abe50c7355c91b0eddd7381529f35f052e71913c3bf0
-	sha256sums = 4011b3dccad3954d7090c8ab70e615ef23ba29958b888e88ecd85d76eaba7372
+	sha256sums = 1688c7e887a771801af60c915c793c285ee5318c15c76fd5ba06e2b0918adf47
+	sha256sums = 86868318bd3252d689e51aecf1e2a480cf2e2ef3fb2c238171a6cb3a2cdf6506
+	sha256sums = 322ea656cceda16567caff9093acbcd398f055878d47340a7695deac1ce6902b
 
 pkgname = libjpeg-xl-git
 
diff --git a/010-libjpeg-xl-git-remove-werror.patch b/010-libjpeg-xl-git-remove-werror.patch
index 8eb82fabec41..3c9aa933c25c 100644
--- a/010-libjpeg-xl-git-remove-werror.patch
+++ b/010-libjpeg-xl-git-remove-werror.patch
@@ -1,7 +1,6 @@
-diff -Naurp a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-04-22 00:42:34.000000000 +0000
-+++ b/CMakeLists.txt	2020-04-22 00:42:38.000000000 +0000
-@@ -154,10 +154,6 @@ add_compile_options(
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -151,10 +151,6 @@ add_compile_options(
    -Wall
  )
  
diff --git a/020-libjpeg-xl-git-fix-headers-install-path.patch b/020-libjpeg-xl-git-fix-headers-install-path.patch
index ca22218e2089..e70c92983038 100644
--- a/020-libjpeg-xl-git-fix-headers-install-path.patch
+++ b/020-libjpeg-xl-git-fix-headers-install-path.patch
@@ -1,7 +1,6 @@
-diff -Naurp a/jpegxl.cmake b/jpegxl.cmake
---- a/jpegxl.cmake	2020-04-22 00:42:34.000000000 +0000
-+++ b/jpegxl.cmake	2020-04-22 00:42:38.000000000 +0000
-@@ -457,9 +457,9 @@ endif()  # APPLE
+--- a/jpegxl.cmake
++++ b/jpegxl.cmake
+@@ -451,9 +451,9 @@ endif()  # APPLE
  install(TARGETS jpegxl
    DESTINATION ${CMAKE_INSTALL_LIBDIR})
  install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/jpegxl
diff --git a/030-libjpeg-xl-git-fix-gdk-pixbuf-install-path.patch b/030-libjpeg-xl-git-fix-gdk-pixbuf-install-path.patch
deleted file mode 100644
index 9a64d69f4098..000000000000
--- a/030-libjpeg-xl-git-fix-gdk-pixbuf-install-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurp a/plugins/gdk-pixbuf/CMakeLists.txt b/plugins/gdk-pixbuf/CMakeLists.txt
---- a/plugins/gdk-pixbuf/CMakeLists.txt	2020-04-22 00:42:34.000000000 +0000
-+++ b/plugins/gdk-pixbuf/CMakeLists.txt	2020-04-22 00:42:38.000000000 +0000
-@@ -24,9 +24,9 @@ endif ()
- add_library(pixbufloader-jxl SHARED pixbufloader-jxl.c c_interop.cc c_interop.h)
- target_link_libraries(pixbufloader-jxl jpegxl-static jpegxl_threads PkgConfig::Gdk-Pixbuf)
- 
--install(TARGETS pixbufloader-jxl LIBRARY DESTINATION /usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders)
-+install(TARGETS pixbufloader-jxl LIBRARY DESTINATION /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
- 
--find_program(GDK_PIXBUF_QUERY_LOADERS_PROG gdk-pixbuf-query-loaders /usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0)
-+find_program(GDK_PIXBUF_QUERY_LOADERS_PROG gdk-pixbuf-query-loaders /usr/lib/gdk-pixbuf-2.0)
- if(NOT ${GDK_PIXBUF_QUERY_LOADERS_PROG} STREQUAL "GDK_PIXBUF_QUERY_LOADERS_PROG-NOTFOUND")
-   install(CODE "execute_process(COMMAND ${GDK_PIXBUF_QUERY_LOADERS_PROG} --update-cache)")
- else()
diff --git a/030-libjpeg-xl-git-fix-highway-build.patch b/030-libjpeg-xl-git-fix-highway-build.patch
new file mode 100644
index 000000000000..7ef65a97cc58
--- /dev/null
+++ b/030-libjpeg-xl-git-fix-highway-build.patch
@@ -0,0 +1,12 @@
+--- a/third_party/highway/CMakeLists.txt
++++ b/third_party/highway/CMakeLists.txt
+@@ -66,6 +66,9 @@ set(HWY_FLAGS
+   -Wnon-virtual-dtor
+   -Woverloaded-virtual
+   -Wvla
++  
++  # Build fixes
++  -fPIC
+ )
+ 
+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
diff --git a/040-libjpeg-xl-git-fix-highway-build.patch b/040-libjpeg-xl-git-fix-highway-build.patch
deleted file mode 100644
index 84c3d3678e4a..000000000000
--- a/040-libjpeg-xl-git-fix-highway-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurp a/third_party/highway/CMakeLists.txt b/third_party/highway/CMakeLists.txt
---- a/third_party/highway/CMakeLists.txt	2020-04-22 00:42:34.000000000 +0000
-+++ b/third_party/highway/CMakeLists.txt	2020-04-22 00:43:41.699909851 +0000
-@@ -72,6 +72,9 @@ set(HWY_FLAGS
-   -Wnon-virtual-dtor
-   -Woverloaded-virtual
-   -Wvla
-+  
-+  # Build fixes
-+  -fPIC
- )
- 
- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
diff --git a/PKGBUILD b/PKGBUILD
index 88fa149b3cbd..2e75f622595e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=libjpeg-xl-git
-pkgver=r4.gf84edfb
-pkgrel=2
+pkgver=r6.g50bbf27
+pkgrel=1
 pkgdesc='JPEG XL image format reference implementation (git version)'
 arch=('x86_64')
 url='https://jpeg.org/jpegxl/'
@@ -14,7 +14,8 @@ optdepends=('giflib: 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')
+             'libpng' 'openexr' 'zlib' 'libgl' 'freeglut' 'gtest' 'python'
+             'doxygen')
 provides=('libjpeg-xl')
 conflicts=('libjpeg-xl')
 source=('git+https://gitlab.com/wg1/jpeg-xl.git'
@@ -28,8 +29,7 @@ source=('git+https://gitlab.com/wg1/jpeg-xl.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-fix-highway-build.patch')
+        '030-libjpeg-xl-git-fix-highway-build.patch')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -39,10 +39,9 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '0f538f216f7fca8611efd5d638b521eb2c3b1fb716720afb371f034b3165c90c'
-            'c2ea669a2afd94b6582921c893e0b382cd632c12d0a9c2358f955fd6cccffdc3'
-            '1666790b92321fbf5859abe50c7355c91b0eddd7381529f35f052e71913c3bf0'
-            '4011b3dccad3954d7090c8ab70e615ef23ba29958b888e88ecd85d76eaba7372')
+            '1688c7e887a771801af60c915c793c285ee5318c15c76fd5ba06e2b0918adf47'
+            '86868318bd3252d689e51aecf1e2a480cf2e2ef3fb2c238171a6cb3a2cdf6506'
+            '322ea656cceda16567caff9093acbcd398f055878d47340a7695deac1ce6902b')
 
 prepare() {
     local _mingw_commit
@@ -61,8 +60,7 @@ prepare() {
     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"
+    patch -d jpeg-xl -Np1 -i "${srcdir}/030-libjpeg-xl-git-fix-highway-build.patch"
 }
 
 pkgver() {
@@ -70,8 +68,6 @@ pkgver() {
 }
 
 build() {
-    export CFLAGS+=" ${CPPFLAGS}"
-    export CXXFLAGS+=" ${CPPFLAGS}"
     cmake -B build -S jpeg-xl \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
@@ -89,6 +85,8 @@ check() {
 
 package() {
     make -C build DESTDIR="$pkgdir" install
-    install -D -m644 jpeg-xl/plugins/mime/image-x-jxl.xml -t "${pkgdir}/usr/share/mime/packages"
+    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/lib/"{libhwy.a,pkgconfig/libhwy{,-test}.pc}
+    rm -r "${pkgdir}/usr/include/hwy"
 }