diff options
| -rw-r--r-- | dists/redhat/scummvm-nomad.patch | 13 | ||||
| -rw-r--r-- | dists/redhat/scummvm-vorbis.patch | 13 | ||||
| -rw-r--r-- | dists/redhat/scummvm.spec | 27 |
3 files changed, 15 insertions, 38 deletions
diff --git a/dists/redhat/scummvm-nomad.patch b/dists/redhat/scummvm-nomad.patch deleted file mode 100644 index b43ef466a4..0000000000 --- a/dists/redhat/scummvm-nomad.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- scummvm-0.5.0/Makefile 2003-08-01 21:14:54.000000000 +0200 -+++ scummvm-0.5.0/Makefile.mad 2003-08-01 21:17:59.000000000 +0200 -@@ -49,8 +49,8 @@ - ####################################################################### - - # Uncomment this to activate the MAD lib for compressed sound files --DEFINES += -DUSE_MAD --LIBS += -lmad -+# DEFINES += -DUSE_MAD -+# LIBS += -lmad - - # Uncomment this to activate the Ogg Vorbis lib for compressed sound files - # DEFINES += -DUSE_VORBIS diff --git a/dists/redhat/scummvm-vorbis.patch b/dists/redhat/scummvm-vorbis.patch deleted file mode 100644 index 22a09c3393..0000000000 --- a/dists/redhat/scummvm-vorbis.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- scummvm-0.5.0/Makefile 2003-08-01 21:18:49.000000000 +0200 -+++ scummvm-0.5.0/Makefile.vorbis 2003-08-01 21:19:06.000000000 +0200 -@@ -53,8 +53,8 @@ - # LIBS += -lmad - - # Uncomment this to activate the Ogg Vorbis lib for compressed sound files --# DEFINES += -DUSE_VORBIS --# LIBS += -lvorbisfile -lvorbis -+DEFINES += -DUSE_VORBIS -+LIBS += -lvorbisfile -lvorbis - - # Uncomment this to activate the ALSA lib for midi - # DEFINES += -DUSE_ALSA diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index e84c78bcd7..42d4235d30 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -8,7 +8,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm -Version : 0.5.4cvs +Version : 0.6.0 Release : 1 Summary : Graphic adventure game interpreter Group : Interpreters @@ -16,38 +16,39 @@ License : GPL Url : http://www.scummvm.org -Source : %{name}-%{version}.tar.gz +Source : %{name}-%{version}.tar.bz2 +Source1 : libmad-0.15.1b.tar.bz2 +Source2 : mpeg2dec-0.4.0b.tar.bz2 BuildRoot : %{_tmppath}/%{name}-%{version}-root -Patch0: scummvm-nomad.patch -Patch1: scummvm-vorbis.patch - #------------------------------------------------------------------------------ # Description #------------------------------------------------------------------------------ %description ScummVM is an interpreter that will play graphic adventure games written for LucasArts' SCUMM virtual machine, Adventure Soft's Simon the Sorcerer 1 and 2, -and Revolution Software Ltd's Beneath a Steel Sky. It uses the SDL library for -outputting graphics. +Revolution Software Ltd's Beneath a Steel Sky and Renegade Software's +Flight of the Amazon Queen. It uses the SDL library for outputting graphics. #------------------------------------------------------------------------------ # install scripts #------------------------------------------------------------------------------ %prep -%setup -q -n scummvm-%{version} -%patch0 -p1 -b .mad -%patch1 -p1 -b .vorbis +%setup -q -a 1 -a 2 -n scummvm-%{version} +mkdir tmp %build +(cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +(cd mpeg2dec-0.4.0; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp make %install install -m755 -D scummvm %{buildroot}%{_bindir}/scummvm -install -m644 -D scummvm.6 %{buildroot}%{_mandir}/man6/scummvm.6 +install -m644 -D scummvm.6 %{buildroot}/%{_mandir}/man6/scummvm.6 %clean -rm -Rf %{buildroot} +rm -Rf ${RPM_BUILD_ROOT} #------------------------------------------------------------------------------ # Files listing. @@ -62,6 +63,8 @@ rm -Rf %{buildroot} # Change Log #------------------------------------------------------------------------------ %changelog +* Mon Mar 15 2004 (0.6.0) + - included libmad and libmpeg2 * Sat Aug 02 2003 (0.5.0) - Enhanced versions of Maniac Mansion and Zak McKracken are now supported and completable - Beneath A Steel Sky is now supported and completable |