diff --git a/mingw-w64-libraw/LibRaw_wsock32.patch b/mingw-w64-libraw/LibRaw_wsock32.patch deleted file mode 100644 index 1cb2a0c169..0000000000 --- a/mingw-w64-libraw/LibRaw_wsock32.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN LibRaw-0.15.4/Makefile.am LibRaw-0.15.4-new/Makefile.am ---- LibRaw-0.15.4/Makefile.am 2013-08-23 04:55:48.000000000 +0200 -+++ LibRaw-0.15.4-new/Makefile.am 2013-12-28 00:56:56.418284134 +0100 -@@ -41,8 +41,8 @@ lib_libraw_r_a_CFLAGS = -pthread -w - lib_libraw_la_SOURCES = $(lib_libraw_a_SOURCES) - lib_libraw_r_la_SOURCES = $(lib_libraw_a_SOURCES) - --lib_libraw_la_LDFLAGS = -no-undefined -version-info $(LIBRAW_SHLIB_VER) --lib_libraw_r_la_LDFLAGS = -no-undefined -version-info $(LIBRAW_SHLIB_VER) -+lib_libraw_la_LDFLAGS = -no-undefined -version-info $(LIBRAW_SHLIB_VER) -lwsock32 -+lib_libraw_r_la_LDFLAGS = -no-undefined -version-info $(LIBRAW_SHLIB_VER) -lwsock32 - - - # Sample binaries diff --git a/mingw-w64-libraw/PKGBUILD b/mingw-w64-libraw/PKGBUILD index 570e8d44b7..0735d9bf64 100644 --- a/mingw-w64-libraw/PKGBUILD +++ b/mingw-w64-libraw/PKGBUILD @@ -6,13 +6,14 @@ pkgname="${MINGW_PACKAGE_PREFIX}-libraw" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.20.0 +pkgver=0.20.1 pkgrel=1 pkgdesc="Library for reading RAW files obtained from digital photo cameras (mingw-w64)" arch=('any') url="https://www.libraw.org/" license=("LGPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-jasper" "${MINGW_PACKAGE_PREFIX}-lcms2" @@ -20,24 +21,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' 'strip') source=("https://www.libraw.org/data/${_realname}-${pkgver}.tar.gz" - "LibRaw_wsock32.patch" "LibRaw_obsolete-macros.patch") -sha256sums=('1f0a383da2ce9f409087facd28261decbf6be72cc90c78cd003b0766e4d694a3' - '4bd077917fb8f37fa736e3a8bf32fabe3df3ff5438b684acbb5adff8a6c2a73b' +sha256sums=('73b0356e16af5aebbf1f637693ff0e6e51936c34c5d113a2cf3deddebcc9c90c' '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -Np1 -i "${srcdir}/LibRaw_wsock32.patch" - patch -Np1 -i "${srcdir}/LibRaw_obsolete-macros.patch" + patch -p1 -i "${srcdir}/LibRaw_obsolete-macros.patch" autoreconf -ifv } build() { - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${MINGW_CHOST}" - cd "${srcdir}/build-${MINGW_CHOST}" + [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}" + mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}" CPPFLAGS+=" -DLIBRAW_NODLL" ../${_realname}-${pkgver}/configure \ @@ -49,6 +46,6 @@ build() { } package() { - cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/build-${CARCH}" + make install DESTDIR="${pkgdir}" }