From 437a768e8d76f1b7e03de308b7f8da0f9e722d21ebbdc5c6cea534b416af755a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 12 Jan 2010 09:16:12 +0000 Subject: [PATCH] fix build OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=8 --- SDL_mixer-1.2.11-repack.tar.bz2 | 3 +++ SDL_mixer-1.2.8-64bit-fix.patch | 24 -------------------- SDL_mixer-1.2.8-repack.tar.bz2 | 3 --- SDL_mixer-1.2.8-timidity_cfg.patch | 11 ---------- SDL_mixer.changes | 35 ++++++++++++++++++++++++++++++ SDL_mixer.spec | 19 ++++++++-------- 6 files changed, 47 insertions(+), 48 deletions(-) create mode 100644 SDL_mixer-1.2.11-repack.tar.bz2 delete mode 100644 SDL_mixer-1.2.8-64bit-fix.patch delete mode 100644 SDL_mixer-1.2.8-repack.tar.bz2 delete mode 100644 SDL_mixer-1.2.8-timidity_cfg.patch diff --git a/SDL_mixer-1.2.11-repack.tar.bz2 b/SDL_mixer-1.2.11-repack.tar.bz2 new file mode 100644 index 0000000..40bf734 --- /dev/null +++ b/SDL_mixer-1.2.11-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b994aad5dbb1d80093cda0bf193f24686dc4ce63ae421585b166db2d9771f308 +size 523290 diff --git a/SDL_mixer-1.2.8-64bit-fix.patch b/SDL_mixer-1.2.8-64bit-fix.patch deleted file mode 100644 index 8c9bbd3..0000000 --- a/SDL_mixer-1.2.8-64bit-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- mikmod/mikmod.h -+++ mikmod/mikmod.h -@@ -85,7 +85,8 @@ - - /*@DOES_NOT_HAVE_SIGNED@*/ - --#if defined(__alpha) || defined(_LP64) -+#include -+#if __WORDSIZE == 64 - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ ---- mikmod/mikmod_internals.h -+++ mikmod/mikmod_internals.h -@@ -69,7 +69,8 @@ - /*========== More type definitions */ - - /* SLONGLONG: 64bit, signed */ --#if defined(__alpha) || defined(_LP64) -+#include -+#if __WORDSIZE == 64 - typedef long SLONGLONG; - #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) diff --git a/SDL_mixer-1.2.8-repack.tar.bz2 b/SDL_mixer-1.2.8-repack.tar.bz2 deleted file mode 100644 index 527da56..0000000 --- a/SDL_mixer-1.2.8-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3330e17d74ed11a96ae5154618c020ccc8561f62d077dae29e24762614e73c30 -size 568842 diff --git a/SDL_mixer-1.2.8-timidity_cfg.patch b/SDL_mixer-1.2.8-timidity_cfg.patch deleted file mode 100644 index 94516ad..0000000 --- a/SDL_mixer-1.2.8-timidity_cfg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- timidity/config.h -+++ timidity/config.h -@@ -176,7 +176,7 @@ - #if defined(__WIN32__) || defined(__OS2__) - #define DEFAULT_PATH "\\TIMIDITY" - #else --#define DEFAULT_PATH "/usr/local/lib/timidity" -+#define DEFAULT_PATH "/usr/share/timidity" - #endif - - /* These affect general volume */ diff --git a/SDL_mixer.changes b/SDL_mixer.changes index 673ca14..bb84ecc 100644 --- a/SDL_mixer.changes +++ b/SDL_mixer.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Jan 12 09:16:01 UTC 2010 - coolo@novell.com + +- fix file list + +------------------------------------------------------------------- +Mon Dec 21 14:28:09 UTC 2009 - prusnak@suse.cz + +- updated to 1.2.11 + * Fixed initialization error and crashes if MikMod library isn't available + * Fixed bug loading multiple music files + * Added Mix_Init()/Mix_Quit() to prevent constantly loading and unloading DLLs + * Check for fork/vfork on any platform, don't just assume it on UNIX + * Fixed export of Mix_GetNumChunkDecoders() and Mix_GetNumMusicDecoders() + * Reset channel volumes after a fade out interrupts a fade in. + * Fixed crash race condition with position audio functions + * Fixed stereo panning in 8-bit mode + * Added /usr/share/timidity to the default timidity.cfg locations + * MOD support uses libmikmod and is dynamically loaded by default + * Added TIMIDITY_CFG environment variable to fully locate timidity.cfg + * Implemented seamless looping for music playback + * ID3 files are now recognized as MP3 format + * Added decoder enumeration API: + Mix_GetNumChunkDecoders(), Mix_GetChunkDecoder(), + Mix_GetNumMusicDecoders(), Mix_GetMusicDecoder() + * Added support for FLAC audio both as chunks and streaming + * Added support for streaming WAV files with Mix_LoadMUS_RW() + * Fixed crash caused by not resetting position_channels +- drop no longer needed 64bit-fix.patch and timidity_cfg.patch + +------------------------------------------------------------------- +Sat Dec 19 19:21:38 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + ------------------------------------------------------------------- Wed Oct 7 14:52:31 CEST 2009 - prusnak@suse.cz diff --git a/SDL_mixer.spec b/SDL_mixer.spec index d925d5f..4ef2c79 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -1,5 +1,5 @@ # -# spec file for package SDL_mixer (Version 1.2.8) +# spec file for package SDL_mixer (Version 1.2.11) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,14 +21,14 @@ Name: SDL_mixer BuildRequires: libSDL-devel libmikmod-devel libogg-devel libvorbis-devel Summary: Sample Mixer Library for SDL -Version: 1.2.8 -Release: 156 -License: LGPL v2.1 or later +Version: 1.2.11 +Release: 1 +License: LGPLv2.1+ Group: System/Libraries # removed VisualC.zip, Watcom-OS2.zip, Xcode.tar.gz from upstream tarball [bnc#508180] +# removed libmikmod-3.1.12.zip Source: %{name}-%{version}-repack.tar.bz2 -Patch0: %{name}-%{version}-timidity_cfg.patch -Patch1: %{name}-%{version}-64bit-fix.patch +Source1: baselibs.conf Url: http://www.libsdl.org/projects/SDL_mixer/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +42,7 @@ Timidity MIDI, and SMPEG MP3 libraries. %package -n libSDL_mixer-1_2-0 Summary: Sample Mixer Library for SDL Group: System/Libraries -License: LGPL v2.1 or later +License: LGPLv2.1+ Provides: SDL_mixer = %{version} Obsoletes: SDL_mixer <= %{version} # bug437293 @@ -58,7 +58,7 @@ Timidity MIDI, and SMPEG MP3 libraries. %package -n libSDL_mixer-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Requires: %{name} = %{version} SDL-devel Summary: Sample Mixer Library for SDL - files mandatory for development Group: Development/Libraries/C and C++ @@ -79,8 +79,6 @@ Timidity MIDI, and SMPEG MP3 libraries. %prep %setup -q -%patch0 -%patch1 %build %configure \ @@ -110,5 +108,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/play* %{_includedir}/SDL/* %{_libdir}/*.so +%{_libdir}/pkgconfig/SDL_mixer.pc %changelog