[arch-commits] Commit in bmp-wma/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 17:54:27
  Author: jgc
Revision: 49933

Merged revisions 356,49817 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/bmp-wma/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49817 | jgc | 2009-08-16 18:08:10 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  upgpkg: bmp-wma 0.1.1-3
      Make it build on x86_64
........

Modified:
  bmp-wma/repos/extra-i686/	(properties)
  bmp-wma/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)


Property changes on: bmp-wma/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /bmp-wma/trunk:1
   + /bmp-wma/trunk:1-49932

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-16 21:48:44 UTC (rev 49932)
+++ extra-i686/PKGBUILD	2009-08-16 21:54:27 UTC (rev 49933)
@@ -4,23 +4,27 @@
 
 pkgname=bmp-wma
 pkgver=0.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="WMA plugin for Beep Media Player"
 url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma"
-license="GPL"
+license=('GPL')
+arch=('x86_64' 'i686')
 depends=('bmp')
 groups=('bmp-plugins' 'bmp-io-plugins')
+options=(!libtool !emptydirs)
 source=(http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz
-bmp-wma-gcc4.patch)
-md5sums=('8dcf3fcdb10e8e2e386f70745812412b' '730eba8f41e989dd8b56c18bcc826cc4')
+        bmp-wma-gcc4.patch)
+md5sums=('8dcf3fcdb10e8e2e386f70745812412b'
+         '730eba8f41e989dd8b56c18bcc826cc4')
 
 build() {
-  cd $startdir/src/${pkgname}-${pkgver}
-  patch -Np0 -i ../bmp-wma-gcc4.patch
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" || return 1
+  if [ "${CARCH}" = "x86_64" ]; then
+    export CFLAGS="${CFLAGS} -fPIC"
+  fi
+  ./configure --prefix=/usr --disable-static || return 1
+  echo '#define HAVE_LRINTF 1' >> config.h
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  rmdir $startdir/pkg/usr/bin
-  # libtool-slay
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR="${pkgdir}" install || return 1
 }