[packages/scummvm] - up to 2.7.1 - drop the engine split, it brings no value and it's a PITA on every update

baggins baggins at pld-linux.org
Sun Sep 24 19:39:44 CEST 2023


commit a2f9a9dc526114ba806a81f3bb23f10c9f81c7d1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Sep 24 19:16:38 2023 +0200

    - up to 2.7.1
    - drop the engine split, it brings no value and it's a PITA on every update

 dwarf-debug.patch       |    6 +-
 scummvm-wx-config.patch |    2 +-
 scummvm.desktop         |   10 -
 scummvm.spec            | 1477 +++--------------------------------------------
 sdl2.patch              |   20 -
 5 files changed, 102 insertions(+), 1413 deletions(-)
---
diff --git a/scummvm.spec b/scummvm.spec
index 0fc7885..a43680c 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -1,37 +1,18 @@
-# TODO:`warning: Installed (but unpackaged) file(s) found:
-#    /usr/lib64/scummvm/libags.so
-#    /usr/lib64/scummvm/libasylum.so
-#    /usr/lib64/scummvm/libburied.so
-#    /usr/lib64/scummvm/libgrim.so
-#    /usr/lib64/scummvm/libhadesch.so
-#    /usr/lib64/scummvm/libicb.so
-#    /usr/lib64/scummvm/libmyst3.so
-#    /usr/lib64/scummvm/libnancy.so
-#    /usr/lib64/scummvm/libngi.so
-#    /usr/lib64/scummvm/libprivate.so
-#    /usr/lib64/scummvm/libsaga2.so
-#    /usr/lib64/scummvm/libstark.so
-#    /usr/lib64/scummvm/libtrecision.so
-#    /usr/lib64/scummvm/libtwine.so
-#    /usr/share/scummvm/residualvm.zip
-
-%define		version_tools	2.2.0
+%define		version_tools	2.7.0
 Summary:	Graphic adventure game interpreter
 Summary(pl.UTF-8):	Interpreter gier przygodowych
 Name:		scummvm
-Version:	2.5.1
-Release:	6
+Version:	2.7.1
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	https://downloads.scummvm.org/frs/scummvm/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	79f7541e404f575a37bfa6be448c4046
+# Source0-md5:	24275e3caa26b9dc0d21020411db77c9
 Source1:	https://downloads.scummvm.org/frs/scummvm-tools/%{version_tools}/%{name}-tools-%{version_tools}.tar.xz
-# Source1-md5:	b788cd15f6becca13197032f42a15109
-Source2:	%{name}.desktop
+# Source1-md5:	0f93bc0d423c6d93bfade50a7e6f2bbe
 Patch0:		%{name}-wx-config.patch
 Patch1:		dwarf-debug.patch
 Patch2:		fluidsynth-printf-attr.patch
-Patch3:		sdl2.patch
 URL:		http://scummvm.org/
 BuildRequires:	SDL2-devel
 BuildRequires:	SDL2_net-devel
@@ -53,8 +34,88 @@ BuildRequires:	wxGTK2-unicode-devel
 BuildRequires:	wxWidgets-devel
 BuildRequires:	xz
 BuildRequires:	zlib-devel
-Obsoletes:	scummvm-engine-m4
+Obsoletes:	scummvm-engine-access < 2.7.1
+Obsoletes:	scummvm-engine-adl < 2.7.1
+Obsoletes:	scummvm-engine-agi < 2.7.1
+Obsoletes:	scummvm-engine-agos < 2.7.1
+Obsoletes:	scummvm-engine-avalanche < 2.7.1
+Obsoletes:	scummvm-engine-bbvs < 2.7.1
+Obsoletes:	scummvm-engine-bladerunner < 2.7.1
+Obsoletes:	scummvm-engine-cge < 2.7.1
+Obsoletes:	scummvm-engine-cge2 < 2.7.1
+Obsoletes:	scummvm-engine-chewy < 2.7.1
+Obsoletes:	scummvm-engine-cine < 2.7.1
+Obsoletes:	scummvm-engine-composer < 2.7.1
+Obsoletes:	scummvm-engine-cruise < 2.7.1
+Obsoletes:	scummvm-engine-cryo < 2.7.1
+Obsoletes:	scummvm-engine-cryomni3d < 2.7.1
+Obsoletes:	scummvm-engine-director < 2.7.1
+Obsoletes:	scummvm-engine-dm < 2.7.1
+Obsoletes:	scummvm-engine-draci < 2.7.1
+Obsoletes:	scummvm-engine-dragons < 2.7.1
+Obsoletes:	scummvm-engine-drascula < 2.7.1
+Obsoletes:	scummvm-engine-dreamweb < 2.7.1
 Obsoletes:	scummvm-engine-fullpipe < 2.5.1
+Obsoletes:	scummvm-engine-glk < 2.7.1
+Obsoletes:	scummvm-engine-gnap < 2.7.1
+Obsoletes:	scummvm-engine-gob < 2.7.1
+Obsoletes:	scummvm-engine-griffon < 2.7.1
+Obsoletes:	scummvm-engine-groovie < 2.7.1
+Obsoletes:	scummvm-engine-hdb < 2.7.1
+Obsoletes:	scummvm-engine-hopkins < 2.7.1
+Obsoletes:	scummvm-engine-hugo < 2.7.1
+Obsoletes:	scummvm-engine-illusions < 2.7.1
+Obsoletes:	scummvm-engine-kingdom < 2.7.1
+Obsoletes:	scummvm-engine-kyra < 2.7.1
+Obsoletes:	scummvm-engine-lab < 2.7.1
+Obsoletes:	scummvm-engine-lastexpress < 2.7.1
+Obsoletes:	scummvm-engine-lilliput < 2.7.1
+Obsoletes:	scummvm-engine-lure < 2.7.1
+Obsoletes:	scummvm-engine-m4 < 2.5.1
+Obsoletes:	scummvm-engine-macventure < 2.7.1
+Obsoletes:	scummvm-engine-made < 2.7.1
+Obsoletes:	scummvm-engine-mads < 2.7.1
+Obsoletes:	scummvm-engine-mohawk < 2.7.1
+Obsoletes:	scummvm-engine-mortevielle < 2.7.1
+Obsoletes:	scummvm-engine-mutationofjb < 2.7.1
+Obsoletes:	scummvm-engine-neverhood < 2.7.1
+Obsoletes:	scummvm-engine-parallaction < 2.7.1
+Obsoletes:	scummvm-engine-pegasus < 2.7.1
+Obsoletes:	scummvm-engine-petka < 2.7.1
+Obsoletes:	scummvm-engine-pink < 2.7.1
+Obsoletes:	scummvm-engine-plumbers < 2.7.1
+Obsoletes:	scummvm-engine-prince < 2.7.1
+Obsoletes:	scummvm-engine-queen < 2.7.1
+Obsoletes:	scummvm-engine-saga < 2.7.1
+Obsoletes:	scummvm-engine-sci < 2.7.1
+Obsoletes:	scummvm-engine-scumm < 2.7.1
+Obsoletes:	scummvm-engine-sherlock < 2.7.1
+Obsoletes:	scummvm-engine-sky < 2.7.1
+Obsoletes:	scummvm-engine-sludge < 2.7.1
+Obsoletes:	scummvm-engine-startrek < 2.7.1
+Obsoletes:	scummvm-engine-supernova < 2.7.1
+Obsoletes:	scummvm-engine-sword1 < 2.7.1
+Obsoletes:	scummvm-engine-sword2 < 2.7.1
+Obsoletes:	scummvm-engine-sword25 < 2.7.1
+Obsoletes:	scummvm-engine-teenagent < 2.7.1
+Obsoletes:	scummvm-engine-testbed < 2.7.1
+Obsoletes:	scummvm-engine-tinsel < 2.7.1
+Obsoletes:	scummvm-engine-titanic < 2.7.1
+Obsoletes:	scummvm-engine-toltecs < 2.7.1
+Obsoletes:	scummvm-engine-tony < 2.7.1
+Obsoletes:	scummvm-engine-toon < 2.7.1
+Obsoletes:	scummvm-engine-touche < 2.7.1
+Obsoletes:	scummvm-engine-tsage < 2.7.1
+Obsoletes:	scummvm-engine-tucker < 2.7.1
+Obsoletes:	scummvm-engine-ultima < 2.7.1
+Obsoletes:	scummvm-engine-voyeur < 2.7.1
+Obsoletes:	scummvm-engine-wage < 2.7.1
+Obsoletes:	scummvm-engine-wintermute < 2.7.1
+Obsoletes:	scummvm-engine-xeen < 2.7.1
+Obsoletes:	scummvm-engine-zvision < 2.7.1
+Obsoletes:	scummvm-theme-classic < 2.7.1
+Obsoletes:	scummvm-theme-modern < 2.7.1
+Obsoletes:	scummvm-theme-remastered < 2.7.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_sparc	-fPIC
@@ -103,1028 +164,6 @@ with ScummVM.
 %description tools -l pl.UTF-8
 Zestaw narzędzi mogących być użytecznymi w połączeniu ze ScummVM.
 
-%package engine-agi
-Summary:	Adventure Game Interpreter
-Summary(pl.UTF-8):	Adventure Game Interpreter
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-agi
-The AGI (Adventure Game Interpreter) engine was used by Sierra in
-their early adventure games.
-
-%description engine-agi -l pl.UTF-8
-Silnik AGI (Adventure Game Interpreter) był używany przez firmę Sierra
-w jej wczesnych grach przygodowych.
-
-%package engine-agos
-Summary:	AGOS engine
-Summary(pl.UTF-8):	Silnik AGOS
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-agos
-The AGOS Engine was originally created by Alan Cox at HorrorSoft and
-is based on AberMUD V, with graphical extensions. Required for
-following games:
-- Elvira
-- Elvira 2
-- Waxworks
-- Simon the Sorcerer
-- Simon the Sorcerer 2
-- The Feeble Files
-
-%description engine-agos -l pl.UTF-8
-Silnik AGOS został stworzony przez Alana Coksa w firmie HorrorSoft,
-bazowany jest na programie AberMUD V z graficznymi rozszerzeniami.
-Używany w następujących grach:
-- Elvira
-- Elvira 2
-- Waxworks
-- Simon the Sorcerer
-- Simon the Sorcerer 2
-- The Feeble Files
-
-%package engine-bladerunner
-Summary:	Blade Runner engine
-Summary(pl.UTF-8):	Silnik Blade Runner
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-bladerunner
-Blade Runner engine.
-
-%description engine-bladerunner -l pl.UTF-8
-Silnik Blade Runner.
-
-%package engine-cge
-Summary:	CGE engine
-Summary(pl.UTF-8):	Silnik CGE
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-cge
-CGE engine.
-
-%description engine-cge -l pl.UTF-8
-Silnik CGE.
-
-%package engine-chewy
-Summary:	Chewy: Esc from F5 engine
-Summary(pl.UTF-8):	Silnik Chewy: Esc from F5
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-chewy
-Chewy: Esc from F5 engine.
-
-%description engine-chewy -l pl.UTF-8
-Silnik Chewy: Esc from F5.
-
-%package engine-cine
-Summary:	Cinematique engine
-Summary(pl.UTF-8):	Silnik Cinematique
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-cine
-Cinematique engine.
-
-%description engine-cine -l pl.UTF-8
-Silnik Cinematique.
-
-%package engine-composer
-Summary:	Composer engine
-Summary(pl.UTF-8):	Silnik Composer
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-composer
-Composer engine.
-
-%description engine-composer -l pl.UTF-8
-Silnik Composer.
-
-%package engine-cruise
-Summary:	Cruise engine
-Summary(pl.UTF-8):	Silnik Cruise
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-cruise
-Cruise engine.
-
-%description engine-cruise -l pl.UTF-8
-Silnik Cruise.
-
-%package engine-cryo
-Summary:	Cryo engine
-Summary(pl.UTF-8):	Silnik Cryo
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-cryo
-Engine to run adventure games created by Cryo Interactive.
-
-%description engine-cryo -l pl.UTF-8
-Silnik do uruchamiania gier stworzonych przez Cryo Interactive.
-
-%package engine-cryomni3d
-Summary:	Cryoni3d engine
-Summary(pl.UTF-8):	Silnik Cryoni3d
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-cryomni3d
-Engine to run adventure games created by Cryo Interactive.
-
-%description engine-cryomni3d -l pl.UTF-8
-Silnik do uruchamiania gier stworzonych przez Cryo Interactive.
-
-%package engine-draci
-Summary:	Draci engine
-Summary(pl.UTF-8):	Silnik Draci
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-draci
-Draci engine.
-
-%description engine-draci -l pl.UTF-8
-Silnik Draci.
-
-%package engine-dragons
-Summary:	Dragons engine
-Summary(pl.UTF-8):	Silnik Dragons
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-dragons
-Dragons engine.
-
-%description engine-dragons -l pl.UTF-8
-Silnik Dragons.
-
-%package engine-drascula
-Summary:	Drascula engine
-Summary(pl.UTF-8):	Silnik Drascula
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-drascula
-Drascula engine.
-
-%description engine-drascula -l pl.UTF-8
-Silnik Drascula.
-
-%package engine-dreamweb
-Summary:	Dreamweb engine
-Summary(pl.UTF-8):	Silnik Dreamweb
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-dreamweb
-Dreamweb engine.
-
-%description engine-dreamweb -l pl.UTF-8
-Silnik Dreamweb.
-
-%package engine-glk
-Summary:	Glk engine
-Summary(pl.UTF-8):	Silnik Glk
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-glk
-Glk Engine.
-
-%description engine-glk -l pl.UTF-8
-Silnik Glk.
-
-%package engine-gob
-Summary:	Gob engine
-Summary(pl.UTF-8):	Silnik Gob
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-gob
-Engine to run adventure games created by Coktel Vision.
-
-%description engine-gob -l pl.UTF-8
-Silnik do uruchamiania gier stworzonych przez Coktel Vision.
-
-%package engine-griffon
-Summary:	Griffon engine
-Summary(pl.UTF-8):	Silnik Griffon
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-griffon
-Griffon Engine.
-
-%description engine-griffon -l pl.UTF-8
-Silnik Griffon.
-
-%package engine-groovie
-Summary:	Groovie engine
-Summary(pl.UTF-8):	Silnik Groovie
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-groovie
-Engine to run adventure games created by Trilobyte or Aftermath Media
-(The 7th Guest, The 11th Hour).
-
-%description engine-groovie -l pl.UTF-8
-Silnik do uruchamiania gier stworzonych przez Trilobyte i Aftermath
-Media (The 7th Guest, The 11th Hour).
-
-%package engine-hdb
-Summary:	HDB engine
-Summary(pl.UTF-8):	Silnik HDB
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-hdb
-HDB engine for Hyperspace Delivery Boy.
-
-%description engine-hdb -l pl.UTF-8
-Silnik HDB do gry Hyperspace Delivery Boy.
-
-%package engine-hugo
-Summary:	Hugo engine
-Summary(pl.UTF-8):	Silnik Hugo
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-hugo
-Hugo engine.
-
-%description engine-hugo -l pl.UTF-8
-Silnik Hugo.
-
-%package engine-illusions
-Summary:	Illusions engine
-Summary(pl.UTF-8):	Silnik Illusions
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-illusions
-Illusions is an engine used in adventure games by The Illusions Gaming
-Company such as Duckman: The Graphic Adventures of a Private Dick and 
-Beavis and Butt-Head: Do U.
-
-%description engine-illusions -l pl.UTF-8
-Silnik Illusions jest wykorzystywany w wydanych przez The Illusions
-Gaming Company grach takich jak Duckman: The Graphic Adventures of a
-Private Dick oraz Beavis and Butt-Head: Do U.
-
-%package engine-kingdom
-Summary:	Kingdom engine
-Summary(pl.UTF-8):	Silnik Kingdom
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-kingdom
-Kingdom engine.
-
-%description engine-kingdom -l pl.UTF-8
-Silnik Kingdom.
-
-%package engine-kyra
-Summary:	Kyrandia engine
-Summary(pl.UTF-8):	Silnik Kyrandia
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-kyra
-Kyrandia engine.
-
-%description engine-kyra -l pl.UTF-8
-Silnik Kyrandia.
-
-%package engine-lastexpress
-Summary:	Lastexpress engine
-Summary(pl.UTF-8):	Silnik Lastexpress
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-lastexpress
-Lastexpress is the engine for the game Lastexpress of the Temptress.
-
-%description engine-lastexpress -l pl.UTF-8
-Lastexpress jest silnikiem dla gry Lastexpress of the Temptress.
-
-%package engine-lilliput
-Summary:	Lilliput engine
-Summary(pl.UTF-8):	Silnik lilliput
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-lilliput
-Lilliput is the engine for gaemes The Adventures of Robin Hood and
-Rome: Pathway to Power.
-
-%description engine-lilliput -l pl.UTF-8
-Lilliput jest silnikiem dla gier The Adventures of Robin Hood oraz
-Rome: Pathway to power.
-
-%package engine-lure
-Summary:	Lure engine
-Summary(pl.UTF-8):	Silnik Lure
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-lure
-Lure is the engine for the game Lure of the Temptress.
-
-%description engine-lure -l pl.UTF-8
-Lure jest silnikiem dla gry Lure of the Temptress.
-
-%package engine-made
-Summary:	MADE engine
-Summary(pl.UTF-8):	Silnik MADE
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-made
-MADE stands for Multimedia Applications Development Environment, and
-was used by Activision to create some of their point'n'click adventure
-games.
-
-%description engine-made -l pl.UTF-8
-MADE to Multimedia Applications Development Environment, był używany
-przez Activision w grach przygodowych.
-
-%package engine-mohawk
-Summary:	Mohawk engine
-Summary(pl.UTF-8):	Silnik Mohawk
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-mohawk
-The Mohawk engine was developed by Brøderbund starting in the early
-1990's with the Windows port of Myst.
-
-%description engine-mohawk -l pl.UTF-8
-Silnik Mohawk został stworzony przez Brøderbund we wczesnych latach
-90-ych, na potrzeby gry Myst.
-
-%package engine-mutationofjb
-Summary:	MutationOfJB engine
-Summary(pl.UTF-8):	Silnik MutationOfJB
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-mutationofjb
-This engine is used by Mutation of J.B. by Invention.
-
-%description engine-mutationofjb -l pl.UTF-8
-Ten silnik jest wykorzystywany przez grę Mutation of J.B. wydaną przez
-Invention
-
-%package engine-parallaction
-Summary:	Parallaction engine
-Summary(pl.UTF-8):	Silnik Parallaction
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-parallaction
-Parallaction engine.
-
-%description engine-parallaction -l pl.UTF-8
-Silnik Parallaction.
-
-%package engine-petka
-Summary:	Petka engine
-Summary(pl.UTF-8):	Silnik Petka
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-petka
-Petka engine.
-
-%description engine-petka -l pl.UTF-8
-Silnik Petka.
-
-%package engine-pink
-Summary:	Pink Panther engine
-Summary(pl.UTF-8):	Silnik Pink Panther
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-pink
-This engine runs the adventure games Pink Panther: Passport to Peril
-and Pink Panther: Hokus Pokus Pink by Wanderlust Interactive.
-The internal name of the engine is OxCart Runtime.
-
-%description engine-pink -l pl.UTF-8
-Ten silnik jest wykorzystywany przy grach Pink Panther: Passport to
-Peril oraz Pink Panther: Hokus Pokus Pink.
-
-%package engine-plumbers
-Summary:	Plumbers engine
-Summary(pl.UTF-8):	Silnik Plumbers
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-plumbers
-This engine was used in Plumbers Don't Wear Ties.
-
-%description engine-plumbers -l pl.UTF-8
-Ten silnik jest wykorzystywany przy grze Plumbers Don't Wear Ties.
-
-%package engine-queen
-Summary:	Queen engine
-Summary(pl.UTF-8):	Silnik Queen
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-queen
-The Queen Engine is used to play Interactive Binary Illusions' Flight
-of the Amazon Queen.
-
-%description engine-queen -l pl.UTF-8
-Silnik Queen jest używany do gry w Flight of the Amazon Queen firmy
-Interactive Binary Illusions.
-
-%package engine-saga
-Summary:	Scripts for Animated Graphic Adventures
-Summary(pl.UTF-8):	Scripts for Animated Graphic Adventures
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-saga
-SAGA (Scripts for Animated Graphic Adventures) engine.
-
-%description engine-saga -l pl.UTF-8
-Silnik SAGA (Scripts for Animated Graphic Adventures).
-
-%package engine-sci
-Summary:	Sierra's "SCript Interpreter"
-Summary(pl.UTF-8):	SCript Interpreter Sierry
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-sci
-Sierra's "SCript Interpreter" and the "Sierra's Creative Interpreter.
-
-%description engine-sci -l pl.UTF-8
-SCript Interpreter Sierry.
-
-%package engine-scumm
-Summary:	Script Creation Utility for Maniac Mansion
-Summary(pl.UTF-8):	Script Creation Utility for Maniac Mansion
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-scumm
-SCUMM is a utility used to create the famous LucasArts adventure games
-like the Monkey Island series and also gave ScummVM its name.
-
-%description engine-scumm -l pl.UTF-8
-SCUMM jest narzędziem użytym do stworzenia znanych gier przygodowych
-firmy LucasArts takich jak seria Monkey Island, dał również ScummVM
-nazwę.
-
-%package engine-sky
-Summary:	Sky engine
-Summary(pl.UTF-8):	Silnik Sky
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-sky
-Sky is the internal name for the Virtual Theatre variant which runs
-Beneath a Steel Sky.
-
-%description engine-sky -l pl.UTF-8
-Sky jest wewnętrzną nazwą na wariant Virtual Theatre, który uruchamia
-Beneath a Steel Sky.
-
-%package engine-sludge
-Summary:	SLUDGE engine
-Summary(pl.UTF-8):	Silnik SLUDGE
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-sludge
-SLUDGE (standing for Scripting Language for Unhindered Development of
-a Gaming Environment) is a system by which anyone (within reason) can
-make an adventure game.
-
-%description engine-sludge -l pl.UTF-8
-SLUDGE (skrót od Scripting Language for Unhindered Development of
-a Gaming Environment) to środowisko w którym każdy może stworzyć
-grę przygodową.
-
-%package engine-sword1
-Summary:	Sword1 engine
-Summary(pl.UTF-8):	Silnik Sword1
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-sword1
-Sword1 engine.
-
-%description engine-sword1 -l pl.UTF-8
-Silnik Sword1.
-
-%package engine-sword2
-Summary:	Sword2 engine
-Summary(pl.UTF-8):	Silnik Sword2
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-sword2
-Sword2 engine.
-
-%description engine-sword2 -l pl.UTF-8
-Silnik Sword2.
-
-%package engine-sword25
-Summary:	Sword2.5 engine
-Summary(pl.UTF-8):	Silnik Sword2.5
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-sword25
-Sword2.5 engine.
-
-%description engine-sword25 -l pl.UTF-8
-Silnik Sword2.5.
-
-%package engine-startrek
-Summary:	Star Trek engine
-Summary(pl.UTF-8):	Silnik Star Trek
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-startrek
-This engine runs the adventure games Star Trek: 25th Anniversary
-and Star Trek: Judgment Rites by Interplay. 
-
-%description engine-startrek -l pl.UTF-8
-Ten silnik jest używany do gry w Star Trek: 25th Anniversary
-oraz Star Trek: Judgement Rites.
-
-%package engine-supernova
-Summary:	Mission Supernova engine
-Summary(pl.UTF-8):	Silnik Mission Supernova
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-supernova
-This engine runs the adventure games Mission Supernova.
-
-%description engine-supernova -l pl.UTF-8
-Ten silnik jest używany do gry w Mission Supernova.
-
-%package engine-teenagent
-Summary:	TeenAgent engine
-Summary(pl.UTF-8):	Silnik TeenAgent
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-teenagent
-This engine is only used by TeenAgent.
-
-%description engine-teenagent -l pl.UTF-8
-Ten silnik jest używany tylko przez TeenAgenta.
-
-%package engine-testbed
-Summary:	Testbed engine
-Summary(pl.UTF-8):	Silnik Testbed
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-testbed
-TestBed: the Testing framework engine
-
-%description engine-testbed -l pl.UTF-8
-TestBed: the Testing framework engine
-
-%package engine-tinsel
-Summary:	Tinsel engine
-Summary(pl.UTF-8):	Silnik Tinsel
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-tinsel
-This engine is only used by Discworld 1 and Discworld 2.
-
-%description engine-tinsel -l pl.UTF-8
-Ten silnik jest używany tylko przez Discworld 1 i Discworld 2.
-
-%package engine-toon
-Summary:	Toon engine
-Summary(pl.UTF-8):	Silnik Toon
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-toon
-Toonstruck engine.
-
-%description engine-toon -l pl.UTF-8
-Silnik Toonstruck.
-
-%package engine-touche
-Summary:	Touche engine
-Summary(pl.UTF-8):	Silnik Touche
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-touche
-This engine is only used by Touche: The Adventures of the Fifth
-Musketeer.
-
-%description engine-touche -l pl.UTF-8
-Ten silnik jest używany tylko przez Touché: Przygody Piątego
-Muszkietera.
-
-%package engine-tsage
-Summary:	Tsage engine
-Summary(pl.UTF-8):	Silnik Tsage
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-tsage
-This engine is only used by Ringworld: Revenge Of The Patriarch.
-
-%description engine-tsage -l pl.UTF-8
-Ten silnik jest używany tylko przez Ringworld: Revenge Of The
-Patriach.
-
-%package engine-tucker
-Summary:	Tucker engine
-Summary(pl.UTF-8):	Silnik Tucker
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-tucker
-The Tucker engine is used in Bud Tucker in Double Trouble.
-
-%description engine-tucker -l pl.UTF-8
-Silnik Tucker jest używany przez Bud Tucker in Double Trouble.
-
-%package engine-ultima
-Summary:	Ultima engine
-Summary(pl.UTF-8):	Silnik Ultima
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-ultima
-Ultima engine.
-
-%description engine-ultima -l pl.UTF-8
-Silnik Ultima.
-
-%package engine-hopkins
-Summary:	Hopkins FBI engine
-Summary(pl.UTF-8):	Silnik Hopkins FBI
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-hopkins
-This engine is used by Hopkins FBI.
-
-%description engine-hopkins -l pl.UTF-8
-Ten silnik jest używany przez Hopkins FBI.
-
-%package engine-pegasus
-Summary:	Pegasus engine
-Summary(pl.UTF-8):	Silnik Pegasus
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-pegasus
-This engine is used by The Journeyman Project: Pegasus Prime.
-
-%description engine-pegasus -l pl.UTF-8
-Ten silnik jest używany przez The Journeyman Project: Pegasus Prime.
-
-%package engine-toltecs
-Summary:	Toltecs engine
-Summary(pl.UTF-8):	Silnik Toltecs
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-toltecs
-This engine is used by 3 Skulls of the Toltecs.
-
-%description engine-toltecs -l pl.UTF-8
-Ten silnik jest używany przez 3 Skulls of the Toltecs.
-
-%package engine-tony
-Summary:	Tony engine
-Summary(pl.UTF-8):	Silnik Tony
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-tony
-This engine is used by Tony Tough and the Night of Roasted Moths.
-
-%description engine-tony -l pl.UTF-8
-Ten silnik jest używany przez Tony Tough and the Night of Roasted
-Moths.
-
-%package engine-wintermute
-Summary:	Wintermute engine
-Summary(pl.UTF-8):	Silnik Wintermute
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-wintermute
-The engine is used for the Wintermute games.
-
-%description engine-wintermute -l pl.UTF-8
-Ten silnik jest używany przez gry Wintermute.
-
-%package engine-access
-Summary:	Access engine
-Summary(pl.UTF-8):	Silnik Access
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-access
-The engine is used for the Amazon: Guardians of Eden,
-Martian Memorandum and Noctropolis games.
-
-%description engine-access -l pl.UTF-8
-Ten silnik jest używany przez gry Amazon: Guardians of Eden,
-Martian Memorandum i Noctropolis.
-
-%package engine-adl
-Summary:	ADL engine
-Summary(pl.UTF-8):	Silnik ADL
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-adl
-The engine is used for the Sierra ADL Hi-Res Adventure games.
-
-%description engine-adl -l pl.UTF-8
-Ten silnik jest używany przez gry Sierra ADL Hi-Res Adventure.
-
-%package engine-avalanche
-Summary:	Avalanche engine
-Summary(pl.UTF-8):	Silnik Avalanche
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-avalanche
-The engine is used for the Lord Avalot d'Argent game.
-
-%description engine-avalanche -l pl.UTF-8
-Ten silnik jest używany przez grę Lord Avalot d'Argent.
-
-%package engine-bbvs
-Summary:	BBVS engine
-Summary(pl.UTF-8):	Silnik BBVS
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-bbvs
-The engine is used for the Beavis and Butt-Head in
-Virtual Stupidity game.
-
-%description engine-bbvs -l pl.UTF-8
-Ten silnik jest używany przez grę Beavis and Butt-Head in
-Virtual Stupidity.
-
-%package engine-cge2
-Summary:	CGE2 engine
-Summary(pl.UTF-8):	Silnik CGE2
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-cge2
-The engine is used for the Sfinx game.
-
-%description engine-cge2 -l pl.UTF-8
-Ten silnik jest używany przez grę Sfinx.
-
-%package engine-director
-Summary:	Director engine
-Summary(pl.UTF-8):	Silnik Director
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-director
-The engine is used for the Director games.
-
-%description engine-director -l pl.UTF-8
-Ten silnik jest używany przez gry Director.
-
-%package engine-dm
-Summary:	DM engine
-Summary(pl.UTF-8):	Silnik DM
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-dm
-The engine is used for the Dungeon Master game.
-
-%description engine-dm -l pl.UTF-8
-Ten silnik jest używany przez grę Dungeon Master.
-
-%package engine-gnap
-Summary:	GNAP engine
-Summary(pl.UTF-8):	Silnik GNAP
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-gnap
-The engine is used for the U.F.O.s game.
-
-%description engine-gnap -l pl.UTF-8
-Ten silnik jest używany przez grę U.F.O.s.
-
-%package engine-lab
-Summary:	Lab engine
-Summary(pl.UTF-8):	Silnik Lab
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-lab
-The engine is used for The Labyrinth of Time game.
-
-%description engine-lab -l pl.UTF-8
-Ten silnik jest używany przez grę The Labyrinth of Time.
-
-%package engine-macventure
-Summary:	MacVenture engine
-Summary(pl.UTF-8):	Silnik MacVenture
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-macventure
-The engine is used for the Deja Vu game.
-
-%description engine-macventure -l pl.UTF-8
-Ten silnik jest używany przez grę Deja Vu.
-
-%package engine-mads
-Summary:	MADS engine
-Summary(pl.UTF-8):	Silnik MADS
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-mads
-The engine is used for the Dragonsphere and
-Return of the Phantom games.
-
-%description engine-mads -l pl.UTF-8
-Ten silnik jest używany przez gry Dragonsphere i
-Return of the Phantom.
-
-%package engine-mortevielle
-Summary:	Mortevielle engine
-Summary(pl.UTF-8):	Silnik Mortevielle
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-mortevielle
-The engine is used for the Mortville Manor game.
-
-%description engine-mortevielle -l pl.UTF-8
-Ten silnik jest używany przez grę Mortville Manor.
-
-%package engine-neverhood
-Summary:	Neverhood engine
-Summary(pl.UTF-8):	Silnik Neverhood
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-neverhood
-The engine is used for the Neverhood game.
-
-%description engine-neverhood -l pl.UTF-8
-Ten silnik jest używany przez grę Neverhood.
-
-%package engine-prince
-Summary:	Prince engine
-Summary(pl.UTF-8):	Silnik Prince
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-prince
-The engine is used for The Prince and the Coward game.
-
-%description engine-prince -l pl.UTF-8
-Ten silnik jest używany przez grę The Prince and the Coward.
-
-%package engine-sherlock
-Summary:	Sherlock engine
-Summary(pl.UTF-8):	Silnik Sherlock
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-sherlock
-The engine is used for The Lost Files of Sherlock Holmes games.
-
-%description engine-sherlock -l pl.UTF-8
-Ten silnik jest używany przez gry The Lost Files of Sherlock Holmes.
-
-%package engine-titanic
-Summary:	Titanic engine
-Summary(pl.UTF-8):	Silnik Titanic
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-titanic
-The engine is used for Starship Titanic game.
-
-%description engine-titanic -l pl.UTF-8
-Ten silnik jest używany przez gry Starship Titanic.
-
-%package engine-voyeur
-Summary:	Voyeur engine
-Summary(pl.UTF-8):	Silnik Voyeur
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-voyeur
-The engine is used for the Voyeur game.
-
-%description engine-voyeur -l pl.UTF-8
-Ten silnik jest używany przez grę Voyeur.
-
-%package engine-wage
-Summary:	WAGE engine
-Summary(pl.UTF-8):	Silnik WAGE
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-wage
-The engine is used for the WAGE games.
-
-%description engine-wage -l pl.UTF-8
-Ten silnik jest używany przez gry WAGE.
-
-%package engine-xeen
-Summary:	Xeen engine
-Summary(pl.UTF-8):	Silnik Xeen
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-xeen
-The engine is used for the Might and Magic III, IV, V
-and World of Xeen games.
-
-%description engine-xeen -l pl.UTF-8
-Ten silnik jest używany przez gry Might and Magic III, IV, V
-i World of Xeen.
-
-%package engine-zvision
-Summary:	ZVision engine
-Summary(pl.UTF-8):	Silnik ZVision
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-zvision
-The engine is used for the Zork Nemesis and
-Zork: Grand Inquisitor games.
-
-%description engine-zvision -l pl.UTF-8
-Ten silnik jest używany przez gry Zork Nemesis
-i Zork: Grand Inquisitor.
-
-%package theme-classic
-Summary:	Theme classic for ScummVM
-Summary(pl.UTF-8):	Motyw classic dla ScummVM
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description theme-classic
-Theme classic for ScummVM.
-
-%description theme-classic -l pl.UTF-8
-Motyw classic dla ScummVM.
-
-%package theme-modern
-Summary:	Theme modern for ScummVM
-Summary(pl.UTF-8):	Motyw modern dla ScummVM
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description theme-modern
-Theme modern for ScummVM.
-
-%description theme-modern -l pl.UTF-8
-Motyw modern dla ScummVM.
-
-%package theme-remastered
-Summary:	Theme remastered for ScummVM
-Summary(pl.UTF-8):	Motyw remastered dla ScummVM
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description theme-remastered
-Theme remastered for ScummVM.
-
-%description theme-remastered -l pl.UTF-8
-Motyw remastered dla ScummVM.
-
 %prep
 %setup -q -a 1
 %patch1 -p1
@@ -1132,7 +171,6 @@ cd scummvm-tools-%{version_tools}
 %patch0 -p2
 cd ..
 %patch2 -p1
-%patch3 -p1
 
 %{__sed} -i -e 's:"plugins":"%{_libdir}/scummvm":' base/plugins.cpp
 
@@ -1142,6 +180,7 @@ CXXFLAGS="%{rpmcppflags} %{rpmcflags}" \
 LDFLAGS="%{rpmcflags} %{rpmldflags}" \
 ./configure \
 	--prefix=%{_prefix} \
+	--libdir=%{_libdir} \
 	--disable-debug \
 	--enable-all-engines \
 	--enable-plugins \
@@ -1154,6 +193,7 @@ cd scummvm-tools-%{version_tools}
 CXX="%{__cxx}" \
 CXXFLAGS="%{rpmcppflags} %{rpmcflags}" \
 LDFLAGS="%{rpmcflags} %{rpmldflags}" \
+_wxconfig=wx-gtk3-unicode-config \
 ./configure \
 	--prefix=%{_prefix} \
 	--disable-debug
@@ -1163,22 +203,13 @@ LDFLAGS="%{rpmcflags} %{rpmldflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man6,%{_pixmapsdir},%{_desktopdir},%{_libdir}/scummvm}
-
-cp -p scummvm $RPM_BUILD_ROOT%{_bindir}
-#install scummvm.6 $RPM_BUILD_ROOT%{_mandir}/man6
 
-cp -p plugins/lib*.so $RPM_BUILD_ROOT%{_libdir}/scummvm
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} -C scummvm-tools-%{version_tools} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-cp -p icons/%{name}.svg $RPM_BUILD_ROOT%{_pixmapsdir}
-
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -p gui/themes/*.zip $RPM_BUILD_ROOT%{_datadir}/%{name}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1187,10 +218,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS CONTRIBUTING.md COPYRIGHT NEWS.md README.md TODO
 %attr(755,root,root) %{_bindir}/scummvm
 %dir %{_libdir}/scummvm
-#%{_mandir}/man6/*
+%attr(755,root,root) %{_libdir}/scummvm/lib*.so
+%{_mandir}/man6/scummvm.6*
 %{_pixmapsdir}/*
 %{_desktopdir}/*.desktop
-%dir %{_datadir}/%{name}
+%{_datadir}/%{name}
+%{_iconsdir}/hicolor/scalable/apps/scummvm.svg
+%{_datadir}/metainfo/scummvm.appdata.xml
+
 
 %files tools
 %defattr(644,root,root,755)
@@ -1198,323 +233,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %exclude %{_bindir}/scummvm
 %{_datadir}/scummvm-tools
-
-%files engine-agi
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libagi.so
-
-%files engine-agos
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libagos.so
-
-%files engine-bladerunner
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libbladerunner.so
-
-%files engine-cge
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libcge.so
-
-%files engine-chewy
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libchewy.so
-
-%files engine-cine
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libcine.so
-
-%files engine-composer
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libcomposer.so
-
-%files engine-cruise
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libcruise.so
-
-%files engine-cryo
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libcryo.so
-
-%files engine-cryomni3d
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libcryomni3d.so
-
-%files engine-draci
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libdraci.so
-
-%files engine-dragons
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libdragons.so
-
-%files engine-drascula
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libdrascula.so
-
-%files engine-dreamweb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libdreamweb.so
-
-%files engine-gob
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libgob.so
-
-%files engine-glk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libglk.so
-
-%files engine-griffon
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libgriffon.so
-
-%files engine-groovie
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libgroovie.so
-
-%files engine-hdb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libhdb.so
-
-%files engine-hugo
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libhugo.so
-
-%files engine-illusions
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libillusions.so
-
-%files engine-kingdom
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libkingdom.so
-
-%files engine-kyra
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libkyra.so
-
-%files engine-lastexpress
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/liblastexpress.so
-
-%files engine-lilliput
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/liblilliput.so
-
-%files engine-lure
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/liblure.so
-
-%files engine-made
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libmade.so
-
-%files engine-mohawk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libmohawk.so
-
-%files engine-mutationofjb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libmutationofjb.so
-
-%files engine-parallaction
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libparallaction.so
-
-%files engine-petka
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libpetka.so
-
-%files engine-pink
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libpink.so
-
-%files engine-plumbers
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libplumbers.so
-
-%files engine-queen
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libqueen.so
-
-%files engine-saga
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsaga.so
-
-%files engine-sci
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsci.so
-
-%files engine-scumm
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libscumm.so
-
-%files engine-sky
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsky.so
-
-%files engine-sludge
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsludge.so
-
-%files engine-sword1
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsword1.so
-
-%files engine-sword2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsword2.so
-
-%files engine-sword25
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsword25.so
-
-%files engine-startrek
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libstartrek.so
-
-%files engine-supernova
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsupernova.so
-
-%files engine-teenagent
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libteenagent.so
-
-%files engine-testbed
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtestbed.so
-
-%files engine-tinsel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtinsel.so
-
-%files engine-touche
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtouche.so
-
-%files engine-toon
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtoon.so
-
-%files engine-tsage
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtsage.so
-
-%files engine-tucker
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtucker.so
-
-%files engine-ultima
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libultima.so
-
-%files engine-hopkins
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libhopkins.so
-
-%files engine-pegasus
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libpegasus.so
-
-%files engine-toltecs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtoltecs.so
-
-%files engine-tony
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtony.so
-
-%files engine-wintermute
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libwintermute.so
-
-%files engine-access
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libaccess.so
-
-%files engine-adl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libadl.so
-
-%files engine-avalanche
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libavalanche.so
-
-%files engine-bbvs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libbbvs.so
-
-%files engine-cge2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libcge2.so
-
-%files engine-director
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libdirector.so
-
-%files engine-dm
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libdm.so
-
-%files engine-gnap
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libgnap.so
-
-%files engine-lab
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/liblab.so
-
-%files engine-macventure
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libmacventure.so
-
-%files engine-mads
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libmads.so
-
-%files engine-mortevielle
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libmortevielle.so
-
-%files engine-neverhood
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libneverhood.so
-
-%files engine-prince
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libprince.so
-
-%files engine-sherlock
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libsherlock.so
-
-%files engine-titanic
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libtitanic.so
-
-%files engine-voyeur
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libvoyeur.so
-
-%files engine-wage
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libwage.so
-
-%files engine-xeen
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libxeen.so
-
-%files engine-zvision
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/scummvm/libzvision.so
-
-%files theme-classic
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/scummclassic.*
-
-%files theme-modern
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/scummmodern.*
-
-%files theme-remastered
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/scummremastered.*
diff --git a/dwarf-debug.patch b/dwarf-debug.patch
index 65d287c..01b4043 100644
--- a/dwarf-debug.patch
+++ b/dwarf-debug.patch
@@ -1,10 +1,14 @@
 --- scummvm-1.6.0/configure~	2013-05-26 22:21:47.000000000 +0200
 +++ scummvm-1.6.0/configure	2013-07-16 01:07:53.563063545 +0200
-@@ -3786,7 +3786,7 @@
+@@ -3786,11 +3786,7 @@
  					append_var NASMFLAGS "-f aout"
  				;;
  				*)
 -					append_var NASMFLAGS "-f elf"
+-					if $LD $LDFLAGS -Wl,--version 2>/dev/null | grep -q -e 'GNU gold'; then
+-						# gold throws an internal error when nasm uses dwarf, force older stabs in this case
+-						append_var NASMFLAGS "-F stabs"
+-					fi
 +					append_var NASMFLAGS "-f elf -F dwarf"
  				;;
  			esac
diff --git a/scummvm-wx-config.patch b/scummvm-wx-config.patch
index 1a4956b..39153cd 100644
--- a/scummvm-wx-config.patch
+++ b/scummvm-wx-config.patch
@@ -5,7 +5,7 @@
  find_wxconfig() {
  	echo_n "Looking for wx-config... "
 -	wxconfigs="$_wxconfig:wxgtk2-2.8-config"
-+	wxconfigs="$_wxconfig:wx-gtk2-unicode-config"
++	wxconfigs="$_wxconfig:wx-gtk3-unicode-config"
  	_wxconfig=
  
  	IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR"
diff --git a/scummvm.desktop b/scummvm.desktop
deleted file mode 100644
index a9d6c58..0000000
--- a/scummvm.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=scummvm
-Comment=SCUMM graphic adventure game interpreter
-Comment[pl]=Interpreter przygodówek opartych na SCUMM
-Icon=scummvm
-Exec=scummvm
-Terminal=false
-Type=Application
-Categories=Game;AdventureGame;
-# vi: encoding=utf-8
diff --git a/sdl2.patch b/sdl2.patch
deleted file mode 100644
index 34877c9..0000000
--- a/sdl2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- scummvm-2.5.1/configure.orig	2022-09-11 22:50:44.875895176 +0200
-+++ scummvm-2.5.1/configure	2022-09-11 23:12:09.358791198 +0200
-@@ -3840,7 +3840,7 @@
- 	append_var INCLUDES "$SDL_CFLAGS"
- 	append_var LIBS "$SDL_LIBS"
- 	case $_sdlversion in
--		2.0.*)
-+		2.*)
- 			add_line_to_config_mk "USE_SDL2 = 1"
- 			_sdlMajorVersionNumber=2
- 			;;
-@@ -5368,7 +5368,7 @@
- 					_opengl_mode=gl
- 					;;
- 
--				2.0.*)
-+				2.*)
- 					# SDL2 supports both OpenGL + OpenGL ES contexts.
- 					# However, Mac OS X only allows OpenGL context creation at
- 					# this time, thus we limit us to OpenGL on that platform.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scummvm.git/commitdiff/a2f9a9dc526114ba806a81f3bb23f10c9f81c7d1




More information about the pld-cvs-commit mailing list