Djam/SDL_mixer
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/SDL_mixer.git synced 2025-02-23 15:52:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 1.2.11

Browse source
This commit is contained in:
Rosa 2012-02-01 17:08:25 +04:00
parent e6e8abd626
commit fec4eb3aac
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SDL_mixer-1.2.11-music-crash-fix.patch Normal file
View file

@ -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:

29
SDL_mixer.spec
View file

@ -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 <oeriksson@mandriva.com> 1.2.11-6mdv2011.0
* Wed Jan 04 2012 Andrey Bondrov <abondrov@mandriva.org> 1.2.11-8mdv2012.0
+ Revision: 753220
- Rebuild for .la files issue
* Sun Aug 21 2011 Tomas Kindl <supp@mandriva.org> 1.2.11-7
+ Revision: 696013
- add patch that MAY help to fix #58059
* Mon Jun 20 2011 Oden Eriksson <oeriksson@mandriva.com> 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 <oblin@mandriva.com> 1.2.8-5mdv2008.1
* Mon Mar 10 2008 Olivier Blin <blino@mandriva.org> 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 <oblin@mandriva.com> 1.2.8-4mdv2008.1
* Fri Mar 07 2008 Olivier Blin <blino@mandriva.org> 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 <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>