From 3c9f024c862876c3f492b01001c6e76df2acb00936630cbff029f0a91a4ffdec Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 16 Dec 2023 17:41:55 +0000 Subject: [PATCH] - Specfile modernization - Rename devel package to just %name-devel, which is what most our packages do. OBS-URL: https://build.opensuse.org/package/show/games/SDL_mixer?expand=0&rev=34 --- SDL_mixer.changes | 7 +++++++ SDL_mixer.spec | 34 +++++++++++++--------------------- baselibs.conf | 4 ++-- double-free-crash.patch | 1 + mikmod1.patch | 1 + mikmod2.patch | 1 + 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/SDL_mixer.changes b/SDL_mixer.changes index da34af1..8fd55b0 100644 --- a/SDL_mixer.changes +++ b/SDL_mixer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Aug 20 08:22:31 UTC 2022 - Jan Engelhardt + +- Specfile modernization +- Rename devel package to just %name-devel, which is what most + our packages do. + ------------------------------------------------------------------- Tue Jan 6 12:27:02 UTC 2015 - jengelh@inai.de diff --git a/SDL_mixer.spec b/SDL_mixer.spec index cc0b661..b5c4d14 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -1,7 +1,7 @@ # # spec file for package SDL_mixer # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,17 +23,13 @@ Release: 0 Summary: SDL sound mixer library License: Zlib Group: Development/Libraries/C and C++ -Url: http://libsdl.org/projects/SDL_mixer/release-1.2.html +URL: http://libsdl.org/projects/SDL_mixer/release-1.2.html Source: http://libsdl.org/projects/SDL_mixer/release/%name-%version.tar.gz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/56cad6484b04 Patch1: mikmod1.patch -# PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/2ebb0d016f27 Patch2: mikmod2.patch -# PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b Patch3: double-free-crash.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fluidsynth) @@ -62,27 +58,24 @@ 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. -%package -n libSDL_mixer-devel +%package devel Summary: Development files for the SDL sound mixer library Group: Development/Libraries/C and C++ -Requires: %lname = %version -Provides: SDL_mixer-devel = %version -Obsoletes: SDL_mixer-devel < %version +Requires: %lname = %version-%release +Obsoletes: libSDL_mixer-devel < %version-%release +Provides: libSDL_mixer-devel = %version-%release # bug437293 %ifarch ppc64 Obsoletes: SDL_mixer-devel-64bit %endif -%description -n libSDL_mixer-devel +%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 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 # remove unneccessary files from upstream tarball [bnc#508180] to clean up source RPM rm libmikmod-3.1.12.zip rm Watcom-OS2.zip @@ -94,7 +87,7 @@ rm -rf Xcode-iOS %configure --disable-music-mod-shared --disable-music-ogg-shared \ --disable-music-flac-shared --enable-music-mod-modplug \ --disable-static -make %{?_smp_mflags} +%make_build %install %make_install install-bin @@ -104,12 +97,11 @@ rm -f "%buildroot/%_libdir"/*.la %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) -%doc README CHANGES COPYING +%license COPYING %_libdir/libSDL_mixer-1*.so.* -%files -n libSDL_mixer-devel -%defattr(-,root,root) +%files devel +%doc README CHANGES %_bindir/play* %_includedir/SDL/ %_libdir/libSDL_mixer.so diff --git a/baselibs.conf b/baselibs.conf index aa78697..5d99eb8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,6 @@ libSDL_mixer-1_2-0 provides "SDL_mixer- = " obsoletes "SDL_mixer- <= " -libSDL_mixer-devel - requires -libSDL_mixer- +SDL_mixer-devel + requires -SDL_mixer- requires "libSDL_mixer-1_2-0- = " diff --git a/double-free-crash.patch b/double-free-crash.patch index 8748352..9816273 100644 --- a/double-free-crash.patch +++ b/double-free-crash.patch @@ -4,6 +4,7 @@ # Date 1329087437 18000 # Node ID 2d713670db9b832b0c5aa700824900bc1fc3c3cd # Parent df72f22b4b411ad4b08f924329678aabd5ac97d6 +# http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b Fixed 1418 - crash on double free if loading WAV file failed diff -r df72f22b4b41 -r 2d713670db9b mixer.c diff --git a/mikmod1.patch b/mikmod1.patch index a80ebaf..f7c2c25 100644 --- a/mikmod1.patch +++ b/mikmod1.patch @@ -4,6 +4,7 @@ # Date 1342998807 25200 # Node ID 56cad6484b04f83c8d42428c755a046678506436 # Parent c92001a2c18f628698c58aa4e05a7335d10d0e9e +# http://hg.libsdl.org/SDL_mixer/rev/56cad6484b04 Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver diff -r c92001a2c18f -r 56cad6484b04 CHANGES diff --git a/mikmod2.patch b/mikmod2.patch index c23b6ec..fed8998 100644 --- a/mikmod2.patch +++ b/mikmod2.patch @@ -4,6 +4,7 @@ # Date 1343000017 25200 # Node ID 2ebb0d016f277f7f643d8a66ed0e1099e10d1fba # Parent 56cad6484b04f83c8d42428c755a046678506436 +# http://hg.libsdl.org/SDL_mixer/rev/2ebb0d016f27 Fixed normal linking with libmikmod and linking with earlier versions of libmikmod. diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c