OBS User unknown 2007-01-15 22:50:24 +00:00 committed by Git OBS Bridge
commit b9a0e8b304
10 changed files with 455 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

3
SDL_mixer-1.2.7.tar.bz2 Normal file
View File

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

24
SDL_mixer-64bit-fix.dif Normal file
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__)

13
SDL_mixer-libmikmod.patch Normal file
View File

@ -0,0 +1,13 @@
--- 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

View File

@ -0,0 +1,11 @@
--- SDL_mixer-1.2.7/timidity/config.h
+++ SDL_mixer-1.2.7/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 */

54
SDL_mixer-warn.dif Normal file
View File

@ -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++;
}

160
SDL_mixer.changes Normal file
View File

@ -0,0 +1,160 @@
-------------------------------------------------------------------
Thu Sep 14 14:52:41 CEST 2006 - nadvornik@suse.cz
- updated to 1.2.7:
* Added support for dynamically loading Ogg Vorbis library
* Search timidity.cfg also in /etc
* Fix memory leaks in timidity player
* Always build SDL_RWops music support
- fixed Requires of devel subpackage
-------------------------------------------------------------------
Fri Mar 10 14:29:44 CET 2006 - bk@suse.de
- SDL_mixer-devel: add libstdc++ and gcc to Requires (libSDL_mixer.la)
- SDL_mixer-devel: add gpm and libmikmod to Requires (libSDL_mixer.la)
- SDL_mixer-devel: remove libogg-devel from Requires (already by libvorbis-devel)
-------------------------------------------------------------------
Tue Jan 31 06:46:15 CET 2006 - aj@suse.de
- Add libogg-devel libvorbis-devel to BuildRequires.
-------------------------------------------------------------------
Wed Jan 25 21:33:57 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Wed Jul 27 20:21:42 CEST 2005 - nadvornik@suse.cz
- added libmikmod to nfb [#98983]
-------------------------------------------------------------------
Thu Jul 21 16:46:20 CEST 2005 - nadvornik@suse.cz
- update to 1.2.6
- added devel subpackage
-------------------------------------------------------------------
Mon Mar 28 15:10:10 CEST 2005 - schwab@suse.de
- Fix namespace pollution.
-------------------------------------------------------------------
Fri Jan 28 15:52:17 CET 2005 - ro@suse.de
- make it possible to build without smpeg
-------------------------------------------------------------------
Sat Jan 10 17:03:14 CET 2004 - adrian@suse.de
- add %run_ldconfig
-------------------------------------------------------------------
Fri Aug 8 15:42:34 CEST 2003 - bk@suse.de
- update to 1.2.5(numerious fixes, eg for mp3 playback, midi crash)
-------------------------------------------------------------------
Mon Dec 16 17:46:03 CET 2002 - ro@suse.de
- fix build with automake, use "AUTOMAKE_OPTIONS = foreign"
-------------------------------------------------------------------
Tue Aug 20 17:19:15 CEST 2002 - tiwai@suse.de
- fixed the detection of 64bit architectures [bug #18106]
-------------------------------------------------------------------
Mon Jul 22 14:57:25 CEST 2002 - bk@suse.de
- don't use %configure, it uses broken target_platform syntax
-------------------------------------------------------------------
Tue Jul 16 14:51:37 CEST 2002 - bk@suse.de
- update to 1.2.4
-------------------------------------------------------------------
Thu Jul 11 14:15:31 CEST 2002 - meissner@suse.de
- rerun auto* so we get shared libraries too.
-------------------------------------------------------------------
Tue Jan 22 18:23:53 CET 2002 - ro@suse.de
- changed neededforbuild <kdelibs-artsd> to <kdelibs3-artsd>
-------------------------------------------------------------------
Thu Oct 18 14:05:32 CEST 2001 - tiwai@suse.de
- added suse_update_config to build shared libraries.
- added libogg/libvorbis and devel packages to neededforbuild.
-------------------------------------------------------------------
Thu Aug 16 14:31:54 CEST 2001 - nadvornik@suse.cz
- added smpeg-devel to neededforbuild
-------------------------------------------------------------------
Wed Aug 8 17:43:57 CEST 2001 - ro@suse.de
- changed neededforbuild <kdelibs kdelibs-devel> to <kdelibs-artsd>
-------------------------------------------------------------------
Wed Aug 8 16:55:46 CEST 2001 - ro@suse.de
- changed neededforbuild <sdl> to <SDL>
- changed neededforbuild <sdl-devel> to <SDL-devel>
-------------------------------------------------------------------
Fri Jun 22 01:59:20 CEST 2001 - ro@suse.de
- added kdelibs for artsd
-------------------------------------------------------------------
Thu Apr 12 16:50:28 CEST 2001 - nadvornik@suse.cz
- update to 1.2.0
-------------------------------------------------------------------
Mon Mar 26 12:05:39 CEST 2001 - ro@suse.de
- changed neededforbuild <sdl> to <sdl sdl-devel>
-------------------------------------------------------------------
Fri Mar 9 01:45:10 CET 2001 - ro@suse.de
- added xf86
-------------------------------------------------------------------
Mon Mar 5 06:19:42 CET 2001 - bk@suse.de
- rename sdlmixer -> SDL_mixer
- Update to 1.1.0 and added smpeg to neededforbuild for MP3 music support
- fix copyright (LGPL) and group (Applications/Sound -> System/Libraries)
- removed libmikmo from neededforbuild, SDL_mixer uses internal libmikmod
(and timidity) libs
-------------------------------------------------------------------
Mon Feb 19 17:36:52 CET 2001 - uli@suse.de
- added alsa* to neededforbuild (needed by new SDL)
- added esound-devel to neededforbuild
-------------------------------------------------------------------
Mon Nov 6 00:35:48 CET 2000 - ro@suse.de
- fixed neededforbuild
-------------------------------------------------------------------
Mon Oct 16 10:17:02 CEST 2000 - nadvornik@suse.cz
- fixed to compile with correct CFLAGS
-------------------------------------------------------------------
Thu May 25 16:58:30 CEST 2000 - freitag@suse.de
- new version v. 1.0.5

166
SDL_mixer.spec Normal file
View File

@ -0,0 +1,166 @@
#
# spec file for package SDL_mixer (Version 1.2.7)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: SDL_mixer
BuildRequires: SDL-devel libmikmod libogg-devel libvorbis-devel xorg-x11
Summary: Sample Mixer Library for SDL
Obsoletes: sdlmixer
Version: 1.2.7
Release: 1
License: LGPL
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
URL: http://www.libsdl.org/projects/SDL_mixer/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package devel
Requires: %{name} = %{version} SDL-devel libvorbis-devel libstdc++-devel gcc gpm libmikmod
Summary: Sample Mixer Library for SDL - files mandatory for development
Group: Development/Libraries/C and C++
%description
A multichannel audio mixer. It supports four channels of 16-bit stereo
audio, plus a single channel of music, mixed by the popular MikMod MOD,
Timidity MIDI, and SMPEG MP3 libraries.
%description devel
A multi-channel audio mixer. It supports 4 channels of 16-bit stereo
audio, plus a single channel of music, mixed by the popular MikMod MOD,
Timidity MIDI, and SMPEG MP3 libraries.
%prep
%setup -q
%patch -p1
%patch1
%patch2
%patch3
%build
./autogen.sh
if [ -f /usr/%_lib/libsmpeg.so ] ; then
CONF_ARGS="--enable-music-mp3=yes"
else
CONF_ARGS="--enable-music-mp3=no"
fi
CFLAGS='%optflags' ./configure --prefix=%_prefix --libdir=%_libdir --enable-music-libmikmod $CONF_ARGS
grep '^CFLAGS =.*-DUSE_TIMIDITY_MIDI' Makefile || true
grep '^CFLAGS =.*-DOGG_MUSIC' Makefile || true
grep '^CFLAGS =.*-DMP3_MUSIC' Makefile || true
make
%install
make install install-bin DESTDIR=%buildroot
%clean
rm -rf %buildroot
%post
%run_ldconfig
%postun
%run_ldconfig
%files
%defattr(-,root,root)
%doc README CHANGES COPYING
%{_bindir}/play*
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root)
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_includedir}/SDL/*
%changelog -n SDL_mixer
* Thu Sep 14 2006 - nadvornik@suse.cz
- updated to 1.2.7:
* Added support for dynamically loading Ogg Vorbis library
* Search timidity.cfg also in /etc
* Fix memory leaks in timidity player
* Always build SDL_RWops music support
- fixed Requires of devel subpackage
* Fri Mar 10 2006 - bk@suse.de
- SDL_mixer-devel: add libstdc++ and gcc to Requires (libSDL_mixer.la)
- SDL_mixer-devel: add gpm and libmikmod to Requires (libSDL_mixer.la)
- SDL_mixer-devel: remove libogg-devel from Requires (already by libvorbis-devel)
* Tue Jan 31 2006 - aj@suse.de
- Add libogg-devel libvorbis-devel to BuildRequires.
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jul 27 2005 - nadvornik@suse.cz
- added libmikmod to nfb [#98983]
* Thu Jul 21 2005 - nadvornik@suse.cz
- update to 1.2.6
- added devel subpackage
* Mon Mar 28 2005 - schwab@suse.de
- Fix namespace pollution.
* Fri Jan 28 2005 - ro@suse.de
- make it possible to build without smpeg
* Sat Jan 10 2004 - adrian@suse.de
- add %%run_ldconfig
* Fri Aug 08 2003 - bk@suse.de
- update to 1.2.5(numerious fixes, eg for mp3 playback, midi crash)
* Mon Dec 16 2002 - ro@suse.de
- fix build with automake, use "AUTOMAKE_OPTIONS = foreign"
* Tue Aug 20 2002 - tiwai@suse.de
- fixed the detection of 64bit architectures [bug #18106]
* Mon Jul 22 2002 - bk@suse.de
- don't use %%configure, it uses broken target_platform syntax
* Tue Jul 16 2002 - bk@suse.de
- update to 1.2.4
* Thu Jul 11 2002 - meissner@suse.de
- rerun auto* so we get shared libraries too.
* Tue Jan 22 2002 - ro@suse.de
- changed neededforbuild <kdelibs-artsd> to <kdelibs3-artsd>
* Thu Oct 18 2001 - tiwai@suse.de
- added suse_update_config to build shared libraries.
- added libogg/libvorbis and devel packages to neededforbuild.
* Thu Aug 16 2001 - nadvornik@suse.cz
- added smpeg-devel to neededforbuild
* Wed Aug 08 2001 - ro@suse.de
- changed neededforbuild <kdelibs kdelibs-devel> to <kdelibs-artsd>
* Wed Aug 08 2001 - ro@suse.de
- changed neededforbuild <sdl> to <SDL>
- changed neededforbuild <sdl-devel> to <SDL-devel>
* Fri Jun 22 2001 - ro@suse.de
- added kdelibs for artsd
* Thu Apr 12 2001 - nadvornik@suse.cz
- update to 1.2.0
* Mon Mar 26 2001 - ro@suse.de
- changed neededforbuild <sdl> to <sdl sdl-devel>
* Fri Mar 09 2001 - ro@suse.de
- added xf86
* Mon Mar 05 2001 - bk@suse.de
- rename sdlmixer -> SDL_mixer
- Update to 1.1.0 and added smpeg to neededforbuild for MP3 music support
- fix copyright (LGPL) and group (Applications/Sound -> System/Libraries)
- removed libmikmo from neededforbuild, SDL_mixer uses internal libmikmod
(and timidity) libs
* Mon Feb 19 2001 - uli@suse.de
- added alsa* to neededforbuild (needed by new SDL)
- added esound-devel to neededforbuild
* Mon Nov 06 2000 - ro@suse.de
- fixed neededforbuild
* Mon Oct 16 2000 - nadvornik@suse.cz
- fixed to compile with correct CFLAGS
* Thu May 25 2000 - freitag@suse.de
- new version v. 1.0.5

0
ready Normal file
View File