[arch-commits] Commit in sdl_mixer/trunk (PKGBUILD multisound-crash.patch)
Allan McRae
allan at archlinux.org
Sun Nov 15 07:53:27 UTC 2009
Date: Sunday, November 15, 2009 @ 02:53:27
Author: allan
Revision: 58820
upgpkg: sdl_mixer 1.2.10-2
fix crash when playing multiple sounds
Added:
sdl_mixer/trunk/multisound-crash.patch
Modified:
sdl_mixer/trunk/PKGBUILD
------------------------+
PKGBUILD | 9 ++++++---
multisound-crash.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-11-15 07:43:09 UTC (rev 58819)
+++ PKGBUILD 2009-11-15 07:53:27 UTC (rev 58820)
@@ -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
Added: multisound-crash.patch
===================================================================
--- multisound-crash.patch (rev 0)
+++ multisound-crash.patch 2009-11-15 07:53:27 UTC (rev 58820)
@@ -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