scummvm: upgrade 1.5.0 (broken) -> 2.2.0 and rewrite recipe completely

* Update source location * Move to SDL2 * Change license file to correct one * Add missing dependencies - If somebody wants to introduce PACKAGECONFIGs - feel free * remove unnecessary configure options Build tested on * dunfell / aarch64 * master / armv7 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2026-01-29 17:08:42 +01:00 · 2020-10-25 19:23:13 +01:00
parent 2a2dfae62d
commit 46bac90c4f
5 changed files with 124 additions and 90 deletions
--- a/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch
+++ b/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch
@@ -1,6 +1,6 @@
 From 27c44b052ca69873046f32631b3ccbe1d6b11dd3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 15 Mar 2015 00:57:10 +0100
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 25 Oct 2020 17:47:51 +0100
 Subject: [PATCH] use pkg-config to gather sdl information
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -8,32 +8,33 @@ Content-Transfer-Encoding: 8bit

 Upstream-Status: Inappropriate [oe specific]

-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
 configure | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

 diff --git a/configure b/configure
-index 9496cf8..1bce86e 100755
+index 36a857e..e69e39c 100755
 --- a/configure
 +++ b/configure
-@@ -2710,13 +2710,12 @@ MODULES="$MODULES backends/platform/$_backend"
+@@ -3735,14 +3735,13 @@ fi
+ # Setup SDL specifics for SDL based backends
 #
- case $_backend in
- 	dingux | gp2x | gph | linuxmoto | maemo | openpandora | samsungtv | sdl)
-		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-+		INCLUDES="$INCLUDES `pkg-config --cflags sdl`"
-+		LIBS="$LIBS `pkg-config --libs sdl`"
- 		DEFINES="$DEFINES -DSDL_BACKEND"
- 		add_line_to_config_mk "SDL_BACKEND = 1"
+ if test "$_sdl" = auto ; then
+-	find_sdlconfig
+-	append_var SDL_CFLAGS "`$_sdlconfig --prefix="$_sdlpath" --cflags`"
+	append_var SDL_CFLAGS "`pkg-config --cflags sdl2`"
+ 	if test "$_static_build" = yes ; then
+ 		append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --static-libs`"
+ 	else
+-		append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --libs`"
+		append_var SDL_LIBS "`pkg-config --libs sdl2`"
+ 	fi
+-	_sdlversion=`$_sdlconfig --version`
+	_sdlversion=`pkg-config --modversion sdl2`
 
-		_sdlversion=`$_sdlconfig --version`
-+		_sdlversion=`pkg-config --modversion`
- 		case $_sdlversion in
- 			1.3.*)
- 				add_line_to_config_mk "USE_SDL13 = 1"
+ 	echocheck "SDL"
+ 	_sdl=no
 -- 
-1.9.3
+2.26.2

--- a/recipes-games/scummvm/scummvm/0002-Do-not-split-binaries-during-install.patch
+++ b/recipes-games/scummvm/scummvm/0002-Do-not-split-binaries-during-install.patch
@@ -0,0 +1,40 @@
+From 230f20ed7a97c3a4f4f2fb38bdd5b6157ef2c318 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 25 Oct 2020 18:13:58 +0100
+Subject: [PATCH] Do not split binaries during install
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ ports.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ports.mk b/ports.mk
+index b562799..fdca3df 100644
+--- a/ports.mk
+++ b/ports.mk
+@@ -29,7 +29,7 @@ endif
+ 
+ install-strip:
+ 	$(INSTALL) -d "$(DESTDIR)$(bindir)"
+-	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+	$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+ 	$(INSTALL) -d "$(DESTDIR)$(mandir)/man6/"
+ 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6"
+ 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
+@@ -46,7 +46,7 @@ install-strip:
+ 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.appdata.xml" "$(DESTDIR)$(datarootdir)/metainfo/scummvm.appdata.xml"
+ ifdef DYNAMIC_MODULES
+ 	$(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/"
+-	$(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"
+	$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"
+ endif
+ 
+ uninstall:
+-- 
+2.26.2
+
--- a/recipes-games/scummvm/scummvm/no-strip.patch
+++ b/recipes-games/scummvm/scummvm/no-strip.patch
@@ -1,24 +0,0 @@
-Submitted https://github.com/scummvm/scummvm/pull/286
---
-Index: scummvm-1.5.0/ports.mk
-===================================================================
--- scummvm-1.5.0.orig/ports.mk	2012-10-13 19:48:34.137966047 +0200
-+++ scummvm-1.5.0/ports.mk	2012-10-13 19:49:04.797967339 +0200
-@@ -8,7 +8,7 @@
- #
- install:
- 	$(INSTALL) -d "$(DESTDIR)$(bindir)"
-	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
-+	$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
- 	$(INSTALL) -d "$(DESTDIR)$(mandir)/man6/"
- 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(mandir)/man6/scummvm.6"
- 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/pixmaps/"
-@@ -19,7 +19,7 @@
- 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
- ifdef DYNAMIC_MODULES
- 	$(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/"
-	$(INSTALL) -c -s -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"
-+	$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"
- endif
- 
- uninstall:
--- a/recipes-games/scummvm/scummvm_1.5.0.bb
+++ b/recipes-games/scummvm/scummvm_1.5.0.bb
@@ -1,46 +0,0 @@
-DESCRIPTION = "Virtual Machine for several classic graphical point-and-click adventure games"
-HOMEPAGE = "http://www.scummvm.org"
-SECTION = "games"
-PRIORITY = "optional"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=761a03e159b8bb74f377e30458e210e1"
-
-inherit autotools-brokensep
-
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
-    file://0001-use-pkg-config-to-gather-sdl-information.patch \
-    file://scummvm.desktop \
-    file://no-strip.patch \
-"
-
-DEPENDS = "virtual/libsdl libvorbis libogg zlib flac faad2 \
-           ${@oe.utils.conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
-
-EXTRA_OECONF = " \
-  --host=${HOST_SYS} \
-  --backend=sdl \
-  --with-sdl-prefix=${STAGING_BINDIR_CROSS} \
-  --prefix=${prefix} \
-  --with-ogg-prefix=${STAGING_LIBDIR}/.. \
-  --with-vorbis-prefix=${STAGING_LIBDIR}/.. \
-  --disable-alsa \
-  --enable-plugins \
-  --default-dynamic \
-  --enable-all-engines \
-  --disable-fluidsynth \
-  ${@oe.utils.conditional('ENTERPRISE_DISTRO', '1', '--disable-mad', '--with-mad-prefix=${STAGING_LIBDIR}/..', d)} \
-"
-
-EXTRA_OEMAKE = "MANDIR=${mandir}"
-
-do_configure() {
-	./configure ${EXTRA_OECONF}
-        sed -i "s/AS := as/AS := ${AS}/" ${S}/config.mk
-        sed -i "s/AR := ar cru/AR := ${AR} cru/" ${S}/config.mk
-        sed -i "s/STRIP := strip/STRIP := ${STRIP}/" ${S}/config.mk
-        sed -i "s/RANLIB := ranlib/RANLIB := ${RANLIB}/" ${S}/config.mk
-}
-
-SRC_URI[md5sum] = "d71d1df5c8262556fedbe885972fbf6e"
-SRC_URI[sha256sum] = "81831cd878a8daad2976f65c92139a2102233082c7d2770579d7e425b19cea2e"
--- a/recipes-games/scummvm/scummvm_2.2.0.bb
+++ b/recipes-games/scummvm/scummvm_2.2.0.bb
@@ -0,0 +1,63 @@
+SUMMARY = "Virtual Machine for several classic adventure games"
+DESCRIPTION = "Virtual Machine for several classic graphical point-and-click adventure games"
+HOMEPAGE = "https://www.scummvm.org"
+SECTION = "games"
+PRIORITY = "optional"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit autotools-brokensep pkgconfig gtk-icon-cache manpages features_check
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+SRC_URI = " \
+    https://www.scummvm.org/frs/scummvm/${PV}/${BPN}-${PV}.tar.xz \
+    file://0001-use-pkg-config-to-gather-sdl-information.patch \
+    file://0002-Do-not-split-binaries-during-install.patch \
+    file://scummvm.desktop \
+"
+SRC_URI[sha256sum] = "1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387"
+
+DEPENDS = " \
+    virtual/libgl \
+    libsdl2 \
+    libsdl2-net \
+    gtk+3 \
+    curl \
+    hicolor-icon-theme \
+    libpng \
+    jpeg \
+    libvorbis \
+    libogg \
+    libtheora \
+    zlib \
+    flac \
+    faad2 \
+    libmad \
+    mpeg2dec \
+    fluidsynth \
+"
+
+DISABLE_STATIC = ""
+
+EXTRA_OECONF = " \
+    --backend=sdl \
+    --prefix=${prefix} \
+    --mandir=${mandir} \
+    --host=${HOST_SYS} \
+    --enable-all-engines \
+    --enable-c++11 \
+    --enable-optimizations \
+    --enable-plugins \
+    --default-dynamic \
+"
+
+do_configure() {
+    ./configure ${EXTRA_OECONF}
+        sed -i "s/AS := as/AS := ${AS}/" ${S}/config.mk
+        sed -i "s/AR := ar cru/AR := ${AR} cru/" ${S}/config.mk
+        sed -i "s/STRIP := strip/STRIP := ${STRIP}/" ${S}/config.mk
+        sed -i "s/RANLIB := ranlib/RANLIB := ${RANLIB}/" ${S}/config.mk
+}
+
+FILES_${PN} += "${datadir}"