mame: upgrade 0231 -> 0232

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> (cherry picked from commit 3a3f8188c9)
d1x-rebirth: various enhancements
2021-05-28 23:12:36 +02:00 · 2021-05-08 18:00:53 +02:00 · 2021-05-02 20:32:36 +02:00
38 changed files with 852 additions and 420 deletions
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ Policies
 * **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-retro/issues).
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
  * Use 4 spaces for indentation always (shell and python code)
-  * For splitting of long list values use four-space indentation on successive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
-  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
+  * For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
+  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.


 Maintainers
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,13 +8,5 @@ BBFILE_COLLECTIONS += "meta-retro"
 BBFILE_PATTERN_meta-retro := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-retro = "10"

-LICENSE_PATH += "${LAYERDIR}/files/licenses"
-
-# ffmpeg4-layer: https://github.com/schnitzeltony/meta-ffmpeg4
-LAYERDEPENDS_meta-retro = " \
-    core \
-    openembedded-layer \
-    filesystems-layer \
-    ffmpeg4-layer \
-"
-LAYERSERIES_COMPAT_meta-retro = "honister kirkstone"
+LAYERDEPENDS_meta-retro = "core openembedded-layer filesystems-layer"
+LAYERSERIES_COMPAT_meta-retro = "dunfell gatesgarth hardknott"
--- a/files/licenses/DXX-Rebirth
+++ b/files/licenses/DXX-Rebirth
@@ -1,72 +0,0 @@
-DXX-REBIRTH LICENSE
-====================
-The original Descent source release is copyright by Parallax and subject 
-to the Parallax license below.  Contributions from the D1X/D2X ("DXX") 
-and D1X-Rebirth/D2X-Rebirth ("Rebirth") projects are copyright their 
-respective contributors.  The DXX and Rebirth contributors grant you 
-permission to convey their work, with or without modifications, pursuant 
-to the terms of the GNU General Public License, version 3 ("GPLv3").  As 
-a special exception, in recognition of the restrictions imposed by the 
-original Parallax license, you are excused from GPLv3 requirements that 
-conflict with the restrictions of the original Parallax license, but 
-only to the extent that such excuse is required to prevent a conflict 
-between the terms of the original Parallax license and the GNU General 
-Public License v3.  This special exception is an "Additional permission" 
-as defined by section 7 of the GNU General Public License v3.  All 
-provisions of the GPLv3 that can be satisfied without violating the 
-original Parallax license must be satisfied to the greatest extent 
-possible without violating the original Parallax license.  Failure to 
-satisfy any non-excused GPLv3 provision is expressly prohibited under 
-this license, and is therefore void and is handled pursuant to GPLv3 
-section 8 "Termination.", exactly as would occur for a non-permitted 
-propagation or modification of a GPLv3 covered work that had no special 
-exceptions.
-
-For purposes of this document, "copyright by Parallax" shall include any 
-subsequent entities to which some or all of the Parallax copyrights were 
-transferred, without regard to how the transfer occurred.  In the event 
-that you are permitted to convey the material originally copyright by 
-Parallax under terms other than the original Parallax license below, 
-whether due to a general relicensing by the appropriate copyright 
-holders, due to special permission from the appropriate copyright 
-holders, or any other circumstance, the contributions from the DXX and 
-Rebirth projects remain subject to the GNU General Public License, 
-version 3.  The special exception described in the preceding paragraph 
-excuses only conflicts with the original Parallax license.  If a 
-subsequent license to the Parallax work conflicts with the GPLv3 in any 
-way that the original Parallax license did not conflict, then such new 
-conflicts are not excused.  As detailed in GPLv3 section 12 "No 
-Surrender of Others' Freedom.", if you cannot simultaneously satisfy the 
-non-excused terms of the GPLv3 and all other conditions imposed on you, 
-then you may not convey the GPLv3 covered work at all.
-
-Additionally, if you are permitted to convey the material originally 
-copyright by Parallax under terms other than the original Parallax 
-license, and such new permission allows you to comply with the GPLv3 to 
-a greater extent than the original Parallax license allowed, and you 
-convey the covered work or a portion thereof, then such conveyance must 
-comply with all GPLv3 terms which can be satisfied without violating the 
-permission under which you convey the material originally copyright by 
-Parallax.
-
-
-See GPL-3.txt for further details on the GPLv3.
-For project history and its contributors, please visit the 
-DXX-Rebirth GIT repository at https://github.com/dxx-rebirth/dxx-rebirth/
-
-
-
-PARALLAX LICENSE
-================
-THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
-SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
-END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
-ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
-IN USING, DISPLAYING,  AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
-SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
-FREE PURPOSES.  IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
-CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES.  THE END-USER UNDERSTANDS
-AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
-COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
-
-We make no warranties as to the usability or correctness of this code.
--- a/recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch
+++ b/recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch
@@ -0,0 +1,32 @@
+From ccf4abdd7b2e521e0665186e620a606277682597 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 18 Feb 2020 00:07:24 +0100
+Subject: [PATCH] Do no search for cross g-ir-compiler but
+ g-ir-compiler-wrapper
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ core/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index c4982de9..80fdd309 100644
+--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
+@@ -66,7 +66,7 @@ set_target_properties("${LIBCORE}" PROPERTIES
+                       VERSION ${LIBCORE_VERSION}
+                       )
+ 
+-find_program (GIR_COMPILER_BIN g-ir-compiler)
+find_program (GIR_COMPILER_BIN g-ir-compiler-wrapper)
+ add_custom_target(${LIBCORE_GIR}.typelib ALL
+                   COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir
+                   --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib
+-- 
+2.21.0
+
--- a/recipes-browser/midori/midori_git.bb
+++ b/recipes-browser/midori/midori_git.bb
@@ -0,0 +1,61 @@
+SUMMARY = "A lightweight web browser"
+HOMEPAGE = "https://www.midori-browser.org/"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+DEPENDS = " \
+    intltool-native \
+    gcr \
+    webkitgtk \
+    json-glib \
+    libarchive \
+    libsoup-2.4 \
+    libpeas \
+    sqlite \
+"
+
+inherit cmake pkgconfig gtk-icon-cache gettext vala python3native features_check gobject-introspection mime-xdg
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+# Midori requires gobject-introspection to build. Check below is not the whole
+# story: There are some extra machine-specific disable entries in webkitgtk
+# recipe and there is nothing we can do to check here...
+python () {
+    if d.getVar('GI_DATA_ENABLED') != 'True':
+        raise bb.parse.SkipRecipe('Midori needs gobject-introspection but it is either disabled or machine does not support it!' )
+}
+
+SRC_URI = " \
+    git://github.com/midori-browser/core.git \
+    file://0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch \
+"
+SRCREV = "f6b3b1e030db7eb2de7faf73ec4ccc18949b668d"
+PV = "9.0"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = " \
+    -DCMAKE_INSTALL_PREFIX=${prefix} \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+"
+
+do_configure_prepend() {
+    export VALAC=${STAGING_BINDIR_NATIVE}/valac
+}
+
+RRECOMMENDS_${PN} += " \
+    glib-networking ca-certificates \
+    adwaita-icon-theme \
+"
+
+# No project but oe packs gstreamer plugins that fine as we do. Cannot say
+# which plugins are # really necessary so use gstreamer1.0-plugins-*-meta.
+# These are necessary to make video streaming work - see [1]
+# [1] https://github.com/midori-browser/core/issues/329
+RRECOMMENDS_${PN} += " \
+    gstreamer1.0-plugins-base-meta \
+    gstreamer1.0-plugins-good-meta \
+    gstreamer1.0-libav \
+"
+
+FILES_${PN} += "${datadir}/metainfo"
--- a/recipes-emulators/dosbox/dosbox-staging.bb
+++ b/recipes-emulators/dosbox/dosbox-staging.bb
@@ -1,49 +0,0 @@
-SUMMARY = "DOS/x86 emulator focusing on ease of use"
-HOMEPAGE = "https://dosbox-staging.github.io/" 
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca8be14ecd86a8ae1155f8023c73bca6"
-
-DEPENDS = " \
-    libsdl2 \
-    libsdl2-net \
-    libpcap \
-    libxkbfile \
-    libpng \
-    alsa-lib \
-    fluidsynth \
-    opusfile \
-    munt \
-    libslirp \
-    iir1 \
-"
-
-inherit meson pkgconfig gtk-icon-cache features_check
-
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
-
-SRC_URI = "git://github.com/dosbox-staging/dosbox-staging.git;branch=release/0.79.x;protocol=https"
-SRCREV = "dd7f21809870cc998005b3b09a33f1c36bd764a6"
-PV = "0.79.1"
-S = "${WORKDIR}/git"
-
-DYNCORE ?= "-Ddynamic_core=dynrec"
-
-EXTRA_OEMESON = " \
-    ${DYNCORE} \
-"
-
-do_install:append() {
-    # avoid clashes
-    mv ${D}${bindir}/dosbox ${D}${bindir}/dosbox-staging
-    sed -i 's:Exec=dosbox:Exec=dosbox-staging:g' ${D}${datadir}/applications/dosbox-staging.desktop
-}
-
-# sorry - but it does not make sense
-COMPATIBLE_HOST:armv4 = 'null'
-COMPATIBLE_HOST:armv5 = 'null'
-COMPATIBLE_HOST:armv6 = 'null'
-
-FILES:${PN} += "${datadir}/metainfo"
-FILES:${PN}-doc += "${datadir}/licenses"
-
--- a/recipes-emulators/dosbox/dosbox-x.bb
+++ b/recipes-emulators/dosbox/dosbox-x.bb
@@ -1,7 +1,7 @@
 SUMMARY = "DOSBox-X fork of the DOSBox project"
 HOMEPAGE = "https://dosbox-x.com/" 

-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b5d36d7c1f35e9597b9843b9bedb6667" 

 DEPENDS = " \
@@ -14,17 +14,17 @@ DEPENDS = " \
    fluidsynth \
 "

-inherit autotools-brokensep pkgconfig dos2unix gtk-icon-cache features_check bash-completion
+inherit autotools-brokensep pkgconfig dos2unix gtk-icon-cache features_check

 REQUIRED_DISTRO_FEATURES = "x11 opengl"

 SRC_URI = " \
-    git://github.com/joncampbell123/dosbox-x.git;branch=master;protocol=https \
+    git://github.com/joncampbell123/dosbox-x.git \
    file://0001-use-pkgconfig-to-find-sdl2.patch \
    file://0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch \
 "
-SRCREV = "f35f2e895b58bcebac4212ef96f672f22d447700"
-PV = "0.84.3"
+SRCREV = "9c950893419b387425172c2f532c45cb81cd709a"
+PV = "0.83.13"
 S = "${WORKDIR}/git"

 EXTRA_OECONF = " \
@@ -36,8 +36,8 @@ EXTRA_OECONF = " \
 "

 # sorry - but it does not make sense
-COMPATIBLE_HOST:armv4 = 'null'
-COMPATIBLE_HOST:armv5 = 'null'
-COMPATIBLE_HOST:armv6 = 'null'
+COMPATIBLE_HOST_armv4 = 'null'
+COMPATIBLE_HOST_armv5 = 'null'
+COMPATIBLE_HOST_armv6 = 'null'

-FILES:${PN} += "${datadir}/metainfo"
+FILES_${PN} += "${datadir}/metainfo"
--- a/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch
+++ b/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch
@@ -1,6 +1,6 @@
 From 94c1308880c9bed9f7ddecf930e8f1e771a9f552 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 8 Dec 2021 23:34:23 +0100
+Date: Fri, 16 Oct 2020 23:41:09 +0200
 Subject: [PATCH] use pkgconfig to find sdl2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [oe specific]

 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- acinclude.m4 | 63 ++++------------------------------------------------
- 1 file changed, 4 insertions(+), 59 deletions(-)
+ acinclude.m4 | 64 ++++------------------------------------------------
+ 1 file changed, 4 insertions(+), 60 deletions(-)

 diff --git a/acinclude.m4 b/acinclude.m4
-index faf376e2c..23f260630 100644
+index a7424b901..edf15214e 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
@@ -12,37 +12,9 @@ AC_ARG_ENABLE(sdl2,     [  --enable-sdl2           Enable SDL 2.x],
@@ -36,9 +36,9 @@ index faf376e2c..23f260630 100644
 -      fi
 -    fi
 -
-    if test -x vs/sdl2/linux-host/bin/sdl2-config ; then
-      SDL2_CONFIG=vs/sdl2/linux-host/bin/sdl2-config
-      PATH=vs/sdl2/linux-host/bin:$PATH
+-    if test -x vs2015/sdl2/linux-host/bin/sdl2-config ; then
+-      SDL2_CONFIG=vs2015/sdl2/linux-host/bin/sdl2-config
+-      PATH=vs2015/sdl2/linux-host/bin:$PATH
 -    fi
 -
 -    AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no)
@@ -57,9 +57,11 @@ index faf376e2c..23f260630 100644
   fi
 
   AC_SUBST(SDL2_CFLAGS)
-@@ -69,35 +41,8 @@ AC_ARG_ENABLE(sdl, [  --enable-sdl            Enable SDL 1.x],
+@@ -67,37 +39,9 @@ AC_ARG_ENABLE(sdl, [  --enable-sdl            Enable SDL 1.x],
 
-   SDL_CONFIG=no
+   AH_TEMPLATE(C_SDL1,[Set to 1 to enable SDL 1.x support])
+ 
+-  SDL_CONFIG=no
   if test x$enable_sdlenable = xyes ; then
 -    if test x$sdl_exec_prefix != x ; then
 -      sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
@@ -74,9 +76,9 @@ index faf376e2c..23f260630 100644
 -      fi
 -    fi
 -
-    if test -x vs/sdl/linux-host/bin/sdl-config ; then
-      SDL_CONFIG=vs/sdl/linux-host/bin/sdl-config
-      PATH=vs/sdl/linux-host/bin:$PATH
+-    if test -x vs2015/sdl/linux-host/bin/sdl-config ; then
+-      SDL_CONFIG=vs2015/sdl/linux-host/bin/sdl-config
+-      PATH=vs2015/sdl/linux-host/bin:$PATH
 -    fi
 -
 -    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
@@ -96,5 +98,5 @@ index faf376e2c..23f260630 100644
 
   AC_SUBST(SDL_CFLAGS)
 -- 
-2.31.1
+2.26.2

--- a/recipes-emulators/dosbox/dosbox.bb
+++ b/recipes-emulators/dosbox/dosbox.bb
@@ -1,7 +1,7 @@
 SUMMARY = "DOSBox is a DOS-emulator that uses the SDL-library"
 HOMEPAGE = "http://www.dosbox.com/" 

-LICENSE = "GPL-2.0-or-later"
+LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 

 DEPENDS = "libsdl libsdl-net libpng"
@@ -20,7 +20,7 @@ PV = "0.74-3"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
 PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"

-do_install:append() {
+do_install_append() {
 	install -d ${D}/${datadir}/applications
 	install -m 0644 ${WORKDIR}/*.desktop ${D}/${datadir}/applications

--- a/recipes-emulators/mame/mame.bb
+++ b/recipes-emulators/mame/mame.bb
@@ -1,19 +1,19 @@
 SUMMARY = "Multiple Arcade Machine Emulator"
 HOMEPAGE = "http://www.mamedev.org/index.php" 

-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=07be887a543dff60d56851e4cb65a910"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=417c683350df4c63046fee551c461bd4"

 SRC_URI = " \
-    git://github.com/mamedev/mame.git;branch=master;protocol=https \
+    git://github.com/mamedev/mame.git \
    file://mame.desktop \
    file://mame32k.desktop \
 "
-PV = "0248"
-SRCREV = "2d3d0deec8fa4025ea51c1722a21e6b9a7a8bb92"
+PV = "0232"
+SRCREV = "2b0f01bc3aee493b3c05cf34c15af7cf5521210a"
 S = "${WORKDIR}/git"

-inherit pkgconfig siteinfo gtk-icon-cache
+inherit siteinfo gtk-icon-cache

 DEPENDS = " \
    libsdl2 \
@@ -26,6 +26,7 @@ DEPENDS = " \
    flac \
    jpeg \
    glm \
+    lua lua-native \
    sqlite3 \
    portaudio-v19 \
    rapidjson \
@@ -35,14 +36,14 @@ DEPENDS = " \
 CLEANBROKEN = "1"

 # avoid stip fail for size of executable >> 4GB - stolen from chromium
-DEBUG_FLAGS:remove:arm = "-g"
-DEBUG_FLAGS:append:arm = "-g1"
-DEBUG_FLAGS:remove:x86 = "-g"
-DEBUG_FLAGS:append:x86 = "-g1"
-DEBUG_FLAGS:remove:aarch64 = "-g"
-DEBUG_FLAGS:append:aarch64 = "-g1"
-DEBUG_FLAGS:remove:x86-64 = "-g"
-DEBUG_FLAGS:append:x86-64 = "-g1"
+DEBUG_FLAGS_remove_arm = "-g"
+DEBUG_FLAGS_append_arm = "-g1"
+DEBUG_FLAGS_remove_x86 = "-g"
+DEBUG_FLAGS_append_x86 = "-g1"
+DEBUG_FLAGS_remove_aarch64 = "-g"
+DEBUG_FLAGS_append_aarch64 = "-g1"
+DEBUG_FLAGS_remove_x86-64 = "-g"
+DEBUG_FLAGS_append_x86-64 = "-g1"

 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"

@@ -67,6 +68,7 @@ EXTRA_OEMAKE = " \
    USE_SYSTEM_LIB_FLAC=1 \
    USE_SYSTEM_LIB_JPEG=1 \
    USE_SYSTEM_LIB_GLM=1 \
+    USE_SYSTEM_LIB_LUA=1 \
    USE_SYSTEM_LIB_PORTAUDIO=1 \
    USE_SYSTEM_LIB_SQLITE3=1 \
    USE_SYSTEM_LIB_ZLIB=1 \
@@ -77,7 +79,7 @@ EXTRA_OEMAKE = " \
    PYTHON_EXECUTABLE=python3 \
 "

-do_compile:prepend() {
+do_compile_prepend() {
    # seems there is some race. Build complains
    # | Assembler messages:
    # | Fatal error: can't create obj/Release/3rdparty/lzma/C/7zAlloc.o: No such file or directory
@@ -143,7 +145,7 @@ do_install() {
        install -pm 644 castool.1 chdman.1 imgtool.1 floptool.1 jedutil.1 ldresample.1 \
                        ldverify.1 romcmp.1 ${D}${mandir}/man1
        install -d ${D}${mandir}/man6
-        install -pm 644 mame.6 ${D}${mandir}/man6
+        install -pm 644 mame.6 mess.6 ${D}${mandir}/man6
    popd

    # install paths where user can add downloaded files
@@ -202,7 +204,7 @@ EOF
 }

 PACKAGES =+ "${PN}-tools"
-FILES:${PN}-tools = " \
+FILES_${PN}-tools = " \
    ${bindir}/castool \
    ${bindir}/chdman \
    ${bindir}/floptool \
--- a/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch
+++ b/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch
@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 7 insertions(+), 5 deletions(-)

 diff --git a/configure b/configure
-index df91054..81690b2 100755
+index 4fb2cf0..37f502e 100755
 --- a/configure
 +++ b/configure
-@@ -323,6 +323,7 @@ mingw32-cross)
+@@ -331,6 +331,7 @@ mingw32-cross)
 	_host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 	_host_os=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 	_host_vendor=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
@@ -26,7 +26,7 @@ index df91054..81690b2 100755
 	;;
 esac
 
-@@ -549,8 +550,9 @@ if test -n "$_host"; then
+@@ -557,8 +558,9 @@ if test -n "$_host"; then
 			_host_os=unix
 			;;
 		*)
@@ -38,7 +38,7 @@ index df91054..81690b2 100755
 			;;
 	esac
 
-@@ -762,7 +764,7 @@ fi
+@@ -802,7 +804,7 @@ fi
 # Now, add the appropriate defines/libraries/headers
 #
 echo
@@ -47,16 +47,16 @@ index df91054..81690b2 100755
 
 SRC="src"
 CORE="$SRC/emucore"
-@@ -783,7 +785,7 @@ JSON="$SRC/json"
+@@ -821,7 +823,7 @@ SQLITE="$SRC/common/repository/sqlite"
 
- INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER -I$JSON -I$SQLITE_REPO -I$SQLITE_LIB"
+ INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER"
 
 -INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
 +INCLUDES="$INCLUDES `pkg-config --cflags sdl2`"
 if test "$_build_static" = yes ; then
 	_sdl_conf_libs="--static-libs"
 	LDFLAGS="-static $LDFLAGS"
-@@ -791,7 +793,7 @@ else
+@@ -829,7 +831,7 @@ else
 	_sdl_conf_libs="--libs"
 fi
 
--- a/recipes-emulators/stella/stella_6.1.2.bb
+++ b/recipes-emulators/stella/stella_6.1.2.bb
@@ -2,10 +2,10 @@ SUMMARY = "Multi-platform Atari 2600 VCS emulator"
 HOMEPAGE = "https://stella-emu.github.io/" 
 SECTION = "emulators"

-LICENSE = "GPL-2.0-only" 
+LICENSE = "GPLv2" 
 LIC_FILES_CHKSUM = "file://License.txt;md5=878e3965c7b52d85827c75f5a2f3b314" 

-inherit autotools-brokensep pkgconfig gtk-icon-cache
+inherit autotools-brokensep gtk-icon-cache

 DEPENDS += "libsdl2 zlib libpng"

@@ -13,6 +13,7 @@ SRC_URI = " \
    https://github.com/stella-emu/stella/releases/download/${PV}/${BPN}-${PV}-src.tar.xz \
    file://0001-custtomize-configure-and-Makefile-to-our-needs.patch \
 "
-SRC_URI[sha256sum] = "b49d5e5a5aa872e1f4b6f24eabd72304abdd577801d6ec349760c73b99e7f14d"
+SRC_URI[md5sum] = "36b927c46ca0be0ae7dee06760b9091b"
+SRC_URI[sha256sum] = "8086e57c231625f0b840ca361f493969247d20476cbb53609d778d37bda17c34"

 CLEANBROKEN = "1"
--- a/recipes-emulators/vice/vice/0001-Adjust-to-ffmpeg4.patch
+++ b/recipes-emulators/vice/vice/0001-Adjust-to-ffmpeg4.patch
@@ -1,63 +0,0 @@
-From 7a5b60cce751eb9603541d8fd2d30290edb0dbf3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 17 Mar 2022 00:18:20 +0100
-Subject: [PATCH] Adjust to ffmpeg4
-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>
---
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3f206ab..1cc40db 100755
--- a/configure.ac
-+++ b/configure.ac
-@@ -2336,13 +2336,13 @@ if test x"$enable_external_ffmpeg" = "xyes"; then
- 
-   if test x"$valid_ffmpeg_platform" = "xyes"; then
-     AC_MSG_RESULT([via pkg-config])
-    PKG_CHECK_MODULES(FFMPEG_AV,  [libavcodec libavformat libavutil],
-+    PKG_CHECK_MODULES(FFMPEG_AV,  [libavcodec4 libavformat4 libavutil4],
-       [old_CFLAGS=$CFLAGS
-        old_CPPFLAGS=$CPPFLAGS
-        CFLAGS="$CFLAGS $FFMPEG_AV_CFLAGS"
-        CPPFLAGS="$CPPFLAGS $FFMPEG_AV_CFLAGS"
- 
-       AC_CHECK_HEADER(libavformat/avformat.h,
-+       AC_CHECK_HEADER(ffmpeg4/libavformat/avformat.h,
-         [AC_DEFINE([HAVE_FFMPEG_HEADER_SUBDIRS],,[FFMPEG uses subdirs for headers])],
-         [AC_CHECK_HEADER(avformat.h,,
-           [AC_MSG_ERROR([No suitable FFMPEG header found!])])])
-@@ -2350,7 +2350,7 @@ if test x"$enable_external_ffmpeg" = "xyes"; then
-        CFLAGS=$old_CFLAGS
-        CPPFLAGS=$old_CPPFLAGS
- 
-      PKG_CHECK_MODULES(FFMPEG_SWSCALE, [libswscale],
-+      PKG_CHECK_MODULES(FFMPEG_SWSCALE, [libswscale4],
-         [have_swscale=yes],
-         [echo "no. trying img_convert"]
-         [old_LIBS=$LIBS]
-@@ -2375,13 +2375,13 @@ if test x"$enable_external_ffmpeg" = "xyes"; then
-     )
-     AC_DEFINE([EXTERNAL_FFMPEG],,[External FFMPEG libraries are used])
-     HAVE_EXTERNAL_FFMPEG=yes
-    PKG_CHECK_MODULES(FFMPEG_SWRESAMPLE, [libswresample], [have_swresample=yes], [have_swresample=no])
-+    PKG_CHECK_MODULES(FFMPEG_SWRESAMPLE, [libswresample4], [have_swresample=yes], [have_swresample=no])
-     if test x"$have_swresample" = "xyes"; then
-       AC_DEFINE([HAVE_FFMPEG_SWRESAMPLE],,[Have FFMPEG swresample lib available])
-       HAVE_FFMPEG_SWRESAMPLE_SUPPORT="yes"
-     else
-       # dnl libav is abandoned and support should be removed, but check for it if swresample is missing.
-      PKG_CHECK_MODULES(FFMPEG_AVRESAMPLE, [libavresample], [have_avresample=yes], [have_avresample=no])
-+      PKG_CHECK_MODULES(FFMPEG_AVRESAMPLE, [libavresample4], [have_avresample=yes], [have_avresample=no])
-       if test x"$have_avresample" = "xyes"; then
-         AC_DEFINE([HAVE_FFMPEG_AVRESAMPLE],,[Have libav avresample lib available])
-         HAVE_FFMPEG_AVRESAMPLE_SUPPORT="yes"
-- 
-2.34.1
-
--- a/recipes-emulators/vice/vice/0001-fix-autoreconfig.patch
+++ b/recipes-emulators/vice/vice/0001-fix-autoreconfig.patch
@@ -0,0 +1,34 @@
+From 701abed61ce01e2d91394bc266b98281f006efe7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 21 Oct 2016 18:15:31 +0200
+Subject: [PATCH] fix autoreconfig
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes:
+
+| gnu-configize: 'configure.ac' or 'configure.in' is required
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b5403d2..3b7f0bb 100755
+--- a/configure.ac
+++ b/configure.ac
+@@ -2360,7 +2360,6 @@ if test x"$FFMPEG_DO_SUBDIRS" = "xyes"; then
+   else
+       ac_configure_args="$ac_configure_args --enable-yasm-command=${YASM} --enable-make-command=${MAKE-make} --enable-full-host=${ac_cv_host} --enable-compiler=${CC} --prefix=${prefix}"
+   fi
+-  AC_CONFIG_SUBDIRS(src/lib/ffmpeg)
+ fi
+ 
+ if test x"$HAVE_SHARED_FFMPEG" = "xyes"; then
+-- 
+2.5.5
+
--- a/recipes-emulators/vice/vice/0002-use-extern-for-the-declarations.patch
+++ b/recipes-emulators/vice/vice/0002-use-extern-for-the-declarations.patch
@@ -0,0 +1,43 @@
+From 7570ff1980acb288e11ae91221b89bfdc5b396d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 7 Sep 2020 21:06:16 +0200
+Subject: [PATCH] use extern for the declarations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37520/]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/arch/gtk3/widgets/base/carthelpers.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/arch/gtk3/widgets/base/carthelpers.h b/src/arch/gtk3/widgets/base/carthelpers.h
+index 1de1d40..cfee67a 100644
+--- a/src/arch/gtk3/widgets/base/carthelpers.h
+++ b/src/arch/gtk3/widgets/base/carthelpers.h
+@@ -31,13 +31,13 @@
+ #include "vice.h"
+ #include <gtk/gtk.h>
+ 
+-int (*carthelpers_save_func)(int type, const char *filename);
+-int (*carthelpers_flush_func)(int type);
+-int (*carthelpers_is_enabled_func)(int type);
+-int (*carthelpers_enable_func)(int type);
+-int (*carthelpers_disable_func)(int type);
+-int (*carthelpers_can_save_func)(int type);
+-int (*carthelpers_can_flush_func)(int type);
+extern int (*carthelpers_save_func)(int type, const char *filename);
+extern int (*carthelpers_flush_func)(int type);
+extern int (*carthelpers_is_enabled_func)(int type);
+extern int (*carthelpers_enable_func)(int type);
+extern int (*carthelpers_disable_func)(int type);
+extern int (*carthelpers_can_save_func)(int type);
+extern int (*carthelpers_can_flush_func)(int type);
+ 
+ 
+ void carthelpers_set_functions(
+-- 
+2.26.2
+
--- a/recipes-emulators/vice/vice/0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch
+++ b/recipes-emulators/vice/vice/0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch
@@ -0,0 +1,46 @@
+From 1936dac13d3019ecb2fc07fb7b61106f5164cac4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 7 Sep 2020 21:22:32 +0200
+Subject: [PATCH] two more fixes to fix -fno-common compiliation, patch #217
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37527/]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/c128/z80.c       | 3 ++-
+ src/rs232drv/rs232.h | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/c128/z80.c b/src/c128/z80.c
+index 3a7eba3..f53f55d 100644
+--- a/src/c128/z80.c
+++ b/src/c128/z80.c
+@@ -444,7 +444,8 @@ static const uint8_t SZP[256] = {
+ 
+ /* ------------------------------------------------------------------------- */
+ 
+-z80_regs_t z80_regs;
+/* This struct variable is exported by ../c64/cart/cpmcart.c */
+/* z80_regs_t z80_regs; */
+ 
+ static void import_registers(void)
+ {
+diff --git a/src/rs232drv/rs232.h b/src/rs232drv/rs232.h
+index 1c5e6ff..e21fbaf 100644
+--- a/src/rs232drv/rs232.h
+++ b/src/rs232drv/rs232.h
+@@ -78,7 +78,7 @@ extern int rs232_cmdline_options_init(void);
+ #define RS232_NUM_DEVICES 4
+ 
+ extern char *rs232_devfile[RS232_NUM_DEVICES];
+-int rs232_useip232[RS232_NUM_DEVICES];
+extern int rs232_useip232[RS232_NUM_DEVICES];
+ 
+ /* the "ip232" protocol used by tcpser 
+  
+-- 
+2.26.2
+
--- a/recipes-emulators/vice/vice_3.6.1.bb
+++ b/recipes-emulators/vice/vice_3.6.1.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Versatile Commodore Emulator"
 HOMEPAGE = "http://vice-emu.sourceforge.net"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"

 # Sources for c64 software:
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"

 SRC_URI = " \
    ${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
-    file://0001-Adjust-to-ffmpeg4.patch \
+    file://0001-fix-autoreconfig.patch \
+    file://0002-use-extern-for-the-declarations.patch \
+    file://0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch \
    file://c64_16.png \
    file://c64_32.png \
    file://c64_48.png \
@@ -16,9 +18,10 @@ SRC_URI = " \
    file://vice_64dtv.desktop \
    file://vice_64sc.desktop \
 "
-SRC_URI[sha256sum] = "20df84c851aaf2f5000510927f6d31b32f269916d351465c366dc0afc9dc150c"
+SRC_URI[md5sum] = "24d83f692910f5d87de19857e8095f0b"
+SRC_URI[sha256sum] = "4bd00c1c63d38cd1fe01b90032834b52f774bc29e4b67eeb1e525b14fee07aeb"

-inherit autotools-brokensep pkgconfig gtk-icon-cache features_check
+inherit autotools pkgconfig gtk-icon-cache features_check

 REQUIRED_DISTRO_FEATURES = "opengl x11"

@@ -27,11 +30,11 @@ DEPENDS = " \
    bdftopcf-native \
    mkfontdir-native \
    mkfontscale-native \
-    dos2unix-native \
    xa-native \
    bison-native \
    glew \
    gtk+3 \
+    libav \
    libsdl \
    libpng \
    jpeg \
@@ -41,7 +44,6 @@ DEPENDS = " \
    mpg123 \
    virtual/libgl \
    vte9 \
-    ffmpeg4 \
 "

 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
@@ -49,37 +51,25 @@ PACKAGECONFIG[pulseaudio] = "--with-pulse,--without-pulse,pulseaudio,pulseaudio-

 EXTRA_OECONF = " \
    --enable-external-ffmpeg \
+    --enable-parsid \
    --enable-native-gtk3ui \
    --without-oss \
-    --disable-pdf-docs \
    --libdir=${libdir} \
    --enable-x64 \
 "

-EXTRA_OECONF:remove = " \
+EXTRA_OECONF_remove = " \
    --disable-static \
 "

-CONFIGUREOPTS:remove = " \
+CONFIGUREOPTS_remove = " \
    --disable-silent-rules \
    ${@append_libtool_sysroot(d)} \
 "

 export ar_check="no"

-
-do_configure() {
-    cd ${S}/src/resid
-    echo "Configuring resid..."
-    ACLOCAL="$ACLOCAL" autoreconf -Wcross -Wno-obsolete --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed."
-    echo "Configuring resid done"
-    cd ${S}
-    rm -f ./configure
-    ACLOCAL="$ACLOCAL" autoreconf -Wcross -Wno-obsolete --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed."
-    oe_runconf
-}
-
-do_install:append() {
+do_install_append() {
    install -d ${D}/${datadir}/applications
    install -m 0644 ${WORKDIR}/vice_64*.desktop ${D}/${datadir}/applications

@@ -89,7 +79,7 @@ do_install:append() {
    done
 }

-RDEPENDS:${PN} += "hicolor-icon-theme"
+RDEPENDS_${PN} += "hicolor-icon-theme"

-RREPLACES:${PN} += "vice-3.2"
-RCONFLICTS:${PN} += "vice-3.2"
+RREPLACES_${PN} += "vice-3.2"
+RCONFLICTS_${PN} += "vice-3.2"
--- a/recipes-emulators/z80/cass80.bb
+++ b/recipes-emulators/z80/cass80.bb
@@ -3,7 +3,7 @@ AUTHOR = "Jürgen Buchmüller"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9fa70e05c591cf3ab4016b22aab701df"

-SRC_URI = "git://github.com/pullmoll/cass80.git;branch=master;protocol=https"
+SRC_URI = "git://github.com/pullmoll/cass80.git"
 SRCREV= "372455830343e5c8ebd42125cfe13191f976c343"
 PV = "0.0.0+git${SRCPV}"
 S = "${WORKDIR}/git"
@@ -12,7 +12,7 @@ inherit qmake5

 DEPENDS = "qtbase"

-do_install:append() {
+do_install_append() {
    install -d ${D}${bindir}
    mv ${D}/opt/cass80/bin/cass80 ${D}${bindir}
    rm -r ${D}/opt
--- a/recipes-emulators/z80/z80_git.bb
+++ b/recipes-emulators/z80/z80_git.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Radio Shack® TRS-80 and the EACA Colour Genie EG2000 emulator"
 HOMEPAGE = "http://pmbits.de/40846.html"
 AUTHOR = "Jürgen Buchmüller"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"

 SRC_URI = " \
-    git://github.com/schnitzeltony/z80.git;branch=master;protocol=https \
+    git://github.com/schnitzeltony/z80.git;branch=master \
    file://0001-use-pkg-config-to-find-sdl.patch \
    file://cgenie.desktop \
    file://trs80.desktop \
@@ -46,4 +46,4 @@ do_install() {
 	install -m 0644 ${WORKDIR}/*.desktop ${D}/${datadir}/applications
 }

-FILES:${PN} += "${datadir}/cgenie ${datadir}/trs80"
+FILES_${PN} += "${datadir}/cgenie ${datadir}/trs80"
--- a/recipes-games/doomretro/doomretro.bb
+++ b/recipes-games/doomretro/doomretro.bb
@@ -1,23 +1,23 @@
 SUMMARY = "The classic, refined DOOM source port"
 HOMEPAGE = "https://www.doomretro.com" 

-LICENSE = "GPL-3.0-only"
+LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=435fa6b85536eff97b3594b76fd0048f" 

 DEPENDS = "libsdl2 libsdl2-image libsdl2-mixer"

-inherit cmake pkgconfig
+inherit cmake

 SRC_URI = " \
-    git://github.com/bradharding/doomretro.git;branch=master;protocol=https \
+    git://github.com/bradharding/doomretro.git \
    file://doomretro.png \
    file://doomretro.desktop \
 "
-SRCREV = "bdcad451c02ffc38ac44900d32648952ad710971"
-PV = "4.4.1"
+SRCREV = "2655445b7a82643568bd58192185b25a864e5380"
+PV = "3.5.10"
 S = "${WORKDIR}/git"

-do_install:append() {
+do_install_append() {
    install -d ${D}${datadir}/applications
    install ${WORKDIR}/${BPN}.desktop ${D}${datadir}/applications

--- a/recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch
+++ b/recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch
@@ -0,0 +1,37 @@
+From a9bdc7d166851eb032af187b5873f2e74b6deaaa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 8 May 2021 16:23:08 +0200
+Subject: [PATCH] Hack build with gcc11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| common/2d/canvas.cpp:58:19: error: '<unknown>' may be used uninitialized [-Werror=maybe-uninitialized]
+|    58 |     gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
+|       |     ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ common/2d/canvas.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/common/2d/canvas.cpp b/common/2d/canvas.cpp
+index b32b31902..c47aa3ce1 100644
+--- a/common/2d/canvas.cpp
+++ b/common/2d/canvas.cpp
+@@ -55,7 +55,10 @@ void gr_init_canvas(grs_canvas &canv, unsigned char *const pixdata, const bm_mod
+ 	canv.cv_font_fg_color = 0;
+ 	canv.cv_font_bg_color = 0;
+ 	auto wreal = w;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ 	gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
+#pragma GCC diagnostic pop	
+ }
+ 
+ void gr_init_sub_canvas(grs_canvas &n, grs_canvas &src, uint16_t x, uint16_t y, uint16_t w, uint16_t h)
+-- 
+2.30.2
+
--- a/recipes-games/dxx-rebirth/d1x-rebirth_git.bb
+++ b/recipes-games/dxx-rebirth/d1x-rebirth_git.bb
@@ -4,7 +4,7 @@ SECTION = "games"
 LICENSE = "DXX-Rebirth"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7077769a51d612f2edcc6abd1e5dfa6d"

-inherit python3native pkgconfig
+inherit python3native

 DEPENDS = " \
    python3-scons-native \
@@ -16,12 +16,13 @@ DEPENDS = " \
 "

 SRC_URI = " \
-    git://github.com/dxx-rebirth/dxx-rebirth.git;branch=master;protocol=https \
+    git://github.com/dxx-rebirth/dxx-rebirth.git \
    http://www.dxx-rebirth.com/download/dxx/content/descent-mac-demo.zip;name=data \
    http://www.descent2.de/files/sound/hires-sounds.7z;name=sound \
    http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa;name=music;unpack=0 \
+    file://0001-Hack-build-with-gcc11.patch \
 "
-SRCREV = "ad46235b67a24a38dec4734f94a59eba149ad94a"
+SRCREV = "48589d0fb019eb971818c15665358e30fa778dc4"
 PV = "v0.59+git${SRCPV}"
 S = "${WORKDIR}/git"

@@ -40,7 +41,7 @@ do_compile() {

 do_install() {
    install -d ${D}${bindir}
-    install ${S}/build/${BPN}/${BPN} ${D}${bindir}
+    install ${S}/${BPN}/${BPN} ${D}${bindir}

    install -d ${D}${datadir}/applications
    install ${S}/${BPN}/${BPN}.desktop ${D}${datadir}/applications
@@ -52,4 +53,4 @@ do_install() {
    install ${WORKDIR}/descent.hog ${WORKDIR}/descent.pig ${WORKDIR}/d1xr-sc55-music.dxa ${D}${datadir}/${BPN}
 }

-RRECOMMENDS:${PN} = "tremor"
+RRECOMMENDS_${PN} = "tremor"
--- a/recipes-games/opentyrian/opentyrian.bb
+++ b/recipes-games/opentyrian/opentyrian.bb
@@ -1,7 +1,7 @@
 SUMMARY = "OpenTyrian is a port of the DOS shoot-em-up Tyrian"
 HOMEPAGE = "https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 SECTION = "games"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"

 DEPENDS = "libsdl2 libsdl2-net"
@@ -9,7 +9,7 @@ DEPENDS = "libsdl2 libsdl2-net"
 inherit autotools-brokensep pkgconfig

 SRC_URI = " \
-    git://github.com/opentyrian/opentyrian.git;branch=master;protocol=https \
+    git://github.com/opentyrian/opentyrian.git \
    http://camanis.net/opentyrian/tyrian21.zip;name=data \
    file://0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch \
    file://0002-fix-build-with-gcc8.patch \
@@ -18,6 +18,7 @@ S = "${WORKDIR}/git"
 SRCREV = "822c71943f6a06bc2599a0478ea41b6d413648d6"
 PV = "2.1.20130907+git${SRCPV}"

+SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
 SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"

 do_install() {
@@ -44,4 +45,4 @@ do_install() {
    find ${D}${datadir}/games/tyrian -name '*.tfp' -exec rm -f {} \; 
 }

-FILES:${PN} += "${datadir}/games"
+FILES_${PN} += "${datadir}/games"
--- a/recipes-support/gtkglext/files/0001-gtkglwidget-various-fixes.patch
+++ b/recipes-support/gtkglext/files/0001-gtkglwidget-various-fixes.patch
@@ -0,0 +1,173 @@
+From be3b1dcbe0d9920eff4094e0a2ef8cd736051dff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 21 Dec 2016 08:20:27 +0100
+Subject: [PATCH] gtkglwidget: various fixes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taken from [1]
+
+[1] http://pkgs.fedoraproject.org/cgit/rpms/gtkglext.git/plain/gtkglext-1.2.0-bz677457.diff
+
+Upstream Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ gtk/gtkglwidget.c | 31 +++++++++++++++++++------------
+ 1 file changed, 19 insertions(+), 12 deletions(-)
+
+diff --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c
+index ecb41ef..2e5e9f6 100644
+--- a/gtk/gtkglwidget.c
+++ b/gtk/gtkglwidget.c
+@@ -16,7 +16,9 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gtk/gtkmain.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+ 
+ #include "gtkglprivate.h"
+ #include "gtkglwidget.h"
+@@ -68,6 +70,7 @@
+ gtk_gl_widget_realize (GtkWidget       *widget,
+                        GLWidgetPrivate *private)
+ {
+  GdkWindow *window;
+   GdkGLWindow *glwindow;
+ 
+   GTK_GL_NOTE_FUNC_PRIVATE ();
+@@ -77,9 +80,10 @@
+    * handlers.
+    */
+ 
+-  if (!gdk_window_is_gl_capable (widget->window))
+  window = gtk_widget_get_window (widget);
+  if (!gdk_window_is_gl_capable (window))
+     {
+-      glwindow = gdk_window_set_gl_capability (widget->window,
+      glwindow = gdk_window_set_gl_capability (window,
+                                                private->glconfig,
+                                                NULL);
+       if (glwindow == NULL)
+@@ -127,9 +131,9 @@
+    * Synchronize OpenGL and window resizing request streams.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
+  if (gtk_widget_get_realized (widget) && private->is_realized)
+     {
+-      gldrawable = gdk_window_get_gl_drawable (widget->window);
+      gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));
+       gdk_gl_drawable_wait_gdk (gldrawable);
+     }
+ }
+@@ -146,7 +150,7 @@
+ 
+   if (private->glcontext != NULL)
+     {
+-      gdk_gl_context_destroy (private->glcontext);
+      g_object_unref (private->glcontext);
+       private->glcontext = NULL;
+     }
+ 
+@@ -154,8 +158,8 @@
+    * Remove OpenGL-capability from widget->window.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
+-    gdk_window_unset_gl_capability (widget->window);
+  if (gtk_widget_get_realized (widget))
+    gdk_window_unset_gl_capability (gtk_widget_get_window (widget));
+ 
+   private->is_realized = FALSE;
+ }
+@@ -174,7 +178,7 @@
+    */
+ 
+   toplevel = gtk_widget_get_toplevel (widget);
+-  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
+  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
+     {
+       GTK_GL_NOTE (MISC,
+         g_message (" - Install colormap to the top-level window."));
+@@ -188,23 +192,27 @@
+                          GtkStyle  *previous_style,
+                          gpointer   user_data)
+ {
+  GdkWindow *window;
+
+   GTK_GL_NOTE_FUNC_PRIVATE ();
+ 
+   /* 
+    * Set a background of "None" on window to avoid AIX X server crash.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
+     {
+      window = gtk_widget_get_window (widget);
+
+       GTK_GL_NOTE (MISC,
+         g_message (" - window->bg_pixmap = %p",
+-                   ((GdkWindowObject *) (widget->window))->bg_pixmap));
+                   ((GdkWindowObject *) window)->bg_pixmap));
+ 
+-      gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
+      gdk_window_set_back_pixmap (window, NULL, FALSE);
+ 
+       GTK_GL_NOTE (MISC,
+         g_message (" - window->bg_pixmap = %p",
+-                   ((GdkWindowObject *) (widget->window))->bg_pixmap));
+                   ((GdkWindowObject *) window)->bg_pixmap));
+     }
+ }
+ 
+@@ -250,8 +258,8 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
+  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
+  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
+   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
+ 
+   /* 
+@@ -432,9 +440,9 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+-  gldrawable = gdk_window_get_gl_drawable (widget->window);
+  gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));
+   if (gldrawable == NULL)
+     return NULL;
+ 
+@@ -474,7 +482,7 @@
+   GLWidgetPrivate *private;
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
+   if (private == NULL)
+@@ -501,7 +509,7 @@
+ gtk_widget_get_gl_window (GtkWidget *widget)
+ {
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+-  return gdk_window_get_gl_window (widget->window);
+  return gdk_window_get_gl_window (gtk_widget_get_window (widget));
+ }
+-- 
+2.5.5
+
--- a/recipes-support/gtkglext/files/0002-Fix-variable-name-conflict.patch
+++ b/recipes-support/gtkglext/files/0002-Fix-variable-name-conflict.patch
@@ -0,0 +1,51 @@
+From 9cbea61c54ee97b6a92263f6392cd84a4918aa54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 6 Jun 2018 14:10:19 +0200
+Subject: [PATCH] Fix variable name conflict
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| ../../gtkglext-1.2.0/gdk/gdkglshapes.c:547:12: error: 'index' redeclared as different kind of symbol
+|  static int index[20][3] =
+|             ^~~~~
+| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/string.h:431:0,
+|                  from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtestutils.h:30,
+|                  from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:82,
+|                  from ../../gtkglext-1.2.0/gdk/gdkglshapes.c:21:
+| /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/strings.h:68:14: note: previous declaration of 'index' was here
+|  extern char *index (const char *__s, int __c)
+|               ^~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ gdk/gdkglshapes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
+index f72abba..d468b05 100644
+--- a/gdk/gdkglshapes.c
+++ b/gdk/gdkglshapes.c
+@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
+   {-Z, -X, 0}
+ };
+ 
+-static int index[20][3] =
+static int _index[20][3] =
+ {
+   {0, 4, 1},
+   {0, 9, 4},
+@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
+   int i;
+ 
+   for (i = 19; i >= 0; i--) {
+-    drawtriangle(i, idata, index, shadeType);
+    drawtriangle(i, idata, _index, shadeType);
+   }
+ }
+ 
+-- 
+2.14.3
+
--- a/recipes-support/gtkglext/gtkglext_1.2.0.bb
+++ b/recipes-support/gtkglext/gtkglext_1.2.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "OpenGL Extension to GTK"
+LICENSE = "GPLv2 | LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
+
+inherit gnomebase pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+DEPENDS += "gtk+ glib-2.0-native pangox-compat libglu libxmu"
+
+SRC_URI += " \
+    file://0001-gtkglwidget-various-fixes.patch \
+    file://0002-Fix-variable-name-conflict.patch \
+"
+SRC_URI[archive.md5sum] = "ed7ba24ce06a8630c07f2d0ee5f04ab4"
+SRC_URI[archive.sha256sum] = "16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51"
+GNOME_COMPRESS_TYPE="bz2"
+
+FILES_${PN}-dev += "${libdir}/gtkglext-1.0"
--- a/recipes-support/iir/iir1.bb
+++ b/recipes-support/iir/iir1.bb
@@ -1,10 +0,0 @@
-SUMMARY = "DSP IIR realtime filter library written in C++"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3e4bda4204237f84ed771428f1b0a656"
-
-SRC_URI = "git://github.com/berndporr/iir1.git;protocol=https;branch=master"
-SRCREV = "f5eaccc87c437d7ca3d050bdfe0783523dbb9d0e"
-PV = "1.9.3"
-S = "${WORKDIR}/git"
-
-inherit cmake pkgconfig
--- a/recipes-support/munt/munt.bb
+++ b/recipes-support/munt/munt.bb
@@ -1,35 +0,0 @@
-SUMMARY = "A multi-platform software synthesiser"
-DESCRIPTION = "A multi-platform software synthesiser emulating pre-GM MIDI devices such as the Roland MT-32, CM-32L, CM-64 and LAPC-I. In no way endorsed by or affiliated with Roland Corp"
-HOMEPAGE = "https://sourceforge.net/projects/munt/"
-
-LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later & GPL-3.0-or-later"
-LIC_FILES_CHKSUM = " \
-    file://mt32emu/COPYING.LESSER.txt;md5=243b725d71bb5df4a1e5920b344b86ad \
-    file://mt32emu/COPYING.txt;md5=751419260aa954499f7abaabaa882bbe \
-    file://mt32emu_alsadrv/COPYING.LESSER.txt;md5=243b725d71bb5df4a1e5920b344b86ad \
-    file://mt32emu_alsadrv/COPYING.txt;md5=751419260aa954499f7abaabaa882bbe \
-    file://mt32emu_qt/COPYING.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://mt32emu_smf2wav/COPYING.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://mt32emu_win32drv/COPYING.LESSER.txt;md5=243b725d71bb5df4a1e5920b344b86ad \
-    file://mt32emu_win32drv/COPYING.txt;md5=751419260aa954499f7abaabaa882bbe \
-"
-
-DEPENDS = " \
-    glib-2.0 \
-"
-
-inherit cmake
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
-
-SRC_URI = "git://github.com/munt/munt.git;branch=master;protocol=https"
-SRCREV = "4c5fd03fdcc6545fdaad539962df0e88059b11d0"
-PV = "2.5.3"
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE = " \
-    -Dlibmt32emu_SHARED=ON \
-"
-
-#PACKAGECONFIG ??= "${@bb.utils.contains_any('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
-PACKAGECONFIG[qt5] = "-Dmunt_WITH_MT32EMU_QT=ON,-Dmunt_WITH_MT32EMU_QT=OFF,qttools-native qtbase qtmultimedia"
-
--- a/recipes-support/packagegroups/meta-retro-world.bb
+++ b/recipes-support/packagegroups/meta-retro-world.bb
@@ -1,23 +0,0 @@
-SUMMARY = "All layer packages - just for build test"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-# wlroots gets dynamically renamed
-PACKAGE_ARCH = "${TUNE_PKGARCH}"
-
-inherit packagegroup
-
-RDEPENDS:${PN} = " \
-    dosbox dosbox-staging dosbox-x \
-    mame \
-    stella \
-    vice \
-    cass80 z80 \
-    \
-    doomretro \
-    d1x-rebirth \
-    \
-    cage \
-    wlroots \
-"
-
--- a/recipes-support/pangox-compat/pangox-compat/0001-Hack-to-build-with-recent-pango.patch
+++ b/recipes-support/pangox-compat/pangox-compat/0001-Hack-to-build-with-recent-pango.patch
@@ -0,0 +1,189 @@
+From 23b4318e2836d82c04b3bead9d21ab2e53d0dd5f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 25 Aug 2019 22:12:39 +0200
+Subject: [PATCH] Hack to build with recent pango
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inapropriate [dead-project]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ pango-impl-utils.h | 145 +++++++++++++++++++++++++++++++++++++++++++++
+ pangox.c           |   2 +
+ 2 files changed, 147 insertions(+)
+
+diff --git a/pango-impl-utils.h b/pango-impl-utils.h
+index 6d6c8ff..55af764 100644
+--- a/pango-impl-utils.h
+++ b/pango-impl-utils.h
+@@ -27,6 +27,151 @@
+ #include <glib-object.h>
+ #include <pango/pango.h>
+ 
+/* pango plays remove and oops don't remove with PangoFontClass so add our own fallback [1]
+ * [1] https://gitlab.gnome.org/GNOME/pango/commit/db1e5dae6e355db792e75cdcca0b7845c89ac4a4 */
+
+#include <pango/pango-font.h>
+
+#ifndef PANGO_FONT_CLASS
+#define PANGO_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT, PangoFontClass))
+#define PANGO_IS_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT))
+#define PANGO_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT, PangoFontClass))
+
+typedef struct _PangoFontClass       PangoFontClass;
+
+struct _PangoFontMetrics
+{
+  /* <private> */
+  guint ref_count;
+
+  int ascent;
+  int descent;
+  int height;
+  int approximate_char_width;
+  int approximate_digit_width;
+  int underline_position;
+  int underline_thickness;
+  int strikethrough_position;
+  int strikethrough_thickness;
+};
+
+struct _PangoFontClass
+{
+  GObjectClass parent_class;
+
+  /*< public >*/
+
+  PangoFontDescription *(*describe)           (PangoFont      *font);
+  PangoCoverage *       (*get_coverage)       (PangoFont      *font,
+                                               PangoLanguage  *language);
+  void                  (*get_glyph_extents)  (PangoFont      *font,
+                                               PangoGlyph      glyph,
+                                               PangoRectangle *ink_rect,
+                                               PangoRectangle *logical_rect);
+  PangoFontMetrics *    (*get_metrics)        (PangoFont      *font,
+                                               PangoLanguage  *language);
+  PangoFontMap *        (*get_font_map)       (PangoFont      *font);
+  PangoFontDescription *(*describe_absolute)  (PangoFont      *font);
+  void                  (*get_features)       (PangoFont      *font,
+                                               hb_feature_t   *features,
+                                               guint           len,
+                                               guint          *num_features);
+  hb_font_t *           (*create_hb_font)     (PangoFont      *font);
+};
+#endif /* PANGO_FONT_CLASS */
+
+
+#ifndef PANGO_FONT_FAMILY_CLASS
+#define PANGO_FONT_FAMILY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
+#define PANGO_IS_FONT_FAMILY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FAMILY))
+#define PANGO_FONT_FAMILY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
+
+typedef struct _PangoFontFamily      PangoFontFamily;
+typedef struct _PangoFontFamilyClass PangoFontFamilyClass;
+
+#ifndef PANGO_DISABLE_DEPRECATED
+
+/**
+ * PangoFontFamily:
+ *
+ * The #PangoFontFamily structure is used to represent a family of related
+ * font faces. The faces in a family share a common design, but differ in
+ * slant, weight, width and other aspects.
+ */
+struct _PangoFontFamily
+{
+  GObject parent_instance;
+};
+
+struct _PangoFontFamilyClass
+{
+  GObjectClass parent_class;
+
+  /*< public >*/
+
+  void  (*list_faces)      (PangoFontFamily  *family,
+                            PangoFontFace  ***faces,
+                            int              *n_faces);
+  const char * (*get_name) (PangoFontFamily  *family);
+  gboolean (*is_monospace) (PangoFontFamily *family);
+  gboolean (*is_variable)  (PangoFontFamily *family);
+
+  /*< private >*/
+
+  /* Padding for future expansion */
+  void (*_pango_reserved2) (void);
+  void (*_pango_reserved3) (void);
+};
+
+#endif /* PANGO_DISABLE_DEPRECATED */
+#endif /* PANGO_FONT_FAMILY_CLASS */
+
+#ifndef PANGO_FONT_FACE_CLASS
+
+#define PANGO_FONT_FACE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
+#define PANGO_IS_FONT_FACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FACE))
+#define PANGO_FONT_FACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
+
+typedef struct _PangoFontFaceClass   PangoFontFaceClass;
+
+#ifndef PANGO_DISABLE_DEPRECATED
+
+/**
+ * PangoFontFace:
+ *
+ * The #PangoFontFace structure is used to represent a group of fonts with
+ * the same family, slant, weight, width, but varying sizes.
+ */
+struct _PangoFontFace
+{
+  GObject parent_instance;
+};
+
+struct _PangoFontFaceClass
+{
+  GObjectClass parent_class;
+
+  /*< public >*/
+
+  const char           * (*get_face_name)  (PangoFontFace *face);
+  PangoFontDescription * (*describe)       (PangoFontFace *face);
+  void                   (*list_sizes)     (PangoFontFace  *face,
+                                            int           **sizes,
+                                            int            *n_sizes);
+  gboolean               (*is_synthesized) (PangoFontFace *face);
+
+  /*< private >*/
+
+  /* Padding for future expansion */
+  void (*_pango_reserved3) (void);
+  void (*_pango_reserved4) (void);
+};
+
+#endif /* PANGO_DISABLE_DEPRECATED */
+#endif /* PANGO_FONT_FACE_CLASS */
+
+/* end of pango fallback */
+
+ G_BEGIN_DECLS
+ 
+ #define PANGO_DEFINE_TYPE_FULL(name, prefix,				   \
+diff --git a/pangox.c b/pangox.c
+index 1a98fa5..1362c14 100644
+--- a/pangox.c
+++ b/pangox.c
+@@ -279,7 +279,9 @@ pango_x_font_class_init (PangoXFontClass *class)
+ 
+   font_class->describe = pango_x_font_describe;
+   font_class->get_coverage = pango_x_font_get_coverage;
+#ifndef PANGO_VERSION_1_44
+   font_class->find_shaper = pango_x_font_find_shaper;
+#endif
+   font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
+   font_class->get_metrics = pango_x_font_get_metrics;
+   font_class->get_font_map = pango_x_font_get_font_map;
+-- 
+2.21.0
+
--- a/recipes-support/pangox-compat/pangox-compat_0.0.2.bb
+++ b/recipes-support/pangox-compat/pangox-compat_0.0.2.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Compatibility library for pangox"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+inherit gnomebase pkgconfig
+
+DEPENDS += "pango"
+
+SRC_URI += "file://0001-Hack-to-build-with-recent-pango.patch"
+SRC_URI[archive.md5sum] = "7bcbd0187f03e1e27af9a81e07249c33"
+SRC_URI[archive.sha256sum] = "552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046"
--- a/recipes-support/portmidi/portmidi_217.bb
+++ b/recipes-support/portmidi/portmidi_217.bb
@@ -29,7 +29,7 @@ EXTRA_OECMAKE += " \
    -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release \
 "

-do_install:append() {
+do_install_append() {
    ln -s libportmidi.so.0. "${D}/${libdir}/libporttime.so"
    ln -s libportmidi.so.0. "${D}/${libdir}/libporttime.so.0"
    ln -s libportmidi.so.0. "${D}/${libdir}/libporttime.so.0."
--- a/recipes-support/slirp/libslirp.bb
+++ b/recipes-support/slirp/libslirp.bb
@@ -1,14 +0,0 @@
-SUMMARY = "A general purpose TCP-IP emulator"
-LICENSE = "BSD-3-Clause & MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
-
-SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
-SRCREV = "cceced0cce9d578ed01db68edf31af78eb66f858"
-PV = "4.6.1"
-S = "${WORKDIR}/git"
-
-DEPENDS = " \
-    glib-2.0 \
-"
-
-inherit meson pkgconfig
--- a/recipes-support/xa/xa_2.3.11.bb
+++ b/recipes-support/xa/xa_2.3.11.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Open-source 6502 cross assembler"
-LICENSE = "GPL-2.0-only"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1f67e705f4eb5064027b8c40ccfdb43e"

 # They move old versions to a different folder
--- a/recipes-wayland/cage/cage.bb
+++ b/recipes-wayland/cage/cage.bb
@@ -12,15 +12,15 @@ DEPENDS = " \
    libxkbcommon \
 "

-inherit meson pkgconfig features_check
+inherit meson features_check

 REQUIRED_DISTRO_FEATURES = "wayland"

-SRC_URI = "git://github.com/Hjdskes/${BPN}.git;branch=master;protocol=https"
-SRCREV = "646b3e80b45a011676eb4190652b8c506d56e7a4"
-PV = "0.1.4"
+SRC_URI = "git://github.com/Hjdskes/${BPN}.git"
+SRCREV = "d09739373288adef901cdd58c983c0d02302932c"
+PV = "0.1.2.1"
 S = "${WORKDIR}/git"

 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland','',d)}"
-PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xwayland"
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xserver-xorg-xwayland"

--- a/recipes-wayland/seatd/seatd.bb
+++ b/recipes-wayland/seatd/seatd.bb
@@ -1,33 +0,0 @@
-# stolen from: https://github.com/MarkusVolk/meta-wayland/blob/master/recipes-core/seatd/seatd_git.bb
-
-SUMMARY = "A minimal seat management daemon, and a universal seat management library."
-DESCRIPTION = "Seat management takes care of mediating access to shared devices (graphics, input), without requiring the applications needing access to be root."
-AUTHOR = "kennylevinsen"
-HOMEPAGE = "https://git.sr.ht/~kennylevinsen/seatd"
-SECTION = "libs"
-LICENSE = "0BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
-
-SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master"
-
-PACKAGECONFIG[systemd] = ",,systemd"
-PACKAGECONFIG[sysvinit] = ",,elogind"
-
-# On systems without logind/elogind, you need to use libseat-builtin.
-# You have to suid the sway binary. Sway will drop root permissions shortly after startup.
-PACKAGECONFIG[libseat-builtin] = "-Dlibseat-builtin=enabled -Dlibseat-logind=disabled,-Dlibseat-builtin=disabled"
-
-PACKAGECONFIG[man-pages] = ",,scdoc-native"
-
-PACKAGECONFIG ?= " \
-	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
-	${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)} \
-"
-
-S = "${WORKDIR}/git"
-PV = "0.5.0+${SRCREV}"
-SRCREV = "2204db5531ed16bf32f969645e7177f6118f8a8e"
-
-inherit meson
-
-EXTRA_OEMESON += "--buildtype release"
--- a/recipes-wayland/sway/wlroots.bb
+++ b/recipes-wayland/sway/wlroots.bb
@@ -15,18 +15,20 @@ DEPENDS = " \
    libxkbcommon \
    udev \
    pixman \
-    seatd \
 "

-inherit meson pkgconfig features_check
+inherit meson features_check

 REQUIRED_DISTRO_FEATURES = "wayland opengl"

 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland x11-backend','',d)}"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,virtual/libx11 xwayland xcb-util-wm"
-PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,virtual/libx11 xcb-util-renderutil"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xserver-xorg-xwayland"
+PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg"

-SRC_URI = "git://github.com/swaywm/${BPN}.git;branch=0.14;protocol=https"
-SRCREV = "49a574420138646845fb664862db03982cfd9f5b"
-PV = "0.14.1"
+SRC_URI = " \
+    git://github.com/swaywm/${BPN}.git \
+    file://0001-Adjust-meson.build-to-meson-0.54.patch \
+"
+SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285"
+PV = "0.12.0"
 S = "${WORKDIR}/git"
--- a/recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch
+++ b/recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch
@@ -0,0 +1,43 @@
+From df8a70b2db61a395bb424d4f4942434544e3ef43 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 8 Dec 2020 01:57:15 +0100
+Subject: [PATCH] Adjust meson.build to meson < 0.54
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* meson.override_dependency is not required here. It requires meson >= 0.54
+* we set min version to what dunfell ships
+
+Upstream-Status: Inappropriate[Configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 835e0195..b07760ab 100644
+--- a/meson.build
+++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+ 	'c',
+ 	version: '0.12.0',
+ 	license: 'MIT',
+-	meson_version: '>=0.54.0',
+	meson_version: '>=0.53.2',
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=2',
+@@ -172,8 +172,6 @@ wlroots = declare_dependency(
+ 	include_directories: wlr_inc,
+ )
+ 
+-meson.override_dependency('wlroots', wlroots)
+-
+ summary({
+ 	'systemd': conf_data.get('WLR_HAS_SYSTEMD', 0),
+ 	'elogind': conf_data.get('WLR_HAS_ELOGIND', 0),
+-- 
+2.26.2
+