Merge pull request #19682 from kmilos/libraw_cr3_fix

libraw: include upstream fix for CR3 decoding
msys2 · Jan 9, 2024 · 13d1a94 · 13d1a94
2 parents af8979e + 2a3c8f8
commit 13d1a94
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/mingw-w64-libraw/PKGBUILD b/mingw-w64-libraw/PKGBUILD
@@ -8,13 +8,13 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=0.21.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for reading RAW files obtained from digital photo cameras (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_repository_url='https://github.com/LibRaw/LibRaw'
 url="https://www.libraw.org/"
-license=("spdx:LGPL-2.1")
+license=("spdx:LGPL-2.1 OR CDDL-1.0")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-jasper"
@@ -26,16 +26,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 options=('staticlibs' 'strip')
 source=("https://www.libraw.org/data/${_realname}-${pkgver}.tar.gz"
         "0001-libraw-pkgconfig-remove-stdcxx.patch"
-        "LibRaw_obsolete-macros.patch")
+        "LibRaw_obsolete-macros.patch"
+        https://github.com/LibRaw/LibRaw/commit/e231b01a49ce37d2add75e2a8f7ece5602f00457.patch)
 sha256sums=('fe7288013206854baf6e4417d0fb63ba4ed7227bf36fff021992671c2dd34b03'
             '3b4c6aece23e020bf50a8bf349a25186273a601286fa2bb1f0a7269083277c13'
-            '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f')
+            '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f'
+            'df9a7d570be17acc9c4e4c2f836bc0815f7d43aec644fc16098969f6fa6353d8')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i "${srcdir}/0001-libraw-pkgconfig-remove-stdcxx.patch"
   patch -p1 -i "${srcdir}/LibRaw_obsolete-macros.patch"
 
+  # https://github.com/LibRaw/LibRaw/issues/624
+  patch --binary -p1 -i "${srcdir}/e231b01a49ce37d2add75e2a8f7ece5602f00457.patch"
+
   autoreconf -ifv
 }
 
@@ -66,5 +71,6 @@ package() {
 
   make install DESTDIR="${pkgdir}"
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.LGPL" "${pkgdir}${MINGW_PREFIX}/share/licenses/libraw/LICENSE"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.CDDL" "${pkgdir}${MINGW_PREFIX}/share/licenses/libraw/LICENSE.CDDL"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.LGPL" "${pkgdir}${MINGW_PREFIX}/share/licenses/libraw/LICENSE.LGPL"
 }