1
0
forked from pool/SDL_mixer

Accepting request 27250 from home:jengelh:branches:games

Copy from home:jengelh:branches:games/SDL_mixer via accept of submit request 27250 revision 2.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/27250
OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=4
This commit is contained in:
Stephan Kulow 2009-12-20 21:49:29 +00:00 committed by Git OBS Bridge
parent f1d381575c
commit fce0d68e27
6 changed files with 49 additions and 36 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b994aad5dbb1d80093cda0bf193f24686dc4ce63ae421585b166db2d9771f308
size 523290

View File

@ -0,0 +1,24 @@
--- mikmod/mikmod.h
+++ mikmod/mikmod.h
@@ -85,7 +85,8 @@
/*@DOES_NOT_HAVE_SIGNED@*/
-#if defined(__alpha) || defined(_LP64)
+#include <stdint.h>
+#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 <stdint.h>
+#if __WORDSIZE == 64
typedef long SLONGLONG;
#define NATIVE_64BIT_INT
#elif defined(__WATCOMC__)

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3330e17d74ed11a96ae5154618c020ccc8561f62d077dae29e24762614e73c30
size 568842

View File

@ -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 */

View File

@ -1,28 +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 Sat Dec 19 19:21:38 CET 2009 - jengelh@medozas.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package SDL_mixer (Version 1.2.11) # spec file for package SDL_mixer (Version 1.2.8)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -21,14 +21,15 @@
Name: SDL_mixer Name: SDL_mixer
BuildRequires: libSDL-devel libmikmod-devel libogg-devel libvorbis-devel BuildRequires: libSDL-devel libmikmod-devel libogg-devel libvorbis-devel
Summary: Sample Mixer Library for SDL Summary: Sample Mixer Library for SDL
Version: 1.2.11 Version: 1.2.8
Release: 1 Release: 156
License: LGPLv2.1+ License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
# removed VisualC.zip, Watcom-OS2.zip, Xcode.tar.gz from upstream tarball [bnc#508180] # 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 Source: %{name}-%{version}-repack.tar.bz2
Source1: baselibs.conf Source2: baselibs.conf
Patch0: %{name}-%{version}-timidity_cfg.patch
Patch1: %{name}-%{version}-64bit-fix.patch
Url: http://www.libsdl.org/projects/SDL_mixer/ Url: http://www.libsdl.org/projects/SDL_mixer/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -42,7 +43,7 @@ Timidity MIDI, and SMPEG MP3 libraries.
%package -n libSDL_mixer-1_2-0 %package -n libSDL_mixer-1_2-0
Summary: Sample Mixer Library for SDL Summary: Sample Mixer Library for SDL
Group: System/Libraries Group: System/Libraries
License: LGPLv2.1+ License: LGPL v2.1 or later
Provides: SDL_mixer = %{version} Provides: SDL_mixer = %{version}
Obsoletes: SDL_mixer <= %{version} Obsoletes: SDL_mixer <= %{version}
# bug437293 # bug437293
@ -58,7 +59,7 @@ Timidity MIDI, and SMPEG MP3 libraries.
%package -n libSDL_mixer-devel %package -n libSDL_mixer-devel
License: LGPLv2.1+ License: LGPL v2.1 or later
Requires: %{name} = %{version} SDL-devel Requires: %{name} = %{version} SDL-devel
Summary: Sample Mixer Library for SDL - files mandatory for development Summary: Sample Mixer Library for SDL - files mandatory for development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -79,6 +80,8 @@ Timidity MIDI, and SMPEG MP3 libraries.
%prep %prep
%setup -q %setup -q
%patch0
%patch1
%build %build
%configure \ %configure \