[arch-commits] Commit in sdl_mixer/repos (3 files)
Allan McRae
allan at archlinux.org
Mon Nov 16 00:06:35 UTC 2009
Date: Sunday, November 15, 2009 @ 19:06:34
Author: allan
Revision: 58857
Merged revisions 58856 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/sdl_mixer/trunk
........
r58856 | allan | 2009-11-16 10:05:39 +1000 (Mon, 16 Nov 2009) | 2 lines
upgpkg: sdl_mixer 1.2.11-1
upstream update
........
Modified:
sdl_mixer/repos/extra-i686/ (properties)
sdl_mixer/repos/extra-i686/PKGBUILD
Deleted:
sdl_mixer/repos/extra-i686/multisound-crash.patch
------------------------+
PKGBUILD | 13 ++++---------
multisound-crash.patch | 47 -----------------------------------------------
2 files changed, 4 insertions(+), 56 deletions(-)
Property changes on: sdl_mixer/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /sdl_mixer/trunk:1-58823
+ /sdl_mixer/trunk:1-58856
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-11-16 00:05:39 UTC (rev 58856)
+++ extra-i686/PKGBUILD 2009-11-16 00:06:34 UTC (rev 58857)
@@ -4,24 +4,19 @@
# Contributor: Lukas Sabota <punkrockguy318 at cocmast.net> (Timidity Patch)
pkgname=sdl_mixer
-pkgver=1.2.10
-pkgrel=3
+pkgver=1.2.11
+pkgrel=1
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
- multisound-crash.patch)
-md5sums=('a357558552436b0b5ea0333b3e2327df'
- '4669f453a7fe29e2987c0b2b8e4c5c82')
+source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz)
+md5sums=('65ada3d997fe85109191a5fb083f248c')
build() {
cd ${srcdir}/SDL_mixer-${pkgver}
- patch -Np2 -i $srcdir/multisound-crash.patch
- # soname bump was an upstream mistake
- sed -i "/BINARY_AGE/s#0#10#" configure
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
Deleted: extra-i686/multisound-crash.patch
===================================================================
--- extra-i686/multisound-crash.patch 2009-11-16 00:05:39 UTC (rev 58856)
+++ extra-i686/multisound-crash.patch 2009-11-16 00:06:34 UTC (rev 58857)
@@ -1,47 +0,0 @@
---- 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