From 3231457f0f5cff56dceb6760e30b427ddec6ee45352c354b1fa549bac9166f3d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Mar 2022 19:45:01 +0000 Subject: [PATCH] Go back to r19; turns out SDL(2)_sound has more (packaging) changes than previously thought and it cannot be used as a drop-in OBS-URL: https://build.opensuse.org/package/show/games/SDL_sound?expand=0&rev=24 --- SDL_sound-1.0.3-nompglib.patch | 41 ++++++++++++++++++++ SDL_sound-1.0.3-nompglib.tar.bz2 | 3 ++ SDL_sound.changes | 10 ----- SDL_sound.spec | 64 +++++++++++++++++--------------- baselibs.conf | 6 +++ v2.0.1.tar.gz | 3 -- 6 files changed, 85 insertions(+), 42 deletions(-) create mode 100644 SDL_sound-1.0.3-nompglib.patch create mode 100644 SDL_sound-1.0.3-nompglib.tar.bz2 create mode 100644 baselibs.conf delete mode 100644 v2.0.1.tar.gz diff --git a/SDL_sound-1.0.3-nompglib.patch b/SDL_sound-1.0.3-nompglib.patch new file mode 100644 index 0000000..b59ba10 --- /dev/null +++ b/SDL_sound-1.0.3-nompglib.patch @@ -0,0 +1,41 @@ +--- configure ++++ configure +@@ -22990,7 +22990,7 @@ + fi + + +-ac_config_files="$ac_config_files Makefile decoders/Makefile decoders/timidity/Makefile decoders/mpglib/Makefile playsound/Makefile" ++ac_config_files="$ac_config_files Makefile decoders/Makefile decoders/timidity/Makefile playsound/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +--- configure.in ++++ configure.in +@@ -342,6 +342,5 @@ + Makefile + decoders/Makefile + decoders/timidity/Makefile +-decoders/mpglib/Makefile + playsound/Makefile + ]) +--- decoders/Makefile.am ++++ decoders/Makefile.am +@@ -1,6 +1,6 @@ + noinst_LTLIBRARIES = libdecoders.la + +-SUBDIRS = timidity mpglib ++SUBDIRS = timidity + + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/decoders/timidity + +--- decoders/Makefile.in ++++ decoders/Makefile.in +@@ -201,7 +201,7 @@ + target_os = @target_os@ + target_vendor = @target_vendor@ + noinst_LTLIBRARIES = libdecoders.la +-SUBDIRS = timidity mpglib ++SUBDIRS = timidity + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/decoders/timidity + libdecoders_la_SOURCES = \ + aiff.c \ diff --git a/SDL_sound-1.0.3-nompglib.tar.bz2 b/SDL_sound-1.0.3-nompglib.tar.bz2 new file mode 100644 index 0000000..06025da --- /dev/null +++ b/SDL_sound-1.0.3-nompglib.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5c3d268d631d175ade562ba3a2187282f0a85f7f6ee0894d0ea843c030e10d3 +size 995688 diff --git a/SDL_sound.changes b/SDL_sound.changes index 197e97e..f2a3151 100644 --- a/SDL_sound.changes +++ b/SDL_sound.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Sat Mar 26 13:11:24 UTC 2022 - Jan Engelhardt - -- Update to release 2.0.1 - * Removed support for QuickTime, Speex and MikMod. - * SDL_sound 2's public API has not changed at all from - SDL_sound 1.x. -- Drop SDL_sound-1.0.3-nompglib.patch, no longer applies. -- Drop baselibs.conf. - ------------------------------------------------------------------- Thu Jan 17 23:27:04 UTC 2019 - Jan Engelhardt diff --git a/SDL_sound.spec b/SDL_sound.spec index a238f7a..d1d5de2 100644 --- a/SDL_sound.spec +++ b/SDL_sound.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_sound # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,25 @@ Name: SDL_sound -%define lname libSDL2_sound2 -Version: 2.0.1 +%define lname libSDL_sound-1_0-1 +Version: 1.0.3 Release: 0 Summary: Sound Sample Library for SDL (Simple DirectMedia Layer) License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -URL: http://icculus.org/SDL_sound/ +Url: http://icculus.org/SDL_sound/ -Source: https://github.com/icculus/SDL_sound/archive/refs/tags/v%version.tar.gz -BuildRequires: c++_compiler -BuildRequires: cmake -BuildRequires: pkgconfig(sdl2) -Provides: bundled(dr_flac) = 0.12.37 -Provides: bundled(dr_mp3) = 0.6.32 -Provides: bundled(libmodplug) -Provides: bundled(stb_vorbis) = 1.22 +Source: %name-%version-nompglib.tar.bz2 +Source2: baselibs.conf +Patch0: %name-%version-nompglib.patch +BuildRequires: flac-devel +BuildRequires: libSDL-devel +BuildRequires: libmikmod-devel +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: speex-devel +BuildRequires: pkgconfig(libmodplug) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description SDL_sound is a library that handles the decoding of several popular @@ -54,15 +57,15 @@ play a file or alternatively decode a file and hand back a single pointer to the waveform. SDL_sound also can handle channel conversion on-the-fly and behind-the-scenes. -%package devel +%package -n libSDL_sound-devel Summary: Development files for the SDL sound sample library Group: Development/Libraries/C and C++ Requires: %lname = %version -Requires: pkgconfig(sdl2) -Provides: libSDL_sound-devel = %version -Obsoletes: libSDL_sound-devel <= %version +Requires: pkgconfig(sdl) +Provides: SDL_sound-devel = %version +Obsoletes: SDL_sound-devel <= %version -%description devel +%description -n libSDL_sound-devel SDL_sound is a library that handles the decoding of several popular sound file formats, such as wav, ogg mp3 and midi. SDL_sound can just play a file or alternatively decode a file and hand back a single @@ -70,28 +73,31 @@ pointer to the waveform. SDL_sound also can handle channel conversion on-the-fly and behind-the-scenes. %prep -%autosetup +%setup -q +%patch0 %build -%cmake -DSDLSOUND_BUILD_STATIC:BOOL=OFF -%cmake_build +%configure \ + --disable-static \ + --disable-sdltest \ + --disable-smpeg \ + --disable-mpglib +make %{?_smp_mflags} %install -b="%buildroot" -mkdir -p "$b/%_libdir" "$b/%_includedir/SDL" "$b/%_bindir" -cp -av build/libSDL* "$b/%_libdir/" -ln -s libSDL2_sound.so "$b/%_libdir/libSDL_sound.so" -cp -av src/SDL_sound.h "$b/%_includedir/SDL/" -cp -av build/play* "$b/%_bindir/" +make install DESTDIR=%buildroot +rm -f "%buildroot/%_libdir"/*.la %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig -%files -n %lname -%license LICENSE.txt +%files -n libSDL_sound-1_0-1 +%defattr(-,root,root) +%doc CHANGELOG COPYING CREDITS README TODO %_libdir/lib*.so.* -%files devel +%files -n libSDL_sound-devel +%defattr(-,root,root) %_bindir/playsound* %_includedir/SDL/ %_libdir/lib*.so diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..3438e2c --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,6 @@ +libSDL_sound-1_0-1 + provides "SDL_sound- = " + obsoletes "SDL_sound- <= " +libSDL_sound-devel + requires -libSDL_sound- + requires "libSDL_sound-1_0-1- = " diff --git a/v2.0.1.tar.gz b/v2.0.1.tar.gz deleted file mode 100644 index a7c7f83..0000000 --- a/v2.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3527f05b7a3f00d8523cf25671598c85568b4e8b615ce7570113b44cbb7d555c -size 443682