diff --git a/mingw-w64-lensfun/PKGBUILD b/mingw-w64-lensfun/PKGBUILD index 2c437a827f..930fb414fa 100644 --- a/mingw-w64-lensfun/PKGBUILD +++ b/mingw-w64-lensfun/PKGBUILD @@ -1,49 +1,38 @@ # Maintainer: Alexey Pavlov _realname=lensfun - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.2.8 -pkgrel=2 +pkgver=0.3.0 +pkgrel=1 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database (mingw-w64)" arch=('any') -url="http://lensfun.berlios.de/" +url="http://lensfun.sourceforge.net" license=("LGPL3") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-python2") depends=("${MINGW_PACKAGE_PREFIX}-glib2" - "${MINGW_PACKAGE_PREFIX}-libpng" - "${MINGW_PACKAGE_PREFIX}-libgnurx" - "${MINGW_PACKAGE_PREFIX}-zlib" - ) + "${MINGW_PACKAGE_PREFIX}-libpng" + "${MINGW_PACKAGE_PREFIX}-libsystre" + "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' 'strip') -source=("http://download.berlios.de/${_realname}/${_realname}-${pkgver}.tar.bz2" - lensfun-0.2.8-make-4.0.patch - cmake-mingw.patch) -md5sums=('db2988505e7432c6b331aa597789c639' - '9464d933a5e4ccefed7fc38656a9ec18' - 'a048b433caf35cce363c631fd6ad559b') +source=(http://sourceforge.net/projects/lensfun/files/${pkgver}/${_realname}-${pkgver}.tar.bz2 + cmake-mingw.patch) +md5sums=('c553cb37f1b781d1af05787beacf0193' + 'aedb52587330ebbcd48525b3c6f006d4') prepare(){ cd "$srcdir/${_realname}-$pkgver" - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure - # fix configure script for make 4.0 - patch -Np0 -i "${srcdir}/lensfun-0.2.8-make-4.0.patch" + patch -p1 -i "${srcdir}/cmake-mingw.patch" } build() { - mkdir -p ${pkgdir}${MINGW_PREFIX} - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - mkdir $srcdir/build-${MINGW_CHOST} cd $srcdir/build-${MINGW_CHOST} [[ $CARCH == x86_64 ]] && ENABLESSE2="-DBUILD_FOR_SSE2=ON" ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \ + -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \ -DBUILD_STATIC=OFF \ -DBUILD_AUXFUN=ON \ -DBUILD_TESTS=OFF \ diff --git a/mingw-w64-lensfun/cmake-mingw.patch b/mingw-w64-lensfun/cmake-mingw.patch index b233bcaf8c..8f30c3b4dc 100644 --- a/mingw-w64-lensfun/cmake-mingw.patch +++ b/mingw-w64-lensfun/cmake-mingw.patch @@ -24,9 +24,9 @@ -IF(WIN32 AND NOT BUILD_STATIC) +IF(WIN32 AND NOT BUILD_STATIC AND NOT MINGW) - FIND_FILE(GLIB2_DLL - NAMES glib-2.dll glib-2-vs9.dll - PATHS "${GLIB2_BASE_DIR}/bin" + FIND_FILE(GLIB2_DLL + NAMES glib-2.dll glib-2-vs9.dll + PATHS "${GLIB2_BASE_DIR}/bin" --- lensfun-0.2.8/libs/lensfun/CMakeLists.txt.orig 2014-01-17 00:56:47.952600000 +0400 +++ lensfun-0.2.8/libs/lensfun/CMakeLists.txt 2014-01-17 00:56:59.746200000 +0400 @@ -19,6 +19,8 @@ diff --git a/mingw-w64-lensfun/lensfun-0.2.8-make-4.0.patch b/mingw-w64-lensfun/lensfun-0.2.8-make-4.0.patch deleted file mode 100644 index c7694457d7..0000000000 --- a/mingw-w64-lensfun/lensfun-0.2.8-make-4.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.old 2013-12-06 16:55:09.098654166 +0100 -+++ configure 2013-12-06 16:55:20.298676545 +0100 -@@ -45,7 +45,7 @@ - } - - # Check for tools --tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "3.81", True) -+tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "4.0", True) - if tibs.check_program ("makedep", "makedep -V", ".*Version.*?([0-9\.]+).*", "0.1.0"): - tibs.add_config_mak ("MAKEDEP", "makedep") - makedep = "yes"