From 02265f0d88d3d3c2651f14b8e279602be456f026b3ff52ad489bf0102d5e1e10 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 29 Jul 2016 18:31:39 +0000 Subject: [PATCH 1/2] Accepting request 415924 from home:Mailaender:branches:games new upstream release OBS-URL: https://build.opensuse.org/request/show/415924 OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=39 --- appdata.xml.patch | 44 ++++++++++++++++++++++++++++++++ scummvm-1.8.0.tar.xz | 3 --- scummvm-1.8.1.tar.xz | 3 +++ scummvm.changes | 60 ++++++++++++++++++++++++++++++++++++++++++++ scummvm.spec | 10 +++++++- 5 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 appdata.xml.patch delete mode 100644 scummvm-1.8.0.tar.xz create mode 100644 scummvm-1.8.1.tar.xz diff --git a/appdata.xml.patch b/appdata.xml.patch new file mode 100644 index 0000000..c4b41ac --- /dev/null +++ b/appdata.xml.patch @@ -0,0 +1,44 @@ +From cba074852eb6a3c8b3010493e4aa7fed548391fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= +Date: Fri, 29 Jul 2016 19:46:25 +0200 +Subject: [PATCH] Add an appdata.xml file. + +--- + dists/scummvm.appdata.xml | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + create mode 100644 dists/scummvm.appdata.xml + +diff --git a/dists/scummvm.appdata.xml b/dists/scummvm.appdata.xml +new file mode 100644 +index 0000000..e9185cd +--- /dev/null ++++ b/dists/scummvm.appdata.xml +@@ -0,0 +1,28 @@ ++ ++ ++ scummvm.desktop ++ CC0-1.0 ++ GPL-2.0+ ++ ScummVM ++ Interpreter for several adventure games ++ ++

++ ScummVM is an interpreter that will play graphic adventure games written ++ for LucasArts' SCUMM virtual machine (such as Day of the Tentacle and ++ Monkey Island), Sierra's AGI adventures (such as early King's Quest and ++ Space Quest games), Adventure Soft's Simon the Sorcerer 1, 2 and Feeble Files, ++ Revolution Software's Beneath a Steel Sky and Broken Sword 1, 2 and 2.5, ++ Interactive Binary Illusions' Flight of the Amazon Queen, ++ Coktel Vision's Gobliiins, Wyrmkeep's Inherit the Earth, Westwood's ++ Legend of Kyrandia, and various others. ++

++ ++ ++ ++ http://wiki.scummvm.org/images/f/f8/Launcherwithgames.png ++ ScummVM Launcher ++ ++ ++ https://www.scummvm.org ++ scummvm-devel@lists.sourceforge.net ++ diff --git a/scummvm-1.8.0.tar.xz b/scummvm-1.8.0.tar.xz deleted file mode 100644 index 49e1c95..0000000 --- a/scummvm-1.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a85c23a2b1fcb7586a7527ecdbdf6c899a45ecbdcba28b9322057dc27914daa8 -size 17385064 diff --git a/scummvm-1.8.1.tar.xz b/scummvm-1.8.1.tar.xz new file mode 100644 index 0000000..b1ec42f --- /dev/null +++ b/scummvm-1.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:935f53d7e4c460fbc22c58fee5007d4858891e4961831f53f575a3594b7f612a +size 17807468 diff --git a/scummvm.changes b/scummvm.changes index 9b9dd79..45abbfb 100644 --- a/scummvm.changes +++ b/scummvm.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Fri Jul 29 17:51:04 UTC 2016 - mailaender@opensuse.org + +- Update to 1.8.1 (maintenance release) + * General: + - Removed TESTING flag from several supported games. + - Added Chinese Pinyin translation. + - Fixed cursor stuttering in the launcher that occured on some systems. + * BBVS: + - Fixed game restart. + * CinE: + - Fixed sound effect loading. + * Drascula: + - Fixed text alignment to be faithful to the original. + - Fixed character walking off screen. + - Fixed loading savegames in the Pendulum scene. + - Fixed wrong background for inventory items during chapter 6 in the + Spanish version. + - Fixed animations speed (they were running two times slower than in the + original engine). + - Fixed noise at start and/or end of speech. This was most noticeable + with the Spanish speech. + - Fixed delay when interacting with the verb menu and the inventory. + - Fixed possibility to pick up the axe in the castle multiple times. + * Gob: + - Fixed lock up for some games during sound initialization. + * KYRA: + - Fixed potential crash when using swamp snake potion on the rat in Hand + of Fate. (NOTE: This fix was included in version 1.8.0, but it was not + added to the NEWS file). + - Fixed missing voice reactions when hitting enemies in CD version of + Lands of Lore. + * Lab: + - Fixed lock-up during ending sequence. + - Improved internal game controls. + - Fixed lock-up during some in-game animations. + * SAGA: + - Fixed user interface colors in the French and German versions of I Have No + Mouth and I Must Scream. + * SCI: + - Make cursor workarounds work properly on OpenPandora (and other devices, that + support touch screen and analog sticks/mouse at the same time) + - Script patch to fix broken ending battle in multilingual King's Quest 5 + (French, German + Spanish versions are all broken) + - Fixed invalid memory access, when loading broken King's Quest 5 credit music track + - Fixed lowres/hires issues in King's Quest 6 when saving, changing the lowres/hires + setting and restoring the saved game afterwards. + * SCUMM: + - Fixed detection of Maniac Mansion from Day of the Tentacle in the Windows + version of ScummVM. + - Fixed a sound effect not stopping in Loom EGA with AdLib. + * Broken Sword 2.5: + - Added option to use English speech instead of German one when no speech is + available for the selected language. + - Fixed resource releasing on game exit. + - Fixed game restart after language change in-game. + - Fixed flickering in main Menu. + - Fixed long save time on Windows. +- Add appdata.xml.patch + ------------------------------------------------------------------- Sun Mar 6 12:25:48 UTC 2016 - mailaender@opensuse.org diff --git a/scummvm.spec b/scummvm.spec index 6066c86..98d27a7 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -20,13 +20,15 @@ %bcond_with mp3 Name: scummvm -Version: 1.8.0 +Version: 1.8.1 Release: 0 Summary: Interpreter for several adventure games License: GPL-2.0+ Group: Amusements/Games/Other Url: http://www.scummvm.org/ Source: http://www.scummvm.org/frs/scummvm/%{version}/scummvm-%{version}.tar.xz +# PATCH-FEATURE-UPSTREAM https://github.com/scummvm/scummvm/pull/797 +Patch0: appdata.xml.patch BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -75,6 +77,7 @@ These engines are in a worse state, but allow to play extra games. %prep %setup -q +%patch0 -p1 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" base/version.cpp backends/plugins/elf/version.cpp FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') @@ -102,6 +105,9 @@ make %{?_smp_mflags} # Since desktop-file-utils 0.19 (openSUSE 12.2) it automatically searches for %%{buildroot} desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ dists/scummvm.desktop +mkdir -p %{buildroot}%{_datadir}/appdata +install -m0644 dists/scummvm.appdata.xml %{buildroot}%{_datadir}/appdata/ + %post %icon_theme_cache_post %desktop_database_post @@ -116,6 +122,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ dists/scummvm.d %{_datadir}/scummvm %{_mandir}/man6/scummvm.6* %{_datadir}/applications/scummvm.desktop +%dir %{_datadir}/appdata/ +%{_datadir}/appdata/scummvm.appdata.xml %{_datadir}/icons/hicolor/*/*/* %{_datadir}/pixmaps/scummvm.xpm %{_docdir}/%{name} From 1baf8417ef1533e272227292dfead17780e207039eb35a6b7d196837fc86a358 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 29 Jul 2016 23:33:54 +0000 Subject: [PATCH 2/2] Accepting request 415957 from home:Mailaender:branches:games updated the patch in collaboration with upstream OBS-URL: https://build.opensuse.org/request/show/415957 OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=40 --- appdata.xml.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++-- scummvm.spec | 5 ----- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/appdata.xml.patch b/appdata.xml.patch index c4b41ac..7e510bb 100644 --- a/appdata.xml.patch +++ b/appdata.xml.patch @@ -1,7 +1,7 @@ From cba074852eb6a3c8b3010493e4aa7fed548391fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 29 Jul 2016 19:46:25 +0200 -Subject: [PATCH] Add an appdata.xml file. +Subject: [PATCH 1/3] Add an appdata.xml file. --- dists/scummvm.appdata.xml | 28 ++++++++++++++++++++++++++++ @@ -42,3 +42,49 @@ index 0000000..e9185cd + https://www.scummvm.org + scummvm-devel@lists.sourceforge.net + + +From c10a5aa10b93273d03d1bbdac97e9da11799372c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= +Date: Fri, 29 Jul 2016 21:40:50 +0200 +Subject: [PATCH 2/3] Install the .desktop file. + +--- + ports.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ports.mk b/ports.mk +index dce5a5d..3f0a6a5 100644 +--- a/ports.mk ++++ b/ports.mk +@@ -18,6 +18,8 @@ install: + $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)" + $(INSTALL) -d "$(DESTDIR)$(datadir)" + $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/" ++ $(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications" ++ $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop" + ifdef DYNAMIC_MODULES + $(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/" + $(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/" + +From 5466359eed2fbe68b7ed3f019d334aefcc36b0c8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= +Date: Fri, 29 Jul 2016 21:41:00 +0200 +Subject: [PATCH 3/3] Install the appdata.xml file. + +--- + ports.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ports.mk b/ports.mk +index 3f0a6a5..2c81651 100644 +--- a/ports.mk ++++ b/ports.mk +@@ -20,6 +20,8 @@ install: + $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/" + $(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications" + $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop" ++ $(INSTALL) -d "$(DESTDIR)$(datarootdir)/appdata" ++ $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.appdata.xml" "$(DESTDIR)$(datarootdir)/appdata/scummvm.appdata.xml" + ifdef DYNAMIC_MODULES + $(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/" + $(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/" diff --git a/scummvm.spec b/scummvm.spec index 98d27a7..288a855 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -102,11 +102,6 @@ make %{?_smp_mflags} %install %make_install -# Since desktop-file-utils 0.19 (openSUSE 12.2) it automatically searches for %%{buildroot} -desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ dists/scummvm.desktop - -mkdir -p %{buildroot}%{_datadir}/appdata -install -m0644 dists/scummvm.appdata.xml %{buildroot}%{_datadir}/appdata/ %post %icon_theme_cache_post