[arch-commits] Commit in scummvm/repos (3 files)

[Juergen Hoetzel]

    Date: Thursday, June 11, 2009 @ 03:49:12
  Author: juergen
Revision: 42102

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

........
  r42100 | juergen | 2009-06-11 09:24:37 +0200 (Do, 11 Jun 2009) | 1 line
  
  fix gcc4 cast error
........
  r42101 | juergen | 2009-06-11 09:48:40 +0200 (Do, 11 Jun 2009) | 1 line
  
  upgpkg: scummvm 0.13.1-1
........

Added:
  scummvm/repos/extra-i686/scummvm-0.13.1-gcc4-fix.patch
    (from rev 42101, scummvm/trunk/scummvm-0.13.1-gcc4-fix.patch)
Modified:
  scummvm/repos/extra-i686/	(properties)
  scummvm/repos/extra-i686/PKGBUILD

-------------------------------+
 PKGBUILD                      |    9 +++++----
 scummvm-0.13.1-gcc4-fix.patch |   12 ++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)


Property changes on: scummvm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /scummvm/trunk:1-21147
   + /scummvm/trunk:1-42101

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-11 07:48:40 UTC (rev 42101)
+++ extra-i686/PKGBUILD	2009-06-11 07:49:12 UTC (rev 42102)
@@ -3,18 +3,19 @@
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=0.12.0
-pkgrel=2
+pkgver=0.13.1
+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')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('cd5620c57645948c8da0d4d9c9fcffb3')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ${pkgname}-${pkgver}-gcc4-fix.patch)
+md5sums=('843d9cd4470022bd3b269eb84298dc16' '810a6f483010cd2ccc434f7d01d0436f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -p1 -i ${startdir}/${pkgname}-${pkgver}-gcc4-fix.patch
   ./configure --backend=sdl --disable-debug \
 			--with-mpeg2-prefix=/usr \
 			--with-flac-prefix=/usr \

Copied: scummvm/repos/extra-i686/scummvm-0.13.1-gcc4-fix.patch (from rev 42101, scummvm/trunk/scummvm-0.13.1-gcc4-fix.patch)
===================================================================
--- extra-i686/scummvm-0.13.1-gcc4-fix.patch	                        (rev 0)
+++ extra-i686/scummvm-0.13.1-gcc4-fix.patch	2009-06-11 07:49:12 UTC (rev 42102)
@@ -0,0 +1,12 @@
+diff -ubr scummvm-0.13.1.orig/backends/midi/alsa.cpp scummvm-0.13.1/backends/midi/alsa.cpp
+--- scummvm-0.13.1.orig/backends/midi/alsa.cpp	2009-04-18 23:32:38.000000000 +0200
++++ scummvm-0.13.1/backends/midi/alsa.cpp	2009-06-11 09:23:01.000000000 +0200
+@@ -228,7 +228,7 @@
+ }
+ 
+ int MidiDriver_ALSA::parse_addr(const char *arg, int *client, int *port) {
+-	char *p;
++	const char *p;
+ 
+ 	if (isdigit(*arg)) {
+ 		if ((p = strpbrk(arg, ADDR_DELIM)) == NULL)