=== Rebuild for GCC-5.1.0. Part X ===

2015-07-15 12:22:29 +03:00
parent 66babeee0f
commit c47d0fdc3b
21 changed files with 122 additions and 112 deletions
--- a/mingw-w64-aribb24/PKGBUILD
+++ b/mingw-w64-aribb24/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=aribb24
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for ARIB STD-B24, decoding JIS 8 bit characters and parsing MPEG-TS stream (mingw-w64)"
 arch=('any')
 url="https://github.com/nkoriyama/aribb24"
@@ -25,16 +25,17 @@ prepare() {
 build() {
  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
  cd "${srcdir}/build-${MINGW_CHOST}"
-  "${srcdir}"/${_realname}-${pkgver}/configure \
+  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
    --build=${MINGW_CHOST} \
    --host=${MINGW_CHOST} \
    --enable-static \
    --enable-shared
+
  make
 }

 package() {
  cd "${srcdir}/build-${MINGW_CHOST}"
-  make -j1 DESTDIR="$pkgdir" install
+  make -j1 DESTDIR="${pkgdir}" install
 }
--- a/mingw-w64-bullet/PKGBUILD
+++ b/mingw-w64-bullet/PKGBUILD
@@ -2,7 +2,7 @@

 _realname=bullet
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-pkgver=2.83.4
+pkgver=2.83.5
 pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and  animation (mingw-w64)"
 arch=('any')
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/bulletphysics/bullet3/archive/${pkgver}.tar.gz"
        cast-error.patch
        promit-bulletcollisions.patch)
-md5sums=('58b4e151bf580fe6746e8413cb2a4cbe'
+md5sums=('87e42fad2216801d5cef0af7e547ce08'
         '8db1300cf01a0fb244cb4b3ea5eb102e'
         '1340ed3f23915dcaf8e29d0eedc5e8c3')

@@ -35,9 +35,10 @@ build_release() {

  [ -d build-release ] && rm -rf build-release
  mkdir -p build-release && pushd build-release
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
  ${MINGW_PREFIX}/bin/cmake \
    -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX}\
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}\
    -DBUILD_SHARED_LIBS=1 \
    -DBUILD_EXTRAS=1 \
    -DINSTALL_LIBS=1 \
@@ -48,7 +49,7 @@ build_release() {
    ../bullet3-${pkgver}

  make
-  make install
+  make DESTDIR=${pkgdir} install
  
  mkdir -p ${pkgdir}${MINGW_PREFIX}/share/bullet
  for f in $(find examples -type f -iname *.dll -o -iname *.exe); do
@@ -60,11 +61,6 @@ build_release() {
  done

  mv -f ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/
-
-  local PREFIX_WIN=$(cygpath -wm ${pkgdir}${MINGW_PREFIX})
-  sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
-    -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/bullet.pc \
-    -i ${pkgdir}${MINGW_PREFIX}/lib/cmake/bullet/BulletConfig.cmake
 }

 build_debug() {
@@ -72,9 +68,10 @@ build_debug() {

  [ -d build-debug ] && rm -rf build-debug
  mkdir -p build-debug && pushd build-debug
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
  ${MINGW_PREFIX}/bin/cmake \
    -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX}  \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}  \
    -DBUILD_SHARED_LIBS=1 \
    -DBUILD_EXTRAS=1 \
    -DINSTALL_LIBS=1 \
@@ -86,7 +83,7 @@ build_debug() {
    ../bullet3-${pkgver}

  make
-  make install
+  make DESTDIR=${pkgdir} install

  mv -f ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/

--- a/mingw-w64-crt-git/PKGBUILD
+++ b/mingw-w64-crt-git/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=crt
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
-pkgver=5.0.0.4520.f3f8cd3
+pkgver=5.0.0.4522.e2d9393
 pkgrel=1
 pkgdesc='MinGW-w64 CRT for Windows'
 arch=('any')
--- a/mingw-w64-eog-plugins/PKGBUILD
+++ b/mingw-w64-eog-plugins/PKGBUILD
@@ -3,21 +3,21 @@
 _realname=eog-plugins
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.16.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="Eye of GNOME graphics viewer program - plugins (mingw-w64)"
 options=(strip staticlibs)
 depends=("${MINGW_PACKAGE_PREFIX}-eog"
-         "${MINGW_PACKAGE_PREFIX}-python2"
-         "${MINGW_PACKAGE_PREFIX}-libgdata"
+         "${MINGW_PACKAGE_PREFIX}-libchamplain"
         "${MINGW_PACKAGE_PREFIX}-libexif"
+         "${MINGW_PACKAGE_PREFIX}-libgdata"
         "${MINGW_PACKAGE_PREFIX}-postr"
-         "${MINGW_PACKAGE_PREFIX}-libchamplain")
+         "${MINGW_PACKAGE_PREFIX}-python2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gsettings-desktop-schemas")
 options=('strip' 'staticlibs')
 license=("GPL 2")
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz
        001-win.patch
        002-champlain.patch)
 sha256sums=('6fab1c1e0705fc2b0e4a63caf3ba1c5b64b4eaa1301e4cbc04bb934428b68450'
@@ -34,6 +34,7 @@ prepare() {
 }

 build() {
+  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
  mkdir -p build-${MINGW_CHOST}
  cd build-${MINGW_CHOST}

@@ -43,10 +44,11 @@ build() {
    --build=${MINGW_CHOST} \
    --prefix=${MINGW_PREFIX} \
    --libexecdir=${MINGW_PREFIX}/lib
+
  make
 }

 package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  make DESTDIR=$pkgdir install
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR=${pkgdir} install
 }
--- a/mingw-w64-evince/PKGBUILD
+++ b/mingw-w64-evince/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=evince
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.16.1
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="Document (PostScript, PDF) viewer (mingw-w64)"
 options=(strip staticlibs)
@@ -38,7 +38,6 @@ sha256sums=('06ff75065b2a30cd588c402f6bd2ea88ee3166181805e0cc00bd54f71dbf6130'

 prepare() {
  cd "${srcdir}"/${_realname}-${pkgver}
-
  patch -p1 -i ${srcdir}/001-give-cc-to-gir-scanner.mingw.patch

  AUTOPOINT='intltoolize --automake --copy' autoreconf -f -i
--- a/mingw-w64-freeglut/PKGBUILD
+++ b/mingw-w64-freeglut/PKGBUILD
@@ -5,7 +5,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pre=
 _ver=3.0.0
 pkgver=${_ver}${_pre}
-pkgrel=1
+pkgrel=2
 pkgdesc="Freeglut allows the user to create and manage windows containing OpenGL contexts (mingw32-w64)"
 arch=('any')
 url="http://freeglut.sourceforge.net/"
@@ -17,10 +17,9 @@ md5sums=('90c3ca4dd9d51cf32276bc5344ec9754')
 noextract=(${_realname}-${_ver}${_pre}.tar.gz)

 prepare() {
-  cd ${startdir}
  # Clean up old sources so re-patching doesn't fail.
-  [[ -d $srcdir/${_realname}-${_ver}${_pre} ]] && rm -rf $srcdir/${_realname}-${_ver}${_pre}
-  tar -xzvf ${_realname}-${_ver}${_pre}.tar.gz -C $srcdir
+  [[ -d ${srcdir}/${_realname}-${_ver}${_pre} ]] && rm -rf ${srcdir}/${_realname}-${_ver}${_pre}
+  tar -xzvf ${_realname}-${_ver}${_pre}.tar.gz -C ${srcdir}
 }

 build() {
@@ -28,9 +27,10 @@ build() {
  mkdir "${srcdir}/build-${MINGW_CHOST}"
  cd "${srcdir}/build-${MINGW_CHOST}"

+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
  ${MINGW_PREFIX}/bin/cmake \
    -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
    -DCMAKE_BUILD_TYPE=Release \
    ../${_realname}-${_ver}${_pre}

@@ -39,5 +39,5 @@ build() {

 package() {
  cd "${srcdir}/build-${MINGW_CHOST}"
-  make install
+  make DESTDIR=${pkgdir} install
 }
--- a/mingw-w64-headers-git/PKGBUILD
+++ b/mingw-w64-headers-git/PKGBUILD
@@ -4,7 +4,7 @@ _realname=headers
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
 pkgdesc="MinGW-w64 headers for Windows"
-pkgver=5.0.0.4520.f3f8cd3
+pkgver=5.0.0.4522.e2d9393
 pkgrel=1
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
--- a/mingw-w64-libdvbpsi/PKGBUILD
+++ b/mingw-w64-libdvbpsi/PKGBUILD
@@ -2,7 +2,7 @@

 _realname=libdvbpsi
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.1.2
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables (mingw-w64)"
 arch=('any')
@@ -11,21 +11,22 @@ license=("LGPL2.1")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=('staticlibs' 'strip')
-source=("http://download.videolan.org/pub/${_realname}/$pkgver/${_realname}-$pkgver.tar.bz2")
-sha256sums=('22436366beaa1bff27b3f6d80e43de1012b16d3b63b1e22d37d4a6fcb5db8933')
+source=("http://download.videolan.org/pub/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.bz2")
+sha256sums=('a2fed1d11980662f919bbd1f29e2462719e0f6227e1a531310bd5a706db0a1fe')

 build() {
  mkdir -p "${srcdir}/build-${MINGW_CHOST}"
-  cd "${srcdir}/${_realname}-$pkgver"
-  ./configure \
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
    --build=${MINGW_CHOST} \
    --host=${MINGW_CHOST} \
    --enable-release
+
  make SUBDIRS=src
 }

 package() {
-  cd "${srcdir}/${_realname}-$pkgver"
-  make SUBDIRS=src DESTDIR="$pkgdir" install
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make SUBDIRS=src DESTDIR="${pkgdir}" install
 }
--- a/mingw-w64-libebml/PKGBUILD
+++ b/mingw-w64-libebml/PKGBUILD
@@ -3,13 +3,15 @@
 _realname=libebml
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Extensible Binary Meta Language library (mingw-w64)"
 arch=('any')
 license=('LGPL')
-url="http://dl.matroska.org/downloads/libebml/"
+url="http://matroska.org"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "automake" "autoconf")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "automake" "autoconf")
 options=('staticlibs')
 source=("http://dl.matroska.org/downloads/${_realname}/${_realname}-${pkgver}.tar.bz2")
 md5sums=('2d5a0e502fabedfded2a890c6b5513a5')
--- a/mingw-w64-libgoom2/PKGBUILD
+++ b/mingw-w64-libgoom2/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libgoom2
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2k4
-pkgrel=1
+pkgrel=2
 pkgdesc="Shared library part of the Goom visualization plugin (mingw-w64)"
 arch=('any')
 url="http://www.fovea.cc/?page=details_produits&id=goom"
@@ -11,7 +11,7 @@ license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "flex")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 options=('staticlibs' 'strip')
-source=("http://downloads.sourceforge.net/project/goom/goom2k4/0/goom-2k4-0-src.tar.gz"
+source=("http://downloads.sourceforge.net/project/goom/goom2k4/0/goom-${pkgver}-0-src.tar.gz"
        001-no-undefined.patch
        002-fix-random.patch)
 md5sums=('8100dd07e0c6784fdf079eeaa53a5c7f'
@@ -30,7 +30,7 @@ prepare() {
 }

 build() {
-  mkdir -p $srcdir/build-${CARCH} && cd $srcdir/build-${CARCH}
+  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
  ../goom2k4-0/configure \
      --prefix=${MINGW_PREFIX} \
      --build=${MINGW_CHOST} \
@@ -40,6 +40,7 @@ build() {
      --enable-static \
      --without-xmms \
      --without-sdl
+
  make
 }

--- a/mingw-w64-libgxps/PKGBUILD
+++ b/mingw-w64-libgxps/PKGBUILD
@@ -3,25 +3,25 @@
 _realname=libgxps
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="A library to handling and rendering XPS documents (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
-        "${MINGW_PACKAGE_PREFIX}-cairo"
-        "${MINGW_PACKAGE_PREFIX}-lcms2"
-        "${MINGW_PACKAGE_PREFIX}-libarchive"
-        "${MINGW_PACKAGE_PREFIX}-libxslt"
-        "${MINGW_PACKAGE_PREFIX}-gtk3"
-        "${MINGW_PACKAGE_PREFIX}-libjpeg")
+         "${MINGW_PACKAGE_PREFIX}-gtk3"
+         "${MINGW_PACKAGE_PREFIX}-cairo"
+         "${MINGW_PACKAGE_PREFIX}-lcms2"
+         "${MINGW_PACKAGE_PREFIX}-libarchive"
+         "${MINGW_PACKAGE_PREFIX}-libjpeg"
+         "${MINGW_PACKAGE_PREFIX}-libxslt")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-            "${MINGW_PACKAGE_PREFIX}-pkg-config"
-            "make"
-            "intltool"
-            "gettext-devel")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "make"
+             "intltool"
+             "gettext-devel")
 options=('strip' 'staticlibs')
 license=("LGPL 2.1")
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:3}/${_realname}-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:3}/${_realname}-${pkgver}.tar.xz
        0001-give-cc-to-gir-scanner.all.patch
        0002-missing-include.patch)
 sha256sums=('39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be'
@@ -37,6 +37,7 @@ prepare() {
 }

 build() {
+  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
  mkdir -p build-${MINGW_CHOST}
  cd build-${MINGW_CHOST}

@@ -46,10 +47,11 @@ build() {
    --build=${MINGW_CHOST} \
    --prefix=${MINGW_PREFIX} \
    --libexecdir=${MINGW_PREFIX}/lib
+
  make
 }

 package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  make DESTDIR=$pkgdir install
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR=${pkgdir} install
 }
--- a/mingw-w64-libmatroska/PKGBUILD
+++ b/mingw-w64-libmatroska/PKGBUILD
@@ -3,13 +3,15 @@
 _realname=libmatroska
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Matroska library (mingw-w64)"
 arch=('any')
 license=('LGPL')
-url="http://dl.matroska.org/downloads/libebml/"
+url="http://matroska.org"
 depends=("${MINGW_PACKAGE_PREFIX}-libebml")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "automake" "autoconf")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "automake" "autoconf")
 options=('staticlibs')
 source=("http://dl.matroska.org/downloads/${_realname}/${_realname}-${pkgver}.tar.bz2"
        001-ebml-ldflags.patch)
--- a/mingw-w64-libmpcdec/PKGBUILD
+++ b/mingw-w64-libmpcdec/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libmpcdec
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Musepack decoding library (mingw-w64)"
 arch=("any")
 url="http://musepack.net/"
@@ -19,10 +19,9 @@ prepare() {
 }

 build() {
-  [ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
  mkdir ${srcdir}/build-${MINGW_CHOST}
  cd ${srcdir}/build-${MINGW_CHOST}
-  #cd ${_realname}-${pkgver}
  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
    --build=${MINGW_CHOST} \
@@ -30,6 +29,7 @@ build() {
    --target=${MINGW_CHOST} \
    --enable-shared \
    --enable-static
+
  make
 }

--- a/mingw-w64-libproxy/PKGBUILD
+++ b/mingw-w64-libproxy/PKGBUILD
@@ -3,15 +3,15 @@
 _realname=libproxy
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.4.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides automatic proxy configuration management (mingw-w64)"
 arch=('any')
 url="http://libproxy.googlecode.com"
 license=("LGPL")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-gcc"
             "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-python2")
 options=('staticlibs' 'strip')
 source=("http://libproxy.googlecode.com/files/${_realname}-${pkgver}.tar.gz"
@@ -23,13 +23,13 @@ source=("http://libproxy.googlecode.com/files/${_realname}-${pkgver}.tar.gz"

 md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84'
         '6c8423fb0b2595d5254c8aac3797a36a'
-         'e8f9219bf9e0e6311419cd96a85b4c9d'
+         '3fe1d50d8a4bccdc14a58166ec7f9b59'
         '275ae951b6fcb2608498549c493810d7'
         '35bcd97f6f79d83b0689907f97476e4b'
         '74adbf77b1ba5b99ea11600d9e43c8f9')

 prepare() {
-  cd "$srcdir/${_realname}-$pkgver"
+  cd "${srcdir}/${_realname}-${pkgver}"
  patch -p1 -i ${srcdir}/001-fix-casting-error.patch
  patch -p1 -i ${srcdir}/002-fix-win32-close-scoket.patch
  patch -p1 -i ${srcdir}/003-fix-leaks.patch
@@ -38,35 +38,27 @@ prepare() {
 }

 build() {
-  pushd ${MINGW_PREFIX} > /dev/null
-  export PREFIX_DEPS=`pwd -W`
-  popd > /dev/null
-
-  [[ -d $srcdir/build-${MINGW_CHOST} ]] && rm -rf $srcdir/build-${MINGW_CHOST}
-  mkdir $srcdir/build-${MINGW_CHOST}
-  cd $srcdir/build-${MINGW_CHOST}
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MINGW_CHOST}

+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DLIBEXEC_INSTALL_DIR=" \
  ${MINGW_PREFIX}/bin/cmake \
    -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
-    -DLIBEXEC_INSTALL_DIR=${pkgdir}${MINGW_PREFIX}/lib/libproxy \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DLIBEXEC_INSTALL_DIR=${MINGW_PREFIX}/lib/libproxy \
    -DCMAKE_SKIP_RPATH=ON \
    -DCMAKE_BUILD_TYPE=Release \
    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
    -DCMAKE_C_FLAGS="${CFLAGS}" \
    -DWITH_PERL=OFF \
    -DWITH_PYTHON=ON \
-    ../${_realname}-$pkgver
+    ../${_realname}-${pkgver}
+
  make
 }

 package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  make install
-
-  pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
-  local PREFIX_WIN=`pwd -W`
-  popd > /dev/null
-  sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
-    -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libproxy-1.0.pc
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR=${pkgdir} install
 }
--- a/mingw-w64-libsamplerate/PKGBUILD
+++ b/mingw-w64-libsamplerate/PKGBUILD
@@ -4,19 +4,16 @@
 _realname=libsamplerate
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.1.8
-pkgrel=1
-pkgdesc="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio."
+pkgrel=2
+pkgdesc="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio (mingw-w64)"
 arch=('any')
 license=('GGPL')
 url="http://www.mega-nerd.com"
 depends=("${MINGW_PACKAGE_PREFIX}-libsndfile"
-        "${MINGW_PACKAGE_PREFIX}-fftw")
-
+         "${MINGW_PACKAGE_PREFIX}-fftw")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-            "${MINGW_PACKAGE_PREFIX}-pkg-config")
-
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 options=(!strip staticlibs !buildflags)
-
 source=("http://www.mega-nerd.com/SRC/${_realname}-${pkgver}.tar.gz")
 md5sums=('1c7fb25191b4e6e3628d198a66a84f47')

@@ -24,7 +21,7 @@ build() {
  mkdir ${srcdir}/build-${MINGW_CHOST}
  cd ${srcdir}/build-${MINGW_CHOST}

-  ${srcdir}/${_realname}-${pkgver}/configure \
+  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
    --build=${MINGW_CHOST} \
    --host=${MINGW_CHOST}
--- a/mingw-w64-protobuf-c/PKGBUILD
+++ b/mingw-w64-protobuf-c/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=protobuf-c
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Protocol Buffers implementation in C (mingw-w64)"
 arch=('any')
 url="https://github.com/protobuf-c/protobuf-c"
@@ -11,7 +11,7 @@ license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-protobuf")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 options=('staticlibs' 'strip')
-source=("$url/releases/download/v$pkgver/${_realname}-${pkgver}.tar.gz")
+source=("$url/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 md5sums=('41d437677ea16f9d3611d98841c4af3b')

 prepare() {
--- a/mingw-w64-protobuf/PKGBUILD
+++ b/mingw-w64-protobuf/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=protobuf
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Protocol Buffers - Google's data interchange format (mingw-w64)"
 arch=('any')
 url='https://developers.google.com/protocol-buffers/'
@@ -11,7 +11,7 @@ license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
 options=('staticlibs' 'strip')
-source=(https://github.com/google/protobuf/releases/download/${pkgver}/protobuf-${pkgver}.tar.bz2)
+source=(https://github.com/google/protobuf/releases/download/v${pkgver}/protobuf-${pkgver}.tar.bz2)
 md5sums=('11aaac2d704eef8efd1867a807865d85')

 prepare() {
--- a/mingw-w64-qt4/PKGBUILD
+++ b/mingw-w64-qt4/PKGBUILD
@@ -72,7 +72,8 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgv
        qt-4.8.7-dont-add-resource-files-to-qmake-libs.patch
        qt4-build-debug-qmake.patch
        qt-4.8.7-mingw-configure.patch
-        qt-4.8.7-mingw-unix-tests.patch)
+        qt-4.8.7-mingw-unix-tests.patch
+        qt-4.8.7-mingw-use-shared-libmng.patch)
 md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
         '3795e9f26a38045b69bb411f307905ac'
         '63dc5a13265ed82b2ba3abd0aa7a59f7'
@@ -93,8 +94,9 @@ md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
         '68657fc5b131e2c5e3532b61e2c3da42'
         '562ababd98ecca9e3a6cbc9b70e8f7f9'
         '49c33922e8f3c506cb7cc15cbe9b4a0a'
-         'e202913dee43bef855d7429138d7436b'
-         'fc3b3f45db0eda55d429310faf529ae9')
+         'de870877cb94f64a57c81d52ce6327e5'
+         'fc3b3f45db0eda55d429310faf529ae9'
+         '7370d976dc950404b65e4958ceadb4c7')

 prepare() {
  cd ${srcdir}/${_pkgfqn}
@@ -118,6 +120,7 @@ prepare() {
  patch -p1 -i ${srcdir}/qt-4.8.7-dont-add-resource-files-to-qmake-libs.patch
  patch -p1 -i ${srcdir}/qt-4.8.7-mingw-configure.patch
  patch -p1 -i ${srcdir}/qt-4.8.7-mingw-unix-tests.patch
+  patch -p1 -i ${srcdir}/qt-4.8.7-mingw-use-shared-libmng.patch
  
  if check_option "debug" "y"; then
    patch -p1 -i ${srcdir}/qt4-build-debug-qmake.patch
--- a/mingw-w64-qt4/qt-4.8.7-mingw-configure.patch
+++ b/mingw-w64-qt4/qt-4.8.7-mingw-configure.patch
@@ -79,18 +79,13 @@
      CYGWIN*:*)
         PLATFORM=cygwin-g++
         ;;
-@@ -3139,6 +3167,18 @@
+@@ -3139,6 +3167,13 @@
 
 if [ -z "${CFG_HOST_ARCH}" ]; then
     case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
 +    MINGW*:*:*)
 +        MACHINE_GCC=`(gcc -dumpmachine) 2>/dev/null`
 +        CFG_HOST_ARCH=${MACHINE_GCC%%-*}
-+        case "$CFG_HOST_ARCH" in
-+            i?86)
-+                CFG_HOST_ARCH=i686
-+                ;;
-+        esac
 +        if [ "$OPT_VERBOSE" = "yes" ]; then
 +            echo "    MINGW/MSYS ($CFG_HOST_ARCH)"
 +        fi
--- a/mingw-w64-qt4/qt-4.8.7-mingw-use-shared-libmng.patch
+++ b/mingw-w64-qt4/qt-4.8.7-mingw-use-shared-libmng.patch
@@ -0,0 +1,14 @@
+--- a/src/gui/image/qmnghandler.cpp	2015-05-27 14:49:31.512616600 +0300
+++ b/src/gui/image/qmnghandler.cpp	2015-05-27 14:49:38.480009800 +0300
+@@ -45,7 +45,11 @@
+ #include "qvariant.h"
+ #include "qcolor.h"
+ 
+#ifdef _WIN32
+#define MNG_USE_DLL
+#else
+ #define MNG_USE_SO
+#endif
+ #include <libmng.h>
+ 
+ QT_BEGIN_NAMESPACE
--- a/mingw-w64-vcdimager/PKGBUILD
+++ b/mingw-w64-vcdimager/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=vcdimager
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.7.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's (mingw-w64)"
 arch=("any")
 url="http://www.vcdimager.org/"
@@ -30,18 +30,20 @@ prepare() {
 }

 build() {
-  cd ${_realname}-${pkgver}
-  ./configure \
+  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  ../${_realname}-${pkgver}/configure \
    --prefix=${MINGW_PREFIX} \
    --build=${MINGW_CHOST} \
    --host=${MINGW_CHOST} \
    --target=${MINGW_CHOST} \
    --enable-static \
    --enable-shared
+
  make
 }

 package() {
-  cd ${_realname}-${pkgver}
+  cd build-${MINGW_CHOST}
  make DESTDIR="${pkgdir}" install
 }