diff --git a/libSDL_sound-1.0.3-renamed-physfs-export.patch b/libSDL_sound-1.0.3-renamed-physfs-export.patch new file mode 100644 index 0000000..316d165 --- /dev/null +++ b/libSDL_sound-1.0.3-renamed-physfs-export.patch @@ -0,0 +1,27 @@ +diff -ru SDL_sound.orig/playsound/physfsrwops.h SDL_sound/playsound/physfsrwops.h +--- SDL_sound.orig/playsound/physfsrwops.h 2014-01-11 06:28:35.494936000 +0100 ++++ SDL_sound/playsound/physfsrwops.h 2014-01-11 06:31:38.315675483 +0100 +@@ -29,6 +29,11 @@ + extern "C" { + #endif + ++/* renamed in physfs dev, add alias */ ++#ifdef PHYSFS_DECL ++#define __EXPORT__ PHYSFS_DECL ++#endif ++ + /** + * Open a platform-independent filename for reading, and make it accessible + * via an SDL_RWops structure. The file will be closed in PhysicsFS when the +@@ -77,6 +82,11 @@ + */ + __EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); + ++/* renamed in physfs dev, remove alias */ ++#ifdef PHYSFS_DECL ++#undef __EXPORT__ ++#endif ++ + #ifdef __cplusplus + } + #endif diff --git a/libSDL_sound.spec b/libSDL_sound.spec index 8446f0a..96dc9af 100644 --- a/libSDL_sound.spec +++ b/libSDL_sound.spec @@ -1,6 +1,6 @@ Name: libSDL_sound Version: 1.0.3 -Release: 5mamba +Release: 6mamba Summary: A library that handles the decoding of several popular sound file formats, such as .WAV and .MP3 Group: System/Libraries Vendor: openmamba @@ -9,10 +9,8 @@ Packager: Silvan Calarco URL: http://icculus.org/SDL_sound/ Source: http://icculus.org/SDL_sound/downloads/SDL_sound-%{version}.tar.gz Patch0: libSDL_sound-1.0.1-configure.patch +Patch1: libSDL_sound-1.0.3-renamed-physfs-export.patch License: LGPL - -BuildRequires: libsmpeg-devel >= 0.4.5 -BuildRequires: libflac >= 1.1.2 ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libaudio-devel @@ -35,9 +33,8 @@ BuildRequires: libXdmcp-devel BuildRequires: libXt-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END - -BuildRoot: %{_tmppath}/%{name}-%{version}-root - +BuildRequires: libsmpeg-devel >= 0.4.5 +BuildRequires: libflac >= 1.1.2 %description SDL_sound is a library that handles the decoding of several popular sound file formats, such as .WAV and .MP3. It is meant to make the programmer's sound playback tasks simpler. The programmer gives SDL_sound a filename, or feeds it data directly from one of many sources, and then reads the decoded waveform data back at her leisure. If resource constraints are a concern, SDL_sound can process sound data in programmer-specified blocks. Alternately, SDL_sound can decode a whole sound file and hand back a single pointer to the whole waveform. SDL_sound can also handle sample rate, audio format, and channel conversion on-the-fly and behind-the-scenes, if the programmer desires. @@ -49,16 +46,27 @@ Requires: %{name} = %{?epoch:%epoch:}%{version} %description devel SDL_sound is a library that handles the decoding of several popular sound file formats, such as .WAV and .MP3. It is meant to make the programmer's sound playback tasks simpler. The programmer gives SDL_sound a filename, or feeds it data directly from one of many sources, and then reads the decoded waveform data back at her leisure. If resource constraints are a concern, SDL_sound can process sound data in programmer-specified blocks. Alternately, SDL_sound can decode a whole sound file and hand back a single pointer to the whole waveform. SDL_sound can also handle sample rate, audio format, and channel conversion on-the-fly and behind-the-scenes, if the programmer desires. +This package contains static libraries and header files needed for development. -This package contains static libraries and header files need for development. +%package tools +Summary: Tools provided with %{name} +Group: Applications/Multimedia +Requires: %{name} = %{?epoch:%epoch:}%{version} + +%description tools +SDL_sound is a library that handles the decoding of several popular sound file formats, such as .WAV and .MP3. It is meant to make the programmer's sound playback tasks simpler. The programmer gives SDL_sound a filename, or feeds it data directly from one of many sources, and then reads the decoded waveform data back at her leisure. If resource constraints are a concern, SDL_sound can process sound data in programmer-specified blocks. Alternately, SDL_sound can decode a whole sound file and hand back a single pointer to the whole waveform. SDL_sound can also handle sample rate, audio format, and channel conversion on-the-fly and behind-the-scenes, if the programmer desires. +This package contains the tools provided with %{name}. + +%debug_package %prep %setup -q -n SDL_sound-%{version} #%patch0 -p1 +%patch1 -p1 %build %configure -%make +%make -j1 %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -69,20 +77,26 @@ This package contains static libraries and header files need for development. %files %defattr(-,root,root) -%doc COPYING CREDITS README TODO -%{_bindir}/playsound -%{_bindir}/playsound_simple %{_libdir}/libSDL_sound-1.0.so.* +%doc COPYING CREDITS %files devel %defattr(-,root,root) -%dir %{_includedir}/SDL %{_includedir}/SDL/*.h %{_libdir}/libSDL_sound.a %{_libdir}/libSDL_sound.la %{_libdir}/libSDL_sound.so +%doc README TODO + +%files tools +%defattr(-,root,root) +%{_bindir}/playsound +%{_bindir}/playsound_simple %changelog +* Sun Oct 17 2021 Silvan Calarco 1.0.3-6mamba +- don't own /usr/include/SDL; add debug package; other specfile fixes + * Sun Aug 22 2010 Automatic Build System 1.0.3-5mamba - automatic rebuild by autodist