jengelh/SDL_mixer
SHA256
1
0
Fork 0
forked from pool/SDL_mixer
Code Pull Requests Activity

- Specfile modernization

Browse Source 
- 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
This commit is contained in:
Jan Engelhardt 2023-12-16 17:41:55 +00:00 committed by Git OBS Bridge
parent db00f69c06
commit 3c9f024c86
6 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SDL_mixer.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Aug 20 08:22:31 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- 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 Tue Jan 6 12:27:02 UTC 2015 - jengelh@inai.de

34
SDL_mixer.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package SDL_mixer # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 Summary: SDL sound mixer library
License: Zlib License: Zlib
Group: Development/Libraries/C and C++ 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 Source: http://libsdl.org/projects/SDL_mixer/release/%name-%version.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/56cad6484b04
Patch1: mikmod1.patch Patch1: mikmod1.patch
# PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/2ebb0d016f27
Patch2: mikmod2.patch Patch2: mikmod2.patch
# PATCH-FIX-UPSTREAM: http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b
Patch3: double-free-crash.patch Patch3: double-free-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(fluidsynth) 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, audio, plus a single channel of music, mixed by the popular MikMod MOD,
Timidity MIDI, and SMPEG MP3 libraries. Timidity MIDI, and SMPEG MP3 libraries.
%package -n libSDL_mixer-devel %package devel
Summary: Development files for the SDL sound mixer library Summary: Development files for the SDL sound mixer library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %lname = %version Requires: %lname = %version-%release
Provides: SDL_mixer-devel = %version Obsoletes: libSDL_mixer-devel < %version-%release
Obsoletes: SDL_mixer-devel < %version Provides: libSDL_mixer-devel = %version-%release
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: SDL_mixer-devel-64bit Obsoletes: SDL_mixer-devel-64bit
%endif %endif
%description -n libSDL_mixer-devel %description devel
A multi-channel audio mixer. It supports 4 channels of 16-bit stereo 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, audio, plus a single channel of music, mixed by the popular MikMod MOD,
Timidity MIDI, and SMPEG MP3 libraries. Timidity MIDI, and SMPEG MP3 libraries.
%prep %prep
%setup -q %autosetup -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# remove unneccessary files from upstream tarball [bnc#508180] to clean up source RPM # remove unneccessary files from upstream tarball [bnc#508180] to clean up source RPM
rm libmikmod-3.1.12.zip rm libmikmod-3.1.12.zip
rm Watcom-OS2.zip rm Watcom-OS2.zip
@ -94,7 +87,7 @@ rm -rf Xcode-iOS
%configure --disable-music-mod-shared --disable-music-ogg-shared \ %configure --disable-music-mod-shared --disable-music-ogg-shared \
--disable-music-flac-shared --enable-music-mod-modplug \ --disable-music-flac-shared --enable-music-mod-modplug \
--disable-static --disable-static
make %{?_smp_mflags} %make_build
%install %install
%make_install install-bin %make_install install-bin
@ -104,12 +97,11 @@ rm -f "%buildroot/%_libdir"/*.la
%postun -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
%files -n %lname %files -n %lname
%defattr(-,root,root) %license COPYING
%doc README CHANGES COPYING
%_libdir/libSDL_mixer-1*.so.* %_libdir/libSDL_mixer-1*.so.*
%files -n libSDL_mixer-devel %files devel
%defattr(-,root,root) %doc README CHANGES
%_bindir/play* %_bindir/play*
%_includedir/SDL/ %_includedir/SDL/
%_libdir/libSDL_mixer.so %_libdir/libSDL_mixer.so

4
baselibs.conf
View File

@ -1,6 +1,6 @@
libSDL_mixer-1_2-0 libSDL_mixer-1_2-0
provides "SDL_mixer-<targettype> = <version>" provides "SDL_mixer-<targettype> = <version>"
obsoletes "SDL_mixer-<targettype> <= <version>" obsoletes "SDL_mixer-<targettype> <= <version>"
libSDL_mixer-devel SDL_mixer-devel
requires -libSDL_mixer-<targettype> requires -SDL_mixer-<targettype>
requires "libSDL_mixer-1_2-0-<targettype> = <version>" requires "libSDL_mixer-1_2-0-<targettype> = <version>"

1
double-free-crash.patch
View File

@ -4,6 +4,7 @@
# Date 1329087437 18000 # Date 1329087437 18000
# Node ID 2d713670db9b832b0c5aa700824900bc1fc3c3cd # Node ID 2d713670db9b832b0c5aa700824900bc1fc3c3cd
# Parent df72f22b4b411ad4b08f924329678aabd5ac97d6 # Parent df72f22b4b411ad4b08f924329678aabd5ac97d6
# http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b
Fixed 1418 - crash on double free if loading WAV file failed Fixed 1418 - crash on double free if loading WAV file failed
diff -r df72f22b4b41 -r 2d713670db9b mixer.c diff -r df72f22b4b41 -r 2d713670db9b mixer.c

1
mikmod1.patch
View File

@ -4,6 +4,7 @@
# Date 1342998807 25200 # Date 1342998807 25200
# Node ID 56cad6484b04f83c8d42428c755a046678506436 # Node ID 56cad6484b04f83c8d42428c755a046678506436
# Parent c92001a2c18f628698c58aa4e05a7335d10d0e9e # Parent c92001a2c18f628698c58aa4e05a7335d10d0e9e
# http://hg.libsdl.org/SDL_mixer/rev/56cad6484b04
Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver Paul P Komkoff Jr fixed malloc/free mismatch in the MikMod driver
diff -r c92001a2c18f -r 56cad6484b04 CHANGES diff -r c92001a2c18f -r 56cad6484b04 CHANGES

1
mikmod2.patch
View File

@ -4,6 +4,7 @@
# Date 1343000017 25200 # Date 1343000017 25200
# Node ID 2ebb0d016f277f7f643d8a66ed0e1099e10d1fba # Node ID 2ebb0d016f277f7f643d8a66ed0e1099e10d1fba
# Parent 56cad6484b04f83c8d42428c755a046678506436 # Parent 56cad6484b04f83c8d42428c755a046678506436
# http://hg.libsdl.org/SDL_mixer/rev/2ebb0d016f27
Fixed normal linking with libmikmod and linking with earlier versions of libmikmod. Fixed normal linking with libmikmod and linking with earlier versions of libmikmod.
diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c diff -r 56cad6484b04 -r 2ebb0d016f27 dynamic_mod.c