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

Allan McRae allan at archlinux.org
Sun Nov 15 02:55:33 EST 2009


    Date: Sunday, November 15, 2009 @ 02:55:33
  Author: allan
Revision: 58822

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

........
  r58820 | allan | 2009-11-15 17:53:27 +1000 (Sun, 15 Nov 2009) | 2 lines
  
  upgpkg: sdl_mixer 1.2.10-2
      fix crash when playing multiple sounds
........

Added:
  sdl_mixer/repos/testing-x86_64/multisound-crash.patch
    (from rev 58820, sdl_mixer/trunk/multisound-crash.patch)
Modified:
  sdl_mixer/repos/testing-x86_64/	(properties)
  sdl_mixer/repos/testing-x86_64/PKGBUILD

------------------------+
 PKGBUILD               |    9 ++++++---
 multisound-crash.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)


Property changes on: sdl_mixer/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /sdl_mixer/trunk:1-58796
   + /sdl_mixer/trunk:1-58821

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-11-15 07:54:23 UTC (rev 58821)
+++ testing-x86_64/PKGBUILD	2009-11-15 07:55:33 UTC (rev 58822)
@@ -5,18 +5,21 @@
 
 pkgname=sdl_mixer
 pkgver=1.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple multi-channel audio mixer"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org/projects/SDL_mixer/"
 license=('LGPL' 'GPL')
 depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg')
 options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz)
-md5sums=('a357558552436b0b5ea0333b3e2327df')
+source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz
+        multisound-crash.patch)
+md5sums=('a357558552436b0b5ea0333b3e2327df'
+         '4669f453a7fe29e2987c0b2b8e4c5c82')
 
 build() {
   cd ${srcdir}/SDL_mixer-${pkgver}
+  patch -Np2 -i $srcdir/multisound-crash.patch
   sed -i 's|/usr/local/lib/timidity|/usr/lib/timidity|' timidity/config.h || return 1
   sed -i 's|/etc/timidity/timidity.cfg|/etc/timidity++/timidity.cfg|' timidity/config.h || return 1
   ./configure --prefix=/usr

Copied: sdl_mixer/repos/testing-x86_64/multisound-crash.patch (from rev 58820, sdl_mixer/trunk/multisound-crash.patch)
===================================================================
--- testing-x86_64/multisound-crash.patch	                        (rev 0)
+++ testing-x86_64/multisound-crash.patch	2009-11-15 07:55:33 UTC (rev 58822)
@@ -0,0 +1,47 @@
+--- trunk/SDL_mixer/mixer.c	2009/11/08 17:11:09	5214
++++ trunk/SDL_mixer/mixer.c	2009/11/14 19:31:39	5243
+@@ -144,36 +144,36 @@
+ {
+ 	int result = 0;
+ 
+-	if ((flags & MIX_INIT_FLAC) && !(initialized & MIX_INIT_FLAC)) {
++	if (flags & MIX_INIT_FLAC) {
+ #ifdef FLAC_MUSIC
+-		if (Mix_InitFLAC() == 0) {
++		if ((initialized & MIX_INIT_FLAC) || Mix_InitFLAC() == 0) {
+ 			result |= MIX_INIT_FLAC;
+ 		}
+ #else
+ 		Mix_SetError("Mixer not built with FLAC support");
+ #endif
+ 	}
+-	if ((flags & MIX_INIT_MOD) && !(initialized & MIX_INIT_MOD)) {
++	if (flags & MIX_INIT_MOD) {
+ #ifdef MOD_MUSIC
+-		if (Mix_InitMOD() == 0) {
++		if ((initialized & MIX_INIT_MOD) || Mix_InitMOD() == 0) {
+ 			result |= MIX_INIT_MOD;
+ 		}
+ #else
+ 		Mix_SetError("Mixer not built with MOD support");
+ #endif
+ 	}
+-	if ((flags & MIX_INIT_MP3) && !(initialized & MIX_INIT_MP3)) {
++	if (flags & MIX_INIT_MP3) {
+ #ifdef MP3_MUSIC
+-		if (Mix_InitMP3() == 0) {
++		if ((initialized & MIX_INIT_MP3) || Mix_InitMP3() == 0) {
+ 			result |= MIX_INIT_MP3;
+ 		}
+ #else
+ 		Mix_SetError("Mixer not built with MP3 support");
+ #endif
+ 	}
+-	if ((flags & MIX_INIT_OGG) && !(initialized & MIX_INIT_OGG)) {
++	if (flags & MIX_INIT_OGG) {
+ #ifdef OGG_MUSIC
+-		if (Mix_InitOgg() == 0) {
++		if ((initialized & MIX_INIT_OGG) || Mix_InitOgg() == 0) {
+ 			result |= MIX_INIT_OGG;
+ 		}
+ #else



More information about the arch-commits mailing list