diff --git a/SDL_mixer-1.2.11-music-crash-fix.patch b/SDL_mixer-1.2.11-music-crash-fix.patch new file mode 100644 index 0000000..8b92611 --- /dev/null +++ b/SDL_mixer-1.2.11-music-crash-fix.patch @@ -0,0 +1,14 @@ +--- music.c 2011-08-21 17:12:52.000000000 +0200 ++++ music.c.2 2011-08-21 17:13:02.000000000 +0200 +@@ -1076,6 +1076,11 @@ + static int music_internal_playing() + { + int playing = 1; ++ ++ if (music_playing == NULL) { ++ return 0; ++ } ++ + switch (music_playing->type) { + #ifdef CMD_MUSIC + case MUS_CMD: diff --git a/SDL_mixer.spec b/SDL_mixer.spec index 1e7a2a5..1e3d361 100644 --- a/SDL_mixer.spec +++ b/SDL_mixer.spec @@ -7,11 +7,12 @@ Summary: Simple DirectMedia Layer - mixer Name: SDL_mixer Version: %{version} -Release: %mkrel 6 +Release: %mkrel 8 License: LGPLv2+ Group: System/Libraries URL: http://www.libsdl.org/projects/SDL_mixer/ Source0: http://www.libsdl.org/projects/SDL_mixer/release/%{name}-%{version}.tar.gz +Patch0: SDL_mixer-1.2.11-music-crash-fix.patch BuildRequires: SDL-devel >= 1.2.10 BuildRequires: esound-devel BuildRequires: libmikmod-devel @@ -63,7 +64,9 @@ Requires: %{libname} = %{version}-%{release} This package contains binary to test the associated library. %prep + %setup -q +%patch0 -p0 %build # (Anssi 02/2010) The below --disable-music-foo-shared options do not disable @@ -91,14 +94,6 @@ rm -rf %{buildroot} perl -pi -e "s|-L/usr/lib\b|-L%{_libdir}|g" %{buildroot}%{_libdir}/*.la %endif -%if %mdkversion < 200900 -%post -n %{libname} -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%postun -n %{libname} -p /sbin/ldconfig -%endif - %clean rm -rf %{buildroot} @@ -124,7 +119,15 @@ rm -rf %{buildroot} %changelog -* Mon Jun 20 2011 Oden Eriksson 1.2.11-6mdv2011.0 +* Wed Jan 04 2012 Andrey Bondrov 1.2.11-8mdv2012.0 ++ Revision: 753220 +- Rebuild for .la files issue + +* Sun Aug 21 2011 Tomas Kindl 1.2.11-7 ++ Revision: 696013 +- add patch that MAY help to fix #58059 + +* Mon Jun 20 2011 Oden Eriksson 1.2.11-6 + Revision: 686304 - avoid pulling 32 bit libraries on 64 bit arch @@ -191,12 +194,12 @@ rm -rf %{buildroot} + Revision: 213219 - BR libz -* Mon Mar 10 2008 Olivier Blin 1.2.8-5mdv2008.1 +* Mon Mar 10 2008 Olivier Blin 1.2.8-5mdv2008.1 + Revision: 183454 - remove pulseaudio-devel requirement in devel package (SDL is not dynamically linked with pulseaudio anymore) -* Fri Mar 07 2008 Olivier Blin 1.2.8-4mdv2008.1 +* Fri Mar 07 2008 Olivier Blin 1.2.8-4mdv2008.1 + Revision: 181200 - explicitely require pulseaudio-devel in devel package (find-requires does not parse .la files, #38653, breaks toppler build) @@ -217,7 +220,7 @@ rm -rf %{buildroot} - spec file clean - correct libification - + Olivier Blin + + Olivier Blin - restore BuildRoot + Thierry Vignaud