From cc0bb033488b8eb2c482797d181b300e0338e8f7373e6721b0359ac4287cc1c8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 27 Jul 2007 00:09:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL_mixer?expand=0&rev=7 --- SDL_mixer-1.2.7.tar.bz2 | 3 - ...fix.dif => SDL_mixer-1.2.8-64bit-fix.patch | 0 ...atch => SDL_mixer-1.2.8-timidity_cfg.patch | 4 +- SDL_mixer-1.2.8.tar.bz2 | 3 + SDL_mixer-libmikmod.patch | 13 ---- SDL_mixer-timidity-crash.patch | 28 --------- SDL_mixer-warn.dif | 54 ----------------- SDL_mixer.changes | 21 +++++++ SDL_mixer.spec | 60 +++++++++---------- 9 files changed, 56 insertions(+), 130 deletions(-) delete mode 100644 SDL_mixer-1.2.7.tar.bz2 rename SDL_mixer-64bit-fix.dif => SDL_mixer-1.2.8-64bit-fix.patch (100%) rename SDL_mixer-timidity_cfg.patch => SDL_mixer-1.2.8-timidity_cfg.patch (76%) create mode 100644 SDL_mixer-1.2.8.tar.bz2 delete mode 100644 SDL_mixer-libmikmod.patch delete mode 100644 SDL_mixer-timidity-crash.patch delete mode 100644 SDL_mixer-warn.dif diff --git a/SDL_mixer-1.2.7.tar.bz2 b/SDL_mixer-1.2.7.tar.bz2 deleted file mode 100644 index 9f6e36f..0000000 --- a/SDL_mixer-1.2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2a2a9d98e6b59fe5be10ef5748b068cc7fda3fdaff2d49d27cc65f55655ed8d -size 1916921 diff --git a/SDL_mixer-64bit-fix.dif b/SDL_mixer-1.2.8-64bit-fix.patch similarity index 100% rename from SDL_mixer-64bit-fix.dif rename to SDL_mixer-1.2.8-64bit-fix.patch diff --git a/SDL_mixer-timidity_cfg.patch b/SDL_mixer-1.2.8-timidity_cfg.patch similarity index 76% rename from SDL_mixer-timidity_cfg.patch rename to SDL_mixer-1.2.8-timidity_cfg.patch index aff14d7..94516ad 100644 --- a/SDL_mixer-timidity_cfg.patch +++ b/SDL_mixer-1.2.8-timidity_cfg.patch @@ -1,5 +1,5 @@ ---- SDL_mixer-1.2.7/timidity/config.h -+++ SDL_mixer-1.2.7/timidity/config.h +--- timidity/config.h ++++ timidity/config.h @@ -176,7 +176,7 @@ #if defined(__WIN32__) || defined(__OS2__) #define DEFAULT_PATH "\\TIMIDITY" diff --git a/SDL_mixer-1.2.8.tar.bz2 b/SDL_mixer-1.2.8.tar.bz2 new file mode 100644 index 0000000..d0f1305 --- /dev/null +++ b/SDL_mixer-1.2.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27b0812ed147de6d07f0a154dd63b57ea485f6a9c40600b683b19eed3e124c48 +size 2012131 diff --git a/SDL_mixer-libmikmod.patch b/SDL_mixer-libmikmod.patch deleted file mode 100644 index 396afd4..0000000 --- a/SDL_mixer-libmikmod.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.in -+++ configure.in -@@ -155,7 +155,9 @@ - printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev); - return 1; - } --],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED", -+], -+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`";EXTRA_LDFLAGS="$EXTRA_LDFLAGS `$LIBMIKMOD_CONFIG --libs`", -+ CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED", - [echo $ac_n "cross compiling; assumed OK... $ac_c"]) - fi - fi diff --git a/SDL_mixer-timidity-crash.patch b/SDL_mixer-timidity-crash.patch deleted file mode 100644 index 8c0b7aa..0000000 --- a/SDL_mixer-timidity-crash.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- timidity/common.c -+++ timidity/common.c -@@ -104,7 +104,6 @@ - FILE *fp; - PathList *plp; - int l; -- static int firsttime=1; - - if (!name || !(*name)) - { -@@ -113,10 +112,9 @@ - } - - #ifdef DEFAULT_PATH -- if (firsttime && (pathlist==NULL)) { -+ if (pathlist==NULL) { - /* Generate path list */ - add_to_pathlist(DEFAULT_PATH); -- firsttime=0; - } - #endif - -@@ -244,4 +242,5 @@ - free(plp); - plp = next_plp; - } -+ pathlist = NULL; - } diff --git a/SDL_mixer-warn.dif b/SDL_mixer-warn.dif deleted file mode 100644 index 9c6d28f..0000000 --- a/SDL_mixer-warn.dif +++ /dev/null @@ -1,54 +0,0 @@ ---- effect_position.c -+++ effect_position.c -@@ -373,16 +373,17 @@ - - for (i = 0; i < len; i += sizeof (Uint32)) { - #if (SDL_BYTEORDER == SDL_BIG_ENDIAN) -- *(p++) = (d[l[(*p & 0xFF000000) >> 24]] << 24) | -- (d[r[(*p & 0x00FF0000) >> 16]] << 16) | -- (d[l[(*p & 0x0000FF00) >> 8]] << 8) | -- (d[r[(*p & 0x000000FF) ]] ) ; -+ *p = (d[l[(*p & 0xFF000000) >> 24]] << 24) | -+ (d[r[(*p & 0x00FF0000) >> 16]] << 16) | -+ (d[l[(*p & 0x0000FF00) >> 8]] << 8) | -+ (d[r[(*p & 0x000000FF) ]] ) ; - #else -- *(p++) = (d[r[(*p & 0xFF000000) >> 24]] << 24) | -- (d[l[(*p & 0x00FF0000) >> 16]] << 16) | -- (d[r[(*p & 0x0000FF00) >> 8]] << 8) | -- (d[l[(*p & 0x000000FF) ]] ) ; -+ *p = (d[r[(*p & 0xFF000000) >> 24]] << 24) | -+ (d[l[(*p & 0x00FF0000) >> 16]] << 16) | -+ (d[r[(*p & 0x0000FF00) >> 8]] << 8) | -+ (d[l[(*p & 0x000000FF) ]] ) ; - #endif -+ p++; - } - } - -@@ -563,16 +564,17 @@ - - for (i = 0; i < len; i += sizeof (Uint32)) { - #if (SDL_BYTEORDER == SDL_BIG_ENDIAN) -- *(p++) = (d[l[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) | -- (d[r[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) | -- (d[l[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) | -- (d[r[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ; -+ *p = (d[l[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) | -+ (d[r[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) | -+ (d[l[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) | -+ (d[r[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ; - #else -- *(p++) = (d[r[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) | -- (d[l[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) | -- (d[r[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) | -- (d[l[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ; -+ *p = (d[r[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) | -+ (d[l[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) | -+ (d[r[((Sint16)(Sint8)((*p & 0x0000FF00) >> 8))+128]] << 8) | -+ (d[l[((Sint16)(Sint8)((*p & 0x000000FF) ))+128]] ) ; - #endif -+ p++; - } - - diff --git a/SDL_mixer.changes b/SDL_mixer.changes index 763b278..bd7c7f4 100644 --- a/SDL_mixer.changes +++ b/SDL_mixer.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Jul 25 18:24:14 CEST 2007 - prusnak@suse.cz + +- updated to 1.2.8 + * improved detection of Ogg Vorbis and Tremor libraries + * fixed memory leaks in Effects API + * added support for MP3 playback with libmad (for GPL projects only!) + * fixed the final loop of audio samples of a certain size + * added support for Ogg Vorbis playback with Tremor (an integer decoder) + * fixed memory corruption in timidity resampling code + * fixed building SDL_mixer with SDL 1.3 pre-release + * fixed compiling both timidity and native midi in the same build + * added volume control to playmus + * fixed linking with system libmikmod + * corrected no-op conditions in SetDistance(), SetPanning() and SetPosition() + * fixed copy/paste errors in channel amplitudes +- dropped obsoleted patch: + * timidity-crash.patch (included in update) + * warn.patch (included in update) + * libmikmod.patch (included in update) + ------------------------------------------------------------------- Sun Jul 22 18:59:22 CEST 2007 - aj@suse.de diff --git a/SDL_mixer.spec b/SDL_mixer.spec index ed1434d..7c2f5e6 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -1,5 +1,5 @@ # -# spec file for package SDL_mixer (Version 1.2.7) +# spec file for package SDL_mixer (Version 1.2.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,17 +13,13 @@ Name: SDL_mixer BuildRequires: SDL-devel libmikmod-devel libogg-devel libvorbis-devel xorg-x11-libX11-devel Summary: Sample Mixer Library for SDL -Obsoletes: sdlmixer -Version: 1.2.7 -Release: 76 +Version: 1.2.8 +Release: 1 License: LGPL v2 or later Group: System/Libraries Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-timidity_cfg.patch -Patch1: SDL_mixer-64bit-fix.dif -Patch2: SDL_mixer-warn.dif -Patch3: SDL_mixer-libmikmod.patch -Patch4: SDL_mixer-timidity-crash.patch +Patch0: %{name}-%{version}-timidity_cfg.patch +Patch1: %{name}-%{version}-64bit-fix.patch URL: http://www.libsdl.org/projects/SDL_mixer/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel @@ -48,37 +44,23 @@ Timidity MIDI, and SMPEG MP3 libraries. %prep %setup -q -%patch -p1 +%patch0 %patch1 -%patch2 -%patch3 -%patch4 %build -./autogen.sh -if [ -f /usr/%_lib/libsmpeg.so ] ; then - CONF_ARGS="--enable-music-mp3=yes" -else - CONF_ARGS="--enable-music-mp3=no" -fi %configure \ - --enable-music-libmikmod $CONF_ARGS -grep '^CFLAGS =.*-DUSE_TIMIDITY_MIDI' Makefile || true -grep '^CFLAGS =.*-DOGG_MUSIC' Makefile || true -grep '^CFLAGS =.*-DMP3_MUSIC' Makefile || true + --enable-music-libmikmod make %{?jobs:-j %jobs} %install -make install install-bin DESTDIR=%buildroot +make install install-bin DESTDIR=$RPM_BUILD_ROOT %clean -rm -rf %buildroot +rm -rf $RPM_BUILD_ROOT -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -88,12 +70,30 @@ rm -rf %buildroot %files devel %defattr(-,root,root) +%{_includedir}/SDL/* %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/*.so -%{_includedir}/SDL/* %changelog +* Wed Jul 25 2007 - prusnak@suse.cz +- updated to 1.2.8 + * improved detection of Ogg Vorbis and Tremor libraries + * fixed memory leaks in Effects API + * added support for MP3 playback with libmad (for GPL projects only!) + * fixed the final loop of audio samples of a certain size + * added support for Ogg Vorbis playback with Tremor (an integer decoder) + * fixed memory corruption in timidity resampling code + * fixed building SDL_mixer with SDL 1.3 pre-release + * fixed compiling both timidity and native midi in the same build + * added volume control to playmus + * fixed linking with system libmikmod + * corrected no-op conditions in SetDistance(), SetPanning() and SetPosition() + * fixed copy/paste errors in channel amplitudes +- dropped obsoleted patch: + * timidity-crash.patch (included in update) + * warn.patch (included in update) + * libmikmod.patch (included in update) * Sun Jul 22 2007 - aj@suse.de - Cleanup BuildRequires. * Sun Apr 15 2007 - dmueller@suse.de