pool/scummvm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to new 1.2.0 release

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=17
This commit is contained in:
Cristian Morales Vega 2010-10-11 14:38:09 +00:00 committed by Git OBS Bridge
parent f6aaab2087
commit 5ce5ceb260
7 changed files with 115 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_service Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<services>
<service name="download_url">
<param name="protocol">https</param>
<param name="host">downloads.sourceforge.net</param>
<param name="path">/project/scummvm/scummvm/1.2.0/scummvm-1.2.0.tar.bz2</param>
</service>
<service name="verify_file">
<param name="file">_service:download_url:scummvm-1.2.0.tar.bz2</param>
<param name="verifier">sha256</param>
<param name="checksum">3ffc594d7ce3c14ad9bbbfaec70479f83a8bdbda81cf1eacf2988127f1d4dac0</param>
</service>
</services>

3
scummvm-1.1.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9cc865c5690bfc1df4970d35984455031467381180a71d84b08dcc9f51e39d4a
size 8668735

2
scummvm-nobuildtime.patch
View File

@ -2,7 +2,7 @@ Index: base/version.cpp
=================================================================== ===================================================================
--- base/version.cpp.orig --- base/version.cpp.orig
+++ base/version.cpp +++ base/version.cpp
@@ -57,9 +57,9 @@ @@ -59,9 +59,9 @@
* to properly work in exports (i.e. release tar balls etc.). * to properly work in exports (i.e. release tar balls etc.).
*/ */
const char *gScummVMVersion = SCUMMVM_VERSION; const char *gScummVMVersion = SCUMMVM_VERSION;

54
scummvm-nostrip.patch
View File

@ -4,36 +4,34 @@ Index: ports.mk
+++ ports.mk +++ ports.mk
@@ -10,24 +10,27 @@ @@ -10,24 +10,27 @@
# #
install: all install:
$(INSTALL) -d "$(DESTDIR)$(BINDIR)" $(INSTALL) -d "$(DESTDIR)$(bindir)"
- $(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)" - $(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+ $(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)" + $(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" $(INSTALL) -d "$(DESTDIR)$(mandir)/man6/"
$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6"
- $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" - $(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
- $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm" - $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm"
- $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" + $(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/"
- $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" + $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/scummvm.xpm"
+ $(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps" + $(INSTALL) -d "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/"
+ $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps/scummvm.xpm" + $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.svg" "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg"
+ $(INSTALL) -d "$(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps" $(INSTALL) -d "$(DESTDIR)$(docdir)"
+ $(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.svg" "$(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/scummvm.svg" $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
+ $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/packages/scummvm/" $(INSTALL) -d "$(DESTDIR)$(datadir)"
+ $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(PREFIX)/share/doc/packages/scummvm/" $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/"
ifdef DYNAMIC_MODULES ifdef DYNAMIC_MODULES
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/" $(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/"
- $(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" - $(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"
+ $(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" + $(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"
endif endif
uninstall: uninstall:
rm -f "$(DESTDIR)$(BINDIR)/$(EXECUTABLE)" rm -f "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
rm -f "$(DESTDIR)$(MANDIR)/man6/scummvm.6" rm -f "$(DESTDIR)$(mandir)/man6/scummvm.6"
- rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm" - rm -f "$(DESTDIR)$(datarootdir)/pixmaps/scummvm.xpm"
+ rm -f "$(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps/scummvm.xpm" + rm -f "$(DESTDIR)$(datarootdir)/icons/hicolor/32x32/apps/scummvm.xpm"
+ rm -f "$(DESTDIR)$(DATADIR)/icons/hicolor/scalable/apps/scummvm.svg" + rm -f "$(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/scummvm.svg"
rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/" rm -rf "$(DESTDIR)$(docdir)"
rm -rf "$(DESTDIR)$(DATADIR)/scummvm/" rm -rf "$(DESTDIR)$(datadir)"
ifdef DYNAMIC_MODULES ifdef DYNAMIC_MODULES

40
scummvm-overflow.patch Normal file
View File

@ -0,0 +1,40 @@
Index: engines/agi/predictive.cpp
===================================================================
--- engines/agi/predictive.cpp.orig
+++ engines/agi/predictive.cpp
@@ -461,9 +461,10 @@ bool AgiEngine::predictiveDialog() {
}
press:
- strncpy(_predictiveResult, prefix.c_str(), 40);
- strncat(_predictiveResult, _currentWord.c_str(), 40);
- _predictiveResult[prefix.size() + _currentCode.size() + 1] = 0;
+ strncpy(_predictiveResult, prefix.c_str(), sizeof(_predictiveResult));
+ _predictiveResult[sizeof(_predictiveResult) - 1]= 0;
+ strncat(_predictiveResult, _currentWord.c_str(), sizeof(_predictiveResult)-strlen(_predictiveResult)-1);
+ _predictiveResult[prefix.size() + _currentCode.size()] = 0;
getout:
// if another window was shown, bring it up again
Index: engines/parallaction/balloons.cpp
===================================================================
--- engines/parallaction/balloons.cpp.orig
+++ engines/parallaction/balloons.cpp
@@ -248,7 +248,7 @@ class BalloonManager_ns : public Balloon
Parallaction_ns *_vm;
static int16 _dialogueBalloonX[5];
- byte _textColors[2];
+ byte _textColors[3];
struct Balloon {
Common::Rect outerBox;
@@ -530,7 +530,7 @@ public:
class BalloonManager_br : public BalloonManager {
Parallaction_br *_vm;
- byte _textColors[2];
+ byte _textColors[3];
struct Balloon {
Common::Rect box;

5
scummvm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 11 13:04:24 UTC 2010 - reddwarf@opensuse.org
- update to new 1.2.0 release
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 6 17:28:42 UTC 2010 - cmorve69@yahoo.es Thu May 6 17:28:42 UTC 2010 - cmorve69@yahoo.es

61
scummvm.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package scummvm (Version 1.1.0) # spec file for package scummvm (Version 1.2.0)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,19 +19,25 @@
%bcond_with mp3 %bcond_with mp3
Name: scummvm Name: scummvm
Version: 1.1.1 Version: 1.2.0
Release: 1 Release: 1
License: GPLv2+, LGPLv2.1+, BSD
Summary: Interpreter for several adventure games Summary: Interpreter for several adventure games
Group: Amusements/Games/Other
License: GPLv2+, LGPLv2.1 or later
Url: http://www.scummvm.org Url: http://www.scummvm.org
Group: Amusements/Games/Other
Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
Patch0: %{name}-nostrip.patch Patch0: %{name}-nostrip.patch
Patch1: %{name}-nobuildtime.patch Patch1: %{name}-nobuildtime.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch2: %{name}-overflow.patch
BuildRequires: SDL-devel >= 1.2.2 flac-devel libvorbis-devel zlib-devel BuildRequires: SDL-devel >= 1.2.2
BuildRequires: fluidsynth-devel gcc-c++ update-desktop-files BuildRequires: flac-devel
BuildRequires: fluidsynth-devel
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: libvorbis-devel
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with mpeg2} %if %{with mpeg2}
BuildRequires: libmpeg2-devel BuildRequires: libmpeg2-devel
%endif %endif
@ -41,7 +47,8 @@ BuildRequires: libmad-devel
%ifarch %{ix86} %ifarch %{ix86}
BuildRequires: nasm BuildRequires: nasm
%endif %endif
Suggests: %{name}-extra %{name}-tools Suggests: %{name}-extra
Suggests: %{name}-tools
%description %description
ScummVM is an interpreter that will play graphic adventure games written for ScummVM is an interpreter that will play graphic adventure games written for
@ -53,37 +60,28 @@ Interactive Binary Illusions' Flight of the Amazon Queen,
Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's
Legend of Kyrandia, and various others. Legend of Kyrandia, and various others.
Authors:
--------
Max Horn
Eugene Sandulenko
%package extra %package extra
Summary: Extra engines for ScummVM Summary: Extra engines for ScummVM
Group: Amusements/Games/Other Group: Amusements/Games/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
%description extra %description extra
M4, mohawk and SCI engines for ScummVM. M4, mohawk and hugo engines for ScummVM.
These engines are in a worse state, but allow to play extra games. These engines are in a worse state, but allow to play extra games.
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1 %patch1
%patch2
%build %build
%ifarch %ix86
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mmmx -msse"
%endif
# No rpm configure because scummvm's configure isn't a real configure and thus # No rpm configure because scummvm's configure isn't a real configure and thus
# doesn't understand some of the options %%configure passes. # doesn't understand some of the options %%configure passes.
CXXFLAGS="$RPM_OPT_FLAGS" ; export CXXFLAGS ; \ CXXFLAGS="%{optflags}" ; export CXXFLAGS ; \
./configure --prefix=%{_prefix} \ ./configure --prefix=%{_prefix} \
--bindir=%{_bindir} \ --bindir=%{_bindir} \
--datadir=%{_datadir} \ --datarootdir=%{_datadir} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
%{?with_mpeg2:--enable-mpeg2} \ %{?with_mpeg2:--enable-mpeg2} \
@ -91,27 +89,28 @@ CXXFLAGS="$RPM_OPT_FLAGS" ; export CXXFLAGS ; \
--enable-plugins \ --enable-plugins \
--enable-m4=dynamic \ --enable-m4=dynamic \
--enable-mohawk=dynamic \ --enable-mohawk=dynamic \
--enable-sci=dynamic \ --enable-hugo=dynamic
--enable-sci32 # --docdir=%{_docdir}/%{name}
# --enable-groovie2 # --enable-groovie2
# --enable-lol # --enable-lol
# --enable-saga2 # --enable-saga2
# While m4, mohawk, sci and sci32 aren't compiled by default they are full # While m4, mohawk and hugo aren't compiled by default they are full
# engines, so I compile them as plugins. groovie2, lol and saga2 are subengines, # engines, so I compile them as plugins. groovie2, lol and saga2 are subengines,
# I prefer not to touch the base engines including support for them. # I prefer not to touch the base engines including support for them.
make %{?jobs:-j %jobs} make %{?_smp_mflags}
%install %install
make install DESTDIR=${RPM_BUILD_ROOT} # docdir is here because in 1.2.0 configure is broken
make install DESTDIR=${RPM_BUILD_ROOT} docdir=%{_docdir}/%{name}
%suse_update_desktop_file -i %{name} %suse_update_desktop_file -i %{name}
%clean %clean
rm -rf ${RPM_BUILD_ROOT} rm -rf %{buildroot}
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%attr(0755,root,root)%{_bindir}/scummvm %attr(0755,root,root)%{_bindir}/%{name}
%{_datadir}/%{name} %{_datadir}/%{name}
%{_mandir}/man6/%{name}.6* %{_mandir}/man6/%{name}.6*
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop