wnarrow

2 files changed, 37 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5c15e59010a..1bd104b396ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = mingw-w64-smpeg
 	pkgdesc = SDL MPEG Player Library (mingw-w64)
 	pkgver = 0.4.5
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = http://icculus.org/smpeg
 	arch = any
 	license = LGPL
-	makedepends = mingw-w64-gcc
-	makedepends = mingw-w64-pkg-config
+	makedepends = mingw-w64-configure
 	makedepends = subversion
-	depends = mingw-w64-crt
 	depends = mingw-w64-sdl
-	provides = mingw-w64-smpeg-svn=399
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = mingw-w64-smpeg::svn://svn.icculus.org/smpeg/tags/release_0_4_5
-	md5sums = SKIP
+	source = smpeg-0.4.5::svn://svn.icculus.org/smpeg/tags/release_0_4_5
+	sha256sums = SKIP
 
 pkgname = mingw-w64-smpeg
 
diff --git a/PKGBUILD b/PKGBUILD
index 2b60692f5207..0fccd962f24b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,53 @@
 pkgname=mingw-w64-smpeg
 epoch=1
 pkgver=0.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="SDL MPEG Player Library (mingw-w64)"
 arch=(any)
 url="http://icculus.org/smpeg"
 license=("LGPL")
-makedepends=(mingw-w64-gcc mingw-w64-pkg-config subversion)
-depends=(mingw-w64-crt mingw-w64-sdl)
-provides=("mingw-w64-smpeg-svn=399")
-source=("${pkgname}::svn://svn.icculus.org/smpeg/tags/release_${pkgver//./_}")
-md5sums=('SKIP')
+makedepends=(mingw-w64-configure subversion)
+depends=(mingw-w64-sdl)
 options=(staticlibs !strip !buildflags)
+source=("smpeg-$pkgver::svn://svn.icculus.org/smpeg/tags/release_${pkgver//./_}")
+sha256sums=('SKIP')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-	cd "$srcdir/$pkgname"
+	cd "$srcdir/smpeg-$pkgver"
   ./autogen.sh
 }
 
 build() {
-	for _arch in ${_architectures}; do
-		unset LDFLAGS
-		mkdir -p "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-		cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-		"${srcdir}"/$pkgname/configure \
-			--prefix=/usr/${_arch} \
-			--build=$CHOST \
-			--host=${_arch} \
-			--disable-sdltest \
-			--disable-gtk-player \
-			--disable-gtktest \
-			--disable-opengl-player \
-			--with-sdl-prefix=/usr/${_arch} \
-			--without-x
-		make LDFLAGS+="-lstdc++"
-		${_arch}-gcc -shared .libs/*.o -lSDL -lstdc++ -o smpeg.dll -Xlinker --out-implib \
-			-Xlinker libsmpeg.dll.a
-	done
+  cd "${srcdir}/smpeg-$pkgver"
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    CFLAGS+=" -Wno-error=narrowing"
+    LDFLAGS+=" -lstdc++"
+    ${_arch}-configure \
+      --disable-sdltest \
+      --disable-gtk-player \
+      --disable-gtktest \
+      --disable-opengl-player \
+      --with-sdl-prefix=/usr/${_arch} \
+      --without-x
+    make 
+    ${_arch}-gcc -shared .libs/*.o -lSDL -lstdc++ -o smpeg.dll -Xlinker --out-implib -Xlinker libsmpeg.dll.a
+    popd
+  done
 }
 
 package() {
-	mkdir -p "$pkgdir/usr/bin"
-	for _arch in ${_architectures}; do
-		cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
-		make DESTDIR="$pkgdir" install
-		install -m644 smpeg.dll "$pkgdir/usr/$_arch/bin/"
-		install -m644 libsmpeg.dll.a "$pkgdir/usr/$_arch/lib/"
-		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 --strip-unneeded
-		find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
-		rm -r "$pkgdir/usr/${_arch}/share"
-		ln -s "/usr/${_arch}/bin/smpeg-config" "$pkgdir/usr/bin/${_arch}-smpeg-config"
-	done
+  install -d "$pkgdir/usr/bin/"
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/smpeg-${pkgver}/build-${_arch}"
+    make install DESTDIR="$pkgdir"
+    install -m644 smpeg.dll "$pkgdir/usr/$_arch/bin/"
+    install -m644 libsmpeg.dll.a "$pkgdir/usr/$_arch/lib/"
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+    rm -r "$pkgdir/usr/${_arch}/share"
+    ln -s "/usr/${_arch}/bin/smpeg-config" "$pkgdir/usr/bin/${_arch}-smpeg-config"
+  done
 }