From 190aca362de4f1dde85b67d918196fa2fd37aef48bd5dde9028f40719a74a32a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 26 Dec 2009 10:43:44 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=7 --- 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 | 30 ------------------------------ SDL_mixer.spec | 8 +++++--- ready | 0 7 files changed, 43 insertions(+), 36 deletions(-) delete mode 100644 SDL_mixer-1.2.11-repack.tar.bz2 create mode 100644 SDL_mixer-1.2.8-64bit-fix.patch create mode 100644 SDL_mixer-1.2.8-repack.tar.bz2 create mode 100644 SDL_mixer-1.2.8-timidity_cfg.patch create mode 100644 ready diff --git a/SDL_mixer-1.2.11-repack.tar.bz2 b/SDL_mixer-1.2.11-repack.tar.bz2 deleted file mode 100644 index 40bf734..0000000 --- a/SDL_mixer-1.2.11-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..8c9bbd3 --- /dev/null +++ b/SDL_mixer-1.2.8-64bit-fix.patch @@ -0,0 +1,24 @@ +--- 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 new file mode 100644 index 0000000..527da56 --- /dev/null +++ b/SDL_mixer-1.2.8-repack.tar.bz2 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..94516ad --- /dev/null +++ b/SDL_mixer-1.2.8-timidity_cfg.patch @@ -0,0 +1,11 @@ +--- 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 f375d83..673ca14 100644 --- a/SDL_mixer.changes +++ b/SDL_mixer.changes @@ -1,33 +1,3 @@ -------------------------------------------------------------------- -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 71d460e..d925d5f 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -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.11 +Version: 1.2.8 Release: 156 License: LGPL v2.1 or later 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 -Source1: baselibs.conf +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 @@ -79,6 +79,8 @@ Timidity MIDI, and SMPEG MP3 libraries. %prep %setup -q +%patch0 +%patch1 %build %configure \ diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4