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

Juergen Hoetzel juergen at archlinux.org
Mon Nov 16 12:10:37 EST 2009


    Date: Monday, November 16, 2009 @ 12:10:37
  Author: juergen
Revision: 58879

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

........
  r58876 | juergen | 2009-11-16 17:50:55 +0100 (Mo, 16 Nov 2009) | 1 line
  
  update to 1.0.0
........
  r58877 | juergen | 2009-11-16 18:02:41 +0100 (Mo, 16 Nov 2009) | 1 line
  
  remove unnecessary patch: Fixes FS#17135
........
  r58878 | juergen | 2009-11-16 18:03:50 +0100 (Mo, 16 Nov 2009) | 1 line
  
  remove unnecessary patch: Fixes FS#17135
........

Modified:
  scummvm/repos/extra-x86_64/	(properties)
  scummvm/repos/extra-x86_64/PKGBUILD
Deleted:
  scummvm/repos/extra-x86_64/scummvm-0.13.1-gcc4-fix.patch

-------------------------------+
 PKGBUILD                      |    7 +++----
 scummvm-0.13.1-gcc4-fix.patch |   12 ------------
 2 files changed, 3 insertions(+), 16 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-16 17:03:50 UTC (rev 58878)
+++ extra-x86_64/PKGBUILD	2009-11-16 17:10:37 UTC (rev 58879)
@@ -3,19 +3,18 @@
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.0.0rc1
+pkgver=1.0.0
 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 scummvm-0.13.1-gcc4-fix.patch)
-md5sums=('f3fabedc7ff2424d6a4bc678229b22ce' '810a6f483010cd2ccc434f7d01d0436f')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('11b911937e0fc73c94a7bdc374ab617c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/scummvm-0.13.1-gcc4-fix.patch
   ./configure --backend=sdl --disable-debug \
 			--with-mpeg2-prefix=/usr \
 			--with-flac-prefix=/usr \

Deleted: extra-x86_64/scummvm-0.13.1-gcc4-fix.patch
===================================================================
--- extra-x86_64/scummvm-0.13.1-gcc4-fix.patch	2009-11-16 17:03:50 UTC (rev 58878)
+++ extra-x86_64/scummvm-0.13.1-gcc4-fix.patch	2009-11-16 17:10:37 UTC (rev 58879)
@@ -1,12 +0,0 @@
-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)



More information about the arch-commits mailing list