[arch-commits] Commit in scummvm/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Juergen Hoetzel]

    Date: Thursday, November 12, 2009 @ 18:33:18
  Author: juergen
Revision: 58726

Merged revisions 58725 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/scummvm/trunk

........
  r58725 | juergen | 2009-11-13 00:03:37 +0100 (Fr, 13 Nov 2009) | 1 line
  
  update to 1.0.0rc1
........

Modified:
  scummvm/repos/extra-x86_64/	(properties)
  scummvm/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)


Property changes on: scummvm/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /scummvm/trunk:1-57416
   + /scummvm/trunk:1-58725

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-12 23:03:37 UTC (rev 58725)
+++ extra-x86_64/PKGBUILD	2009-11-12 23:33:18 UTC (rev 58726)
@@ -3,32 +3,32 @@
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=0.13.1
-pkgrel=2
+pkgver=1.0.0rc1
+pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.scummvm.org/"
 depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'libmpeg2' 'flac>=1.1.4' 'sdl')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}-gcc4-fix.patch)
-md5sums=('843d9cd4470022bd3b269eb84298dc16' '810a6f483010cd2ccc434f7d01d0436f')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 scummvm-0.13.1-gcc4-fix.patch)
+md5sums=('f3fabedc7ff2424d6a4bc678229b22ce' '810a6f483010cd2ccc434f7d01d0436f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/${pkgname}-${pkgver}-gcc4-fix.patch
+  patch -p1 -i ${srcdir}/scummvm-0.13.1-gcc4-fix.patch
   ./configure --backend=sdl --disable-debug \
 			--with-mpeg2-prefix=/usr \
 			--with-flac-prefix=/usr \
-                        --prefix=/usr \
-                        --disable-fluidsynth
-  /usr/bin/make || return 1
+      --prefix=/usr \
+      --disable-fluidsynth
+	make
   install -Dm755 scummvm ${pkgdir}/usr/bin/scummvm
   install -Dm644 dists/scummvm.6 ${pkgdir}/usr/share/man/man6/scummvm.6
-  install -Dm644 gui/themes/modern.ini ${pkgdir}/usr/share/scummvm/modern.ini
-  install -Dm644 gui/themes/modern.zip ${pkgdir}/usr/share/scummvm/modern.zip
   # fixes FS#9118 
   install -Dm644 dists/${pkgname}.desktop \
 	${pkgdir}/usr/share/applications/${pkgname}.desktop
   install -Dm644  icons/scummvm.xpm \
 	${pkgdir}/usr/share/pixmaps/scummvm.xpm
+
+  install -Dm644 gui/themes/scummmodern.zip ${pkgdir}/usr/share/scummvm/scummmodern.zip
 }