diff --git a/dependencies/freealut/freealut_1.1.0.bb b/dependencies/freealut/freealut_1.1.0.bb
index 532e7c2..7d58493 100644
--- a/dependencies/freealut/freealut_1.1.0.bb
+++ b/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"
diff --git a/dependencies/tolua/tolua_5.2.4.bb b/dependencies/tolua/tolua_5.2.4.bb
index be17094..0f0b8b0 100644
--- a/dependencies/tolua/tolua_5.2.4.bb
+++ b/dependencies/tolua/tolua_5.2.4.bb
@@ -10,7 +10,7 @@ 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"
 
 SRC_URI = "\
diff --git a/recipes-games/astromenace/astromenace_1.3.2.bb b/recipes-games/astromenace/astromenace_1.3.2.bb
index 25bcb60..b2a812b 100644
--- a/recipes-games/astromenace/astromenace_1.3.2.bb
+++ b/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 \
diff --git a/recipes-games/atanks/atanks_6.5.bb b/recipes-games/atanks/atanks_6.5.bb
index 409913c..7ad58a8 100644
--- a/recipes-games/atanks/atanks_6.5.bb
+++ b/recipes-games/atanks/atanks_6.5.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/"
 SECTION = "games"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bfbc31ee85cf099e77a598c8a66dd124"
 
 DEPENDS = "allegro4"
diff --git a/recipes-games/etr/etr_0.8.1.bb b/recipes-games/etr/etr_0.8.1.bb
index 3185237..b08ab30 100644
--- a/recipes-games/etr/etr_0.8.1.bb
+++ b/recipes-games/etr/etr_0.8.1.bb
@@ -1,7 +1,7 @@
 SUMMARY = "High speed arctic racing game based on Tux Racer."
 DESCRIPTION = " "
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SECTION = "games"
diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc
index fe9c2e6..41e1f2e 100644
--- a/recipes-games/freeciv/freeciv.inc
+++ b/recipes-games/freeciv/freeciv.inc
@@ -6,7 +6,7 @@ DESCRIPTION = "Freeciv is distributed under the GPL and implemented for X. \
  "
 HOMEPAGE = "http://www.freeciv.org/"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SECTION = "games"
diff --git a/recipes-games/gnome-games/gnome-chess_3.24.1.bb b/recipes-games/gnome-games/gnome-chess_3.24.1.bb
index c5ebf0d..0227004 100644
--- a/recipes-games/gnome-games/gnome-chess_3.24.1.bb
+++ b/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"
 
diff --git a/recipes-games/gnome-games/gnome-robots_3.22.1.bb b/recipes-games/gnome-games/gnome-robots_3.22.1.bb
index 5e95c17..48a42e7 100644
--- a/recipes-games/gnome-games/gnome-robots_3.22.1.bb
+++ b/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"
 
diff --git a/recipes-games/gnome-games/libgames-support_1.0.2.bb b/recipes-games/gnome-games/libgames-support_1.0.2.bb
index 38d9a66..da934b9 100644
--- a/recipes-games/gnome-games/libgames-support_1.0.2.bb
+++ b/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"
diff --git a/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb b/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
index 4ab657e..ee58ec0 100644
--- a/recipes-games/gnome-games/libgnome-games-support_1.4.3.bb
+++ b/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"
diff --git a/recipes-games/maelstrom/maelstrom_3.0.6.bb b/recipes-games/maelstrom/maelstrom_3.0.6.bb
index fbe82f2..4b860f0 100644
--- a/recipes-games/maelstrom/maelstrom_3.0.6.bb
+++ b/recipes-games/maelstrom/maelstrom_3.0.6.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Maelstrom is a GPL'd port of the shareware game for the Macintosh"
-LICENSE = "GPLv2 & CC-BY-3.0"
+LICENSE = "GPL-2.0-only & CC-BY-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0642955deaee2fa53c36bc592dc1ef25"
 HOMEPAGE = "https://www.libsdl.org/projects/Maelstrom/"
 
diff --git a/recipes-games/neverball/neverball.inc b/recipes-games/neverball/neverball.inc
index 504622c..4ab84c4 100644
--- a/recipes-games/neverball/neverball.inc
+++ b/recipes-games/neverball/neverball.inc
@@ -2,7 +2,7 @@ SUMMARY = "Tilt the floor to roll a ball through an obstacle course before time
 SECTION = "graphics"
 HOMEPAGE = "https://neverball.org/"
 
-LICENSE = "GPLv2+"
+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"
diff --git a/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb b/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb
index a295033..878bfe5 100644
--- a/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb
+++ b/recipes-games/pinball/pinball-table-gnu_0.0.20200601.bb
@@ -1,14 +1,14 @@
 DESCRIPTION = "GNU Pinball table for Emilia Pinball Simulator"
 HOMEPAGE = "https://github.com/rzr/pinball-table-gnu"
 SECTION = "games"
-LICENSE = "GPLv2 & GPLv3 & LAL-1.3 & CC-BY-SA-3.0"
+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 = "0.0.20200601"
+SRCREV = "7b738e40fd22fce62c6a317e70922ac0eb39f794"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb b/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb
index 35a8882..28c0374 100644
--- a/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb
+++ b/recipes-games/pinball/pinball-table-hurd_0.0.20201119.bb
@@ -1,14 +1,14 @@
 DESCRIPTION = "HURD Pinball table for Emilia Pinball Simulator"
 HOMEPAGE = "https://github.com/rzr/pinball-table-hurd"
 SECTION = "games"
-LICENSE = "GPLv2 & LAL-1.3 & CC-BY-SA-3.0"
+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 = "0.0.20201119"
+SRCREV = "10e6c04a159209db5b9c19374f632edc5752abbf"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-games/pinball/pinball_0.3.20201218.bb b/recipes-games/pinball/pinball_0.3.20201218.bb
index 88bbe30..d124abd 100644
--- a/recipes-games/pinball/pinball_0.3.20201218.bb
+++ b/recipes-games/pinball/pinball_0.3.20201218.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Emilia Pinball Simulator"
 HOMEPAGE = "http://pinball.sf.net/"
 SECTION = "games"
-LICENSE = "GPLv2 & CC0-1.0"
+LICENSE = "GPL-2.0-only & CC0-1.0"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
     file://debian/copyright;md5=ef0d1a481815636a22c1d73b1233d9c0 \
diff --git a/recipes-games/pingus/pingus_0.7.6.bb b/recipes-games/pingus/pingus_0.7.6.bb
index b0c4f77..79c187f 100644
--- a/recipes-games/pingus/pingus_0.7.6.bb
+++ b/recipes-games/pingus/pingus_0.7.6.bb
@@ -1,6 +1,6 @@
 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/"
 
diff --git a/recipes-games/scummvm/scummvm_2.2.0.bb b/recipes-games/scummvm/scummvm_2.2.0.bb
index 0997432..1224ab4 100644
--- a/recipes-games/scummvm/scummvm_2.2.0.bb
+++ b/recipes-games/scummvm/scummvm_2.2.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Virtual Machine for several classic graphical point-and-click adv
 HOMEPAGE = "https://www.scummvm.org"
 SECTION = "games"
 PRIORITY = "optional"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit autotools-brokensep pkgconfig gtk-icon-cache manpages features_check
diff --git a/recipes-games/supertux/supertux2_0.6.3.bb b/recipes-games/supertux/supertux2_0.6.3.bb
index 891042a..9f522cb 100644
--- a/recipes-games/supertux/supertux2_0.6.3.bb
+++ b/recipes-games/supertux/supertux2_0.6.3.bb
@@ -2,7 +2,7 @@ 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"
 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 glm"
 
diff --git a/recipes-games/supertuxkart/supertuxkart_1.3.bb b/recipes-games/supertuxkart/supertuxkart_1.3.bb
index 06f95d2..b0b0e73 100644
--- a/recipes-games/supertuxkart/supertuxkart_1.3.bb
+++ b/recipes-games/supertuxkart/supertuxkart_1.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "SuperTuxKart is a kart racing game featuring Tux and his friends"
 HOMEPAGE = "http://supertuxkart.sourceforge.net"
 SECTION = "x11/application"
-LICENSE = "GPLv2 & GPLv3+ & CC-BY-SA-3.0 & CC-BY-SA-4.0 & PD"
+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 = " \
diff --git a/recipes-games/wesnoth/files/0003-Do-not-adjust-compiler-flags.patch b/recipes-games/wesnoth/files/0003-Do-not-adjust-compiler-flags.patch
new file mode 100644
index 0000000..08de3e4
--- /dev/null
+++ b/recipes-games/wesnoth/files/0003-Do-not-adjust-compiler-flags.patch
@@ -0,0 +1,63 @@
+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>
+---
+ CMakeLists.txt | 16 ++--------------
+ 1 file changed, 2 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aaf6923..04efa09 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,20 +218,8 @@ if(NOT WIN32)
+ 		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 @@ if(NOT WIN32)
+ # 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)
+ 	add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WIN7 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
+ 
+ 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG_LUA")
+-- 
+2.34.1
+
diff --git a/recipes-games/wesnoth/wesnoth_1.16.2.bb b/recipes-games/wesnoth/wesnoth_1.16.2.bb
index 0a447c1..3035f56 100644
--- a/recipes-games/wesnoth/wesnoth_1.16.2.bb
+++ b/recipes-games/wesnoth/wesnoth_1.16.2.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/"
 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"
@@ -12,6 +12,7 @@ SRC_URI = " \
     ${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[sha256sum] = "729fd0903a28af502240d08c0a27b9ff50e534677644b639d8fd33823a7a9799"
@@ -50,10 +51,6 @@ 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}"
 	rm -f ${S}/cmake/FindBoost.cmake
 }
 
diff --git a/recipes-images/bistic-devel/bistic-devel.bb b/recipes-images/bistic-devel/bistic-devel.bb
index fee19dc..a83bcda 100644
--- a/recipes-images/bistic-devel/bistic-devel.bb
+++ b/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
 
diff --git a/recipes-images/game-image/games-image.bb b/recipes-images/game-image/games-image.bb
index 22fc7c9..9ae19b8 100644
--- a/recipes-images/game-image/games-image.bb
+++ b/recipes-images/game-image/games-image.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "meta-games layer test image"
 
 IMAGE_LINGUAS = " "
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 inherit core-image
 
diff --git a/recipes-images/usbistic/usbistic.bb b/recipes-images/usbistic/usbistic.bb
index ccadc76..cf1a71d 100644
--- a/recipes-images/usbistic/usbistic.bb
+++ b/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