libraw: update to 0.22.0

Author: kmilos

mingw-w64-libraw/0001-libraw-pkgconfig-remove-stdcxx.patch

@@ -1,20 +1,22 @@
 --- a/libraw.pc.in
 +++ b/libraw.pc.in
-@@ -7,6 +7,6 @@
+@@ -7,6 +7,7 @@
  Description: Raw image decoder library (non-thread-safe)
  Requires: @PACKAGE_REQUIRES@
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
-+Libs: -L${libdir} -lraw @PC_OPENMP@
++Libs: -L${libdir} -lraw@PC_OPENMP@
  Libs.private: @PACKAGE_LIBS_PRIVATE@
  Cflags: -I${includedir}/libraw -I${includedir}
++Cflags.private: -DLIBRAW_NODLL
 --- a/libraw_r.pc.in
 +++ b/libraw_r.pc.in
-@@ -7,6 +7,6 @@
+@@ -7,6 +7,7 @@
  Description: Raw image decoder library (thread-safe)
  Requires: @PACKAGE_REQUIRES@
  Version: @PACKAGE_VERSION@
 -Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
-+Libs: -L${libdir} -lraw_r @PC_OPENMP@
++Libs: -L${libdir} -lraw_r@PC_OPENMP@
  Libs.private: @PACKAGE_LIBS_PRIVATE@
  Cflags: -I${includedir}/libraw -I${includedir}
++Cflags.private: -DLIBRAW_NODLL

mingw-w64-libraw/0003-libraw-win32-dlldefs.patch

@@ -0,0 +1,15 @@
+diff --git a/libraw/libraw.h b/libraw/libraw.h
+index 50d4276d43..d4363fe01e 100644
+--- a/libraw/libraw.h
++++ b/libraw/libraw.h
+@@ -55,8 +55,8 @@ it under the terms of the one of two licenses as you choose:
+ #   define LIBRAW_WIN32_CALLS
+ #  endif
+ 
+-/* DLLs: Microsoft or Intel compiler */
+-# if defined(_MSC_VER) || defined(__INTEL_COMPILER)
++/* DLLs: MinGW, Microsoft or Intel compiler */
++# if defined(__GNUC__) || defined(_MSC_VER) || defined(__INTEL_COMPILER)
+ # ifndef LIBRAW_WIN32_DLLDEFS
+ #  define LIBRAW_WIN32_DLLDEFS
+ # endif

mingw-w64-libraw/LibRaw_obsolete-macros.patch

@@ -7,7 +7,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-libraw"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.21.5
+pkgver=0.22.0
 pkgrel=1
 pkgdesc="Library for reading RAW files obtained from digital photo cameras (mingw-w64)"
 arch=('any')
@@ -20,20 +20,19 @@ url="https://www.libraw.org/"
 license=("spdx:LGPL-2.1 OR CDDL-1.0")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
-         "${MINGW_PACKAGE_PREFIX}-jasper"
          "${MINGW_PACKAGE_PREFIX}-lcms2"
          "${MINGW_PACKAGE_PREFIX}-libjpeg"
-         "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread"
-         "${MINGW_PACKAGE_PREFIX}-omp")
+         "${MINGW_PACKAGE_PREFIX}-omp"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 source=("https://www.libraw.org/data/${_realname}-${pkgver}.tar.gz"
         "0001-libraw-pkgconfig-remove-stdcxx.patch"
-        "LibRaw_obsolete-macros.patch"
-        "0002-libraw-datastream-utf8-api.patch")
-sha256sums=('20ecfa6aad943d383ab3f66d303727ef542b042cbba2bb7ddaeff0bb2e9ff916'
-            '3b4c6aece23e020bf50a8bf349a25186273a601286fa2bb1f0a7269083277c13'
-            '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f'
-            '262c29b7e51d0916340b827fe1810ce1581b267886a98b4d6bccf720bd2789d3')
+        "0002-libraw-datastream-utf8-api.patch"
+        "0003-libraw-win32-dlldefs.patch")
+sha256sums=('1071e6e8011593c366ffdadc3d3513f57c90202d526e133174945ec1dd53f2a1'
+            'f3b9cc8eb9e557ad6298cc05285c7f3a91b15ccbc65577f03505e0a38f62c8e8'
+            '262c29b7e51d0916340b827fe1810ce1581b267886a98b4d6bccf720bd2789d3'
+            '4222276a8d5c95ddd5e4c719a8d79e028e611b930dd4fbddeca3631a8624a995')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -43,12 +42,13 @@ prepare() {
   # https://github.com/LibRaw/LibRaw/issues/632
   patch -p1 -i "${srcdir}/0002-libraw-datastream-utf8-api.patch"
 
+  # https://github.com/LibRaw/LibRaw/issues/709
+  patch -p1 -i "${srcdir}/0003-libraw-win32-dlldefs.patch"
+
   autoreconf -ifv
 }
 
 build() {
-  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
-
   if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
     LDFLAGS+=" -lomp"
   fi
@@ -58,17 +58,37 @@ build() {
   # https://github.com/LibRaw/LibRaw/blob/27144e42000/Changelog.txt#L417
   # CPPFLAGS+=" -DUSE_6BY9RPI -DUSE_X3FTOOLS"
 
-  CPPFLAGS+=" -DLIBRAW_FORCE_OPENMP"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
+
+  CPPFLAGS+=" -DLIBRAW_FORCE_OPENMP -DLIBRAW_NODLL"
   ../${_realname}-${pkgver}/configure \
       --prefix=${MINGW_PREFIX} \
       --build=${MINGW_CHOST} \
-      --host=${MINGW_CHOST}
+      --host=${MINGW_CHOST} \
+      --enable-shared=yes \
+      --enable-static=yes
+
+  make
+
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
+
+  CPPFLAGS+=" -ULIBRAW_NODLL -DLIBRAW_BUILDLIB"
+  ../${_realname}-${pkgver}/configure \
+      --prefix=${MINGW_PREFIX} \
+      --build=${MINGW_CHOST} \
+      --host=${MINGW_CHOST} \
+      --enable-shared=yes \
+      --enable-static=no
 
   make
 }
 
 package() {
-  cd "${srcdir}/build-${MSYSTEM}"
+  cd "${srcdir}/build-${MSYSTEM}-static"
+
+  make install DESTDIR="${pkgdir}"
+
+  cd "${srcdir}/build-${MSYSTEM}-shared"
 
   make install DESTDIR="${pkgdir}"