mingw-w64-{gdk-pixbuf2,gtk2,gtk3}: Use mingw-w64-configure

2 files changed, 23 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f056251f8f7..033f961f97d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,6 +7,7 @@ pkgbase = mingw-w64-gdk-pixbuf2
 	license = LGPL
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-pkg-config
+	makedepends = mingw-w64-configure
 	depends = mingw-w64-crt
 	depends = mingw-w64-glib2>=2.37.6
 	depends = mingw-w64-jasper
diff --git a/PKGBUILD b/PKGBUILD
index daf64ef5fb42..f44e63a26ddf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,21 @@
 pkgname=mingw-w64-gdk-pixbuf2
 pkgver=2.31.1
 pkgrel=1
-pkgdesc="An image loading library (mingw-w64)"
+pkgdesc='An image loading library (mingw-w64)'
 arch=(any)
-url="http://www.gtk.org"
-license=("LGPL")
-makedepends=(mingw-w64-gcc mingw-w64-pkg-config)
-depends=(mingw-w64-crt
-'mingw-w64-glib2>=2.37.6'
-mingw-w64-jasper
-mingw-w64-libpng
-mingw-w64-libjpeg-turbo
-mingw-w64-libtiff)
+url='http://www.gtk.org'
+license=('LGPL')
+makedepends=(
+  'mingw-w64-gcc'
+  'mingw-w64-pkg-config'
+  'mingw-w64-configure')
+depends=(
+  'mingw-w64-crt'
+  'mingw-w64-glib2>=2.37.6'
+  'mingw-w64-jasper'
+  'mingw-w64-libpng'
+  'mingw-w64-libjpeg-turbo'
+  'mingw-w64-libtiff')
 options=(!strip !buildflags staticlibs)
 source=("http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz")
 sha256sums=('25a75e3c61dac11e6ff6416ad846951ccafac6486b1c6a1bfb0b213b99db52cd')
@@ -19,31 +23,27 @@ sha256sums=('25a75e3c61dac11e6ff6416ad846951ccafac6486b1c6a1bfb0b213b99db52cd')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
+  cd "${srcdir}/gdk-pixbuf-${pkgver}"
   for _arch in ${_architectures}; do
     unset LDFLAGS
-    export CFLAGS="-O2 -pipe -mms-bitfields"
-    export CXXFLAGS="${CFLAGS}"
-    export CXX=$_arch-g++
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-    ${srcdir}/gdk-pixbuf-${pkgver}/configure \
-      --prefix=/usr/${_arch} \
-      --build=$CHOST \
-      --host=${_arch} \
-      --enable-static \
-      --enable-shared \
+    mkdir -p "build-${_arch}"
+    cd "build-${_arch}"
+    ${_arch}-configure \
       --with-included-loaders=wbmp,png,pnm,ras,ani,xpm,xbm,tga,icns,pcx,qtif,gdip-ico,gdip-wmf,gdip-emf,gdip-bmp,gdip-gif,gdip-jpeg,gdip-tiff
     make
+    cd ..
   done
 }
 
 package() {
+  cd "${srcdir}/gdk-pixbuf-${pkgver}"
   for _arch in ${_architectures}; do
-    cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
+    cd "build-${_arch}"
     make DESTDIR="$pkgdir" install
     find "$pkgdir/usr/${_arch}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
     find "$pkgdir/usr/${_arch}" -name '*.dll' | xargs -rtl1 ${_arch}-strip -x
     find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
     rm -r "$pkgdir/usr/${_arch}/share"
+    cd ..
   done
 }