README: Add notice about abandonin master branch

All users should switch to main branch.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>

README

@@ -1,3 +1,8 @@
+
+Please switch to main branch.
+Old master is being abandoned.
+
+
 meta-games
 ==========
 

conf/layer.conf

@@ -8,4 +8,5 @@ BBFILE_COLLECTIONS += "games-layer"
 BBFILE_PATTERN_games-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_games-layer = "15"
 
-LAYERSERIES_COMPAT_games-layer = "rocko sumo thud warrior zeus"
+LAYERDEPENDS_games-layer = "core openembedded-layer filesystems-layer gnome-layer networking-layer multimedia-layer meta-python qt5-layer"
+LAYERSERIES_COMPAT_games-layer = "mickledore kirkstone langdale"

dependencies/freealut/freealut_1.1.0.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenAL Utility Toolkit"
 SECTION = "libs"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7ec51bd663119a90c3d50704d6051fae"
 
 PR = "r1"

dependencies/libsdl2-gfx/libsdl2-gfx_1.0.4.bb

@@ -1,6 +1,8 @@
 DESCRIPTION = "SDL2 graphics drawing primitives and other support functions."
 SECTION = "libs"
 
+HOMEPAGE = "https://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
+
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e04e1feb331457e9da15e0c88d0e8097"
 
@@ -24,7 +26,8 @@ EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/pkg-config sdl2"
 EXTRA_OECONF += "--disable-mmx"
 EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m32", "--enable-mmx", "", d)}"
 EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m64", "--enable-mmx", "", d)}"
+EXTRA_OECONF += "${@bb.utils.contains("AVAILTUNES", "powerpc", "--disable-mmx", "", d)}"
 
-do_unpack_append() {
+do_unpack:append() {
     os.rename("SDL2_gfx-1.0.4/acinclude", "SDL2_gfx-1.0.4/m4")
 }

dependencies/tolua/tolua/01-tolua_tolua_open-proto-before-need.patch

@@ -0,0 +1,21 @@
+diff -Nurd tolua-5.2/src/bin/tolua.c tolua-5.2/src/bin/tolua.c
+--- tolua-5.2/src/bin/tolua.c	2022-09-26 18:11:41.769267668 +0300
++++ tolua-5.2/src/bin/tolua.c	2020-02-22 14:33:47.775736302 +0200
+@@ -22,6 +22,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#ifndef LUA_SOURCE
++int tolua_tolua_open(lua_State *L);
++#endif
+ 
+ static void help (void)
+ {
+@@ -106,7 +109,6 @@
+ 
+ #ifndef LUA_SOURCE
+  {
+-  int tolua_tolua_open (lua_State* L);
+   tolua_tolua_open(L);
+  }
+ #else

dependencies/tolua/tolua/02-fix-use-after-free.patch

@@ -0,0 +1,13 @@
+diff -Nurd tolua-5.2/src/lib/tolua_event.c tolua-5.2/src/lib/tolua_event.c
+--- tolua-5.2/src/lib/tolua_event.c	2022-09-26 18:17:40.544835582 +0300
++++ tolua-5.2/src/lib/tolua_event.c	2022-08-29 15:10:32.145383356 +0300
+@@ -393,8 +393,8 @@
+       }
+       else if (lua_isuserdata(L,-1) && *((void**)lua_touserdata(L,-1))==NULL) {
+         /* free object */
+-        free(u);
+         tolua_release(L,u);                /* unmap from tolua tables */
++        free(u);
+       }
+     }
+     lua_settop(L,top);

dependencies/tolua/tolua/03-tolua_bnd_takeownership-prototype.patch

@@ -0,0 +1,11 @@
+diff -Nurd tolua-5.2/src/lib/tolua_map.c tolua-5.2/src/lib/tolua_map.c
+--- tolua-5.2/src/lib/tolua_map.c	2022-09-26 18:19:26.145867532 +0300
++++ tolua-5.2/src/lib/tolua_map.c	2020-02-22 14:33:47.779735894 +0200
+@@ -21,6 +21,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+ 
++int tolua_bnd_takeownership(lua_State *L);
+ 
+ static char toluaname[128] = "tolua.";
+ static const char* TOLUANAME (const char* n)  

dependencies/tolua/tolua/04-include-tolua_event.patch

@@ -0,0 +1,12 @@
+diff -Nurd tolua-5.2/src/lib/tolua_event.c tolua-5.2/src/lib/tolua_event.c
+--- tolua-5.2/src/lib/tolua_event.c	2022-09-26 18:20:52.710709210 +0300
++++ tolua-5.2/src/lib/tolua_event.c	2022-09-26 18:18:49.593511033 +0300
+@@ -18,6 +18,8 @@
+ 
+ #include "tolua.h"
+ 
++#include "tolua_event.h"
++
+ /* Store at peer
+ 	* It stores, creating the corresponding table if needed,
+ 	* the pair key/value in the corresponding peer table

dependencies/tolua/tolua/05-gen-code-fix-null-dereferences.patch

@@ -0,0 +1,27 @@
+diff -Nurd tolua-5.2/src/bin/lua/variable.lua tolua-5.2/src/bin/lua/variable.lua
+--- tolua-5.2/src/bin/lua/variable.lua	2022-09-26 18:23:47.772402128 +0300
++++ tolua-5.2/src/bin/lua/variable.lua	2022-08-29 15:10:32.145383356 +0300
+@@ -116,7 +116,10 @@
+  -- check self value
+  if class and static==nil then
+ 	 output('#ifndef TOLUA_RELEASE\n')
+-  output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);');
++	 output('  if (!self) {\n')
++	 output('    tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);\n')
++	 output('    return 0;\n')
++	 output('  }\n')
+ 		output('#endif\n')
+  end
+ 
+@@ -163,7 +166,10 @@
+ 		output('#ifndef TOLUA_RELEASE\n')
+ 		output('  tolua_Error tolua_err;')
+   if class and static==nil then
+-   output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);');
++   output('  if (!self) {\n')
++   output('    tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);\n')
++   output('    return 0;\n')
++   output('  }\n')
+   elseif static then
+    _,_,self.mod = strfind(self.mod,'^%s*static%s%s*(.*)')
+   end

dependencies/tolua/tolua_5.2.4.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Lua binding generator for C/C++"
-DESCRIPTION = " tolua is a tool that greatly simplifies the integration of \
+DESCRIPTION = "Tolua is a tool that greatly simplifies the integration of \
 C/C++ code with Lua. Based on a cleaned header file, tolua automatically \
 generates the binding code to access C/C++ features from Lua. Using Lua API \
 and tag method facilities, tolua maps C/C++ constants, external variables, \
@@ -10,18 +10,23 @@ SECTION = "console/utils"
 DEPENDS= "lua-native"
 BBCLASSEXTEND = "native"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://include/tolua.h;beginline=9;endline=12;md5=4a3fbc0759a4b8318d99f3d71a773105"
 
+# 0?- patches are from freeciv source tree. https://www.freeciv.org/
 SRC_URI = "\
  http://webserver2.tecgraf.puc-rio.br/~celes/tolua/tolua-${PV}.tar.gz \
  file://MakefileFix.patch \
  file://AllLuaPath.patch \
+ file://01-tolua_tolua_open-proto-before-need.patch \
+ file://02-fix-use-after-free.patch \
+ file://03-tolua_bnd_takeownership-prototype.patch \
+ file://04-include-tolua_event.patch \
+ file://05-gen-code-fix-null-dereferences.patch \
 "
 
 B = "${S}"
 
-SRC_URI[md5sum] = "c8dcf13555df45bdcd792981d7356997"
 SRC_URI[sha256sum] = "c5a6b701b3ced9a66e7a9881c9d94430f8612040827650abe1aa3c5c3fc95bf2"
 
 EXTRA_OEMAKE = "STAGING_DIR_NATIVE=${STAGING_DIR_NATIVE}"

recipes-gamelib/allegro4/allegro4_4.4.3.1.bb

@@ -22,5 +22,5 @@ inherit cmake binconfig
 
 S = "${WORKDIR}/allegro-${PV}"
 
-FILES_${PN} += "${libdir}/allegro"
-FILES_${PN}-dbg += "${libdir}/allegro/*/.debug"
+FILES:${PN} += "${libdir}/allegro"
+FILES:${PN}-dbg += "${libdir}/allegro/*/.debug"

recipes-gamelib/sfml/sfml_2.5.1.bb

@@ -1,5 +1,5 @@
 DESCRIPTION = "Simple and Fast Multimedia Library"
-HOMEPAGE = "http://www.sfml-dev.org/index.php"
+HOMEPAGE = "https://www.sfml-dev.org/"
 SECTION = "libs"
 
 LICENSE = "SFML"
@@ -16,4 +16,4 @@ S = "${WORKDIR}/SFML-${PV}"
 
 inherit cmake
 
-FILES_${PN} =+ "${datadir}/SFML"
+FILES:${PN} =+ "${datadir}/SFML"

recipes-games/astromenace/astromenace_1.3.2.bb

@@ -1,6 +1,6 @@
 DESCRIPTION = "AstroMenace is an astonishing hardcore scroll-shooter"
 HOMEPAGE = "http://www.viewizard.com/"
-LICENSE = "GPLv3 & OFL-1.1 & CC-BY-SA-3.0"
+LICENSE = "GPL-3.0-only & OFL-1.1 & CC-BY-SA-3.0"
 LIC_FILES_CHKSUM = " \
     file://gpl-3.0.txt;md5=3c34afdc3adf82d2448f12715a255122 \
     file://License.txt;md5=022aa28c3afa9de245970d5aa93bcb89 \
@@ -10,10 +10,10 @@ DEPENDS = "libsdl freealut openal-soft libogg libvorbis freetype libglu libxiner
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit cmake qemu gtk-icon-cache distro_features_check
+inherit cmake pkgconfig qemu gtk-icon-cache features_check
 
 SRC_URI = " \
-    git://github.com/viewizard/astromenace.git \
+    git://github.com/viewizard/astromenace.git;branch=master;protocol=https \
     file://0001-CMakeLists.txt-use-pkg-config-to-find-freetype.patch \
     file://0002-CMakeLists.txt-use-pkg-config-to-find-sdl.patch \
     file://0003-Loading.cpp-fix-level2-crash.patch \
@@ -44,7 +44,7 @@ EXTRA_OECMAKE = " \
     -DDATADIR=${datadir}/${BPN} \
 "
 
-do_compile_append() {
+do_compile:append() {
     # building native has dependencies which cannot be fullfilled - so run
     # AstroMenace in qemu to build game data
     ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${B}/AstroMenace')} --pack --rawdata=${S}/RAW_VFS_DATA --dir=${B}

recipes-games/atanks/atanks_6.6.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "Annihilate the other tanks to earn money, then spend it on bigger and better shields and weapons to wipe out the opposition."
-HOMEPAGE = "http://atanks.sourceforge.net/"
+HOMEPAGE = "https://atanks.sourceforge.net/"
 SECTION = "games"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bfbc31ee85cf099e77a598c8a66dd124"
 
 DEPENDS = "allegro4"
@@ -11,7 +11,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz
 
 inherit autotools-brokensep
 
-SRC_URI[md5sum] = "3182d080ea71c3837af57f3651b55025"
-SRC_URI[sha256sum] = "32182b2752a77ff362c378fc04b7c51fc15345caa4c8deaad59cc850dad2322e"
+SRC_URI[sha256sum] = "bc6b1efc9fc7e7624fad1d8352d72e927be0fba2160bb25bb6b8bd6c6370bf43"
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"

recipes-games/chromium-bsu/chromium-bsu_0.9.16.1.bb

@@ -1,4 +1,5 @@
 SUMMARY = "Chromium B.S.U. is a fast paced, arcade-style, top-scrolling shooter"
+HOMEPAGE = "https://chromium-bsu.sourceforge.io/"
 LICENSE = "ClArtistic"
 LIC_FILES_CHKSUM = "file://COPYING;md5=641fe79d00b9ef7c22fc782fd98cd651"
 
@@ -21,6 +22,6 @@ PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl libsdl-image"
 PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,libsdl2 libsdl2-image"
 
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datatdir}/icons \
 "

recipes-games/etr/etr/0001-find-libgl-and-libglu-by-pkg-config.patch

@@ -1,49 +0,0 @@
-From 4cd511613675220a3fdb98d58bfb558d7eacc754 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sat, 14 Mar 2015 00:48:57 +0100
-Subject: [PATCH] find libgl and libglu by pkg-config
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstrema-Status: pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7dd6817..8af8a59 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,16 +63,20 @@ PKG_CHECK_MODULES([SDLMIXER], [SDL_mixer],
- ],
- [AC_MSG_ERROR([SDL_mixer not found])])
- 
--AC_CHECK_LIB([GL], [glBegin], [],
-+PKG_CHECK_MODULES([GL], [gl],
-+[
-+  CFLAGS="${CFLAGS} $GL_CFLAGS"
-+  LIBS="${LIBS} $GL_LIBS"
-+],
- [AC_MSG_ERROR([libGL not found])])
- 
--LIBS="$LIBS -lGL"
--
--AC_CHECK_LIB([GLU], [gluBeginCurve], [],
-+PKG_CHECK_MODULES([GLU], [glu],
-+[
-+  CFLAGS="${CFLAGS} $GLU_CFLAGS"
-+  LIBS="${LIBS} $GLU_LIBS"
-+],
- [AC_MSG_ERROR([libGLU not found])])
- 
--LIBS="$LIBS -lGLU"
--
- CPPFLAGS="${CPPFLAGS} -DETR_DATA_DIR=\\\"$datadir\\\""
- 
- # Request c++11 compatibility
--- 
-1.9.3
-

recipes-games/etr/etr/0002-find-sdl-by-pkg-config.patch

@@ -1,235 +0,0 @@
-From 33b8facc7fc52270426ab93769509c854c8aa2be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sat, 14 Mar 2015 01:17:00 +0100
-Subject: [PATCH] find sdl by pkg-config
-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@googlemail.com>
----
- aclocal.m4   | 184 -----------------------------------------------------------
- configure.ac |   9 ++-
- 2 files changed, 6 insertions(+), 187 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 45a8a0d..2499f7b 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -375,191 +375,7 @@ else
- fi[]dnl
- ])# PKG_CHECK_MODULES
- 
--# Configure paths for SDL
--# Sam Lantinga 9/21/99
--# stolen from Manish Singh
--# stolen back from Frank Belew
--# stolen from Manish Singh
--# Shamelessly stolen from Owen Taylor
- 
--# serial 1
--
--dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
--dnl
--AC_DEFUN([AM_PATH_SDL],
--[dnl 
--dnl Get the cflags and libraries from the sdl-config script
--dnl
--AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
--            sdl_prefix="$withval", sdl_prefix="")
--AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
--            sdl_exec_prefix="$withval", sdl_exec_prefix="")
--AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
--		    , enable_sdltest=yes)
--
--  if test x$sdl_exec_prefix != x ; then
--    sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
--    if test x${SDL_CONFIG+set} != xset ; then
--      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
--    fi
--  fi
--  if test x$sdl_prefix != x ; then
--    sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
--    if test x${SDL_CONFIG+set} != xset ; then
--      SDL_CONFIG=$sdl_prefix/bin/sdl-config
--    fi
--  fi
--
--  as_save_PATH="$PATH"
--  if test "x$prefix" != xNONE; then
--    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
--  fi
--  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
--  PATH="$as_save_PATH"
--  min_sdl_version=ifelse([$1], ,0.11.0,$1)
--  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
--  no_sdl=""
--  if test "$SDL_CONFIG" = "no" ; then
--    no_sdl=yes
--  else
--    SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
--    SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
--
--    sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--    sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
--           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--    if test "x$enable_sdltest" = "xyes" ; then
--      ac_save_CFLAGS="$CFLAGS"
--      ac_save_CXXFLAGS="$CXXFLAGS"
--      ac_save_LIBS="$LIBS"
--      CFLAGS="$CFLAGS $SDL_CFLAGS"
--      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
--      LIBS="$LIBS $SDL_LIBS"
--dnl
--dnl Now check if the installed SDL is sufficiently new. (Also sanity
--dnl checks the results of sdl-config to some extent
--dnl
--      rm -f conf.sdltest
--      AC_TRY_RUN([
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include "SDL.h"
--
--char*
--my_strdup (char *str)
--{
--  char *new_str;
--  
--  if (str)
--    {
--      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
--      strcpy (new_str, str);
--    }
--  else
--    new_str = NULL;
--  
--  return new_str;
--}
--
--int main (int argc, char *argv[])
--{
--  int major, minor, micro;
--  char *tmp_version;
--
--  /* This hangs on some systems (?)
--  system ("touch conf.sdltest");
--  */
--  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
--
--  /* HP/UX 9 (%@#!) writes to sscanf strings */
--  tmp_version = my_strdup("$min_sdl_version");
--  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
--     printf("%s, bad version string\n", "$min_sdl_version");
--     exit(1);
--   }
--
--   if (($sdl_major_version > major) ||
--      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
--      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
--    {
--      return 0;
--    }
--  else
--    {
--      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
--      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
--      printf("*** best to upgrade to the required version.\n");
--      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
--      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
--      printf("*** config.cache before re-running configure\n");
--      return 1;
--    }
--}
--
--],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
--       CFLAGS="$ac_save_CFLAGS"
--       CXXFLAGS="$ac_save_CXXFLAGS"
--       LIBS="$ac_save_LIBS"
--     fi
--  fi
--  if test "x$no_sdl" = x ; then
--     AC_MSG_RESULT(yes)
--     ifelse([$2], , :, [$2])     
--  else
--     AC_MSG_RESULT(no)
--     if test "$SDL_CONFIG" = "no" ; then
--       echo "*** The sdl-config script installed by SDL could not be found"
--       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the SDL_CONFIG environment variable to the"
--       echo "*** full path to sdl-config."
--     else
--       if test -f conf.sdltest ; then
--        :
--       else
--          echo "*** Could not run SDL test program, checking why..."
--          CFLAGS="$CFLAGS $SDL_CFLAGS"
--          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
--          LIBS="$LIBS $SDL_LIBS"
--          AC_TRY_LINK([
--#include <stdio.h>
--#include "SDL.h"
--
--int main(int argc, char *argv[])
--{ return 0; }
--#undef  main
--#define main K_and_R_C_main
--],      [ return 0; ],
--        [ echo "*** The test program compiled, but did not run. This usually means"
--          echo "*** that the run-time linker is not finding SDL or finding the wrong"
--          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
--          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
--          echo "*** is required on your system"
--	  echo "***"
--          echo "*** If you have an old version installed, it is best to remove it, although"
--          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
--        [ echo "*** The test program failed to compile or link. See the file config.log for the"
--          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
--          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
--          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
--          CFLAGS="$ac_save_CFLAGS"
--          CXXFLAGS="$ac_save_CXXFLAGS"
--          LIBS="$ac_save_LIBS"
--       fi
--     fi
--     SDL_CFLAGS=""
--     SDL_LIBS=""
--     ifelse([$3], , :, [$3])
--  fi
--  AC_SUBST(SDL_CFLAGS)
--  AC_SUBST(SDL_LIBS)
--  rm -f conf.sdltest
--])
- 
- # Copyright (C) 2002-2013 Free Software Foundation, Inc.
- #
-diff --git a/configure.ac b/configure.ac
-index 8af8a59..576818a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,9 +38,12 @@ esac
- AC_FUNC_MALLOC
- AC_CHECK_FUNCS([floor getcwd memmove memset mkdir pow sqrt strchr strdup])
- 
--AM_PATH_SDL([1.0.0])
--CFLAGS="$CFLAGS $SDL_CFLAGS"
--LIBS="$LIBS $SDL_LIBS"
-+PKG_CHECK_MODULES([SDL], [sdl],
-+[
-+  CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-+  LIBS="$LIBS $SDL_LIBS"
-+],
-+[AC_MSG_ERROR([libsdl not found])])
- 
- PKG_CHECK_MODULES([FT2], [freetype2],
- [
--- 
-1.9.3
-

recipes-games/etr/etr/ftconfigure.patch

@@ -1,28 +0,0 @@
-diff -Nurd etr-0.6.0/configure.ac etr-0.6.0-newbie/configure.ac
---- etr-0.6.0/configure.ac	2013-09-13 22:39:29.000000000 +0300
-+++ etr-0.6.0-newbie/configure.ac	2014-08-29 08:13:30.094868910 +0300
-@@ -15,10 +15,6 @@
- AC_PROG_CC
- 
- # Checks for libraries.
--AC_CHECK_FT2
--
--CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
--LIBS="$LIBS $FT2_LIBS"
- 
- # Checks for header files.
- AC_CHECK_HEADERS([float.h limits.h stdlib.h string.h sys/time.h unistd.h])
-@@ -46,6 +42,13 @@
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- 
-+PKG_CHECK_MODULES([FT2], [freetype2],
-+[
-+  CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
-+  LIBS="$LIBS $FT2_LIBS"
-+],
-+[AC_MSG_ERROR([Freetype not found])])
-+
- PKG_CHECK_MODULES([SDLIMAGE], [SDL_image],
- [
-   CFLAGS="${CFLAGS} $SDLIMAGE_CFLAGS"

recipes-games/etr/etr/pkg.m4

@@ -1,199 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR

recipes-games/etr/etr/simple-configure.patch

@@ -1,32 +1,32 @@
-diff -Nurd -X.diff_ignore etr/configure.ac etr/configure.ac
---- etr/configure.ac	2016-07-22 19:15:31.414693938 +0300
-+++ etr/configure.ac	2016-07-26 00:00:28.539114721 +0300
-@@ -41,33 +41,7 @@
+diff -Nurd etr-0.8.1/configure.ac etr-0.8.1/configure.ac
+--- etr-0.8.1/configure.ac	2021-08-29 05:50:51.338244147 +0300
++++ etr-0.8.1/configure.ac	2021-08-29 05:51:03.434363966 +0300
+@@ -42,33 +42,7 @@
  AC_FUNC_MALLOC
  AC_CHECK_FUNCS([floor getcwd memmove memset mkdir pow sqrt strchr strdup])
  
--PKG_CHECK_MODULES([SFML_SYSTEM], [sfml-system >= 2.2],
+-PKG_CHECK_MODULES([SFML_SYSTEM], [sfml-system >= 2.4],
 -[
 -  CPPFLAGS="${CPPFLAGS} $SFML_SYSTEM_CFLAGS"
 -  LIBS="${LIBS} $SFML_SYSTEM_LIBS"
 -],
 -[AC_MSG_ERROR([sfml-system not found])])
 -
--PKG_CHECK_MODULES([SFML_AUDIO], [sfml-audio >= 2.2],
+-PKG_CHECK_MODULES([SFML_AUDIO], [sfml-audio >= 2.4],
 -[
 -  CPPFLAGS="${CPPFLAGS} $SFML_AUDIO_CFLAGS"
 -  LIBS="${LIBS} $SFML_AUDIO_LIBS"
 -],
 -[AC_MSG_ERROR([sfml-audio not found])])
 -
--PKG_CHECK_MODULES([SFML_WINDOW], [sfml-window >= 2.2],
+-PKG_CHECK_MODULES([SFML_WINDOW], [sfml-window >= 2.4],
 -[
 -  CPPFLAGS="${CPPFLAGS} $SFML_WINDOW_CFLAGS"
 -  LIBS="${LIBS} $SFML_WINDOW_LIBS"
 -],
 -[AC_MSG_ERROR([sfml-window not found])])
 -
--PKG_CHECK_MODULES([SFML_GRAPHICS], [sfml-graphics >= 2.2],
+-PKG_CHECK_MODULES([SFML_GRAPHICS], [sfml-graphics >= 2.4],
 -[
 -  CPPFLAGS="${CPPFLAGS} $SFML_GRAPHICS_CFLAGS"
 -  LIBS="${LIBS} $SFML_GRAPHICS_LIBS"
@@ -34,5 +34,5 @@ diff -Nurd -X.diff_ignore etr/configure.ac etr/configure.ac
 -[AC_MSG_ERROR([sfml-graphics not found])])
 +LIBS="${LIBS} -lsfml-system -lsfml-audio -lsfml-window -lsfml-graphics"
  
- AC_CHECK_LIB([GL], [glBegin], [],
- [AC_MSG_ERROR([libGL not found])])
+ AC_CHECK_LIB([GLU], [gluBeginCurve],
+ [

recipes-games/etr/etr_0.7.5.bb

@@ -1,25 +0,0 @@
-SUMMARY = "High speed arctic racing game based on Tux Racer."
-DESCRIPTION = " "
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SECTION = "games"
-
-SRC_URI = " \
-    http://sourceforge.net/projects/extremetuxracer/files/releases/${PV}/etr-${PV}.tar.xz \
-    file://simple-configure.patch \
-"
-
-SRC_URI[md5sum] = "210a9aa0ac6e348b7f4e3141f383e5e0"
-SRC_URI[sha256sum] = "4fd39c52a426ba22deb26bcceb807d7eebe7b7d7df578cfd03f10066c218c6d3"
-
-DEPENDS = "sfml virtual/libgl libglu"
-
-B = "${WORKDIR}/build"
-
-inherit autotools
-
-do_install_append() {
-        rm -Rf ${D}/${datadir}/appdata
-}

recipes-games/etr/etr_0.8.2.bb

@@ -0,0 +1,25 @@
+SUMMARY = "High speed arctic racing game based on Tux Racer."
+DESCRIPTION = " "
+HOMEPAGE = "https://sourceforge.net/projects/extremetuxracer/"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SECTION = "games"
+
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/project/extremetuxracer/releases/${PV}/etr-${PV}.tar.xz \
+    file://simple-configure.patch \
+"
+
+SRC_URI[sha256sum] = "1c874965e9e249533bf15c08dabc61e60c05bb3fd578917880117ff8a910cd4e"
+
+DEPENDS = "sfml virtual/libgl libglu"
+
+B = "${WORKDIR}/build"
+
+inherit autotools
+
+do_install:append() {
+        rm -Rf ${D}/${datadir}/metainfo
+}

recipes-games/freeciv/freeciv-qt5.inc

@@ -0,0 +1,11 @@
+
+require freeciv.inc
+
+inherit qmake5_paths
+
+EXTRA_OECONF += "\
+--with-qtver=qt5 \
+--with-qt5-includes=${STAGING_INCDIR}${QT_DIR_NAME} \
+--with-qt5-libs=${STAGING_LIBDIR}${QT_DIR_NAME} \
+MOCCMD=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \
+"

recipes-games/freeciv/freeciv.inc

@@ -4,74 +4,100 @@ DESCRIPTION = "Freeciv is distributed under the GPL and implemented for X. \
  each player becomes leader of a civilization, fighting to obtain \
  the ultimate goal: The extinction of all other civilizations. \
  "
+HOMEPAGE = "https://www.freeciv.org/"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SECTION = "games"
 
-DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext qttools-native"
+FREECIV_GUI = "gtk3.22,qt,sdl2"
 
-SRC_URI = "\
-file://allow-root.patch \
-file://wait-server-start.patch \
-"
+DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext qttools-native libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
 
 S = "${WORKDIR}/freeciv-${PV}"
 B = "${WORKDIR}/build-${PV}"
 
-inherit autotools pkgconfig gettext qmake5_paths
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "\
+ac_cv_working_gettimeofday=yes \
+ac_cv_func_working_vsnprintf=yes \
+--enable-patient-connect \
 --enable-shared --enable-client=${FREECIV_GUI} \
 --disable-mapimg \
 --disable-sdl2test \
---with-qt5-includes=${STAGING_INCDIR}${QT_DIR_NAME} \
---with-qt5-libs=${STAGING_LIBDIR}${QT_DIR_NAME} \
-MOCCMD=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \
+--with-sqlite3-prefix=${STAGING_DIR} \
 SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
 "
 
 acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4"
 
-PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-qt"
+PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common \
+${PN}-gtk3.22 ${PN}-qt ${PN}-sdl2"
 
-do_install_append() {
+do_install:append() {
         rm -Rf ${D}/${datadir}/appdata
+        rm -Rf ${D}/${datadir}/metainfo
+        rm -Rf ${D}/${datadir}/icons/hicolor/*/*/freeciv-ruledit.png
 }
 
-RDEPENDS_${PN} = "freeciv-server freeciv-client"
+RDEPENDS:${PN} = "freeciv-server freeciv-client"
 
-FILES_${PN}-common = "\
+FILES:${PN}-common = "\
 ${libdir}/libfreeciv.so.0.0.0 \
 ${libdir}/libfreeciv.so.0 \
 ${datadir}/po \
 ${datadir}/icons/hicolor/*/*/freeciv-client.png \
 "
 
-RDEPENDS_${PN}-server = "freeciv-common"
-FILES_${PN}-server = "\
+RDEPENDS:${PN}-server = "freeciv-common"
+FILES:${PN}-server = "\
 ${bindir}/freeciv-server \
 ${datadir}/freeciv/default \
 ${datadir}/freeciv/default.serv \
+${datadir}/freeciv/classic \
+${datadir}/freeciv/classic.serv \
+${datadir}/freeciv/civ2civ3 \
+${datadir}/freeciv/civ2civ3.serv \
 ${datadir}/freeciv/nation \
 ${datadir}/icons/hicolor/*/*/freeciv-server.png \
 "
 
-FILES_${PN}-client-common = "\
+FILES:${PN}-client-common = "\
 ${datadir}/freeciv/helpdata.txt \
 ${datadir}/freeciv/flags \
 ${datadir}/freeciv/misc \
 ${datadir}/freeciv/amplio2.tilespec \
 ${datadir}/freeciv/amplio2 \
+${datadir}/freeciv/hexemplio.tilespec \
+${datadir}/freeciv/hexemplio \
 ${datadir}/freeciv/stdsounds.soundspec \
 ${datadir}/freeciv/stdsounds \
+${datadir}/freeciv/stdmusic.musicspec \
+${datadir}/freeciv/stdmusic \
 ${datadir}/icons/hicolor/*/*/freeciv-modpack.png \
 "
 
-RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
-RPROVIDES_${PN}-qt = "freeciv-client"
-FILES_${PN}-qt = "\
+RDEPENDS:${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
+RPROVIDES:${PN}-gtk3.22 = "freeciv-client"
+FILES:${PN}-gtk3.22 = "\
+${bindir}/freeciv-gtk3.22 \
+${datadir}/freeciv/themes/gtk3.22 \
+${datadir}/freeciv/themes/gui-gtk-3.22 \
+${datadir}/freeciv/gtk3.22_menus.xml \
+"
+
+RDEPENDS:${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
+RPROVIDES:${PN}-qt = "freeciv-client"
+FILES:${PN}-qt = "\
 ${bindir}/freeciv-qt \
 ${datadir}/freeciv/themes/gui-qt \
 "
+
+RDEPENDS:${PN}-sdl2 = "freeciv-common freeciv-client-common"
+RPROVIDES:${PN}-sdl2 = "freeciv-client"
+FILES:${PN}-sdl2 = "\
+${bindir}/freeciv-sdl2 \
+${datadir}/freeciv/themes/gui-sdl2 \
+"

recipes-games/freeciv/freeciv/allow-root-S3_1.patch

@@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index 4fa608e29b..7f4b94166b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -793,6 +793,8 @@ if test "x$emscripten" = "xyes" ; then
+   AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - emscripten])
+ fi
+ 
++AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - OpenEmbedded])
++
+ dnl Settings specific to host OS
+ case "$host_os" in
+ 
+diff --git a/meson.build b/meson.build
+index f746126902..7f50fc258e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -120,6 +120,7 @@ else
+     priv_conf_data.set('ALWAYS_ROOT', 1)
+   else
+     pub_conf_data.set('FREECIV_HAVE_PTHREAD', 1)
++    priv_conf_data.set('ALWAYS_ROOT', 1)
+     net_dep = []
+   endif
+ endif

recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch

@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index e7651bea3e..a36dad82b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -658,6 +658,15 @@ if test "x$XMLREGISTRY" = "xyes" ; then
+   AC_DEFINE([FREECIV_HAVE_XML_REGISTRY], [1], [Build xml-backend for registry])
+ fi
+ 
++dnl Dummy configure option for OpenEmbedded build of older branches
++dnl to avoid unrecognised option error
++AC_ARG_WITH([qtver],
++  AS_HELP_STRING([--with-qtver], [which Qt version to build against [qt5]]),
++[case "${withval}" in
++ qt5|Qt5) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --with-qtver]) ;;
++esac])
++
+ dnl Set debug flags supported by compiler
+ EXTRA_DEBUG_CFLAGS=""
+ EXTRA_DEBUG_CXXFLAGS=""

recipes-games/freeciv/freeciv/dummy-qtver.patch

@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index d26b8fdf28..8daa054344 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -612,6 +612,15 @@ PKG_CHECK_MODULES([ICU], [icu-uc],,
+ UTILITY_CFLAGS="${UTILITY_CFLAGS} ${ICU_CFLAGS}"
+ UTILITY_LIBS="${UTILITY_LIBS} ${ICU_LIBS}"
+ 
++dnl Dummy configure option for OpenEmbedded build of older branches
++dnl to avoid unrecognised option error
++AC_ARG_WITH([qtver],
++  AS_HELP_STRING([--with-qtver], [which Qt version to build against [qt5]]),
++[case "${withval}" in
++ qt5|Qt5) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --with-qtver]) ;;
++esac])
++
+ dnl Set debug flags supported by compiler
+ EXTRA_DEBUG_CFLAGS=""
+ EXTRA_DEBUG_CXXFLAGS=""

recipes-games/freeciv/freeciv/wait-server-start.patch

@@ -1,16 +0,0 @@
-Give server more time to start
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-
-diff -Nurd -X.diff_ignore freeciv/client/connectdlg_common.c freeciv/client/connectdlg_common.c
---- freeciv/client/connectdlg_common.c	2016-04-25 15:07:18.840145337 +0300
-+++ freeciv/client/connectdlg_common.c	2016-05-04 09:43:11.524504302 +0300
-@@ -65,7 +65,7 @@
- #include "tilespec.h"
- 
- #define WAIT_BETWEEN_TRIES 100000 /* usecs */ 
--#define NUMBER_OF_TRIES 500
-+#define NUMBER_OF_TRIES 10000
- 
- #if defined(HAVE_WORKING_FORK) && !defined(WIN32_NATIVE)
- /* We are yet to see WIN32_NATIVE setup where even HAVE_WORKING_FORK would

recipes-games/freeciv/freeciv_2.5.11.bb

@@ -1,35 +0,0 @@
-FREECIV_GUI = "gtk2,gtk3,qt"
-
-require freeciv.inc
-
-DEPENDS =+ "gtk+"
-
-EXTRA_OECONF += "\
---without-ggz-dir \
---enable-sdl-mixer=sdl2 \
-"
-
-SRC_URI += "\
-${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
-"
-
-SRC_URI[md5sum] = "3998a93932bef893f8c33698bbf7ce98"
-SRC_URI[sha256sum] = "4c9c526952fe977cb4b302b8ccf75798fd066c6dde670f72f677fe4964259aad"
-
-PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3"
-
-RDEPENDS_${PN}-gtk2 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk2 = "freeciv-client"
-FILES_${PN}-gtk2 = "\
-${bindir}/freeciv-gtk2 \
-${datadir}/freeciv/themes/gui-gtk-2.0 \
-${datadir}/freeciv/gtk_menus.xml \
-"
-
-RDEPENDS_${PN}-gtk3 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk3 = "freeciv-client"
-FILES_${PN}-gtk3 = "\
-${bindir}/freeciv-gtk3 \
-${datadir}/freeciv/themes/gui-gtk-3.0 \
-${datadir}/freeciv/gtk_menus.xml \
-"

recipes-games/freeciv/freeciv_2.6.0.bb

@@ -1,29 +0,0 @@
-FREECIV_GUI = "gtk3.22,qt,sdl2"
-
-require freeciv.inc
-
-DEPENDS += "libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
-
-SRC_URI += "\
-${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
-"
-
-SRC_URI[md5sum] = "403941dc4eca22b5b76bc9e7587a1134"
-SRC_URI[sha256sum] = "7c20399198d6c7d846fed9a69b02e01134ae5340a3ae0f99d1e38063ade6c999"
-
-PACKAGES =+ "${PN}-sdl2 ${PN}-gtk3.22"
-
-RDEPENDS_${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk3.22 = "freeciv-client"
-FILES_${PN}-gtk3.22 = "\
-${bindir}/freeciv-gtk3.22 \
-${datadir}/freeciv/themes/gui-gtk-3.22 \
-${datadir}/freeciv/gtk3.22_menus.xml \
-"
-
-RDEPENDS_${PN}-sdl2 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-sdl2 = "freeciv-client"
-FILES_${PN}-sdl2 = "\
-${bindir}/freeciv-sdl2 \
-${datadir}/freeciv/themes/gui-sdl2 \
-"

recipes-games/freeciv/freeciv_2.6.8.bb

@@ -0,0 +1,10 @@
+
+require freeciv-qt5.inc
+
+SRC_URI += "\
+${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
+file://allow-root.patch \
+file://dummy-qtver-S2_6.patch \
+"
+
+SRC_URI[sha256sum] = "5a2476d11aea7712fdeaa6bb440b8396cf6cb74509b3f0b01947d3da180622be"

recipes-games/freeciv/freeciv_3.0.6.bb

@@ -0,0 +1,10 @@
+
+require freeciv-qt5.inc
+
+SRC_URI += "\
+${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
+file://allow-root.patch \
+file://dummy-qtver.patch \
+"
+
+SRC_URI[sha256sum] = "40e701157b957a2eb3c4548e5b819d06521c2ad1d47ae926be5117c7d6ace442"

recipes-games/freeciv/freeciv_S3-1-git.bb

@@ -0,0 +1,27 @@
+
+require freeciv-qt5.inc
+
+DEFAULT_PREFERENCE = "-2"
+
+DEPENDS += "tolua-native lua gtk4"
+
+SRC_URI += "\
+git://github.com/freeciv/freeciv.git;protocol=https;branch=S3_1 \
+file://allow-root-S3_1.patch \
+"
+
+SRCREV="8d7cdf503164f296990c68e27a4fe3e2a87eb909"
+PN = "freeciv"
+PV = "3.1.0-alpha5"
+S = "${WORKDIR}/git"
+
+FREECIV_GUI += "gtk4"
+
+PACKAGES += "${PN}-gtk4"
+
+RDEPENDS:${PN}-gtk4 = "freeciv-common freeciv-client-common"
+RPROVIDES:${PN}-gtk4 = "freeciv-client"
+FILES:${PN}-gtk4 = "\
+${bindir}/freeciv-gtk4 \
+${datadir}/freeciv/themes/gtk4 \
+"

recipes-games/gnome-games/gnome-chess_3.24.1.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME Chess is a 2D chess game, where games can be played between a combination of human and computer players."
 HOMEPAGE = "https://www.gnome.org/"
 SECTION = "x11/application"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "libgames-support glib-2.0 gtk+3 librsvg libcanberra intltool-native itstool-native"
 
@@ -12,5 +12,5 @@ inherit gnomebase gettext
 SRC_URI[archive.md5sum] = "56eaa655a7989fd04ce0de3c66c2d8f8"
 SRC_URI[archive.sha256sum] = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3"
 
-FILES_${PN} += "${libdir} ${datadir}"
-FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+FILES:${PN} += "${libdir} ${datadir}"
+FILES:${PN}-dbg += "${libdir}/*/*/.debug"

recipes-games/gnome-games/gnome-games_2.32.1.bb

@@ -1,30 +0,0 @@
-DESCRIPTION = "GNOME Games is a collection of fifteen small games"
-HOMEPAGE = "https://live.gnome.org/GnomeGames"
-SECTION = "x11/application"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "glib-2.0 gtk+ cairo gstreamer librsvg python-pygtk libcanberra guile gnome-doc-utils"
-
-GNOME_COMPRESS_TYPE="bz2"
-
-inherit gnomebase python-dir
-
-SRC_URI += " \
-    file://0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch \
-    file://0002-aisleriot-lib-Makefile.am-fix-configure.patch \
-    file://0003-configure.in-fix-configure-with-quadrapassel-disable.patch \
-    file://0004-aisleriot-game.c-fix-build-with-latest-guile.patch \
-    file://0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch \
-"
-SRC_URI[archive.md5sum] = "e5182bf7dc5d8573bdfdd4f5626890cd"
-SRC_URI[archive.sha256sum] = "1a3b2e82102eed3780f05db4378111c475456678deed82fd4ca379da1c5593d9"
-
-# don't build clutter depending games / pointer to python headers
-EXTRA_OECONF += " \
-    --enable-omitgames=quadrapassel,lightsoff,swell-foop,gnibbles \
-    --disable-scrollkeeper \
-"
-
-# TDB: split packages?
-FILES_${PN} += "${libdir} ${datadir}"
-FILES_${PN}-dbg += "${libdir}/*/*/.debug"

recipes-games/gnome-games/gnome-robots_3.22.1.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "gnome-robots is a small game"
 HOMEPAGE = "https://www.gnome.org/"
 SECTION = "x11/application"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "libgnome-games-support glib-2.0 gtk+3 librsvg libcanberra intltool-native itstool-native"
 
@@ -12,5 +12,5 @@ inherit gnomebase
 SRC_URI[archive.md5sum] = "adc8b1ddfff21e344eb461db0785eb08"
 SRC_URI[archive.sha256sum] = "5cd4564d7eb876fe4ef332dc568bcf7b1515d8ec9f66e53c2bae5331e0182dd4"
 
-FILES_${PN} += "${libdir} ${datadir}"
-FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+FILES:${PN} += "${libdir} ${datadir}"
+FILES:${PN}-dbg += "${libdir}/*/*/.debug"

recipes-games/gnome-games/libgames-support_1.0.2.bb

@@ -3,7 +3,7 @@ but it may be used by others."
 HOMEPAGE = "https://live.gnome.org/GnomeGames"
 SECTION = "x11/application"
 
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "glib-2.0 gtk+3 libgee intltool-native"
@@ -13,4 +13,4 @@ inherit gnomebase
 SRC_URI[archive.md5sum] = "ffba5c102eeb9ae3d96294bccb02446e"
 SRC_URI[archive.sha256sum] = "b096e8d8ddc57ff247edc5eae842d405402b043e289f3a0949499e1df514ba66"
 
-FILES_${PN} += "${libdir} ${datadir}"
+FILES:${PN} += "${libdir} ${datadir}"

recipes-games/gnome-games/libgnome-games-support_1.4.3.bb

@@ -3,7 +3,7 @@ but it may be used by others."
 HOMEPAGE = "https://live.gnome.org/GnomeGames"
 SECTION = "x11/application"
 
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "gtk+3 libgee"
@@ -13,4 +13,4 @@ inherit gnomebase gettext
 SRC_URI[archive.md5sum] = "a18acdf1a5398507a12fc6f408b5c541"
 SRC_URI[archive.sha256sum] = "704a7a93aa5066f84738b60d696cf393dfbbf1a3e339f9adbb40af0cf70eca3c"
 
-FILES_${PN} += "${libdir} ${datadir}"
+FILES:${PN} += "${libdir} ${datadir}"

recipes-games/maelstrom/maelstrom/0001-Use-pkg-config-to-find-sdl.patch

@@ -9,26 +9,19 @@ Content-Transfer-Encoding: 8bit
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- configure.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index 0170f4b..a6f76ac 100644
---- a/configure.in
-+++ b/configure.in
-@@ -47,10 +47,7 @@ AC_SUBST(INETLIB)
+diff -Nurd Maelstrom-3.0.7/configure.in Maelstrom-3.0.7/configure.in
+--- Maelstrom-3.0.7/configure.in	2021-02-04 19:17:55.000000000 +0200
++++ Maelstrom-3.0.7/configure.in	2022-08-24 23:12:31.161825755 +0300
+@@ -47,10 +47,7 @@
  
  dnl Check for SDL
- SDL_VERSION=1.2.0
--AM_PATH_SDL($SDL_VERSION,
+ SDL_VERSION=2.0.14
+-AM_PATH_SDL2($SDL_VERSION,
 -            :,
 -            AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
 -)
-+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION], [HAVE_SDL=yes], [AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])])
++PKG_CHECK_MODULES([SDL], [sdl2 >= $SDL_VERSION], [HAVE_SDL=yes], [AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])])
  CFLAGS="$CFLAGS $SDL_CFLAGS"
  LIBS="$LIBS $SDL_LIBS"
  
--- 
-2.20.1
-

recipes-games/maelstrom/maelstrom/0003-Fix-install-dir.patch

@@ -1,44 +0,0 @@
-From b051343fcac17227369bc4c7e0b0b00811500e24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 12 Feb 2019 15:06:01 +0100
-Subject: [PATCH] Fix install dir
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- Makefile.am  | 2 +-
- configure.in | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4a9e949..a3194fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -65,7 +65,7 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
- 
- # Special install rule for the game
- install:
--	make install_gamedata target=@GAME_INSTALLDIR@
-+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
- 
- install_gamedata:
- 	sh mkinstalldirs $(target)/
-diff --git a/configure.in b/configure.in
-index a6f76ac..e158dd2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -105,6 +105,7 @@ case "$target" in
-         GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
-         ;;
- esac
-+GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
- AC_SUBST(GAME_INSTALLDIR)
- CFLAGS="$CFLAGS -DLIBDIR=\\\"$GAME_INSTALLDIR\\\""
- 
--- 
-2.20.1
-

recipes-games/maelstrom/maelstrom/0004-Maelstrom-3.0.6-setgid.patch

@@ -13,22 +13,16 @@ Upstream-Status: Pending
 [1] https://src.fedoraproject.org/cgit/rpms/Maelstrom.git/tree/Maelstrom-3.0.6-setgid.patch
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- main.cpp   |  8 +++++
- scores.cpp | 87 ++++++++++++++++++++++++++++++++++--------------------
- scores.h   |  1 +
- 3 files changed, 64 insertions(+), 32 deletions(-)
 
-diff --git a/main.cpp b/main.cpp
-index 7728c0b..851cf01 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -170,12 +170,20 @@ int main(int argc, char *argv[])
+diff -Nurd Maelstrom-3.0.7/main.cpp Maelstrom-3.0.7/main.cpp
+--- Maelstrom-3.0.7/main.cpp	2021-02-04 18:50:27.000000000 +0200
++++ Maelstrom-3.0.7/main.cpp	2022-08-24 22:46:23.571071218 +0300
+@@ -170,12 +170,20 @@
  	/* Command line flags */
  	int doprinthigh = 0;
  	int speedtest = 0;
 +	gid_t gid;
- 	Uint32 video_flags = SDL_SWSURFACE;
+ 	Uint32 video_flags = SDL_WINDOW_FULLSCREEN_DESKTOP;
  
  	/* Normal variables */
  	SDL_Event event;
@@ -44,10 +38,9 @@ index 7728c0b..851cf01 100644
  #ifndef __WIN95__
  	/* The first thing we do is calculate our checksum */
  	(void) checksum();
-diff --git a/scores.cpp b/scores.cpp
-index 1633e8f..c8b53b5 100644
---- a/scores.cpp
-+++ b/scores.cpp
+diff -Nurd Maelstrom-3.0.7/scores.cpp Maelstrom-3.0.7/scores.cpp
+--- Maelstrom-3.0.7/scores.cpp	2021-02-06 07:35:46.000000000 +0200
++++ Maelstrom-3.0.7/scores.cpp	2022-08-24 22:53:05.896048770 +0300
 @@ -4,6 +4,8 @@
  */
  
@@ -57,7 +50,7 @@ index 1633e8f..c8b53b5 100644
  #include <sys/types.h>
  #include <sys/stat.h>
  #endif
-@@ -15,11 +17,11 @@
+@@ -15,7 +17,7 @@
  #include "load.h"
  #include "dialog.h"
  
@@ -66,11 +59,6 @@ index 1633e8f..c8b53b5 100644
  #define NUM_SCORES		10		// Do not change this!
  
  /* Everyone can write to scores file if defined to 0 */
--#define SCORES_PERMMASK		0
-+#define SCORES_PERMMASK		002
- 
- #define CLR_DIALOG_WIDTH	281
- #define CLR_DIALOG_HEIGHT	111
 @@ -27,10 +29,31 @@
  Bool gNetScores = 0;
  Scores hScores[NUM_SCORES];
@@ -100,12 +88,12 @@ index 1633e8f..c8b53b5 100644
 +
  void LoadScores(void)
  {
--	LibPath path;
+-	SavePath path;
 -	SDL_RWops *scores_src;
  	int i;
  
  	/* Try to load network scores, if we can */
-@@ -44,50 +67,50 @@ void LoadScores(void)
+@@ -44,50 +67,50 @@
  	}
  	memset(&hScores, 0, sizeof(hScores));
  
@@ -135,7 +123,7 @@ index 1633e8f..c8b53b5 100644
  
  void SaveScores(void)
  {
--	LibPath path;
+-	SavePath path;
 -	SDL_RWops *scores_src;
  	int i;
 -#ifdef unix
@@ -184,10 +172,9 @@ index 1633e8f..c8b53b5 100644
  }
  
  /* Just show the high scores */
-diff --git a/scores.h b/scores.h
-index 4126260..4716751 100644
---- a/scores.h
-+++ b/scores.h
+diff -Nurd Maelstrom-3.0.7/scores.h Maelstrom-3.0.7/scores.h
+--- Maelstrom-3.0.7/scores.h	1998-07-14 04:50:17.000000000 +0300
++++ Maelstrom-3.0.7/scores.h	2022-08-24 22:44:34.517672737 +0300
 @@ -2,6 +2,7 @@
  // Functions from scores.cc
  extern void	LoadScores(void);
@@ -196,6 +183,3 @@ index 4126260..4716751 100644
  extern int	ZapHighScores(void);
  extern int	GetStartLevel(void);
  extern void	PrintHighScores(void);
--- 
-2.20.1
-

recipes-games/maelstrom/maelstrom/0006-scores.cpp-Fix-build-with-hardened-security-flags.patch

@@ -0,0 +1,43 @@
+From 53b3b2081c38c882f5aefcd5e630bdd0591283e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 15 Nov 2020 21:18:59 +0100
+Subject: [PATCH] scores.cpp: Fix build with hardened security flags
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+| In function 'int open(const char*, int, ...)',
+|     inlined from 'void GetScoreFile()' at scores.cpp:44:10:
+| <...>/recipe-sysroot/usr/include/bits/fcntl2.h:50:24: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
+|    50 |    __open_missing_mode ();
+|       |    ~~~~~~~~~~~~~~~~~~~~^~
+| make[1]: *** [Makefile:561: scores.o] Error 1
+
+Stolen from [1]
+
+[1] https://src.fedoraproject.org/rpms/Maelstrom/blob/master/f/Maelstrom-open.patch
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ scores.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scores.cpp b/scores.cpp
+index c8b53b5..f42c40f 100644
+--- a/scores.cpp
++++ b/scores.cpp
+@@ -41,7 +41,7 @@ void GetScoreFile(void)
+ #ifdef unix
+ 	omask=umask(SCORES_PERMMASK);
+ #endif
+-	f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT);
++	f = open(MAELSTROM_SCORES,O_RDWR|O_CREAT,S_IRUSR | S_IWUSR | S_IWGRP | S_IRGRP);
+ 	if (f == -1)
+ 		f = open(MAELSTROM_SCORES,O_RDONLY);
+ 	if (f == -1)
+-- 
+2.26.2
+

recipes-games/maelstrom/maelstrom_3.0.7.bb

@@ -1,30 +1,34 @@
 SUMMARY = "Maelstrom is a GPL'd port of the shareware game for the Macintosh"
-LICENSE = "GPLv2 & CC-BY-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0642955deaee2fa53c36bc592dc1ef25"
+LICENSE = "GPL-2.0-only & CC-BY-3.0"
+LIC_FILES_CHKSUM = "\
+ file://COPYING.GPL;md5=d368405f1c604912f51ba286eed9944a \
+ file://COPYING.txt;md5=1ade764d012d246f775dc01dc4f7c1af \
+"
+
 HOMEPAGE = "https://www.libsdl.org/projects/Maelstrom/"
 
 inherit autotools-brokensep pkgconfig gettext gtk-icon-cache
 
 DEPENDS += " \
-    libsdl-net \
+    libsdl2-net \
 "
 
 SRC_URI = " \
     https://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${PV}.tar.gz \
     file://0001-Use-pkg-config-to-find-sdl.patch \
     file://0002-buttonlist.h-Fix-build-with-recent-gcc-s.patch \
-    file://0003-Fix-install-dir.patch \
     file://0004-Maelstrom-3.0.6-setgid.patch \
+    file://0006-scores.cpp-Fix-build-with-hardened-security-flags.patch \
     file://maelstrom.png \
     file://Maelstrom.desktop \
 "
-SRC_URI[md5sum] = "96aa6359538a6bd60b4198a792de578b"
-SRC_URI[sha256sum] = "e7983c2c7376cdcca1944db1706d92aedd529638cf13358c88a60df982ba7b46"
+
+SRC_URI[sha256sum] = "93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036"
 
 S = "${WORKDIR}/Maelstrom-${PV}"
 
-do_configure_prepend() {
-    touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog
+do_configure:prepend() {
+    touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/COPYING ${S}/README
 }
 
 do_install() {
@@ -37,7 +41,6 @@ do_install() {
     install -m 644 ${WORKDIR}/maelstrom.png ${D}/${datadir}/icons/hicolor/48x48/apps
 
     install -d ${D}/${localstatedir}/lib/games
-    mv ${D}${datadir}/Maelstrom/*Scores ${D}/${localstatedir}/lib/games
 }
 
-FILES_${PN} += "${datadir}/Maelstrom"
+FILES:${PN} += "/usr/games/Maelstrom"

recipes-games/neverball/neverball-data_git.bb

@@ -0,0 +1,16 @@
+require neverball.inc
+
+inherit allarch
+
+DEPENDS:append = " jpeg-native libpng-native libsdl2-native"
+
+do_compile() {
+	oe_runmake CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/SDL2/" LDFLAGS="${BUILD_LDFLAGS} -lpng" mapc sols
+}
+
+do_install() {
+	install -d -m 755 ${D}${datadir}/neverball
+	cp -R --no-dereference --preserve=mode,links ${B}/data ${D}${datadir}/neverball/
+}
+
+FILES:${PN}:append = " ${datadir}/neverball"

recipes-games/neverball/neverball.inc

@@ -0,0 +1,26 @@
+SUMMARY = "Tilt the floor to roll a ball through an obstacle course before time runs out. Neverball is part puzzle game, part action game, and entirely a test of skill."
+SECTION = "graphics"
+HOMEPAGE = "https://neverball.org/"
+
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=200ddba3b50e856bfb681a2b13dfb523"
+
+SRC_URI = "git://github.com/Neverball/neverball.git;branch=master;protocol=https"
+SRCREV = "b1617ed0db2c908ff1b96d6a252a85881f0574c0"
+PV = "1.6.0+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE:append = " \
+	ENABLE_FETCH=0 \
+	ENABLE_OPENGLES=1 \
+	DATADIR=/usr/share/neverball/data \
+	LOCALEDIR=/usr/share/neverball/locale \
+	"
+
+do_configure:append() {
+	sed -i "s@sdl2-config@pkg-config sdl2@" ${S}/Makefile
+	sed -i "s@libpng-config@pkg-config libpng@" ${S}/Makefile
+}

recipes-games/neverball/neverball_git.bb

@@ -0,0 +1,16 @@
+require neverball.inc
+
+DEPENDS:append = " gettext-native virtual/libgles1 virtual/libintl libvorbis jpeg libpng libsdl2 libsdl2-ttf"
+
+do_compile() {
+	oe_runmake neverball neverputt locales desktops
+}
+
+do_install() {
+	install -d -m 755 ${D}${bindir}
+	install -m 755 ${B}/neverball ${D}/${bindir}/
+	install -m 755 ${B}/neverputt ${D}/${bindir}/
+
+	install -d -m 755 ${D}${datadir}/neverball
+	cp -R --no-dereference --preserve=mode,links ${B}/locale ${D}${datadir}/neverball/
+}

recipes-games/packagegroups/packagegroup-games-pinball.bb

@@ -0,0 +1,14 @@
+# Copyright (C) 2020 Philippe Coval <https://purl.org/rzr/pinball>
+SUMMARY = "Pinball simulator and extra tables"
+DESCRIPTION = "Package group bringing Emilia libre pinball simulator game and tables"
+
+inherit packagegroup
+
+PACKAGES = "packagegroup-games-pinball"
+
+ALLOW_EMPTY:${PN} = "1"
+
+RDEPENDS:${PN} += " pinball"
+RDEPENDS:${PN} += " pinball-table-gnu"
+RDEPENDS:${PN} += " pinball-table-hurd"
+

recipes-games/packagegroups/packagegroup-games.bb

@@ -0,0 +1,26 @@
+# Copyright (C) 2021 Philippe Coval <https://purl.org/rzr/>
+SUMMARY = "Games collection"
+DESCRIPTION = "Package group bringing games together"
+
+inherit packagegroup
+
+PACKAGES = "packagegroup-games"
+
+ALLOW_EMPTY:${PN} = "1"
+
+RDEPENDS:${PN} += "\
+astromenace \
+atanks \
+chromium-bsu \
+etr \
+freeciv \
+gnome-games \
+maelstrom \
+packagegroup-games-pinball \
+pingus \
+scummvm \
+supertux \
+supertuxkart \
+wesnoth \
+"
+

recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb

@@ -0,0 +1,60 @@
+DESCRIPTION = "GNU Pinball table for Emilia Pinball Simulator"
+HOMEPAGE = "https://github.com/rzr/pinball-table-gnu"
+SECTION = "games"
+LICENSE = "GPL-2.0-only & GPL-3.0-only & LAL-1.3 & CC-BY-SA-3.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://debian/copyright;md5=7d2f80a6e11a2648d4657afdb89d05a8 \
+"
+
+SRC_URI = "git://github.com/rzr/pinball-table-gnu.git;protocol=https;branch=master"
+SRCREV = "7b738e40fd22fce62c6a317e70922ac0eb39f794"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += "pinball \
+    libsdl \
+"
+
+inherit pkgconfig autotools-brokensep
+
+PACKAGECONFIG ??= "sdl"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl"
+
+PACKAGES = "${PN}"
+PACKAGES += "${PN}-dev"
+PACKAGES += "${PN}-staticdev"
+PACKAGES += "${PN}-dbg"
+PACKAGES += "${PN}-data"
+
+REMOVE_LIBTOOL_LA = "0"
+
+do_configure:prepend() {
+    cd ${S}
+    ./bootstrap
+}
+
+FILES:${PN}-dev = "\
+${includedir}/${PN}/* \
+"
+
+FILES:${PN}-staticdev = "\
+${libdir}/pinball/lib*.a \
+"
+
+FILES:${PN}-dbg = "\
+${libdir}/pinball/.debug/libModule*.so* \
+"
+
+FILES:${PN} = "\
+${libdir}/pinball/libModule*.so* \
+${libdir}/pinball/libModule*.la \
+"
+
+FILES:${PN}-data = "\
+${datadir}/pinball/*/* \
+"
+
+RDEPENDS:${PN} += " pinball"
+RDEPENDS:${PN} += " ${PN}-data"
+INSANE_SKIP:${PN} = "dev-so"

recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb

@@ -0,0 +1,61 @@
+DESCRIPTION = "HURD Pinball table for Emilia Pinball Simulator"
+HOMEPAGE = "https://github.com/rzr/pinball-table-hurd"
+SECTION = "games"
+LICENSE = "GPL-2.0-only & LAL-1.3 & CC-BY-SA-3.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://debian/copyright;md5=894ad8c75ec3bbd77c06d637d85dbb63 \
+"
+
+SRC_URI = "git://github.com/rzr/pinball-table-hurd.git;protocol=https;branch=master"
+SRCREV = "10e6c04a159209db5b9c19374f632edc5752abbf"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += "libsdl \
+    pinball \
+"
+
+inherit pkgconfig autotools-brokensep
+
+PACKAGECONFIG ??= "sdl"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl"
+
+PACKAGES = "${PN}"
+PACKAGES += "${PN}-dev"
+PACKAGES += "${PN}-staticdev"
+PACKAGES += "${PN}-dbg"
+PACKAGES += "${PN}-data"
+
+REMOVE_LIBTOOL_LA = "0"
+
+do_configure:prepend() {
+    cd ${S}
+    ./bootstrap
+}
+
+FILES:${PN}-dev = "\
+${includedir}/${PN}/* \
+"
+
+FILES:${PN}-staticdev = "\
+${libdir}/pinball/lib*.a \
+"
+
+FILES:${PN}-dbg = "\
+${libdir}/pinball/.debug/libModule*.so* \
+"
+
+FILES:${PN} = "\
+${libdir}/pinball/libModule*.so* \
+${libdir}/pinball/libModule*.la \
+"
+
+FILES:${PN}-data = "\
+${datadir}/pinball/*/* \
+${localstatedir}/games/pinball/*/highscores \
+"
+
+RDEPENDS:${PN} += " pinball"
+RDEPENDS:${PN} += " ${PN}-data"
+INSANE_SKIP:${PN} = "dev-so"

recipes-games/pinball/pinball_0.3.20201218.bb

@@ -0,0 +1,72 @@
+DESCRIPTION = "Emilia Pinball Simulator"
+HOMEPAGE = "http://pinball.sf.net/"
+SECTION = "games"
+LICENSE = "GPL-2.0-only & CC0-1.0"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+    file://debian/copyright;md5=ef0d1a481815636a22c1d73b1233d9c0 \
+"
+
+SRC_URI = "git://github.com/adoptware/pinball.git;protocol=https;nobranch=1"
+SRCREV = "fdb2fa3ebea8a1c20e1a50a54c5df292d342b531"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += "libsdl libsdl-image libsdl-mixer \
+    libx11 \
+    virtual/libgl \
+    libglu \
+    alsa-lib \
+    libvorbis \
+    tiff \
+"
+
+inherit features_check pkgconfig autotools-brokensep
+
+REQUIRED_DISTRO_FEATURES = "opengl x11"
+
+PACKAGECONFIG ??= "sdl sdl-image sdl-mixer"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl"
+PACKAGECONFIG[sdl-image] = "--enable-sdl-image,--disable-sdl-image,libsdl-image"
+PACKAGECONFIG[sdl-mixer] = "--enable-sdl-mixer,--disable-sdl-mixer,libsdl-mixer"
+
+PACKAGES = "${PN}"
+PACKAGES += "${PN}-dev"
+PACKAGES += "${PN}-staticdev"
+PACKAGES += "${PN}-dbg"
+PACKAGES += "${PN}-data"
+
+REMOVE_LIBTOOL_LA = "0"
+
+do_configure:prepend() {
+    cd ${S}
+    sed -e "s|libtool --version|-libtool --version|g"  -i helper.mk
+    ./bootstrap
+}
+
+FILES:${PN}-dev = "\
+${includedir}/${PN}/* \
+${bindir}/${PN}-config \
+"
+
+FILES:${PN}-staticdev = "\
+${libdir}/${PN}/lib*.a \
+"
+
+FILES:${PN}-dbg = "\
+${libdir}/${PN}/.debug/libModule*.so* \
+"
+
+FILES:${PN} = "\
+${libdir}/${PN}/libModule*.so* \
+${libdir}/${PN}/libModule*.la* \
+${bindir}/${PN} \
+"
+
+FILES:${PN}-data = "\
+${datadir}/${PN}/* \
+${localstatedir}/games/${PN}/*/highscores \
+"
+
+RDEPENDS:${PN} += " ${PN}-data"
+INSANE_SKIP:${PN} = "dev-so"

recipes-games/pingus/pingus_0.7.6.bb

@@ -1,15 +1,15 @@
 DESCRIPTION = "Pingus is a free Lemmings clone."
 DEPENDS = "virtual/libiconv boost libpng libglu libsdl-mixer libsdl-image"
-LICENSE = "GPLv3+"
+LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-HOMEPAGE = "http://pingus.seul.org/"
+HOMEPAGE = "https://pingus.gitlab.io/"
 
-RDEPENDS_${PN} += "libmikmod bash"
+RDEPENDS:${PN} += "libmikmod bash"
 
-inherit scons pythonnative
+inherit scons pkgconfig python3native
 
 SRC_URI = "\
-    git://github.com/Pingus/pingus.git \
+    git://github.com/Pingus/pingus.git;branch=master;protocol=https \
     file://0001-Add-missing-header-for-std-function-and-std-bind.patch \
     file://0002-Fix-build-with-boost-1.69.0.patch \
     file://0003-SConscript-Fix-for-python3.patch \
@@ -38,7 +38,7 @@ do_install() {
 	install -m 0755 ${S}/build/pingus ${D}${bindir}/pingus
 }
 
-FILES_${PN} += "${datadir}"
+FILES:${PN} += "${datadir}"
 
 SRC_URI[md5sum] = "8f366e7ba76c9f3525888efe8b04b1ad"
 SRC_URI[sha256sum] = "c4cd89e1d350d2472f32de5f6266ac9f3658a3620eace3f79efac45db4323b65"

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 d8b22ac6f54..1474578b47c 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 --cflags | sed 's/[[:space:]]*-Dmain=SDL_main//g'`"
++	append_var SDL_CFLAGS "`pkg-config --cflags sdl2`"
+ 	if test "$_static_build" = yes ; then
+ 		append_var SDL_LIBS "`$_sdlconfig --static-libs`"
+ 	else
+-		append_var SDL_LIBS "`$_sdlconfig --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.31.1
 

recipes-games/scummvm/scummvm/0002-Do-not-split-binaries-during-install.patch

@@ -0,0 +1,35 @@
+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 27b00768b21..3a97938d6da 100644
+--- a/ports.mk
++++ b/ports.mk
+@@ -35,10 +35,10 @@ endif
+ 
+ install-strip: install-data
+ 	$(INSTALL) -d "$(DESTDIR)$(bindir)"
+-	$(INSTALL) -c -s -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
++	$(INSTALL) -c -m 755 "./$(EXECUTABLE)" "$(DESTDIR)$(bindir)/$(EXECUTABLE)"
+ 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.31.1
+

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:

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"

recipes-games/scummvm/scummvm_2.2.0.bb

@@ -0,0 +1,65 @@
+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 = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+inherit autotools-brokensep pkgconfig gtk-icon-cache manpages features_check
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+SRC_URI = " \
+    git://github.com/scummvm/scummvm.git;protocol=https;branch=master \
+    file://0001-use-pkg-config-to-gather-sdl-information.patch \
+    file://0002-Do-not-split-binaries-during-install.patch \
+    file://scummvm.desktop \
+"
+SRCREV = "f45e3184ba6d90612c7a97a4ae17dbb61c063cc8"
+S = "${WORKDIR}/git"
+PV = "2.2.0+git${SRCPV}"
+
+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}"

recipes-games/supertux/files/0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch

@@ -15,18 +15,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9dd3877..9e50b57 100644
+index 0ba66bf..126eb95 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -217,7 +217,7 @@ include_directories(SYSTEM ${VORBIS_INCLUDE_DIR})
- include(CheckSymbolExists)
- 
+@@ -223,7 +223,7 @@ include(CheckSymbolExists)
  find_package(PhysFS)
--check_symbol_exists("PHYSFS_getPrefDir" "${PHYSFS_INCLUDE_DIR}/physfs.h" HAVE_PHYSFS_GETPREFDIR)
-+set(HAVE_PHYSFS_GETPREFDIR TRUE)
+ if(PHYSFS_LIBRARY)
+   set(CMAKE_REQUIRED_LIBRARIES ${PHYSFS_LIBRARY})
+-  check_symbol_exists("PHYSFS_getPrefDir" "${PHYSFS_INCLUDE_DIR}/physfs.h" HAVE_PHYSFS_GETPREFDIR)
++  set(HAVE_PHYSFS_GETPREFDIR TRUE)
+ endif()
  if(HAVE_PHYSFS_GETPREFDIR)
    set(USE_SYSTEM_PHYSFS ON CACHE BOOL "Use preinstalled physfs (must support getPrefDir)")
- else(HAVE_PHYSFS_GETPREFDIR)
 -- 
-2.20.1
+2.21.1
 

recipes-games/supertux/files/0002-do-not-set-included-paths-as-system-causes-trouble-w.patch

@@ -16,15 +16,11 @@ further information at [1]
 [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9e50b57..cf70210 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,7 +134,7 @@ else(ENABLE_BOOST_STATIC_LIBS)
+diff -Nurd SuperTux-v0.6.3-Source/CMakeLists.txt SuperTux-v0.6.3-Source/CMakeLists.txt
+--- SuperTux-v0.6.3-Source/CMakeLists.txt	2021-12-23 01:01:57.000000000 +0200
++++ SuperTux-v0.6.3-Source/CMakeLists.txt	2022-02-17 02:23:35.340439201 +0200
+@@ -172,7 +172,7 @@
    set(Boost_USE_STATIC_LIBS FALSE)
  endif(ENABLE_BOOST_STATIC_LIBS)
  find_package(Boost REQUIRED COMPONENTS filesystem system date_time locale)
@@ -32,8 +28,8 @@ index 9e50b57..cf70210 100644
 +include_directories(${Boost_INCLUDE_DIR})
  link_directories(${Boost_LIBRARY_DIRS})
  
- find_package(PNG REQUIRED)
-@@ -182,14 +182,14 @@ if(ENABLE_OPENGL)
+ find_package(glm QUIET)
+@@ -273,14 +273,14 @@
      set(OpenGL_GL_PREFERENCE "LEGACY")
      find_package(OpenGL)
      if(OPENGL_FOUND)
@@ -50,7 +46,7 @@ index 9e50b57..cf70210 100644
          add_definitions(-DUSE_GLBINDING)
          IF (GLBINDING_DEBUG_OUTPUT)
            add_definitions(-DUSE_GLBINDING_DEBUG_OUTPUT)
-@@ -198,7 +198,7 @@ if(ENABLE_OPENGL)
+@@ -289,7 +289,7 @@
      else()
        find_package(GLEW REQUIRED)
        if(GLEW_FOUND)
@@ -59,12 +55,15 @@ index 9e50b57..cf70210 100644
        endif(GLEW_FOUND)
      endif()
    endif()
-@@ -209,10 +209,10 @@ if(VCPKG_BUILD)
+@@ -301,13 +301,13 @@
+   else()
+     find_package(OpenAL REQUIRED)
+   endif()
+-  include_directories(SYSTEM ${OPENAL_INCLUDE_DIR})
++  include_directories(${OPENAL_INCLUDE_DIR})
  else()
-   find_package(OpenAL REQUIRED)
+   include_directories(${CMAKE_SOURCE_DIR}/mk/emscripten/AL)
  endif()
--include_directories(SYSTEM ${OPENAL_INCLUDE_DIR})
-+include_directories(${OPENAL_INCLUDE_DIR})
  
  find_package(OggVorbis REQUIRED)
 -include_directories(SYSTEM ${VORBIS_INCLUDE_DIR})
@@ -72,7 +71,7 @@ index 9e50b57..cf70210 100644
  
  include(CheckSymbolExists)
  
-@@ -262,7 +262,7 @@ if(NOT USE_SYSTEM_PHYSFS)
+@@ -364,7 +364,7 @@
    set(PHYSFS_INCLUDE_DIR "${PHYSFS_PREFIX}/include/")
  endif()
  
@@ -81,14 +80,17 @@ index 9e50b57..cf70210 100644
  
  
  ## The curl headers are in the standard include path in dependencies
-@@ -283,12 +283,12 @@ if(WIN32 AND VCPKG_BUILD)
+@@ -386,7 +386,7 @@
+     endif()
    endif()
- endif()
- if(CURL_FOUND)
--  include_directories(SYSTEM ${CURL_INCLUDE_DIR})
-+  include_directories(${CURL_INCLUDE_DIR})
-   set(HAVE_LIBCURL TRUE)
- endif(CURL_FOUND)
+   if(CURL_FOUND)
+-    include_directories(SYSTEM ${CURL_INCLUDE_DIR})
++    include_directories(${CURL_INCLUDE_DIR})
+     set(HAVE_LIBCURL TRUE)
+   endif(CURL_FOUND)
+ endif(NOT EMSCRIPTEN)
+@@ -394,7 +394,7 @@
+ find_package(ZLIB REQUIRED)
  
  #find_package(ICONV REQUIRED)
 -#include_directories(SYSTEM ${ICONV_INCLUDE_DIR})
@@ -96,7 +98,7 @@ index 9e50b57..cf70210 100644
  #link_libraries(${ICONV_LIBRARY})
  
  if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-@@ -411,7 +411,7 @@ else()
+@@ -527,7 +527,7 @@
    set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
  endif()
  
@@ -105,23 +107,25 @@ index 9e50b57..cf70210 100644
  
  ## Also build external/tinygettext
  
-@@ -440,7 +440,7 @@ ExternalProject_Add(tinygettext
+@@ -570,7 +570,7 @@
  add_library(tinygettext_lib STATIC IMPORTED)
  set_target_properties(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")
  
 -include_directories(SYSTEM ${TINYGETTEXT_PREFIX}/include)
 +include_directories(${TINYGETTEXT_PREFIX}/include)
  
+ 
  ## external/SDL_ttf with patches
- find_package(Freetype REQUIRED)
-@@ -463,16 +463,16 @@ ExternalProject_Add(SDL_ttf
+@@ -602,7 +602,7 @@
  add_library(SDL_ttf_lib STATIC IMPORTED)
  set_target_properties(SDL_ttf_lib PROPERTIES IMPORTED_LOCATION "${SDL_TTF_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2_ttf${CMAKE_STATIC_LIBRARY_SUFFIX}")
  link_directories(${SDL_TTF_PREFIX}/lib)
 -include_directories(SYSTEM ${SDL_TTF_PREFIX}/include/SDL2)
 +include_directories(${SDL_TTF_PREFIX}/include/SDL2)
- 
- ## Some additional include paths
+ if(RAQM_FOUND)
+   find_package(FriBidi REQUIRED)
+   find_package(HarfBuzz REQUIRED)
+@@ -613,11 +613,11 @@
  
  include_directories(${CMAKE_BINARY_DIR}/)
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
@@ -129,14 +133,25 @@ index 9e50b57..cf70210 100644
 -include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
 -include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
 -include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/)
+-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/partio_zip/)
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
 +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/)
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/partio_zip/)
  
- if(WIN32)
-   add_definitions(-D_USE_MATH_DEFINES -DNOMINMAX)
-@@ -494,7 +494,7 @@ add_library(sexp STATIC ${SEXP_SOURCES_CXX})
+ # Discord SDK
+ # Before removing messages, please check with the community if no one minds that the Discord SDK gets bundled with ST.
+@@ -625,7 +625,7 @@
+ option(ENABLE_DISCORD "Compile the Discord integration" OFF)
+ if(ENABLE_DISCORD)
+   message(STATUS "Discord WILL be compiled. To disable Discord, pass -DENABLE_DISCORD=Off")
+-  include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/discord-sdk/include)
++  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/discord-sdk/include)
+   set(BUILD_EXAMPLES OFF CACHE BOOL "Skip Discord's sample programs" FORCE)
+   add_subdirectory(external/discord-sdk)
+ else(ENABLE_DISCORD)
+@@ -672,7 +672,7 @@
  
  file(GLOB SAVEPNG_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/SDL_SavePNG/savepng.c)
  add_library(savepng STATIC ${SAVEPNG_SOURCES_CXX})
@@ -144,20 +159,24 @@ index 9e50b57..cf70210 100644
 +target_include_directories(savepng PUBLIC ${SDL2_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS})
  target_link_libraries(savepng PUBLIC ${PNG_LIBRARIES})
  
- if(HAVE_OPENGL)
-@@ -746,9 +746,9 @@ if(VCPKG_BUILD)
-   target_include_directories(supertux2_lib PUBLIC ${CURL_INCLUDE_DIRS})
- endif()
+ add_library(partio_zip_lib STATIC ${CMAKE_CURRENT_SOURCE_DIR}/external/partio_zip/zip_manager.cpp)
+@@ -956,8 +956,8 @@
+ target_include_directories(partio_zip_lib PUBLIC external/partio_zip/)
  
--target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL2_INCLUDE_DIRS})
--target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL2IMAGE_INCLUDE_DIRS})
+ if (NOT EMSCRIPTEN)
+-  target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL2_INCLUDE_DIRS})
+-  target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL2IMAGE_INCLUDE_DIRS})
++  target_include_directories(supertux2_lib PUBLIC ${SDL2_INCLUDE_DIRS})
++  target_include_directories(supertux2_lib PUBLIC ${SDL2IMAGE_INCLUDE_DIRS})
+   if(VCPKG_BUILD AND NOT WIN32)
+     target_link_libraries(supertux2_lib PRIVATE SDL2::SDL2main SDL2::SDL2 SDL2::SDL2_image)
+   else()
+@@ -965,7 +965,7 @@
+     target_link_libraries(supertux2_lib PUBLIC ${SDL2IMAGE_LIBRARIES})
+   endif()
+ endif()
 -target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL_TTF_PREFIX}/include/SDL2)
-+target_include_directories(supertux2_lib PUBLIC ${SDL2_INCLUDE_DIRS})
-+target_include_directories(supertux2_lib PUBLIC ${SDL2IMAGE_INCLUDE_DIRS})
 +target_include_directories(supertux2_lib PUBLIC ${SDL_TTF_PREFIX}/include/SDL2)
+ target_link_libraries(supertux2_lib PUBLIC SDL_ttf_lib)
  if(VCPKG_BUILD)
-   target_link_libraries(supertux2_lib PRIVATE SDL2::SDL2main SDL2::SDL2 SDL2_image)
- else()
--- 
-2.20.1
-
+   target_link_libraries(supertux2_lib PUBLIC freetype)

recipes-games/supertux/files/0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch

@@ -14,46 +14,39 @@ Seems current version of cmake is forgetful on this:
 Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf70210..ac223ca 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -241,6 +241,7 @@ if(NOT USE_SYSTEM_PHYSFS)
-   ExternalProject_Add(physfs
-     SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/physfs/"
+diff -Nurd SuperTux-v0.6.3-Source/CMakeLists.txt SuperTux-v0.6.3-Source/CMakeLists.txt
+--- SuperTux-v0.6.3-Source/CMakeLists.txt	2022-02-17 02:25:59.793665316 +0200
++++ SuperTux-v0.6.3-Source/CMakeLists.txt	2022-02-17 02:26:31.085934279 +0200
+@@ -343,6 +343,7 @@
+     "${PHYSFS_PREFIX}/lib${LIB_SUFFIX}/physfs${CMAKE_LINK_LIBRARY_SUFFIX}"
+     "${PHYSFS_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}physfs${CMAKE_STATIC_LIBRARY_SUFFIX}"
      CMAKE_ARGS
 +    -DCMAKE_MAKE_PROGRAM=make
      -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
      -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
      -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-@@ -386,6 +387,7 @@ set(SQUIRREL_PREFIX ${CMAKE_BINARY_DIR}/squirrel/ex)
- ExternalProject_Add(squirrel
-   SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/squirrel/"
+@@ -501,6 +502,7 @@
+   "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}"
+   "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}"
    CMAKE_ARGS
 +  -DCMAKE_MAKE_PROGRAM=make
    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-@@ -423,6 +425,7 @@ set(TINYGETTEXT_PREFIX ${CMAKE_BINARY_DIR}/tinygettext/)
- ExternalProject_Add(tinygettext
-   SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/tinygettext/"
+@@ -553,6 +555,7 @@
+   BUILD_BYPRODUCTS "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}"
+   LIST_SEPARATOR "|"
    CMAKE_ARGS
 +  -DCMAKE_MAKE_PROGRAM=make
    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-@@ -454,6 +457,7 @@ set(SDL_TTF_PREFIX ${CMAKE_BINARY_DIR}/SDL_ttf/)
- ExternalProject_Add(SDL_ttf
+@@ -589,6 +592,7 @@
    SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/SDL_ttf/"
+   BUILD_BYPRODUCTS "${SDL_TTF_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2_ttf${CMAKE_STATIC_LIBRARY_SUFFIX}"
    CMAKE_ARGS
 +  -DCMAKE_MAKE_PROGRAM=make
    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
--- 
-2.20.1
-

recipes-games/supertux/files/0004-Fix-missing-include-with-latest-glibc.patch

@@ -0,0 +1,34 @@
+From ee4ffc159acfb34dd47b1810448ee567fdfb427d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 21 Sep 2022 23:29:10 +0200
+Subject: [PATCH] Fix missing include with latest glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+| SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.hpp:70:10: error: 'unique_ptr' in namespace 'std' does not name a template type
+|    70 |     std::unique_ptr<std::ostream> Add_File(const std::string& filename,const bool binary=true);
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ external/partio_zip/zip_manager.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/external/partio_zip/zip_manager.hpp b/external/partio_zip/zip_manager.hpp
+index 666884d..5cc6ff8 100644
+--- a/external/partio_zip/zip_manager.hpp
++++ b/external/partio_zip/zip_manager.hpp
+@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ #include <string>
+ #include <stdexcept>
+ #include <vector>
++#include <memory>
+ 
+ namespace Partio{
+ struct ZipFileHeader;
+-- 
+2.35.3
+

recipes-games/supertux/supertux2_0.6.3.bb

@@ -1,13 +1,13 @@
 SUMMARY = "SuperTux is a classic 2D jump'n run sidescroller game"
 DESCRIPTION = "SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original Super Mario games covered under the GPL"
-HOMEAPAGE = "http://supertux.lethargik.org"
+HOMEAPAGE = "https://www.supertux.org/"
 SECTION = "x11/application"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "boost libsdl2 libsdl2-image libvorbis curl openal-soft physfs glew freetype"
+DEPENDS = "boost libsdl2 libsdl2-image libvorbis curl openal-soft physfs glew freetype glm"
 
 # somehow boost is not dragged in
-RDEPENDS_${PN} += "boost"
+RDEPENDS:${PN} += "boost"
 
 inherit cmake pkgconfig gtk-icon-cache
 
@@ -20,15 +20,20 @@ SRC_URI = " \
     file://0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch \
     file://0002-do-not-set-included-paths-as-system-causes-trouble-w.patch \
     file://0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch \
+    file://0004-Fix-missing-include-with-latest-glibc.patch \
 "
-SRC_URI[md5sum] = "00514b8042d26a4ff7806b8d282c9a6b"
-SRC_URI[sha256sum] = "c4c3e5fa6f90e87b8c5ad6b22a179e9a9839bf997e7f219e22bbcd1c97223ac0"
+
+SRC_URI[sha256sum] = "f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6"
 
 S = "${WORKDIR}/SuperTux-v${PV}-Source"
 
-EXTRA_OECMAKE = "-DINSTALL_SUBDIR_BIN=bin -DCMAKE_BUILD_TYPE=RELEASE"
+EXTRA_OECMAKE = " \
+    -DINSTALL_SUBDIR_BIN=bin \
+    -DCMAKE_BUILD_TYPE=RELEASE \
+    -DUSE_SYSTEM_PHYSFS=ON \
+"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/metainfo \
     ${datadir}/games/supertux2 \
 "

recipes-games/supertuxkart/supertuxkart_1.4.bb

@@ -1,8 +1,8 @@
 DESCRIPTION = "SuperTuxKart is a kart racing game featuring Tux and his friends"
-HOMEPAGE = "http://supertuxkart.sourceforge.net"
+HOMEPAGE = "https://supertuxkart.sourceforge.net"
 SECTION = "x11/application"
-LICENSE = "GPLv2 & GPLv3+ & CC-BY-SA-3.0 & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b0e65d539fc395f6c95b79063eab9bb3"
+LICENSE = "GPL-2.0-only & GPL-3.0-or-later & CC-BY-SA-3.0 & CC-BY-SA-4.0 & PD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bcfdeb69518cfe348a07845ebba5c295"
 
 DEPENDS = " \
     libogg \
@@ -16,31 +16,35 @@ DEPENDS = " \
     libjpeg-turbo \
     freetype \
     bluez5 \
+    harfbuzz \
+    libsdl2 \
 "
 
-inherit cmake gtk-icon-cache distro_features_check
+inherit cmake pkgconfig gtk-icon-cache features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = " \
-    https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/${PV}/supertuxkart-${PV}-src.tar.xz \
+    https://github.com/supertuxkart/stk-code/releases/download/${PV}/SuperTuxKart-${PV}-src.tar.xz \
 "
 
-SRC_URI[md5sum] = "8de5455b8fdbb92679e302b76c9041cf"
-SRC_URI[sha256sum] = "d8014e7106ba84f98b5ec5f146249dcffc284fc4083f8f237ff420b9e2219cb0"
+SRC_URI[sha256sum] = "9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03"
+
+S = "${WORKDIR}/SuperTuxKart-${PV}-src"
 
 # Give BSP the chance to override GL
 SELECTGL ??= "-DUSE_GLES2=ON"
 
 EXTRA_OECMAKE = " \
     ${SELECTGL} \
+    -DBUILD_RECORDER=0 \
 "
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
 "
 PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_DEVICE=ON,-DENABLE_WAYLAND_DEVICE=OFF,wayland"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/icons \
-    ${datadir}/appdata \
+    ${datadir}/metainfo \
 "

recipes-games/wesnoth/files/0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch

@@ -9,25 +9,18 @@ Content-Transfer-Encoding: 8bit
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5c0df9..1026001 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,8 +71,8 @@ find_package(Gettext)
- find_package(X11)
- 
- # needed to get some SDL2 defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
--set(SDL2_CONFIG "sdl2-config" CACHE STRING "Path to sdl2-config script")
--exec_program(${SDL2_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
-+set(SDL_CONFIG "pkg-config" CACHE STRING "Path to sdl-config script")
-+exec_program(${SDL_CONFIG} ARGS "sdl --cflags" OUTPUT_VARIABLE SDL_CFLAGS)
- add_definitions(${SDL2_CFLAGS})
- 
+diff -Nurd wesnoth-1.16.2/CMakeLists.txt wesnoth-1.16.2/CMakeLists.txt
+--- wesnoth-1.16.2/CMakeLists.txt	2022-01-16 20:10:36.000000000 +0200
++++ wesnoth-1.16.2/CMakeLists.txt	2022-02-15 20:53:25.921752194 +0200
+@@ -81,8 +81,8 @@
  if(NOT WIN32)
--- 
-2.14.4
-
+ 	# needed to get some SDL2 defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
+ 	if(NOT MINGW)
+-		set(SDL2_CONFIG "sdl2-config" CACHE STRING "Path to sdl2-config script")
+-		exec_program(${SDL2_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
++                set(SDL2_CONFIG "pkg-config" CACHE STRING "Path to sdl2-config script")
++                exec_program(${SDL2_CONFIG} ARGS "sdl2 --cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
+ 		add_definitions(${SDL2_CFLAGS})
+ 	else()
+ 		# equivalent to sdl2-config --cflags --libs

recipes-games/wesnoth/files/0002-Do-not-do-the-ar-ranlib-configure-dance-it-won-t-wor.patch

@@ -10,40 +10,24 @@ Content-Transfer-Encoding: 8bit
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt | 19 -------------------
- 1 file changed, 19 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1026001..15ad0bb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -372,25 +372,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- 	endif(ENABLE_LTO)
- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+diff -Nurd wesnoth-1.16.2/CMakeLists.txt wesnoth-1.16.2/CMakeLists.txt
+--- wesnoth-1.16.2/CMakeLists.txt	2022-02-15 20:58:36.302540566 +0200
++++ wesnoth-1.16.2/CMakeLists.txt	2022-02-15 21:00:50.488654972 +0200
+@@ -360,16 +360,6 @@
+ 		endif()
+ 	endif()
  
 -# set CMAKE_AR and CMAKE_RANLIB to use LTO-enabled variants if LTO is enabled
--if(ENABLE_LTO)
--	MESSAGE("Using gcc-ar and gcc-ranlib")
--	find_program(LTO_AR NAMES gcc-ar)
--	find_program(LTO_RANLIB NAMES gcc-ranlib)
--	set(CMAKE_AR "${LTO_AR}" CACHE STRING "Supports LTO" FORCE)
--	set(CMAKE_RANLIB "${LTO_RANLIB}" CACHE STRING "Supports LTO" FORCE)
--else()
--	MESSAGE("Using ar, ranlib, and default linker")
--	find_program(NON_LTO_AR NAMES ar)
--	find_program(NON_LTO_RANLIB NAMES ranlib)
--	set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
--	set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE)
--endif()
--MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
+-	if(ENABLE_LTO)
+-		MESSAGE("Using gcc-ar and gcc-ranlib")
+-		find_program(LTO_AR NAMES gcc-ar)
+-		find_program(LTO_RANLIB NAMES gcc-ranlib)
+-		set(CMAKE_AR "${LTO_AR}" CACHE STRING "Supports LTO" FORCE)
+-		set(CMAKE_RANLIB "${LTO_RANLIB}" CACHE STRING "Supports LTO" FORCE)
+-	endif()
+-	MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
 -
--# add in extra flags
--set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_RELEASE}")
--
- # clean the pgo data
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_SOURCE_DIR}/pgo_data/")
+ # add in extra flags
+ 	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_RELEASE}")
  
--- 
-2.14.4
-

recipes-games/wesnoth/files/0003-Do-not-adjust-compiler-flags.patch

@@ -0,0 +1,56 @@
+From a87ebed70e1d50097bad3b118e513830bb33a3c2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 16 Mar 2022 22:15:30 +0100
+Subject: [PATCH] Do not adjust compiler flags
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Just guesswork:
+Something ha changed elsewhere causing the if-condition pass as seen for broken
+build:
+
+CMake compiler flags set to »-Wall -Wextra -Werror... - long but missing includes
+
+Fixes build errors as:
+| <..>/wesnoth-1.16.2/src/color.hpp:17:10: fatal error: algorithm: No such file or directory
+| <..>/1.16.2-r0/wesnoth-1.16.2/src/tstring.hpp:18:10: fatal error: memory: No such file or directory
+
+Upstream-Status: Inappropriate Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
+diff -Nurd wesnoth-1.16.5/CMakeLists.txt wesnoth-1.16.5/CMakeLists.txt
+--- wesnoth-1.16.5/CMakeLists.txt	2022-08-24 19:31:59.541867878 +0300
++++ wesnoth-1.16.5/CMakeLists.txt	2022-08-24 19:33:34.818527791 +0300
+@@ -218,20 +218,8 @@
+ 		set(COMPILER_FLAGS "${COMPILER_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+ 	endif()
+ 
+-### Set the final compiler flags.
+-
+-	set(COMPILER_FLAGS "${COMPILER_FLAGS} ${CXX_FLAGS_USER}")
+ 
+-	if(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "${COMPILER_FLAGS}")
+-		MESSAGE(STATUS "CMake compiler flags set to »${COMPILER_FLAGS}«")
+-		set(CMAKE_CXX_FLAGS
+-			"${COMPILER_FLAGS}"
+-			CACHE
+-			STRING
+-			"Global flags used by the CXX compiler during all builds."
+-			FORCE
+-		)
+-	endif()
++# do not align compiler flag suggested by oe
+ 
+ # #
+ # Determine optimization level
+@@ -416,7 +404,7 @@
+ # End setting profiler build options
+ # #
+ else()
+-	set(CMAKE_CXX_FLAGS "/W3 /WX /wd4503 /wd4351 /wd4250 /wd4244 /wd4267 /we4239 /wd4275 /EHsc /utf-8" CACHE STRING "Global flags used by the CXX compiler during all builds." FORCE)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX /wd4503 /wd4351 /wd4250 /wd4244 /wd4267 /we4239 /wd4275 /EHsc /utf-8" CACHE STRING "Global flags used by the CXX compiler during all builds." FORCE)
+ 	set(CMAKE_C_FLAGS "/WX" CACHE STRING "Global flags used by the C compiler during all builds." FORCE)
+ 	add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WIN7 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
+ 

recipes-games/wesnoth/wesnoth_1.16.8.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "The Battle for Wesnoth is a turn-based strategy game with a fantasy theme."
-HOMEPAGE = "http://www.wesnoth.org/"
+HOMEPAGE = "https://www.wesnoth.org/"
 SECTION = "games"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://copyright;md5=794c9526b4086a97155c27908976bbfd"
 
 DEPENDS = "asio freetype libsdl2-image libsdl2-mixer libsdl2-net libsdl2-ttf zlib boost pango libpng"
@@ -9,17 +9,17 @@ DEPENDS = "asio freetype libsdl2-image libsdl2-mixer libsdl2-net libsdl2-ttf zli
 SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.bz2 \
+    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-${SHRT_VER}/${BP}/${BP}.tar.bz2 \
     file://0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch \
     file://0002-Do-not-do-the-ar-ranlib-configure-dance-it-won-t-wor.patch \
+    file://0003-Do-not-adjust-compiler-flags.patch \
 "
 
-SRC_URI[md5sum] = "4d4a7ee12a97b774b6636b4856947938"
-SRC_URI[sha256sum] = "854726ec68dcb26f78f65b01a90b3bc51fd985598e59c7cc2ef72999ff2366e8"
+SRC_URI[sha256sum] = "85c5ece5eb55807b9f155d7189bad21a1bd40f055a378bfb6e4d63e22cc16e7c"
 
 ARM_INSTRUCTION_SET = "arm"
 
-inherit cmake pkgconfig
+inherit cmake pkgconfig gettext
 
 EXTRA_OECMAKE = "\
 	-DENABLE_LOW_MEM=ON \
@@ -30,9 +30,9 @@ EXTRA_OECMAKE = "\
 	"
 
 PACKAGES = "${PN}-doc ${PN}-music ${PN}-sounds \
-	${PN}-aoi ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l \
-	${PN}-nr ${PN}-sof ${PN}-sotbe ${PN}-thot ${PN}-trow \
-	${PN}-tsg ${PN}-tb ${PN}-utbs ${PN}-low\
+	${PN}-dw ${PN}-dm ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l ${PN}-low \
+	${PN}-nr ${PN}-sof ${PN}-sota ${PN}-sotbe ${PN}-thot ${PN}-trow \
+	${PN}-tsg ${PN}-tb ${PN}-utbs ${PN}-wc \
 	${PN}-data \
 	${PN}-all-campaigns \
 	${PN}-all \
@@ -40,25 +40,21 @@ PACKAGES = "${PN}-doc ${PN}-music ${PN}-sounds \
 	${PN}-server \
 	"
 
-DESCRIPTION_${PN}-all = "The Battle for ${PN} with all campaigns, music and sounds"
-DESCRIPTION_${PN}-all-campaigns = "The Battle for ${PN} with all campaigns."
-DESCRIPTION_${PN}-sounds = "Optional sound package for The Battle for ${PN}"
-DESCRIPTION_${PN}-music = "Optional music package for The Battle for ${PN}"
-DESCRIPTION_${PN}-data = "Mandatory data package for The Battle for ${PN}"
-DESCRIPTION_${PN}-server = "Optional Battle for Wesnoth server"
+DESCRIPTION:${PN}-all = "The Battle for ${PN} with all campaigns, music and sounds"
+DESCRIPTION:${PN}-all-campaigns = "The Battle for ${PN} with all campaigns."
+DESCRIPTION:${PN}-sounds = "Optional sound package for The Battle for ${PN}"
+DESCRIPTION:${PN}-music = "Optional music package for The Battle for ${PN}"
+DESCRIPTION:${PN}-data = "Mandatory data package for The Battle for ${PN}"
+DESCRIPTION:${PN}-server = "Optional Battle for Wesnoth server"
 
-ALLOW_EMPTY_${PN}-all-campaigns = "1"
-ALLOW_EMPTY_${PN}-all = "1"
+ALLOW_EMPTY:${PN}-all-campaigns = "1"
+ALLOW_EMPTY:${PN}-all = "1"
 
-do_configure_prepend() {
-	export HOST_SYS="${HOST_SYS}"
-	export BUILD_SYS="${BUILD_SYS}"
-	export STAGING_LIBDIR="${STAGING_LIBDIR}"
-	export STAGING_INCDIR="${STAGING_INCDIR}"
+do_configure:prepend() {
 	rm -f ${S}/cmake/FindBoost.cmake
 }
 
-do_install_append() {
+do_install:append() {
 	#ugly hack but otherwise it would have required to
 	#have MANDIR:STRING=share/man that would require a
 	#second python function
@@ -70,29 +66,29 @@ do_install_append() {
     rm -Rf ${D}/var
 }
 
-RDEPENDS_${PN} = "${PN}-data tremor"
+RDEPENDS:${PN} = "${PN}-data tremor"
 
-RDEPENDS_${PN}-data = "bash python"
+RDEPENDS:${PN}-data = "bash python3"
 
-RDEPENDS_${PN}-all-campaigns = "${PN} \
-	${PN}-aoi ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l \
-	${PN}-nr ${PN}-sof ${PN}-sotbe ${PN}-thot ${PN}-trow \
-	${PN}-tsg ${PN}-tb ${PN}-utbs ${PN}-low"
+RDEPENDS:${PN}-all-campaigns = "${PN} \
+	${PN}-did ${PN}-dm ${PN}-dw ${PN}-ei ${PN}-httt \
+	${PN}-l ${PN}-low ${PN}-nr ${PN}-sof ${PN}-sota ${PN}-sotbe \
+	${PN}-tb ${PN}-thot ${PN}-trow ${PN}-tsg ${PN}-utbs ${PN}-wc"
 
 # Installing wesnoth-all should pull everything in (like in Debian).
-RDEPENDS_${PN}-all = "${PN} ${PN}-all-campaigns ${PN}-sounds ${PN}-music"
+RDEPENDS:${PN}-all = "${PN} ${PN}-all-campaigns ${PN}-sounds ${PN}-music"
 
-FILES_${PN}-music = "\
+FILES:${PN}-music = "\
 	${datadir}/wesnoth/data/core/music \
 "
 
-FILES_${PN}-sounds = "\
+FILES:${PN}-sounds = "\
 	${datadir}/wesnoth/data/core/sounds \
 "
 
 # Picks up remaining translations and data. Must be packaged after
 # wesnoth-music, wesnoth-sounds and all campaigns.
-FILES_${PN}-data = "\
+FILES:${PN}-data = "\
 	${datadir}/wesnoth/sounds \
 	${datadir}/wesnoth/images \
 	${datadir}/wesnoth/data \
@@ -101,7 +97,7 @@ FILES_${PN}-data = "\
 	${datadir}/wesnoth/l10n-track \
 "
 
-FILES_${PN} = "\
+FILES:${PN} = "\
 	${bindir}/wesnoth \
 	${datadir}/icons \
     ${datadir}/metainfo \
@@ -109,77 +105,92 @@ FILES_${PN} = "\
 	${datadir}/pixmaps/wesnoth-icon.png \
 "
 
-FILES_${PN}-server = "\
+FILES:${PN}-server = "\
 	${bindir}/wesnothd \
 	${localstatedir}/run/wesnothd \
 "
 
-FILES_${PN}-low ="\
-       ${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \
-       ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \
-"
-
-FILES_${PN}-aoi = "\
-	${datadir}/wesnoth/data/campaigns/An_Orcish_Incursion \
-	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \
-"
-
-FILES_${PN}-did = "\
+FILES:${PN}-did = "\
 	${datadir}/wesnoth/data/campaigns/Descent_Into_Darkness \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-did.mo \
 "
 
-FILES_${PN}-ei = "\
+FILES:${PN}-dm = "\
+	${datadir}/wesnoth/data/campaigns/Delfadors_Memoirs \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-dm.mo \
+"
+
+FILES:${PN}-dw = "\
+	${datadir}/wesnoth/data/campaigns/Dead_Water \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-dw.mo \
+"
+
+FILES:${PN}-ei = "\
 	${datadir}/wesnoth/data/campaigns/Eastern_Invasion \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-ei.mo \
 "
 
-FILES_${PN}-httt = "\
+FILES:${PN}-httt = "\
 	${datadir}/wesnoth/data/campaigns/Heir_To_The_Throne \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-httt.mo \
 "
 
-FILES_${PN}-l = "\
+FILES:${PN}-l = "\
 	${datadir}/wesnoth/data/campaigns/Liberty \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-l.mo \
 "
 
-FILES_${PN}-nr = "\
+FILES:${PN}-low ="\
+	${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-low.mo \
+"
+
+FILES:${PN}-nr = "\
 	${datadir}/wesnoth/data/campaigns/Northern_Rebirth \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-nr.mo \
 "
 
-FILES_${PN}-sof = "\
+FILES:${PN}-sof = "\
 	${datadir}/wesnoth/data/campaigns/Sceptre_of_Fire \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sof.mo \
 "
 
-FILES_${PN}-sotbe = "\
+FILES:${PN}-sota = "\
+	${datadir}/wesnoth/data/campaigns/Secrets_of_the_Ancients \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sota.mo \
+"
+
+FILES:${PN}-sotbe = "\
 	${datadir}/wesnoth/data/campaigns/Son_Of_The_Black_Eye \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sotbe.mo \
 "
 
-FILES_${PN}-thot = "\
-	${datadir}/wesnoth/data/campaigns/The_Hammer_of_Thursagan \
-	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-thot.mo \
-"
-
-FILES_${PN}-trow = "\
-	${datadir}/wesnoth/data/campaigns/The_Rise_Of_Wesnoth \
-	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-trow.mo \
-"
-
-FILES_${PN}-tsg = "\
-	${datadir}/wesnoth/data/campaigns/The_South_Guard \
-	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tsg.mo \
-"
-
-FILES_${PN}-tb = "\
+FILES:${PN}-tb = "\
 	${datadir}/wesnoth/data/campaigns/Two_Brothers \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tb.mo \
 "
 
-FILES_${PN}-utbs = "\
+FILES:${PN}-thot = "\
+	${datadir}/wesnoth/data/campaigns/The_Hammer_of_Thursagan \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-thot.mo \
+"
+
+FILES:${PN}-trow = "\
+	${datadir}/wesnoth/data/campaigns/The_Rise_Of_Wesnoth \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-trow.mo \
+"
+
+FILES:${PN}-tsg = "\
+	${datadir}/wesnoth/data/campaigns/The_South_Guard \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tsg.mo \
+"
+
+FILES:${PN}-utbs = "\
 	${datadir}/wesnoth/data/campaigns/Under_the_Burning_Suns \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-utbs.mo \
 "
+
+FILES:${PN}-wc = "\
+	${datadir}/wesnoth/data/campaigns/World_Conquest \
+	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-wc.mo \
+"

recipes-images/bistic-devel/bistic-devel.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "Games image to be used on USB stick (development image)"
 
 IMAGE_LINGUAS = " "
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 inherit core-image
 

recipes-images/game-image/games-image.bb

@@ -0,0 +1,45 @@
+
+DESCRIPTION = "meta-games layer test image"
+
+IMAGE_LINGUAS = " "
+
+LICENSE = "GPL-2.0-only"
+
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
+
+IMAGE_FEATURES += "package-management x11-base x11-sato ssh-server-dropbear"
+
+IMAGE_FSTYPES += "wic.vmdk"
+
+FREECIV = "\
+ freeciv-server \
+ freeciv-gtk3.22 \
+ freeciv-sdl2 \
+ freeciv-qt \
+"
+
+# Left out:
+# - gnome games - build failures
+
+GAMELIST = "\
+ packagegroup-core-x11-sato-games \
+ ${FREECIV} \
+ etr \
+ pingus \
+ wesnoth \
+ supertuxkart \
+ supertux2 \
+ astromenace \
+ chromium-bsu \
+ maelstrom \
+ atanks \
+"
+
+IMAGE_INSTALL += " \
+packagegroup-core-boot \
+${CORE_IMAGE_EXTRA_INSTALL} \
+${GAMELIST} \
+"
+

recipes-images/usbistic/usbistic.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "Games image to be used on USB stick"
 
 IMAGE_LINGUAS = " "
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 inherit core-image
 

test/images/game-image/games-image.bb

@@ -1,29 +0,0 @@
-
-DESCRIPTION = "meta-games layer test image"
-
-IMAGE_LINGUAS = " "
-
-LICENSE = "GPLv2"
-
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-
-IMAGE_FEATURES += "package-management x11-base x11-sato ssh-server-dropbear"
-
-GAMELIST = "freeciv \
-            wesnoth \
-            pingus \
-            etr \
-           "
-
-IMAGE_INSTALL += " \
-packagegroup-core-boot \
-${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL} \
-${GAMELIST} \
-gdb \
-nano \
-"
-
-# remove not needed ipkg informations
-ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "