From 747e6a8f44b3042df301a3ce08b227cfeea824f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Mon, 27 Jul 2020 10:54:04 +0200 Subject: [PATCH] libraw: update to 0.20.0 --- mingw-w64-libraw/LibRaw_configure-zlib.patch | 30 -------------------- mingw-w64-libraw/PKGBUILD | 7 ++--- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 mingw-w64-libraw/LibRaw_configure-zlib.patch diff --git a/mingw-w64-libraw/LibRaw_configure-zlib.patch b/mingw-w64-libraw/LibRaw_configure-zlib.patch deleted file mode 100644 index 5923191f3b..0000000000 --- a/mingw-w64-libraw/LibRaw_configure-zlib.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index fa11137..2547a6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,7 +83,24 @@ if test x$jasper = xtrue; then - ) - fi - -- -+# check if we want zlib support -+AC_ARG_ENABLE([zlib], -+ [ --enable-zlib Enable zlib support for deflate compressed DNG files], -+ [case "${enableval}" in -+ yes) zlib=true ;; -+ no) zlib=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-zlib]) ;; -+ esac],[zlib=true]) -+ -+if test x$zlib = xtrue; then -+ PKG_CHECK_MODULES([ZLIB],[zlib],[ -+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS -DUSE_ZLIB" -+ LIBS="$LIBS $ZLIB_LIBS" -+ AC_SUBST([PACKAGE_REQUIRES],[zlib]) -+ ], -+ AC_MSG_WARN([zlib support cannot be enabled]) -+ ) -+fi - - # check if we want LCMS support - AC_ARG_ENABLE([lcms], diff --git a/mingw-w64-libraw/PKGBUILD b/mingw-w64-libraw/PKGBUILD index f302da9167..570e8d44b7 100644 --- a/mingw-w64-libraw/PKGBUILD +++ b/mingw-w64-libraw/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-libraw" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.19.5 +pkgver=0.20.0 pkgrel=1 pkgdesc="Library for reading RAW files obtained from digital photo cameras (mingw-w64)" arch=('any') @@ -21,17 +21,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" options=('staticlibs' 'strip') source=("https://www.libraw.org/data/${_realname}-${pkgver}.tar.gz" "LibRaw_wsock32.patch" - "LibRaw_configure-zlib.patch" "LibRaw_obsolete-macros.patch") -sha256sums=('40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5' +sha256sums=('1f0a383da2ce9f409087facd28261decbf6be72cc90c78cd003b0766e4d694a3' '4bd077917fb8f37fa736e3a8bf32fabe3df3ff5438b684acbb5adff8a6c2a73b' - 'f57a186d3c4b74b74d6ddb62a5589a7cc6f330e0eee1b40a0119f0df4634aecc' '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/LibRaw_wsock32.patch" - patch -Np1 -i "${srcdir}/LibRaw_configure-zlib.patch" patch -Np1 -i "${srcdir}/LibRaw_obsolete-macros.patch" autoreconf -ifv