forked from pool/scummvm
Fix 11.2 compilation
OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=12
This commit is contained in:
parent
c4afdfc39c
commit
58fe7259ab
@ -1,6 +1,8 @@
|
|||||||
--- configure
|
Index: configure
|
||||||
|
===================================================================
|
||||||
|
--- configure.orig
|
||||||
+++ configure
|
+++ configure
|
||||||
@@ -1414,7 +1414,7 @@
|
@@ -1425,7 +1425,7 @@ EOF
|
||||||
fi
|
fi
|
||||||
if test "$_vorbis" = yes ; then
|
if test "$_vorbis" = yes ; then
|
||||||
_def_vorbis='#define USE_VORBIS'
|
_def_vorbis='#define USE_VORBIS'
|
||||||
@ -9,7 +11,7 @@
|
|||||||
INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
|
INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
|
||||||
else
|
else
|
||||||
_def_vorbis='#undef USE_VORBIS'
|
_def_vorbis='#undef USE_VORBIS'
|
||||||
@@ -1464,11 +1464,7 @@
|
@@ -1475,11 +1475,7 @@ EOF
|
||||||
fi
|
fi
|
||||||
if test "$_flac" = yes ; then
|
if test "$_flac" = yes ; then
|
||||||
_def_flac='#define USE_FLAC'
|
_def_flac='#define USE_FLAC'
|
||||||
|
13
scummvm-0.13.1-const.patch
Normal file
13
scummvm-0.13.1-const.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: backends/midi/alsa.cpp
|
||||||
|
===================================================================
|
||||||
|
--- backends/midi/alsa.cpp.orig
|
||||||
|
+++ backends/midi/alsa.cpp
|
||||||
|
@@ -228,7 +228,7 @@ void MidiDriver_ALSA::sysEx(const byte *
|
||||||
|
}
|
||||||
|
|
||||||
|
int MidiDriver_ALSA::parse_addr(const char *arg, int *client, int *port) {
|
||||||
|
- char *p;
|
||||||
|
+ const char *p;
|
||||||
|
|
||||||
|
if (isdigit(*arg)) {
|
||||||
|
if ((p = strpbrk(arg, ADDR_DELIM)) == NULL)
|
@ -29,6 +29,7 @@ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
|
|||||||
Patch: %{name}-0.13.0-nostrip.patch
|
Patch: %{name}-0.13.0-nostrip.patch
|
||||||
Patch1: %{name}-0.13.0-extra_deps.patch
|
Patch1: %{name}-0.13.0-extra_deps.patch
|
||||||
Patch2: %{name}-0.13.0-desktop_file.patch
|
Patch2: %{name}-0.13.0-desktop_file.patch
|
||||||
|
Patch3: %{name}-0.13.1-const.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: SDL-devel >= 1.2.2 flac-devel libvorbis-devel zlib-devel
|
BuildRequires: SDL-devel >= 1.2.2 flac-devel libvorbis-devel zlib-devel
|
||||||
BuildRequires: fluidsynth-devel gcc-c++ update-desktop-files
|
BuildRequires: fluidsynth-devel gcc-c++ update-desktop-files
|
||||||
@ -76,6 +77,7 @@ These engines are in a worse state, but allow to play extra games.
|
|||||||
%patch
|
%patch
|
||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
|
%patch3
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch %ix86
|
%ifarch %ix86
|
||||||
@ -128,6 +130,8 @@ rm -Rf ${RPM_BUILD_ROOT}
|
|||||||
%{_libdir}/%{name}
|
%{_libdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 23 2009 cmorve69@yahoo.es - 0.13.1
|
||||||
|
- make it compile in openSUSE 11.2
|
||||||
* Tue May 5 2009 cmorve69@yahoo.es - 0.13.1
|
* Tue May 5 2009 cmorve69@yahoo.es - 0.13.1
|
||||||
- made mpeg2 and mp3 support optional
|
- made mpeg2 and mp3 support optional
|
||||||
- updated to new 0.13.1 release
|
- updated to new 0.13.1 release
|
||||||
|
Loading…
x
Reference in New Issue
Block a user