Author: peroyvind
Date: Sat Feb 3 05:21:40 2007
New Revision: 116038
Added:
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.4-64bit-fix.patch
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.5-endian-fixes.patch
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-fix-path-timidity.patch
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-link-against-system-libmikmod.patch
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-timidity-crash.patch
Removed:
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-fix-path-timidity.patch.bz2
Modified:
packages/cooker/SDL_mixer/current/SPECS/SDL_mixer.spec
Log:
link against smpeg, otherwise it won't pull in required dependency
link against system libmikmod (P2, derived from debian, then fixed)
fix timidity crash (P3, from SuSE)
64 bit fixes (P4, from SuSE)
endian fixes (P5, from SuSE)
Added: packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.4-64bit-fix.patch
==============================================================================
--- (empty file)
+++ packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.4-64bit-fix.patch
Sat Feb 3 05:21:40 2007
@@ -0,0 +1,24 @@
+--- mikmod/mikmod.h
++++ mikmod/mikmod.h
+@@ -85,7 +85,8 @@
+
+ /[EMAIL PROTECTED]@*/
+
+-#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__)
Added:
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.5-endian-fixes.patch
==============================================================================
--- (empty file)
+++
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.5-endian-fixes.patch
Sat Feb 3 05:21:40 2007
@@ -0,0 +1,54 @@
+--- 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++;
+ }
+
+
Added:
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-fix-path-timidity.patch
==============================================================================
--- (empty file)
+++
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-fix-path-timidity.patch
Sat Feb 3 05:21:40 2007
@@ -0,0 +1,11 @@
+--- SDL_mixer-1.2.7/timidity/config.h.timidity 2006-05-01 09:25:52.000000000
+0200
++++ SDL_mixer-1.2.7/timidity/config.h 2006-05-18 10:38:39.000000000 +0200
+@@ -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 */
Added:
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-link-against-system-libmikmod.patch
==============================================================================
--- (empty file)
+++
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-link-against-system-libmikmod.patch
Sat Feb 3 05:21:40 2007
@@ -0,0 +1,41 @@
+--- SDL_mixer-1.2.7/configure.in.libmikmod 2006-05-12 11:33:37.000000000
+0200
++++ SDL_mixer-1.2.7/configure.in 2007-02-03 04:14:41.000000000 +0100
+@@ -132,32 +132,12 @@ AC_ARG_ENABLE([music-libmikmod],
+ AC_HELP_STRING([--enable-music-libmikmod], [enable MOD music via external
libmikmod [[default=no]]]),
+ [], [enable_music_libmikmod=no])
+ if test x$enable_music_libmikmod = xyes; then
+- AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no, [$PATH])
+- if test "$LIBMIKMOD_CONFIG" != "no" ; then
+- no_libmikmod=no
+- CFLAGS_SAVED="$CFLAGS"
+- LIBS_SAVED="$LIBS"
+- CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
+- LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`"
+- AC_MSG_CHECKING([for libmikmod - version >= $libmikmod_ver])
+- AC_TRY_RUN([
+-#include "mikmod.h"
+-#include "stdio.h"
+-
+-int main(int argc, char **argv)
+-{
+- long
maj=$libmikmod_maj,min=$libmikmod_min,rev=$libmikmod_rev,ver=MikMod_GetVersion();
+- /*printf("(%d.%d.%d) ",ver>>16,(ver>>8)&0xff,ver&0xff);*/
+- if(ver>=((maj<<16)|(min<<8)|(rev))) {
+- printf("yes\n");
+- return 0;
+- }
+- printf("no\n*** libmikmod is older than %d.%d.%d, not
using.\n",maj,min,rev);
+- return 1;
+-}
+-],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
+-[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- fi
++ AM_PATH_LIBMIKMOD($libmikmod_ver,
++ CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC $LIBMIKMOD_CFLAGS"
++ EXTRA_LDFLAGS="$SYSTEM_LIBS $LIBMIKMOD_LIBS",
++ no_libmikmod=no)
++else
++ no_libmikmod=yes
+ fi
+
+ AC_ARG_ENABLE([music-mod],
Added:
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-timidity-crash.patch
==============================================================================
--- (empty file)
+++
packages/cooker/SDL_mixer/current/SOURCES/SDL_mixer-1.2.7-timidity-crash.patch
Sat Feb 3 05:21:40 2007
@@ -0,0 +1,28 @@
+--- 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;
+ }
Modified: packages/cooker/SDL_mixer/current/SPECS/SDL_mixer.spec
==============================================================================
--- packages/cooker/SDL_mixer/current/SPECS/SDL_mixer.spec (original)
+++ packages/cooker/SDL_mixer/current/SPECS/SDL_mixer.spec Sat Feb 3
05:21:40 2007
@@ -1,6 +1,6 @@
%define name SDL_mixer
%define version 1.2.7
-%define rel 1
+%define rel 2
%define lib_name_orig lib%{name}
%define lib_major 1.2
%define lib_name %mklibname %{name} %{lib_major}
@@ -10,12 +10,16 @@
Version: %{version}
Release: %mkrel %{rel}
Source0:
http://www.libsdl.org/projects/SDL_mixer/release/%{name}-%{version}.tar.bz2
-Patch1: SDL_mixer-1.2.7-fix-path-timidity.patch.bz2
+Patch1: SDL_mixer-1.2.7-fix-path-timidity.patch
+Patch2: SDL_mixer-1.2.7-link-against-system-libmikmod.patch
+Patch3: SDL_mixer-1.2.7-timidity-crash.patch
+Patch4: SDL_mixer-1.2.4-64bit-fix.patch
+Patch5: SDL_mixer-1.2.5-endian-fixes.patch
License: LGPL
Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
URL: http://www.libsdl.org/projects/SDL_mixer/
-BuildRequires: libSDL-devel >= 1.2.10
+BuildRequires: SDL-devel >= 1.2.10
BuildRequires: esound-devel
BuildRequires: libmikmod-devel
BuildRequires: oggvorbis-devel
@@ -64,15 +68,24 @@
%prep
%setup -q
%patch1 -p1 -b .timidity
+%patch2 -p1 -b .libmikmod
+%patch3 -p0 -b .timidity_crash
+%patch4 -p0 -b .64bit
+%patch5 -p0 -b .endian
%build
#gw our libtool is too old
%define __cputoolize true
-%configure2_5x
+aclocal
+autoconf
+%configure2_5x --enable-music-libmikmod \
+ --enable-music-native-midi \
+ --disable-music-ogg-shared \
+ --disable-music-mp3-shared
%make
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%makeinstall install-bin
%post -n %{lib_name} -p /sbin/ldconfig
@@ -80,7 +93,7 @@
%postun -n %{lib_name} -p /sbin/ldconfig
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -n %{name}-player
%defattr(-, root, root)
