z80: move to sdl2

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-08-05 17:48:10 +02:00
65 changed files with 1029 additions and 1979 deletions
--- a/9
+++ b/9
@@ -0,0 +1,9 @@
+OE layer for all in midlife crisis
+
+This layer depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+branch: master
+revision: HEAD
+
+Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com>
--- a/README.md
+++ b/README.md
@@ -1,27 +0,0 @@
-OE layer for emulators and games from 8/16-bit era
--------------------------------------------------
-
-
-Layer dependencies:
-------------------
-see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
-
-
-Contributing
------------
-* Submit any patches against the `meta-retro` layer by using the GitHub pull-request feature.
-
-
-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.
-
-
-Maintainers
-----------
-
-Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,14 +7,3 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb"
 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"
--- 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-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,43 +0,0 @@
-SUMMARY = "DOSBox-X fork of the DOSBox project"
-HOMEPAGE = "https://dosbox-x.com/" 
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b5d36d7c1f35e9597b9843b9bedb6667" 
-
-DEPENDS = " \
-    libsdl2 \
-    libsdl2-net \
-    libpcap \
-    libxkbfile \
-    libpng \
-    alsa-lib \
-    fluidsynth \
-"
-
-inherit autotools-brokensep pkgconfig dos2unix gtk-icon-cache features_check bash-completion
-
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
-
-SRC_URI = " \
-    git://github.com/joncampbell123/dosbox-x.git;branch=master;protocol=https \
-    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"
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF = " \
-    --disable-sdl \
-    --disable-sdltest \
-    --enable-sdl2 \
-    --disable-sdl2test \
-    --disable-alsatest \
-"
-
-# sorry - but it does not make sense
-COMPATIBLE_HOST:armv4 = 'null'
-COMPATIBLE_HOST:armv5 = 'null'
-COMPATIBLE_HOST:armv6 = 'null'
-
-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,100 +0,0 @@
-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
-Subject: [PATCH] use pkgconfig to find sdl2
-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>
---
- acinclude.m4 | 63 ++++------------------------------------------------
- 1 file changed, 4 insertions(+), 59 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index faf376e2c..23f260630 100644
--- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -12,37 +12,9 @@ AC_ARG_ENABLE(sdl2,     [  --enable-sdl2           Enable SDL 2.x],
- 
-   AH_TEMPLATE(C_SDL2,[Set to 1 to enable SDL 2.x support])
- 
-  SDL2_CONFIG=no
-   if test x$enable_sdl2enable = xyes ; then
-    if test x$sdl2_exec_prefix != x ; then
-      sdl2_args="$sdl2_args --exec-prefix=$sdl2_exec_prefix"
-      if test x${SDL2_CONFIG+set} != xset ; then
-        SDL2_CONFIG=$sdl2_exec_prefix/bin/sdl2-config
-      fi
-    fi
-    if test x$sdl2_prefix != x ; then
-      sdl2_args="$sdl2_args --prefix=$sdl2_prefix"
-      if test x${SDL2_CONFIG+set} != xset ; then
-        SDL2_CONFIG=$sdl2_prefix/bin/sdl2-config
-      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
-    fi
-
-    AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no)
-    min_sdl2_version=ifelse([$1], ,0.11.0,$1)
-    AC_MSG_CHECKING(for SDL2 - version >= $min_sdl2_version)
-    no_sdl2=""
-    if test "$SDL2_CONFIG" = "no" ; then
-      no_sdl2=yes
-    else
-      SDL2_CFLAGS=`$SDL2_CONFIG $sdl2conf_args --cflags`
-      SDL2_LIBS=`$SDL2_CONFIG $sdl2conf_args --libs`
-      AC_DEFINE(C_SDL2,1)
-    fi
-+    AC_DEFINE(C_SDL2,1)
-+    PKG_CHECK_MODULES([SDL2], [sdl2])
-   fi
- 
-   AC_SUBST(SDL2_CFLAGS)
-@@ -69,35 +41,8 @@ AC_ARG_ENABLE(sdl, [  --enable-sdl            Enable SDL 1.x],
- 
-   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"
-      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_args="$sdl_args --prefix=$sdl_prefix"
-      if test x${SDL_CONFIG+set} != xset ; then
-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
-      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
-    fi
-
-    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-    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 $sdlconf_args --cflags`
-      SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-      AC_DEFINE(C_SDL1,1)
-    fi
-+    AC_DEFINE(C_SDL1,1)
-+    PKG_CHECK_MODULES([SDL], [sdl])
-   fi
- 
-   AC_SUBST(SDL_CFLAGS)
-- 
-2.31.1
-
--- a/recipes-emulators/dosbox/dosbox-x/0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch
+++ b/recipes-emulators/dosbox/dosbox-x/0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch
@@ -1,34 +0,0 @@
-From 7513e63ca7621f730adb41df556af470f9fba372 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 19 Oct 2020 23:02:41 +0200
-Subject: [PATCH] Enable unaligned memory based on recipe's suggestion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CPU detection as dosbox-x handles it does not work here. So set in recipe
-what configure would do.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d832bcc9a..8841e6c4d 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -850,7 +850,7 @@ dnl FEATURE: Whether to enable unaligned memory access
- AH_TEMPLATE(C_UNALIGNED_MEMORY,[Define to 1 to use a unaligned memory access])
- AC_ARG_ENABLE(unaligned_memory,AC_HELP_STRING([--disable-unaligned-memory],[Disable unaligned memory access]),,enable_unaligned_memory=yes)
- AC_MSG_CHECKING(whether to enable unaligned memory access) 
-if test x$enable_unaligned_memory = xyes -a x$c_unalignedmemory = xyes; then 
-+if test x$enable_unaligned_memory = xyes; then
-   AC_DEFINE(C_UNALIGNED_MEMORY,1)
-   AC_MSG_RESULT(yes)
- else
-- 
-2.26.2
-
--- a/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_install.conf
+++ b/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_install.conf
@@ -1,58 +0,0 @@
-[dosbox]
-title=Windows 98
-memsize=64
-
-[sdl]
-priority = higher,higher
-autolock = true
-fullresolution = desktop
-windowresolution = 1024x768
-output = opengl
-mouse_wheel_key = -0
-
-[render]
-scaler = none
-aspect = true
-
-[cpu]
-cycles = fixed 60000
-core = dynamic
-cputype = auto
-dynamic core cache block size = 32
-
-[video]
-vesa modelist width limit=0
-vesa modelist height limit=0
-
-[dos]
-automountall=true
-
-[fdc, primary]
-int13fakev86io=true
-
-[ide, primary]
-enable=true
-pnp=true
-int13fakeio=true
-int13fakev86io=true
-enable pio32=true
-
-[ide, secondary]
-int13fakeio=true
-int13fakev86io=true
-cd-rom insertion delay=2000
-
-[autoexec]
-keyb de
-
-# This is done once only
-imgmake /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hd_2gig
-
-# This will be our C:
-imgmount 2 /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hdd
-
-# Installation CD
-imgmount d /home/morona/Emulators/dosbox-x/win98/install-media/win98-de.iso
-
-# Bootdisc - comment after install
-boot /home/morona/Emulators/dosbox-x/win98/install-media/win98-boot.img
--- a/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_run.conf
+++ b/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_run.conf
@@ -1,59 +0,0 @@
-[dosbox]
-title=Windows 98
-memsize=64
-
-[sdl]
-priority = higher,normal
-autolock = true
-fullresolution = desktop
-windowresolution = 1024x768
-output = opengl
-mouse_wheel_key = -0
-
-[render]
-aspect = true
-
-[cpu]
-cycles = fixed 12000
-#core = dynamic
-core = normal
-
-cputype = auto
-#dynamic core cache block size = 1
-#use dynamic core with paging on = false
-
-[video]
-vesa modelist width limit=0
-vesa modelist height limit=0
-
-[dos]
-automountall=true
-
-[mixer]
-blocksize = 1024
-
-[fdc, primary]
-int13fakev86io=true
-
-[ide, primary]
-enable=true
-pnp=true
-int13fakeio=true
-int13fakev86io=true
-enable pio32=true
-
-[ide, secondary]
-int13fakeio=true
-int13fakev86io=true
-cd-rom insertion delay=2000
-
-[autoexec]
-keyb de
-
-# This is our C:
-imgmount 2 /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hdd
-
-# Installation CD
-imgmount d /home/morona/Emulators/dosbox-x/win98/install-media/win98-de.iso
-
-boot /home/morona/Emulators/dosbox-x/win98/win98hd.img
--- a/recipes-emulators/dosbox/dosbox/dosbox.png
+++ b/recipes-emulators/dosbox/dosbox/dosbox.png
--- a/recipes-emulators/dosbox/dosbox_0.74.bb
+++ b/recipes-emulators/dosbox/dosbox_0.74.bb
@@ -1,7 +1,7 @@
-SUMMARY = "DOSBox is a DOS-emulator that uses the SDL-library"
+SUMMARY = "OSBox 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"
@@ -13,14 +13,12 @@ SRC_URI = " \
    file://dosbox.desktop \
    file://dosbox.png \
    file://0001-use-pkgconfig-to-find-sdl.patch \
+    file://0002-include-dos_inc.h-add-missing-include.patch \
 "
-SRC_URI[sha256sum] = "c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a"
-PV = "0.74-3"
+SRC_URI[md5sum] = "b9b240fa87104421962d14eee71351e8"
+SRC_URI[sha256sum] = "13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05"

-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/dosbox/dosbox/0001-use-pkgconfig-to-find-sdl.patch
+++ b/recipes-emulators/dosbox/dosbox/0001-use-pkgconfig-to-find-sdl.patch
@@ -1,6 +1,6 @@
 From 032998923ef3a8e3267d64063723482679a7f736 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 9 Sep 2018 22:31:41 +0200
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 26 Feb 2016 22:49:19 +0100
 Subject: [PATCH] use pkgconfig to find sdl
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -8,20 +8,19 @@ Content-Transfer-Encoding: 8bit

 Upstream-Status: Inappropriate [oe specific]

-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- configure.ac | 21 +--------------------
- 1 file changed, 1 insertion(+), 20 deletions(-)
+ configure.in | 20 +-------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)

-diff --git a/configure.ac b/configure.ac
-index a723222..3b28be1 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -26,29 +26,10 @@ if test x$host = xi386-pc-os2-emx ; then
-     LDFLAGS="$LDFLAGS -Zomf -Zmt"
+diff --git a/configure.in b/configure.in
+index 016ea95..79341e5 100644
+--- a/configure.in
+++ b/configure.in
+@@ -28,28 +28,10 @@ if test x$host = xi386-pc-os2-emx ; then
 fi
 
-dnl Check for SDL
+ dnl Check for SDL
 -SDL_VERSION=1.2.0
 -AM_PATH_SDL($SDL_VERSION,
 -            :,
@@ -33,7 +32,7 @@ index a723222..3b28be1 100644
 
 -dnl Check if SDL is 1.2.x (1.3 not supported)
 -AC_MSG_CHECKING([SDL version only being 1.2.X])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+-AC_COMPILE_IFELSE([
 -#include "SDL.h"
 -void blah(){
 -#if SDL_MINOR_VERSION != 2
@@ -41,7 +40,7 @@ index a723222..3b28be1 100644
 -#endif
 -;
 -}
-])],AC_MSG_RESULT([yes]),[
+-],AC_MSG_RESULT([yes]),[
 - AC_MSG_RESULT([no]) 
 - AC_MSG_ERROR([Only libSDL 1.2.X supported])])
 -
@@ -49,5 +48,5 @@ index a723222..3b28be1 100644
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 -- 
-2.14.4
+2.5.0

--- a/recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch
+++ b/recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch
@@ -0,0 +1,35 @@
+From 9502307543db1329af0d7d6aadb0ee67d4089f52 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 26 Feb 2016 22:57:57 +0100
+Subject: [PATCH] include/dos_inc.h: add missing include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+More or less taken from [1]
+
+[1] http://pkgs.fedoraproject.org/cgit/rpms/dosbox.git/tree/dosbox-0.74-gcc46.patch
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ include/dos_inc.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/dos_inc.h b/include/dos_inc.h
+index 290d76b..b16a164 100644
+--- a/include/dos_inc.h
+++ b/include/dos_inc.h
+@@ -28,6 +28,8 @@
+ #include "mem.h"
+ #endif
+ 
+#include <stddef.h>
+
+ #ifdef _MSC_VER
+ #pragma pack (1)
+ #endif
+-- 
+2.5.0
+
--- a/recipes-emulators/dosbox/dosbox/dosbox.desktop
+++ b/recipes-emulators/dosbox/dosbox/dosbox.desktop
@@ -5,4 +5,4 @@ Exec=dosbox
 Icon=dosbox.png
 Terminal=false
 Type=Application
-Categories=Emulator;Game;
+Categories=System;Emulator;Game;
--- a/recipes-emulators/dosbox/files/dosbox.png
+++ b/recipes-emulators/dosbox/files/dosbox.png
--- a/recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch
+++ b/recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch
@@ -0,0 +1,68 @@
+From 168f7f181099e6fbbb4ba7100e45f224afec6107 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 26 Dec 2015 21:29:16 +0100
+Subject: [PATCH] use pkg-config for finding sdl library settings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ scripts/src/osd/sdl.lua     | 6 +++---
+ scripts/src/osd/sdl_cfg.lua | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
+index d1a8322..32ca84a 100644
+--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
+@@ -78,7 +78,7 @@ function maintargetosdoptions(_target,_subtarget)
+ 					}
+ 				configuration { }
+ 			else
+-				local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+				local str = backtick("pkg-config --libs sdl2 | sed 's/-lSDLmain//'")
+ 				addlibfromstring(str)
+ 				addoptionsfromstring(str)
+ 			end
+@@ -280,7 +280,7 @@ if BASE_TARGETOS=="unix" then
+ 					"SDL2.framework",
+ 				}
+ 			else
+-				local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+				local str = backtick("pkg-config --libs --static sdl2 | sed 's/-lSDLmain//'")
+ 				addlibfromstring(str)
+ 				addoptionsfromstring(str)
+ 			end
+@@ -300,7 +300,7 @@ if BASE_TARGETOS=="unix" then
+ 				"SDL2",
+ 			}
+ 		else
+-			local str = backtick(sdlconfigcmd() .. " --libs")
+			local str = backtick("pkg-config --libs sdl2")
+ 			addlibfromstring(str)
+ 			addoptionsfromstring(str)
+ 		end
+diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
+index 0fd15e5..839a468 100644
+--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
+@@ -84,13 +84,13 @@ if BASE_TARGETOS=="unix" then
+ 					"MACOSX_USE_LIBSDL",
+ 				}
+ 				buildoptions {
+-					backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+					backtick("pkg-config --cflags sdl2 | sed 's:/SDL::'"),
+ 				}
+ 			end
+ 			end
+ 	else
+ 		buildoptions {
+-			backtick(sdlconfigcmd() .. " --cflags"),
+			backtick("pkg-config --cflags sdl2"),
+ 		}
+ 		if _OPTIONS["targetos"]~="asmjs" then
+ 			buildoptions {
+-- 
+2.5.5
+
--- a/recipes-emulators/mame/files/0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch
+++ b/recipes-emulators/mame/files/0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch
@@ -0,0 +1,327 @@
+From 917f9e35b110c84b7748e47d7cf27097c04f8e49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 1 Jan 2016 20:48:10 +0100
+Subject: [PATCH] float4_neon.h: refactor buildins for later gcc's
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+taken from [1-2]
+
+[1] https://patchwork.ozlabs.org/patch/410050/
+[2] https://gcc.gnu.org/ml/gcc-patches/2014-04/txtfStfgLNxV5.txt
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ 3rdparty/bx/include/bx/float4_neon.h | 74 ++++++++++++++++++++++++------------------------
+ 1 file changed, 37 insertions(+), 37 deletions(-)
+
+diff --git a/3rdparty/bx/include/bx/float4_neon.h b/3rdparty/bx/include/bx/float4_neon.h
+index 3b6fa18..df42814 100644
+--- a/3rdparty/bx/include/bx/float4_neon.h
+++ b/3rdparty/bx/include/bx/float4_neon.h
+@@ -96,22 +96,22 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float float4_x(float4_t _a)
+ 	{
+-		return __builtin_neon_vget_lanev4sf(_a, 0, 3);
+		return __builtin_neon_vget_lanev4sf(_a, 0);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float float4_y(float4_t _a)
+ 	{
+-		return __builtin_neon_vget_lanev4sf(_a, 1, 3);
+		return __builtin_neon_vget_lanev4sf(_a, 1);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float float4_z(float4_t _a)
+ 	{
+-		return __builtin_neon_vget_lanev4sf(_a, 2, 3);
+		return __builtin_neon_vget_lanev4sf(_a, 2);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float float4_w(float4_t _a)
+ 	{
+-		return __builtin_neon_vget_lanev4sf(_a, 3, 3);
+		return __builtin_neon_vget_lanev4sf(_a, 3);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_ld(const void* _ptr)
+@@ -179,14 +179,14 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_itof(float4_t _a)
+ 	{
+ 		const _i32x4_t itof   = __builtin_neon_vreinterpretv4siv4sf(_a);
+-		const float4_t result = __builtin_neon_vcvtv4si(itof, 1);
+		const float4_t result = __builtin_neon_vcvtsv4si(itof);
+ 
+ 		return result;
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_ftoi(float4_t _a)
+ 	{
+-		const _i32x4_t ftoi   = __builtin_neon_vcvtv4sf(_a, 1);
+		const _i32x4_t ftoi   = __builtin_neon_vcvtsv4sf(_a);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(ftoi);
+ 
+ 		return result;
+@@ -194,32 +194,32 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_add(float4_t _a, float4_t _b)
+ 	{
+-		return __builtin_neon_vaddv4sf(_a, _b, 3);
+		return __builtin_neon_vaddv4sf(_a, _b);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_sub(float4_t _a, float4_t _b)
+ 	{
+-		return __builtin_neon_vsubv4sf(_a, _b, 3);
+		return __builtin_neon_vsubv4sf(_a, _b);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_mul(float4_t _a, float4_t _b)
+ 	{
+-		return __builtin_neon_vmulv4sf(_a, _b, 3);
+		return __builtin_neon_vmulfv4sf(_a, _b);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_rcp_est(float4_t _a)
+ 	{
+-		return __builtin_neon_vrecpev4sf(_a, 3);
+		return __builtin_neon_vrecpev4sf(_a);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_rsqrt_est(float4_t _a)
+ 	{
+-		return __builtin_neon_vrsqrtev4sf(_a, 3);
+		return __builtin_neon_vrsqrtev4sf(_a);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_cmpeq(float4_t _a, float4_t _b)
+ 	{
+-		const _i32x4_t tmp    = __builtin_neon_vceqv4sf(_a, _b, 3);
+		const _i32x4_t tmp    = __builtin_neon_vceqv4sf(_a, _b);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
+ 
+ 		return result;
+@@ -227,7 +227,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_cmplt(float4_t _a, float4_t _b)
+ 	{
+-		const _i32x4_t tmp    = __builtin_neon_vcgtv4sf(_b, _a, 3);
+		const _i32x4_t tmp    = __builtin_neon_vcgtv4sf(_b, _a);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
+ 
+ 		return result;
+@@ -235,7 +235,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_cmple(float4_t _a, float4_t _b)
+ 	{
+-		const _i32x4_t tmp    = __builtin_neon_vcgev4sf(_b, _a, 3);
+		const _i32x4_t tmp    = __builtin_neon_vcgev4sf(_b, _a);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
+ 
+ 		return result;
+@@ -243,7 +243,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_cmpgt(float4_t _a, float4_t _b)
+ 	{
+-		const _i32x4_t tmp    = __builtin_neon_vcgtv4sf(_a, _b, 3);
+		const _i32x4_t tmp    = __builtin_neon_vcgtv4sf(_a, _b);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
+ 
+ 		return result;
+@@ -251,7 +251,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_cmpge(float4_t _a, float4_t _b)
+ 	{
+-		const _i32x4_t tmp    = __builtin_neon_vcgev4sf(_a, _b, 3);
+		const _i32x4_t tmp    = __builtin_neon_vcgev4sf(_a, _b);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp);
+ 
+ 		return result;
+@@ -259,19 +259,19 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_min(float4_t _a, float4_t _b)
+ 	{
+-		return __builtin_neon_vminv4sf(_a, _b, 3);
+		return __builtin_neon_vminfv4sf(_a, _b);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_max(float4_t _a, float4_t _b)
+ 	{
+-		return __builtin_neon_vmaxv4sf(_a, _b, 3);
+		return __builtin_neon_vmaxfv4sf(_a, _b);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_and(float4_t _a, float4_t _b)
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vandv4si(tmp0, tmp1, 0);
+		const _i32x4_t tmp2   = tmp0 & tmp1;
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -281,7 +281,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vbicv4si(tmp0, tmp1, 0);
+		const _i32x4_t tmp2   = tmp0 & ~tmp1;
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -291,7 +291,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vorrv4si(tmp0, tmp1, 0);
+		const _i32x4_t tmp2   = tmp0 | tmp1;
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -301,7 +301,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_veorv4si(tmp0, tmp1, 0);
+		const _i32x4_t tmp2   = tmp0 ^ tmp1;
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -312,7 +312,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 		if (__builtin_constant_p(_count) )
+ 		{
+ 			const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+-			const _i32x4_t tmp1   = __builtin_neon_vshl_nv4si(tmp0, _count, 0);
+			const _i32x4_t tmp1   = __builtin_neon_vshl_nv4si(tmp0, _count);
+ 			const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
+ 
+ 			return result;
+@@ -320,7 +320,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t shift  = __builtin_neon_vdup_nv4si( (__builtin_neon_si)_count);
+-		const _i32x4_t tmp1   = __builtin_neon_vshlv4si(tmp0, shift, 1);
+		const _i32x4_t tmp1   = __builtin_neon_vshlsv4si(tmp0, shift);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
+ 
+ 		return result;
+@@ -331,7 +331,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 		if (__builtin_constant_p(_count) )
+ 		{
+ 			const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+-			const _i32x4_t tmp1   = __builtin_neon_vshr_nv4si(tmp0, _count, 0);
+			const _i32x4_t tmp1   = __builtin_neon_vshru_nv4si(tmp0, _count);
+ 			const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
+ 
+ 			return result;
+@@ -339,7 +339,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t shift  = __builtin_neon_vdup_nv4si( (__builtin_neon_si)-_count);
+-		const _i32x4_t tmp1   = __builtin_neon_vshlv4si(tmp0, shift, 1);
+		const _i32x4_t tmp1   = __builtin_neon_vshlsv4si(tmp0, shift);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
+ 
+ 		return result;
+@@ -350,7 +350,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 		if (__builtin_constant_p(_count) )
+ 		{
+ 			const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+-			const _i32x4_t tmp1   = __builtin_neon_vshr_nv4si(tmp0, _count, 1);
+			const _i32x4_t tmp1   = __builtin_neon_vshrs_nv4si(tmp0, _count);
+ 			const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
+ 
+ 			return result;
+@@ -358,7 +358,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t shift  = __builtin_neon_vdup_nv4si( (__builtin_neon_si)-_count);
+-		const _i32x4_t tmp1   = __builtin_neon_vshlv4si(tmp0, shift, 1);
+		const _i32x4_t tmp1   = __builtin_neon_vshlsv4si(tmp0, shift);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp1);
+ 
+ 		return result;
+@@ -366,19 +366,19 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_madd(float4_t _a, float4_t _b, float4_t _c)
+ 	{
+-		return __builtin_neon_vmlav4sf(_c, _a, _b, 3);
+		return __builtin_neon_vmlav4sf(_c, _a, _b);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_nmsub(float4_t _a, float4_t _b, float4_t _c)
+ 	{
+-		return __builtin_neon_vmlsv4sf(_c, _a, _b, 3);
+		return __builtin_neon_vmlsv4sf(_c, _a, _b);
+ 	}
+ 
+ 	BX_FLOAT4_FORCE_INLINE float4_t float4_icmpeq(float4_t _a, float4_t _b)
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vceqv4si(tmp0, tmp1, 1);
+		const _i32x4_t tmp2   = __builtin_neon_vceqv4si(tmp0, tmp1);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -388,7 +388,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vcgtv4si(tmp1, tmp0, 1);
+		const _i32x4_t tmp2   = __builtin_neon_vcgtv4si(tmp1, tmp0);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -398,7 +398,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vcgtv4si(tmp0, tmp1, 1);
+		const _i32x4_t tmp2   = __builtin_neon_vcgtv4si(tmp0, tmp1);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -408,7 +408,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vminv4si(tmp0, tmp1, 1);
+		const _i32x4_t tmp2   = __builtin_neon_vminsv4si(tmp0, tmp1);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -418,7 +418,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vmaxv4si(tmp0, tmp1, 1);
+		const _i32x4_t tmp2   = __builtin_neon_vmaxsv4si(tmp0, tmp1);
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -428,7 +428,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vaddv4si(tmp0, tmp1, 1);
+		const _i32x4_t tmp2   = tmp0 + tmp1;
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+@@ -438,7 +438,7 @@ IMPLEMENT_TEST(xyzw , xyzw);
+ 	{
+ 		const _i32x4_t tmp0   = __builtin_neon_vreinterpretv4siv4sf(_a);
+ 		const _i32x4_t tmp1   = __builtin_neon_vreinterpretv4siv4sf(_b);
+-		const _i32x4_t tmp2   = __builtin_neon_vsubv4si(tmp0, tmp1, 1);
+		const _i32x4_t tmp2   = tmp0 - tmp1;
+ 		const float4_t result = __builtin_neon_vreinterpretv4sfv4si(tmp2);
+ 
+ 		return result;
+-- 
+2.5.0
+
--- a/recipes-emulators/mame/files/0003-bx-float4_neon.h-Remove-neon_reinterpret-use-casts.patch
+++ b/recipes-emulators/mame/files/0003-bx-float4_neon.h-Remove-neon_reinterpret-use-casts.patch
@@ -0,0 +1,39 @@
+From b3db2aa6b762711015f2d504006b44e698a4de0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 31 Jul 2016 01:36:52 +0200
+Subject: [PATCH] bx/float4_neon.h: Remove neon_reinterpret, use casts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See gcc6;
+
+commit da08cb5504f0b791ada8889b16620055672999b8
+Author: alalaw01 <alalaw01@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Thu Feb 4 14:49:02 2016 +0000
+
+    [ARM] Remove neon_reinterpret, use casts
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ 3rdparty/bx/include/bx/float4_neon.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/3rdparty/bx/include/bx/float4_neon.h b/3rdparty/bx/include/bx/float4_neon.h
+index c3545d0..811c4ff 100644
+--- a/3rdparty/bx/include/bx/float4_neon.h
+++ b/3rdparty/bx/include/bx/float4_neon.h
+@@ -6,6 +6,10 @@
+ #ifndef BX_FLOAT4_NEON_H_HEADER_GUARD
+ #define BX_FLOAT4_NEON_H_HEADER_GUARD
+ 
+/* gcc6 hacks */
+#define __builtin_neon_vreinterpretv4sfv4si(a) ((float4_t)a)
+#define __builtin_neon_vreinterpretv4siv4sf(a) ((_i32x4_t)a)
+
+ namespace bx
+ {
+ 	typedef __builtin_neon_sf  float4_t __attribute__( (__vector_size__(16) ) );
+-- 
+2.5.5
+
--- a/recipes-emulators/mame/mame.bb
+++ b/recipes-emulators/mame/mame.bb
@@ -1,222 +0,0 @@
-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"
-
-SRC_URI = " \
-    git://github.com/mamedev/mame.git;branch=master;protocol=https \
-    file://mame.desktop \
-    file://mame32k.desktop \
-"
-PV = "0248"
-SRCREV = "2d3d0deec8fa4025ea51c1722a21e6b9a7a8bb92"
-S = "${WORKDIR}/git"
-
-inherit pkgconfig siteinfo gtk-icon-cache
-
-DEPENDS = " \
-    libsdl2 \
-    libsdl2-ttf \
-    fontconfig \
-    libxinerama \
-    \
-    expat \
-    zlib \
-    flac \
-    jpeg \
-    glm \
-    sqlite3 \
-    portaudio-v19 \
-    rapidjson \
-    portmidi \
-"
-
-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"
-
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
-# TBD: x86 may overrideoverrides later - cannot test
-MAME_NOASM="NOASM=1"
-
-# genie.lua does not detect 64bit targets at least on aarch64
-MAME_PTR64 = "${@oe.utils.conditional('SITEINFO_BITS', '64', '-DPTR64=1', '', d)}"
-
-EXTRA_OEMAKE = " \
-    linux \
-    CROSS_BUILD=1 \
-    OVERRIDE_CC='${CC} ${MAME_PTR64}' \
-    OVERRIDE_CXX='${CXX} ${MAME_PTR64}' \
-    OPTIMIZE=3 \
-    TOOLS=1 \
-    USE_QTDEBUG=0 \
-    LTO=0 \
-    NOWERROR=1 \
-    ${MAME_NOASM} \
-    USE_SYSTEM_LIB_EXPAT=1 \
-    USE_SYSTEM_LIB_FLAC=1 \
-    USE_SYSTEM_LIB_JPEG=1 \
-    USE_SYSTEM_LIB_GLM=1 \
-    USE_SYSTEM_LIB_PORTAUDIO=1 \
-    USE_SYSTEM_LIB_SQLITE3=1 \
-    USE_SYSTEM_LIB_ZLIB=1 \
-    USE_SYSTEM_LIB_RAPIDJSON=1 \
-    USE_OPENMP=1 \
-    USE_SYSTEM_LIB_PORTMIDI=1 \
-    SDL_INI_PATH=${sysconfdir}/${BPN} \
-    PYTHON_EXECUTABLE=python3 \
-"
-
-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
-    # | Assembler messages:
-    # | Fatal error: can't create obj/Release/src/mame/drivers/acvirus.o: No such file or directory
-    # But that directory is created with a few files
-    mkdir -p ${S}/build/projects/sdl/mame/gmake-linux/obj/Release/3rdparty/lzma/C
-}
-
-do_install() {
-    # stolen much from https://src.fedoraproject.org/cgit/rpms/mame.git/tree/mame.spec
-
-    # executables
-    install -d ${D}${bindir}
-    install -pm 755 castool chdman floptool imgtool jedutil ldresample ldverify \
-        mame nltool nlwav pngcmp romcmp unidasm ${D}${bindir}
-    for tool in regrep split srcclean; do
-        install -pm 755 $tool ${D}${bindir}/${BPN}-$tool
-    done
-
-    # misc
-    install -d ${D}${datadir}/applications
-    install -m 644 ${WORKDIR}/mame.desktop ${D}${datadir}/applications
-    install -m 644 ${WORKDIR}/mame32k.desktop ${D}${datadir}/applications
-
-    pushd artwork
-        find -type d -exec install -d ${D}${datadir}/${BPN}/artwork/{} \;
-        find -type f -exec install -pm 644 {} ${D}${datadir}/${BPN}/artwork/{} \;
-    popd
-
-    install -d ${D}${datadir}/${BPN}/ctrlr
-    install -pm 644 ctrlr/*.cfg ${D}${datadir}/${BPN}/ctrlr
-
-    install -d ${D}${datadir}/${BPN}/fonts
-    install -m 644 uismall.bdf ${D}${datadir}/${BPN}/fonts
-
-    install -d ${D}${datadir}/${BPN}/hash
-    install -pm 644 hash/* ${D}${datadir}/${BPN}/hash
-
-    install -d ${D}${datadir}/${BPN}/hlsl
-    install -pm 644 hlsl/*.fx ${D}${datadir}/${BPN}/hlsl
-
-    install -d ${D}${datadir}/${BPN}/keymaps
-    install -pm 644 keymaps/* ${D}${datadir}/${BPN}/keymaps
-
-    pushd language
-        find -type d -exec install -d ${D}${datadir}/${BPN}/language/{} \;
-        find -type f -name \*.mo -exec install -pm 644 {} ${D}${datadir}/${BPN}/language/{} \;
-    popd
-
-    pushd plugins
-        find -type d -exec install -d ${D}${datadir}/${BPN}/plugins/{} \;
-        find -type f -exec install -pm 644 {} ${D}${datadir}/${BPN}/plugins/{} \;
-    popd
-
-    install -d ${D}${datadir}/${BPN}/shader
-    pushd src/osd/modules/opengl
-        install -pm 644 shader/*.?sh ${D}${datadir}/${BPN}/shader
-    popd
-
-    pushd docs/man
-        install -d ${D}${mandir}/man1
-        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
-    popd
-
-    # install paths where user can add downloaded files
-    for folder in roms samples; do
-        install -d ${D}${sysconfdir}/skel/Emulators/${BPN}/$folder
-    done
-    echo "Store your downloaded files in subfolders" >> ${D}${sysconfdir}/skel/Emulators/${BPN}/Readme
-
-    # install paths for created data
-    for folder in cfg comments diff history inp nvram snap state; do
-        install -d ${D}${sysconfdir}/skel/.${BPN}/$folder
-    done
-
-    # user config
-    install -d ${D}${sysconfdir}/skel/.config/${BPN}/ini
-
-    # Create ini file
-    cat > ${WORKDIR}/${BPN}.ini << EOF
-# Define source paths
-artpath            ${datadir}/${BPN}/artwork
-#bgfx_path          ${datadir}/${BPN}/bgfx
-#cheatpath          ${datadir}/${BPN}/cheat
-#crosshairpath      ${datadir}/${BPN}/crosshair
-ctrlrpath          ${datadir}/${BPN}/ctrlr
-fontpath           ${datadir}/${BPN}/fonts
-hashpath           ${datadir}/${BPN}/hash
-languagepath       ${datadir}/${BPN}/language
-pluginspath        ${datadir}/${BPN}/plugins
-# Have these per user for simple download/install
-rompath            \$HOME/Emulators/${BPN}/roms
-samplepath         \$HOME/Emulators/${BPN}/samples
-
-# Allow user to override ini settings
-inipath            \$HOME/.config/${BPN}/ini;${sysconfdir}/${BPN}
-
-# Set paths for local storage
-cfg_directory      \$HOME/.${BPN}/cfg
-comment_directory  \$HOME/.${BPN}/comments
-diff_directory     \$HOME/.${BPN}/diff
-historypath        \$HOME/.${BPN}/history
-input_directory    \$HOME/.${BPN}/inp
-nvram_directory    \$HOME/.${BPN}/nvram
-snapshot_directory \$HOME/.${BPN}/snap
-state_directory    \$HOME/.${BPN}/state
-EOF
-    install -d ${D}${sysconfdir}/${BPN}
-    install -m 644 ${WORKDIR}/${BPN}.ini ${D}${sysconfdir}/${BPN}
-
-    # Logo
-    install -d ${D}${datadir}/pixmaps
-    install -m 644 ${S}/docs/source/images/MAMElogo.svg ${D}${datadir}/pixmaps
-
-    # cleanup
-    find ${D}${datadir}/${BPN} -name LICENSE -exec rm {} \;
-    find ${D}${datadir}/${BPN} -name README.md -exec rm {} \;
-}
-
-PACKAGES =+ "${PN}-tools"
-FILES:${PN}-tools = " \
-    ${bindir}/castool \
-    ${bindir}/chdman \
-    ${bindir}/floptool \
-    ${bindir}/imgtool \
-    ${bindir}/jedutil \
-    ${bindir}/ldresample \
-    ${bindir}/ldverify \
-    ${bindir}/nltool \
-    ${bindir}/nlwav \
-    ${bindir}/pngcmp \
-    ${bindir}/${BPN}-regrep \
-    ${bindir}/romcmp \
-    ${bindir}/${BPN}-split \
-    ${bindir}/${BPN}-src2html \
-    ${bindir}/${BPN}-srcclean \
-    ${bindir}/unidasm \
-"
--- a/recipes-emulators/mame/mame/mame.desktop
+++ b/recipes-emulators/mame/mame/mame.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Mame
-Comment=MAME is a multi-purpose emulation framework
-Exec=mame
-Icon=MAMElogo.svg
-Terminal=false
-StartupNotify=false
-Categories=Game
--- a/recipes-emulators/mame/mame/mame32k.desktop
+++ b/recipes-emulators/mame/mame/mame32k.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Mame (32k RAM)
-Comment=MAME is a multi-purpose emulation framework
-Exec=mame -ramsize 32k
-Icon=MAMElogo.svg
-Terminal=false
-StartupNotify=false
-Categories=Game
--- a/recipes-emulators/mame/mame_0176.bb
+++ b/recipes-emulators/mame/mame_0176.bb
@@ -0,0 +1,80 @@
+SUMMARY = "Multiple Arcade Machine Emulator"
+HOMEPAGE = "http://www.mamedev.org/index.php" 
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=89436197a991695e278e47475b4ff7ae" 
+
+SRC_URI = " \
+    https://github.com/mamedev/mame/archive/${BPN}${PV}.tar.gz \
+    file://0001-use-pkg-config-for-finding-sdl-library-settings.patch \
+    file://0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch \
+    file://0003-bx-float4_neon.h-Remove-neon_reinterpret-use-casts.patch \
+"
+SRC_URI[md5sum] = "b2aed655e1ea2bccf26bf96f189257ba"
+SRC_URI[sha256sum] = "e8837ae9c21ac6ca289c0214747a6d7ff7cc4683b9426377f42cda318fddcb25"
+
+S = "${WORKDIR}/${BPN}-${BPN}${PV}"
+
+DEPENDS = " \
+    libsdl2 \
+    libsdl2-ttf \
+    fontconfig \
+    libxinerama \
+    \
+    expat \
+    zlib \
+    flac \
+    jpeg \
+    lua lua-native \
+    sqlite3 \
+    portaudio-v19 \
+"
+
+CLEANBROKEN = "1"
+
+EXTRA_OEMAKE = " \
+    linux \
+    CROSS_BUILD=1 \
+    OVERRIDE_CC='${CC}' \
+    OVERRIDE_CXX='${CXX}' \
+    TOOLS=1 \
+    USE_QTDEBUG=0 \
+    NOWERROR=1 \
+    USE_SYSTEM_LIB_EXPAT=1 \
+    USE_SYSTEM_LIB_ZLIB=1 \
+    USE_SYSTEM_LIB_FLAC=1 \
+    USE_SYSTEM_LIB_JPEG=1 \
+    USE_SYSTEM_LIB_LUA=1 \
+    USE_SYSTEM_LIB_SQLITE3=1 \
+    USE_SYSTEM_LIB_PORTAUDIO=1 \
+"
+
+EXTRA_OEMAKE_append_arm = " \
+    NOASM=1 \
+"
+
+do_install() {
+    # Note: Unstripped mame binary for armv7 is > 1GB!!
+    install -d ${D}${bindir}
+    install mame ${D}${bindir}/
+
+    install -d ${D}${libexecdir}
+    for binary in \
+        castool \
+        chdman \
+        floptool \
+        imgtool \
+        jedutil \
+        ldresample \
+        ldverify \
+        mame \
+        nltool \
+        romcmp \
+        split \
+        src2html \
+        unidasm \
+        ; \
+    do
+        install $binary ${D}${libexecdir}/
+    done
+}
--- 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
@@ -1,70 +0,0 @@
-From 389ed0e18c10a8b3368d0b9fbd2e1f5a7e37f072 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 20 May 2020 22:12:52 +0200
-Subject: [PATCH] custtomize configure and Makefile to our needs
-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>
-
---
- configure | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/configure b/configure
-index df91054..81690b2 100755
--- a/configure
-+++ b/configure
-@@ -323,6 +323,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/'`
-+	_host_prefix=$_host
- 	;;
- esac
- 
-@@ -549,8 +550,9 @@ if test -n "$_host"; then
- 			_host_os=unix
- 			;;
- 		*)
-			echo "Cross-compiling to unknown target, please add your target to configure."
-			exit 1
-+			echo "Cross-compiling for Yocto Project based systems."
-+			DEFINES="$DEFINES -DUNIX"
-+			_host_os=unix
- 			;;
- 	esac
- 
-@@ -762,7 +764,7 @@ fi
- # Now, add the appropriate defines/libraries/headers
- #
- echo
-find_sdlconfig
-+#find_sdlconfig
- 
- SRC="src"
- CORE="$SRC/emucore"
-@@ -783,7 +785,7 @@ JSON="$SRC/json"
- 
- INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER -I$JSON -I$SQLITE_REPO -I$SQLITE_LIB"
- 
-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
- 	_sdl_conf_libs="--libs"
- fi
- 
-LIBS="$LIBS `$_sdlconfig $_sdl_conf_libs`"
-+LIBS="$LIBS `pkg-config $_sdl_conf_libs sdl2`"
- LD=$CXX
- 
- case $_host_os in
-- 
-2.21.1
-
--- a/recipes-emulators/stella/stella/cross_compile_support.patch
+++ b/recipes-emulators/stella/stella/cross_compile_support.patch
@@ -0,0 +1,105 @@
+diff --git a/Makefile b/Makefile
+index 67b1a10a7a81..620072cc1b9c 100644
+--- a/Makefile
+++ b/Makefile
+@@ -172,7 +172,7 @@ config.mak: $(srcdir)/configure
+ 
+ install: all
+ 	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
+-	$(INSTALL) -c -s -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
+	$(INSTALL) -c -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)"
+ 	$(INSTALL) -d "$(DESTDIR)$(DOCDIR)"
+ 	$(INSTALL) -c -m 644 "$(srcdir)/Announce.txt" "$(srcdir)/Changes.txt" "$(srcdir)/Copyright.txt" "$(srcdir)/License.txt" "$(srcdir)/README-SDL.txt" "$(srcdir)/Readme.txt" "$(srcdir)/Todo.txt" "$(srcdir)/docs/index.html" "$(srcdir)/docs/debugger.html" "$(DESTDIR)$(DOCDIR)/"
+ 	$(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics"
+diff --git a/configure b/configure
+index 419eb8a5fe10..8f453b9f5d62 100755
+--- a/configure
+++ b/configure
+@@ -334,6 +334,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/'`
+    _host_prefix=$_host
+ 	;;
+ esac
+ 
+@@ -375,20 +376,27 @@ esac
+ # Determine the C++ compiler
+ #
+ echo_n "Looking for C++ compiler... "
+-if test -n "$_host"; then
+-	compilers="$CXX $_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
+-else
+-	compilers="$CXX g++ c++"
+-fi
+ 
+-for compiler in $compilers; do
+-	if test_compiler $compiler; then
+-		CXX=$compiler
+-		echo $CXX
+-		break
+-	fi
+-done
+-if test -z $CXX; then
+if test_compiler "$CXX"; then
+    echo "$CXX"
+else
+    if test -n "$_host"; then
+        compilers="$_host_prefix-g++ $_host_prefix-c++ $_host_cpu-$_host_os-g++ $_host_cpu-$_host_os-c++"
+    else
+        compilers="g++ c++"
+    fi
+
+    for compiler in $compilers; do
+        echo "testing compile $compiler"
+        if test_compiler $compiler; then
+		    CXX=$compiler
+        	echo $CXX
+		    break
+        fi
+    done
+fi
+
+if test -z "$CXX"; then
+ 	echo "none found!"
+ 	exit 1
+ fi
+@@ -529,8 +537,9 @@ if test -n "$_host"; then
+ 			_host_os=win32
+ 			;;
+ 		*)
+-			echo "Cross-compiling to unknown target, please add your target to configure."
+-			exit 1
+            echo "Cross-compiling for Yocto Project based systems."
+            DEFINES="$DEFINES -DUNIX"
+            _host_os=unix
+ 			;;
+ 	esac
+ 	
+@@ -734,7 +743,7 @@ fi
+ # Now, add the appropriate defines/libraries/headers
+ #
+ echo
+-find_sdlconfig
+#find_sdlconfig
+ 
+ SRC="src"
+ CORE="$SRC/emucore"
+@@ -750,7 +759,7 @@ ZLIB="$SRC/zlib"
+ 
+ INCLUDES="-I$CORE -I$COMMON -I$TV -I$GUI"
+ 
+-INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
+INCLUDES="$INCLUDES `pkg-config --cflags sdl2`"
+ if test "$_build_static" = yes ; then
+ 	_sdl_conf_libs="--static-libs"
+ 	LDFLAGS="-static $LDFLAGS"
+@@ -758,7 +767,7 @@ else
+ 	_sdl_conf_libs="--libs"
+ fi
+ 
+-LIBS="$LIBS `$_sdlconfig $_sdl_conf_libs`"
+LIBS="$LIBS `pkg-config --libs sdl2`"
+ LD=$CXX 
+ case $_host_os in
+ 		unix)
--- a/recipes-emulators/stella/stella_4.6.1.bb
+++ b/recipes-emulators/stella/stella_4.6.1.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Multi-platform Atari 2600 VCS emulator"
+HOMEPAGE = "http://stella.sourceforge.net/" 
+SECTION = "emulators"
+
+LICENSE = "GPLv2" 
+LIC_FILES_CHKSUM = "file://License.txt;md5=878e3965c7b52d85827c75f5a2f3b314" 
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}-src.tar.gz \
+           file://cross_compile_support.patch"
+
+SRC_URI[md5sum] = "91d7a7333097345e81f90a39fcdcc324"
+SRC_URI[sha256sum] = "c1921671dbc08422ae8a7a4102c6a2a34433f04594d67f55a7129c1504bcd288"
+
+DEPENDS = "libsdl2 zlib libpng"
+
+FILES_${PN} += "${datadir}/icons"
+
+inherit autotools-brokensep
--- a/recipes-emulators/stella/stella_6.5.3.bb
+++ b/recipes-emulators/stella/stella_6.5.3.bb
@@ -1,18 +0,0 @@
-SUMMARY = "Multi-platform Atari 2600 VCS emulator"
-HOMEPAGE = "https://stella-emu.github.io/" 
-SECTION = "emulators"
-
-LICENSE = "GPL-2.0-only" 
-LIC_FILES_CHKSUM = "file://License.txt;md5=878e3965c7b52d85827c75f5a2f3b314" 
-
-inherit autotools-brokensep pkgconfig gtk-icon-cache
-
-DEPENDS += "libsdl2 zlib libpng"
-
-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"
-
-CLEANBROKEN = "1"
--- a/recipes-emulators/vice/files/0001-gifdrv.c-fix-build-with-giflib-5.1.0.patch
+++ b/recipes-emulators/vice/files/0001-gifdrv.c-fix-build-with-giflib-5.1.0.patch
@@ -0,0 +1,68 @@
+From 0901ffbd5537d3cf974a3d790304ebf049ca60b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 13 May 2016 00:24:03 +0200
+Subject: [PATCH] gifdrv.c: fix build with giflib > 5.1.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/gfxoutputdrv/gifdrv.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
+index 7f7f3bc..725e1f0 100644
+--- a/src/gfxoutputdrv/gifdrv.c
+++ b/src/gfxoutputdrv/gifdrv.c
+@@ -114,7 +114,11 @@ static int gifdrv_open(screenshot_t *screenshot, const char *filename)
+   if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
+       EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
+   {
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
+    EGifCloseFile(sdata->fd, 0);
+#else
+     EGifCloseFile(sdata->fd);
+#endif
+     VICE_FreeMapObject(gif_colors);
+     lib_free(sdata->data);
+     lib_free(sdata->ext_filename);
+@@ -145,7 +149,11 @@ static int gifdrv_close(screenshot_t *screenshot)
+ 
+     sdata = screenshot->gfxoutputdrv_data;
+ 
+ #if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
+    EGifCloseFile(sdata->fd, 0);
+#else
+     EGifCloseFile(sdata->fd);
+#endif
+     VICE_FreeMapObject(gif_colors);
+ 
+     /* for some reason giflib will create a file with unexpected
+@@ -184,7 +192,11 @@ static char *gifdrv_memmap_ext_filename;
+ 
+ static int gifdrv_close_memmap(void)
+ {
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
+  EGifCloseFile(gifdrv_memmap_fd, 0);
+#else
+   EGifCloseFile(gifdrv_memmap_fd);
+#endif
+   VICE_FreeMapObject(gif_colors);
+   lib_free(gifdrv_memmap_ext_filename);
+ 
+@@ -231,7 +243,11 @@ static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE
+   if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+       EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
+   {
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
+    EGifCloseFile(gifdrv_memmap_fd, 0);
+#else
+     EGifCloseFile(gifdrv_memmap_fd);
+#endif
+     VICE_FreeMapObject(gif_colors);
+     lib_free(gifdrv_memmap_ext_filename);
+     return -1;
+-- 
+2.5.5
+
--- a/recipes-emulators/vice/files/vice_64.desktop
+++ b/recipes-emulators/vice/files/vice_64.desktop
@@ -1,9 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=X64-old (Vice)
-Comment=Commodore 64 Emulator (performing best currently)
+Name=Vice C64 Emulator
 Exec=x64
-Icon=c64
 Terminal=false
 StartupNotify=false
 Categories=Game
--- 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/c64_16.png
+++ b/recipes-emulators/vice/vice/c64_16.png
--- a/recipes-emulators/vice/vice/c64_32.png
+++ b/recipes-emulators/vice/vice/c64_32.png
--- a/recipes-emulators/vice/vice/c64_48.png
+++ b/recipes-emulators/vice/vice/c64_48.png
--- a/recipes-emulators/vice/vice/vice_64dtv.desktop
+++ b/recipes-emulators/vice/vice/vice_64dtv.desktop
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=X64dtv (Vice)
-Comment=Commodore 64 Emulator
-Exec=x64dtv
-Icon=c64
-Terminal=false
-StartupNotify=false
-Categories=Game
-Name[en_US]=vice_64dtv
--- a/recipes-emulators/vice/vice/vice_64sc.desktop
+++ b/recipes-emulators/vice/vice/vice_64sc.desktop
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=X64sc (Vice)
-Comment=Commodore 64 Emulator
-Exec=x64sc
-Icon=c64
-Terminal=false
-StartupNotify=false
-Categories=Game
-Name[en_US]=vice_64sc
--- a/recipes-emulators/vice/vice_2.4.bb
+++ b/recipes-emulators/vice/vice_2.4.bb
@@ -0,0 +1,51 @@
+SUMMARY = "Versatile Commodore Emulator"
+HOMEPAGE = "http://vice-emu.sourceforge.net"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://doc/html/plain/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
+
+# Sources for c64 software:
+# [1] ftp://arnold.c64.org/pub/games/
+
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/project/vice-emu/releases/${BPN}-${PV}.tar.gz \
+    file://0001-gifdrv.c-fix-build-with-giflib-5.1.0.patch \
+    file://vice_64.desktop \
+"
+SRC_URI[md5sum] = "b017647a0c159bbe43cdb81762d1c577"
+SRC_URI[sha256sum] = "ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10"
+
+inherit autotools pkgconfig
+
+DEPENDS = "libxt libxmu libxaw libxpm libxv pulseaudio libav libsdl libpng jpeg giflib"
+
+# some options autotools.bbclass adds by default cause configure to complain
+# so (hack): copy from autotools.bbclass and remove unwanted
+CONFIGUREOPTS = " \
+    --build=${BUILD_SYS} \
+    --host=${HOST_SYS} \
+    --target=${TARGET_SYS} \
+    --prefix=${prefix} \
+    --exec_prefix=${exec_prefix} \
+    --bindir=${bindir} \
+    --sbindir=${sbindir} \
+    --libexecdir=${libexecdir} \
+    --datadir=${datadir} \
+    --sysconfdir=${sysconfdir} \
+    --sharedstatedir=${sharedstatedir} \
+    --localstatedir=${localstatedir} \
+    --libdir=${libdir} \
+    --includedir=${includedir} \
+    --oldincludedir=${oldincludedir} \
+    --infodir=${infodir} \
+    --mandir=${mandir} \
+    ${CONFIGUREOPT_DEPTRACK} \
+"
+
+EXTRA_OECONF = "--disable-ffmpeg"
+
+do_install_append() {
+    install -d ${D}/${datadir}/applications
+    install -m 0644 ${WORKDIR}/vice_64.desktop ${D}/${datadir}/applications
+}
+
+FILES_${PN} += "${datadir}/icons"
--- a/recipes-emulators/vice/vice_3.6.1.bb
+++ b/recipes-emulators/vice/vice_3.6.1.bb
@@ -1,95 +0,0 @@
-SUMMARY = "Versatile Commodore Emulator"
-HOMEPAGE = "http://vice-emu.sourceforge.net"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-
-# Sources for c64 software:
-# [1] ftp://arnold.c64.org/pub/games/
-
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
-    file://0001-Adjust-to-ffmpeg4.patch \
-    file://c64_16.png \
-    file://c64_32.png \
-    file://c64_48.png \
-    file://vice_64.desktop \
-    file://vice_64dtv.desktop \
-    file://vice_64sc.desktop \
-"
-SRC_URI[sha256sum] = "20df84c851aaf2f5000510927f6d31b32f269916d351465c366dc0afc9dc150c"
-
-inherit autotools-brokensep pkgconfig gtk-icon-cache features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl x11"
-
-DEPENDS = " \
-    glib-2.0-native \
-    bdftopcf-native \
-    mkfontdir-native \
-    mkfontscale-native \
-    dos2unix-native \
-    xa-native \
-    bison-native \
-    glew \
-    gtk+3 \
-    libsdl \
-    libpng \
-    jpeg \
-    giflib \
-    libxxf86vm \
-    portaudio-v19 \
-    mpg123 \
-    virtual/libgl \
-    vte9 \
-    ffmpeg4 \
-"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
-PACKAGECONFIG[pulseaudio] = "--with-pulse,--without-pulse,pulseaudio,pulseaudio-server"
-
-EXTRA_OECONF = " \
-    --enable-external-ffmpeg \
-    --enable-native-gtk3ui \
-    --without-oss \
-    --disable-pdf-docs \
-    --libdir=${libdir} \
-    --enable-x64 \
-"
-
-EXTRA_OECONF:remove = " \
-    --disable-static \
-"
-
-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() {
-    install -d ${D}/${datadir}/applications
-    install -m 0644 ${WORKDIR}/vice_64*.desktop ${D}/${datadir}/applications
-
-    for size in 16 32 48; do
-        install -d ${D}/${datadir}/icons/hicolor/${size}x${size}/apps
-        install -m 0644 ${WORKDIR}/c64_${size}.png ${D}/${datadir}/icons/hicolor/${size}x${size}/apps/c64.png
-    done
-}
-
-RDEPENDS:${PN} += "hicolor-icon-theme"
-
-RREPLACES:${PN} += "vice-3.2"
-RCONFLICTS:${PN} += "vice-3.2"
--- a/recipes-emulators/z80/cass80.bb
+++ b/recipes-emulators/z80/cass80.bb
@@ -1,21 +0,0 @@
-DESCRIPTION = "Cas juggler"
-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"
-SRCREV= "372455830343e5c8ebd42125cfe13191f976c343"
-PV = "0.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-inherit qmake5
-
-DEPENDS = "qtbase"
-
-do_install:append() {
-    install -d ${D}${bindir}
-    mv ${D}/opt/cass80/bin/cass80 ${D}${bindir}
-    rm -r ${D}/opt
-}
-
-
--- a/recipes-emulators/z80/files/0001-use-pkg-config-to-find-sdl.patch
+++ b/recipes-emulators/z80/files/0001-use-pkg-config-to-find-sdl.patch
@@ -1,7 +1,7 @@
 From c12487107cc52aa13841533fd151362e37f37ff6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Fri, 13 Mar 2015 01:40:33 +0100
-Subject: [PATCH] use pkg-config to find sdl
+Subject: [PATCH] use pkg-config to find sdl2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,20 +12,20 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/Makefile b/Makefile
-index de4782b..0dfc7ce 100644
+index 1144f9b..9bfef24 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -27,8 +27,8 @@ LIBS:=		-L/usr/lib -lz
- CFLAGS+=	-DDEBUG=$(DEBUG)
+@@ -27,8 +27,8 @@ LIBS:=		-lz
+ #CFLAGS+=	-DDEBUG=$(DEBUG)
 
 # SDL libraries and cflags
-SDL_LIB:=	$(shell sdl-config --libs)
-SDL_INC:=	$(shell sdl-config --cflags)
-+SDL_LIB:=	$(shell pkg-config --libs sdl)
-+SDL_INC:=	$(shell pkg-config --cflags sdl)
+-SDL_LIB:=	$(shell sdl2-config --libs)
+-SDL_INC:=	$(shell sdl2-config --cflags)
+SDL_LIB:=	$(shell pkg-config --libs sdl2)
+SDL_INC:=	$(shell pkg-config --cflags sdl2)
 
 # Expat libraries and cflags
 EXPAT_LIB:=	-L/usr/pkg/lib -lexpat
 -- 
-1.9.3
+2.5.5

--- a/recipes-emulators/z80/z80_git.bb
+++ b/recipes-emulators/z80/z80_git.bb
@@ -1,30 +1,30 @@
 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=sdl2 \
    file://0001-use-pkg-config-to-find-sdl.patch \
    file://cgenie.desktop \
    file://trs80.desktop \
 "

-SRCREV= "a9658c2fd33e862adc618d9dcbccf55a52d0c89d"
+SRCREV= "ec721e4a7f06f22a67e1a9c48f4d681143852e42"
 PV = "0.3.1+git${SRCPV}"

 inherit pkgconfig

-DEPENDS = "expat libsdl"
+DEPENDS = "expat libsdl2"

 S = "${WORKDIR}/git"

 EXTRA_OEMAKE = "-e MAKEFLAGS="

 do_compile() {
-	SDL_INC=$(pkg-config --cflags sdl)
-	SDL_LIB=$(pkg-config --libs sdl)
+	SDL_INC=$(pkg-config --cflags sdl2)
+	SDL_LIB=$(pkg-config --libs sdl2)
 	EXPAT_LIB=$(pkg-config --libs expat)

 	mkdir -p ${S}/obj/trs80
@@ -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,26 +0,0 @@
-SUMMARY = "The classic, refined DOOM source port"
-HOMEPAGE = "https://www.doomretro.com" 
-
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=435fa6b85536eff97b3594b76fd0048f" 
-
-DEPENDS = "libsdl2 libsdl2-image libsdl2-mixer"
-
-inherit cmake pkgconfig
-
-SRC_URI = " \
-    git://github.com/bradharding/doomretro.git;branch=master;protocol=https \
-    file://doomretro.png \
-    file://doomretro.desktop \
-"
-SRCREV = "bdcad451c02ffc38ac44900d32648952ad710971"
-PV = "4.4.1"
-S = "${WORKDIR}/git"
-
-do_install:append() {
-    install -d ${D}${datadir}/applications
-    install ${WORKDIR}/${BPN}.desktop ${D}${datadir}/applications
-
-    install -d ${D}${datadir}/pixmaps
-    install ${WORKDIR}/${BPN}.png ${D}${datadir}/pixmaps/${BPN}.png
-}
--- a/recipes-games/doomretro/doomretro/doomretro.desktop
+++ b/recipes-games/doomretro/doomretro/doomretro.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Doomretro
-Comment=The classic, refined DOOM source port
-Exec=doomretro
-Icon=doomretro
-Terminal=false
-StartupNotify=false
-Categories=Game
--- a/recipes-games/doomretro/doomretro/doomretro.png
+++ b/recipes-games/doomretro/doomretro/doomretro.png
--- a/recipes-games/dxx-rebirth/d1x-rebirth_v0.58.1.bb
+++ b/recipes-games/dxx-rebirth/d1x-rebirth_v0.58.1.bb
@@ -2,29 +2,18 @@ SUMMARY = "D1X-Rebirth is a Source Port of the Descent Game"
 HOMEPAGE = "http://www.dxx-rebirth.com/"
 SECTION = "games"
 LICENSE = "DXX-Rebirth"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7077769a51d612f2edcc6abd1e5dfa6d"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=022f1bfd6fd458067b51b10cd3186e78"

-inherit python3native pkgconfig
-
-DEPENDS = " \
-    python3-scons-native \
-    libsdl \
-    libsdl-mixer \
-    libsdl-image \
-    physfs \
-    libpng \
-"
+DEPENDS = "python-scons-native libsdl libsdl-mixer physfs"

 SRC_URI = " \
-    git://github.com/dxx-rebirth/dxx-rebirth.git;branch=master;protocol=https \
+    http://www.dxx-rebirth.com/download/dxx/${BPN}_${PV}-src.tar.gz \
    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 \
 "
-SRCREV = "ad46235b67a24a38dec4734f94a59eba149ad94a"
-PV = "v0.59+git${SRCPV}"
-S = "${WORKDIR}/git"
-
+SRC_URI[md5sum] = "8f43e66191fdedd0c7ff9278719accf1"
+SRC_URI[sha256sum] = "5befc8a2ab1159fdb4d4141ba9f0e229450592d5ada209e832101da5b0b3e38e"
 SRC_URI[data.md5sum] = "010815be5d87d61150a938ad593102fe"
 SRC_URI[data.sha256sum] = "17d2fdefc06a96a50f54d4eba745835b619115e5327ddc3d23052bf4ec0e3300"
 SRC_URI[sound.md5sum] = "474fdf1c1f8d2bbbc68f271cb9aa28b8"
@@ -32,24 +21,24 @@ SRC_URI[sound.sha256sum] = "39cab9e2aed4c6ec9e3b811bbdf2c880d4acd87e4c66a9e1f80f
 SRC_URI[music.md5sum] = "bf54b45a648052b2531bbb95c001403b"
 SRC_URI[music.sha256sum] = "b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745529d7867962f"

-do_unpack[depends] += "p7zip-native:do_populate_sysroot"
+S = "${WORKDIR}/${BPN}_${PV}-src"

 do_compile() {
-    scons ${PARALLEL_MAKE} opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
+    scons opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
 }

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

    install -d ${D}${datadir}/applications
-    install ${S}/${BPN}/${BPN}.desktop ${D}${datadir}/applications
+    install ${BPN}.desktop ${D}${datadir}/applications

    install -d ${D}${datadir}/pixmaps
-    install ${S}/${BPN}/${BPN}.xpm ${D}${datadir}/pixmaps
+    install ${BPN}.xpm ${D}${datadir}/pixmaps

    install -d ${D}${datadir}/${BPN}
-    install ${WORKDIR}/descent.hog ${WORKDIR}/descent.pig ${WORKDIR}/d1xr-sc55-music.dxa ${D}${datadir}/${BPN}
+    install ../descent.hog ../descent.pig ../d1xr-sc55-music.dxa ${D}${datadir}/${BPN}
 }

-RRECOMMENDS:${PN} = "tremor"
+RRECOMMENDS_${PN} = "tremor"
--- a/recipes-games/opentyrian/files/0001-Makefile-use-pkgconfig-to-find-sdl.patch
+++ b/recipes-games/opentyrian/files/0001-Makefile-use-pkgconfig-to-find-sdl.patch
@@ -0,0 +1,42 @@
+From de64bf5798755f4ea24cc1b8f1d6197b8a0fc7c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 16 Aug 2015 15:43:44 +0200
+Subject: [PATCH 1/2] Makefile: use pkgconfig to find sdl
+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@googlemail.com>
+---
+ Makefile | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 88a8bd6..63c2983 100644
+--- a/Makefile
+++ b/Makefile
+@@ -14,8 +14,6 @@ WITH_NETWORK := true
+ 
+ STRIP := strip
+ 
+-SDL_CONFIG := sdl-config
+-
+ SRCS := $(wildcard src/*.c)
+ OBJS := $(SRCS:src/%.c=obj/%.o)
+ 
+@@ -39,8 +37,8 @@ endif
+ 
+ EXTRA_LDLIBS += -lm
+ 
+-SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
+-SDL_LDLIBS := $(shell $(SDL_CONFIG) --libs)
+SDL_CFLAGS := $(shell pkg-config --cflags sdl)
+SDL_LDLIBS := $(shell pkg-config --libs sdl)
+ ifeq ($(WITH_NETWORK), true)
+     SDL_LDLIBS += -lSDL_net
+ endif
+-- 
+2.1.0
+
--- a/recipes-games/opentyrian/files/0002-Fix-several-uninitialized-variable-warnings.patch
+++ b/recipes-games/opentyrian/files/0002-Fix-several-uninitialized-variable-warnings.patch
@@ -0,0 +1,63 @@
+From 7e1c9fb3c30d12139ad531b6b14c53fb5764b24c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 16 Aug 2015 16:04:41 +0200
+Subject: [PATCH 2/2] Fix several uninitialized variable warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://bitbucket.org/opentyrian/opentyrian/commits/03cdbc8922f7856378f2e4b51f9adb5073f6fc9e/raw/
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/mainint.c | 2 +-
+ src/shots.c   | 2 +-
+ src/tyrian2.c | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/mainint.c b/src/mainint.c
+index 2805752..b00074e 100644
+--- a/src/mainint.c
+++ b/src/mainint.c
+@@ -3635,7 +3635,7 @@ redo:
+ 				blit_sprite2x2(VGAScreen, this_player->x - 17, this_player->y - 7, *shapes9ptr_, 220);
+ 				blit_sprite2x2(VGAScreen, this_player->x + 7, this_player->y - 7, *shapes9ptr_, 222);
+ 
+-				int ship_banking;
+				int ship_banking = 0;
+ 				switch (ship_sprite)
+ 				{
+ 				case 5:
+diff --git a/src/shots.c b/src/shots.c
+index 606a19f..7aa6ac5 100644
+--- a/src/shots.c
+++ b/src/shots.c
+@@ -319,7 +319,7 @@ JE_integer player_shot_create( JE_word portNum, uint bay_i, JE_word PX, JE_word
+ 	if (weapon->sound > 0)
+ 		soundQueue[soundChannel[bay_i]] = weapon->sound;
+ 
+-	int shot_id;
+	int shot_id = MAX_PWEAPON;
+ 	/*Rot*/
+ 	for (int multi_i = 1; multi_i <= weapon->multi; multi_i++)
+ 	{
+diff --git a/src/tyrian2.c b/src/tyrian2.c
+index 3a0a101..4d528cf 100644
+--- a/src/tyrian2.c
+++ b/src/tyrian2.c
+@@ -4325,8 +4325,8 @@ void JE_eventSystem( void )
+ 
+ 	case 19: /* Enemy Global Move */
+ 	{
+-		int initial_i, max_i;
+-		bool all_enemies;
+		int initial_i = 0, max_i = 0;
+		bool all_enemies = false;
+ 
+ 		if (eventRec[eventLoc-1].eventdat3 > 79 && eventRec[eventLoc-1].eventdat3 < 90)
+ 		{
+-- 
+2.1.0
+
--- a/recipes-games/opentyrian/files/0003-fix-build-with-pedantic-gcc6.patch
+++ b/recipes-games/opentyrian/files/0003-fix-build-with-pedantic-gcc6.patch
@@ -0,0 +1,28 @@
+From 95788b1b09b0bd8e89cc3c7e5ed769ae3e87ac34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 31 Jul 2016 04:02:51 +0200
+Subject: [PATCH] fix build with pedantic gcc6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/joystick.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/joystick.c b/src/joystick.c
+index 63dd75d..bf99647 100644
+--- a/src/joystick.c
+++ b/src/joystick.c
+@@ -42,7 +42,6 @@ bool ignore_joystick = false;
+ int joysticks = 0;
+ Joystick *joystick = NULL;
+ 
+-static const char joystick_cfg_version = 1;
+ static const int joystick_analog_max = 32767;
+ 
+ // eliminates axis movement below the threshold
+-- 
+2.5.5
+
--- a/recipes-games/opentyrian/opentyrian.bb
+++ b/recipes-games/opentyrian/opentyrian.bb
@@ -1,47 +0,0 @@
-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"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-DEPENDS = "libsdl2 libsdl2-net"
-
-inherit autotools-brokensep pkgconfig
-
-SRC_URI = " \
-    git://github.com/opentyrian/opentyrian.git;branch=master;protocol=https \
-    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 \
-"
-S = "${WORKDIR}/git"
-SRCREV = "822c71943f6a06bc2599a0478ea41b6d413648d6"
-PV = "2.1.20130907+git${SRCPV}"
-
-SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
-
-do_install() {
-    install -d ${D}${bindir}
-    install ${BPN} ${D}${bindir}
-
-    install -d ${D}${mandir}/man6
-    install linux/man/${BPN}.6 ${D}${mandir}/man6
-
-    install -d ${D}${datadir}/applications
-    install linux/${BPN}.desktop ${D}${datadir}/applications
-
-    install -d ${D}${datadir}/pixmaps
-    install linux/icons/tyrian-128.png ${D}${datadir}/pixmaps/${BPN}.png
-
-    install -d ${D}${datadir}/games/tyrian
-    install ${WORKDIR}/tyrian21/* ${D}${datadir}/games/tyrian
-
-    # remove unneeded DOS stuff    
-    find ${D}${datadir}/games/tyrian -name '*.exe' -exec rm -f {} \; 
-    find ${D}${datadir}/games/tyrian -name '*.ovl' -exec rm -f {} \; 
-    find ${D}${datadir}/games/tyrian -name 'setup.*' -exec rm -f {} \; 
-    find ${D}${datadir}/games/tyrian -name '*.doc' -exec rm -f {} \; 
-    find ${D}${datadir}/games/tyrian -name '*.tfp' -exec rm -f {} \; 
-}
-
-FILES:${PN} += "${datadir}/games"
--- a/recipes-games/opentyrian/opentyrian/0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch
+++ b/recipes-games/opentyrian/opentyrian/0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch
@@ -1,73 +0,0 @@
-From 229d704ce2958ed22ca3ece49169bf1b1b97163d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 30 Jun 2017 11:15:40 +0200
-Subject: [PATCH] increase buffer size to avoid gcc7 format-overflow errors
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- src/episodes.c | 2 +-
- src/episodes.h | 2 +-
- src/lvllib.c   | 2 +-
- src/lvllib.h   | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/episodes.c b/src/episodes.c
-index 796d531..f346641 100644
--- a/src/episodes.c
-+++ b/src/episodes.c
-@@ -41,7 +41,7 @@ JE_EnemyDatType enemyDat;
- /* EPISODE variables */
- JE_byte    initial_episode_num, episodeNum = 0;
- JE_boolean episodeAvail[EPISODE_MAX]; /* [1..episodemax] */
-char       episode_file[13], cube_file[13];
-+char       episode_file[15], cube_file[15];
- 
- JE_longint episode1DataLoc;
- 
-diff --git a/src/episodes.h b/src/episodes.h
-index 598e1ae..0ff4380 100644
--- a/src/episodes.h
-+++ b/src/episodes.h
-@@ -162,7 +162,7 @@ extern JE_EnemyDatType enemyDat;
- extern JE_byte initial_episode_num, episodeNum;
- extern JE_boolean episodeAvail[EPISODE_MAX];
- 
-extern char episode_file[13], cube_file[13];
-+extern char episode_file[15], cube_file[15];
- 
- extern JE_longint episode1DataLoc;
- extern JE_boolean bonusLevel;
-diff --git a/src/lvllib.c b/src/lvllib.c
-index a09c040..ca9a183 100644
--- a/src/lvllib.c
-+++ b/src/lvllib.c
-@@ -22,7 +22,7 @@
- 
- JE_LvlPosType lvlPos;
- 
-char levelFile[13]; /* string [12] */
-+char levelFile[30]; /* string [29] for gcc7's sake */
- JE_word lvlNum;
- 
- void JE_analyzeLevel( void )
-diff --git a/src/lvllib.h b/src/lvllib.h
-index f22e3f5..61b3882 100644
--- a/src/lvllib.h
-+++ b/src/lvllib.h
-@@ -25,7 +25,7 @@
- typedef JE_longint JE_LvlPosType[43]; /* [1..42 + 1] */
- 
- extern JE_LvlPosType lvlPos;
-extern char levelFile[13]; /* string [12] */
-+extern char levelFile[30]; /* string [29] for gcc7's sake */
- extern JE_word lvlNum;
- 
- void JE_analyzeLevel( void );
-- 
-2.9.4
-
--- a/recipes-games/opentyrian/opentyrian/0002-fix-build-with-gcc8.patch
+++ b/recipes-games/opentyrian/opentyrian/0002-fix-build-with-gcc8.patch
@@ -1,67 +0,0 @@
-From 655427d665ee6c9bd9f61193b6e48d3dde8b0bde Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 5 Jul 2018 19:11:21 +0200
-Subject: [PATCH] fix build with gcc8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/game_menu.c | 2 +-
- src/joystick.c  | 4 ++--
- src/tyrian2.c   | 6 +++---
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/game_menu.c b/src/game_menu.c
-index 416f2cb..7d24ad7 100644
--- a/src/game_menu.c
-+++ b/src/game_menu.c
-@@ -852,7 +852,7 @@ void JE_itemScreen( void )
- 					                   ? 100
- 					                   : (yLoc * 100) / ((cube[currentCube].last_line - 9) * 12);
- 
-					char buf[20];
-+					char buf[50];
- 					snprintf(buf, sizeof(buf), "%s %d%%", miscText[11], percent_read);
- 					JE_outTextAndDarken(VGAScreen, 176, 160, buf, 14, 1, TINY_FONT);
- 
-diff --git a/src/joystick.c b/src/joystick.c
-index bf99647..933b791 100644
--- a/src/joystick.c
-+++ b/src/joystick.c
-@@ -493,14 +493,14 @@ void code_to_assignment( Joystick_assignment *assignment, const char *buffer )
- 	assignment->negative_axis = (toupper(direction) == '-');
- }
- 
-/* gives the short (6 or less characters) identifier for a joystick assignment
-+/* gives the short (15 or less characters) identifier for a joystick assignment
-  * 
-  * two of these per direction/action is all that can fit on the joystick config screen,
-  * assuming two digits for the axis/button/hat number
-  */
- const char *assignment_to_code( const Joystick_assignment *assignment )
- {
-	static char name[7];
-+	static char name[16];
- 	
- 	switch (assignment->type)
- 	{
-diff --git a/src/tyrian2.c b/src/tyrian2.c
-index 4d528cf..411d8b6 100644
--- a/src/tyrian2.c
-+++ b/src/tyrian2.c
-@@ -2608,7 +2608,7 @@ new_game:
- 							read_encrypted_pascal_string(s, sizeof(s), ep_f);
- 
- 							char buf[256];
-							strncpy(buf, (strlen(s) > 8) ? s + 8 : "", sizeof(buf));
-+							strncpy(buf, (strlen(s) > 8) ? s + 8 : "", sizeof(buf)-1);
- 
- 							int j = 0, temp;
- 							while (str_pop_int(buf, &temp))
-- 
-2.14.4
-
--- a/recipes-games/opentyrian/opentyrian_2.1.20130907.bb
+++ b/recipes-games/opentyrian/opentyrian_2.1.20130907.bb
@@ -0,0 +1,46 @@
+SUMMARY = "OpenTyrian is a port of the DOS shoot-em-up Tyrian"
+HOMEPAGE = "https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
+SECTION = "games"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+DEPENDS = "libsdl libsdl-net"
+
+inherit autotools-brokensep
+
+SRC_URI = " \
+    http://www.camanis.net/opentyrian/releases/${BPN}-${PV}-src.tar.gz \
+    http://camanis.net/opentyrian/tyrian21.zip;name=data \
+    file://0001-Makefile-use-pkgconfig-to-find-sdl.patch \
+    file://0002-Fix-several-uninitialized-variable-warnings.patch \
+    file://0003-fix-build-with-pedantic-gcc6.patch \
+"
+SRC_URI[md5sum] = "978686c5a1dfbac69a2161aadf084c2b"
+SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"
+
+SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
+SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
+
+do_install() {
+    install -d ${D}${bindir}
+    install ${BPN} ${D}${bindir}
+
+    install -d ${D}${mandir}/man6
+    install linux/man/${BPN}.6 ${D}${mandir}/man6
+
+    install -d ${D}${datadir}/applications
+    install linux/${BPN}.desktop ${D}${datadir}/applications
+
+    install -d ${D}${datadir}/pixmaps
+    install linux/icons/tyrian-128.png ${D}${datadir}/pixmaps/${BPN}.png
+
+    install -d ${D}${datadir}/${BPN}/data
+    install ${WORKDIR}/tyrian21/* ${D}${datadir}/${BPN}/data
+
+    # remove unneeded DOS stuff    
+    find ${D}${datadir}/${BPN}/data -name '*.exe' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name '*.ovl' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name 'setup.*' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name '*.doc' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name '*.tfp' -exec rm -f {} \; 
+}
--- 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/portmidi/files/0001-do-not-build-java-application-to-set-midi-defaults.patch
+++ b/recipes-support/portmidi/files/0001-do-not-build-java-application-to-set-midi-defaults.patch
@@ -1,97 +0,0 @@
-From 908d5fcdfeac32d7ab5cff307d0a46a962ed600f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 6 Sep 2016 00:08:16 +0200
-Subject: [PATCH] do not build java application to set midi defaults
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-dragging in whole java environment for a small tool not everybody misses
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- CMakeLists.txt           |  2 --
- pm_common/CMakeLists.txt | 18 +-----------------
- pm_dylib/CMakeLists.txt  | 14 --------------
- 3 files changed, 1 insertion(+), 33 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4919b78..2137ce4 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,6 +72,4 @@ add_subdirectory(pm_test)
- 
- add_subdirectory(pm_dylib)
- 
-# Cannot figure out how to make an xcode Java application with CMake
-add_subdirectory(pm_java)
- 
-diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
-index bfd4ab9..9ea9030 100644
--- a/pm_common/CMakeLists.txt
-+++ b/pm_common/CMakeLists.txt
-@@ -67,15 +67,6 @@ if(UNIX)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
-    include(FindJNI)
-    message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-    message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-    message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
-    message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
-    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-     list(APPEND LIBSRC ../porttime/ptlinux)
-@@ -109,17 +100,10 @@ add_library(portmidi-static ${LIBSRC})
- set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
- target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
- 
-# define the jni library
-include_directories(${JAVA_INCLUDE_PATHS})
-
-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
-add_library(pmjni SHARED ${JNISRC})
-target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
- 
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-  INSTALL(TARGETS portmidi-static pmjni
-+  INSTALL(TARGETS portmidi-static
-     LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-     ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
- # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
-diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
-index a0c615e..8ad415f 100644
--- a/pm_dylib/CMakeLists.txt
-+++ b/pm_dylib/CMakeLists.txt
-@@ -63,20 +63,6 @@ if(UNIX)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
-    include(FindJNI)
-    # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-    # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-    # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-    # note: user might need to set JAVA_INCLUDE_PATH manually
-    #
-    # this will probably break on BSD and other Unix systems; the fix
-    # depends on whether FindJNI can find Java or not. If yes, then
-    # we should try to rely on automatically set JAVA_INCLUDE_PATH and
-    # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
-    # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
-    # because JAVA_INCLUDE_PATH2 is pretty obscure)
-    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
-
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-     list(APPEND LIBSRC ../porttime/ptlinux)
-- 
-2.5.5
-
--- a/recipes-support/portmidi/files/0002-fix-compilation-du-to-unkown-functions.patch
+++ b/recipes-support/portmidi/files/0002-fix-compilation-du-to-unkown-functions.patch
@@ -1,48 +0,0 @@
-From 7240f951277e47f2f37523b3ca5408bfe5fc3c53 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 6 Sep 2016 01:04:42 +0200
-Subject: [PATCH 2/2] fix compilation du to unkown functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
- pm_linux/finddefault.c | 3 +++
- pm_linux/pmlinux.c     | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/pm_linux/finddefault.c b/pm_linux/finddefault.c
-index 6340316..89ca43a 100644
--- a/pm_linux/finddefault.c
-+++ b/pm_linux/finddefault.c
-@@ -5,10 +5,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <ctype.h>
- #include "portmidi.h"
- 
- #define STRING_MAX 256
- 
-+int pm_find_default_device(char *pattern, int is_input);
-+
- /* skip over spaces, return first non-space */
- void skip_spaces(FILE *inf)
- {
-diff --git a/pm_linux/pmlinux.c b/pm_linux/pmlinux.c
-index 49e266d..42c0906 100755
--- a/pm_linux/pmlinux.c
-+++ b/pm_linux/pmlinux.c
-@@ -26,6 +26,8 @@
- PmDeviceID pm_default_input_device_id = -1;
- PmDeviceID pm_default_output_device_id = -1;
- 
-+PmDeviceID find_default_device(char *path, int input, PmDeviceID id);
-+
- void pm_init()
- {
-     /* Note: it is not an error for PMALSA to fail to initialize. 
-- 
-2.5.5
-
--- a/recipes-support/portmidi/files/0003-fix-format-security..patch
+++ b/recipes-support/portmidi/files/0003-fix-format-security..patch
@@ -1,124 +0,0 @@
-From e597c5c8636a269dbe5e664c706e66887479f161 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 26 Sep 2018 01:44:12 +0200
-Subject: [PATCH] Fix format-security
-
-Stolen from [1]
-
-[1] https://src.fedoraproject.org/cgit/rpms/portmidi.git/plain/portmidi-217-format-security.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- pm_test/latency.c   | 2 +-
- pm_test/midiclock.c | 4 ++--
- pm_test/mm.c        | 8 ++++----
- pm_test/sysex.c     | 2 +-
- pm_test/test.c      | 2 +-
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/pm_test/latency.c b/pm_test/latency.c
-index 507648c..5f4bb5c 100755
--- a/pm_test/latency.c
-+++ b/pm_test/latency.c
-@@ -280,7 +280,7 @@ int get_number(char *prompt)
- {
-     char line[STRING_MAX];
-     int n = 0, i;
-    printf(prompt);
-+    printf("%s",prompt);
-     while (n != 1) {
-         n = scanf("%d", &i);
-         fgets(line, STRING_MAX, stdin);
-diff --git a/pm_test/midiclock.c b/pm_test/midiclock.c
-index 60fcf7a..17967a5 100644
--- a/pm_test/midiclock.c
-+++ b/pm_test/midiclock.c
-@@ -167,7 +167,7 @@ int get_number(char *prompt)
- {
-     char line[STRING_MAX];
-     int n = 0, i;
-    printf(prompt);
-+    printf("%s",prompt);
-     while (n != 1) {
-         n = scanf("%d", &i);
-         fgets(line, STRING_MAX, stdin);
-@@ -256,7 +256,7 @@ int main(int argc, char **argv)
-     err = Pm_OpenOutput(&midi, outp, DRIVER_INFO, OUTPUT_BUFFER_SIZE, 
-                         TIME_PROC, TIME_INFO, LATENCY);
-     if (err) {
-        printf(Pm_GetErrorText(err));
-+        printf("%s",Pm_GetErrorText(err));
-         goto error_exit_no_device;
-     }
-     active = true;
-diff --git a/pm_test/mm.c b/pm_test/mm.c
-index 209ff74..f3e6e7b 100755
--- a/pm_test/mm.c
-+++ b/pm_test/mm.c
-@@ -119,7 +119,7 @@ int get_number(char *prompt)
- {
-     char line[STRING_MAX];
-     int n = 0, i;
-    printf(prompt);
-+    printf("%s",prompt);
-     while (n != 1) {
-         n = scanf("%d", &i);
-         fgets(line, STRING_MAX, stdin);
-@@ -136,7 +136,7 @@ void receive_poll(PtTimestamp timestamp, void *userData)
-     if (!active) return;
-     while ((count = Pm_Read(midi_in, &event, 1))) {
-         if (count == 1) output(event.message);
-        else            printf(Pm_GetErrorText(count));
-+        else            printf("%s",Pm_GetErrorText(count));
-     }
- }
- 
-@@ -168,7 +168,7 @@ int main(int argc, char **argv)
-     inp = get_number("Type input device number: ");
-     err = Pm_OpenInput(&midi_in, inp, NULL, 512, NULL, NULL);
-     if (err) {
-        printf(Pm_GetErrorText(err));
-+        printf("%s",Pm_GetErrorText(err));
-         Pt_Stop();
-         mmexit(1);
-     }
-@@ -484,7 +484,7 @@ private int put_pitch(int p)
-         "gs", "a", "bf", "b"    };
-     /* note octave correction below */
-     sprintf(result, "%s%d", ptos[p % 12], (p / 12) - 1);
-    printf(result);
-+    printf("%s",result);
-     return strlen(result);
- }
- 
-diff --git a/pm_test/sysex.c b/pm_test/sysex.c
-index 627a3df..da2bb90 100755
--- a/pm_test/sysex.c
-+++ b/pm_test/sysex.c
-@@ -39,7 +39,7 @@ int get_number(char *prompt)
- {
-     char line[STRING_MAX];
-     int n = 0, i;
-    printf(prompt);
-+    printf("%s",prompt);
-     while (n != 1) {
-         n = scanf("%d", &i);
-         fgets(line, STRING_MAX, stdin);
-diff --git a/pm_test/test.c b/pm_test/test.c
-index 03d6331..dcac1bc 100755
--- a/pm_test/test.c
-+++ b/pm_test/test.c
-@@ -37,7 +37,7 @@ int get_number(char *prompt)
- {
-     char line[STRING_MAX];
-     int n = 0, i;
-    printf(prompt);
-+    printf("%s",prompt);
-     while (n != 1) {
-         n = scanf("%d", &i);
-         fgets(line, STRING_MAX, stdin);
-- 
-2.14.4
-
--- a/recipes-support/portmidi/files/fedora-portmidi-cmake.patch
+++ b/recipes-support/portmidi/files/fedora-portmidi-cmake.patch
@@ -1,107 +0,0 @@
-diff -rupN portmidi.old/pm_common/CMakeLists.txt portmidi/pm_common/CMakeLists.txt
--- portmidi.old/pm_common/CMakeLists.txt	2010-09-20 15:57:48.000000000 -0400
-+++ portmidi/pm_common/CMakeLists.txt	2011-06-23 22:35:41.000000000 -0400
-@@ -120,8 +120,8 @@ set_target_properties(pmjni PROPERTIES E
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-   INSTALL(TARGETS portmidi-static pmjni
-    LIBRARY DESTINATION /usr/local/lib
-    ARCHIVE DESTINATION /usr/local/lib)
-+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
- # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
- #  INSTALL(FILES portmidi.h ../porttime/porttime.h
- #    DESTINATION /usr/local/include)
-diff -rupN portmidi.old/pm_dylib/CMakeLists.txt portmidi/pm_dylib/CMakeLists.txt
--- portmidi.old/pm_dylib/CMakeLists.txt	2009-11-20 00:41:09.000000000 -0500
-+++ portmidi/pm_dylib/CMakeLists.txt	2011-06-23 22:35:41.000000000 -0400
-@@ -59,7 +59,7 @@ if(UNIX)
- 
-     set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
-     set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-    set(INSTALL_NAME_DIR "/usr/local/lib")
-+    set(INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
-@@ -75,11 +75,7 @@ if(UNIX)
-     # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
-     # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
-     # because JAVA_INCLUDE_PATH2 is pretty obscure)
-    set(JAVA_INCLUDE_PATH  ${JAVA_INCLUDE_PATH-UNKNOWN}
-        CACHE STRING "where to find Java SDK include directory")
-    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
-    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
-+    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
- 
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -114,14 +110,14 @@ prepend_path(SHARED_PATHS ../pm_common/ 
- list(APPEND LIBSRC ${SHARED_PATHS})
- 
- add_library(portmidi-dynamic SHARED ${LIBSRC})
-set_target_properties(portmidi-dynamic PROPERTIES OUTPUT_NAME "portmidi")
-+set_target_properties(portmidi-dynamic PROPERTIES LINK_FLAGS "-L${CMAKE_CACHEFILE_DIR}/Release" SOVERSION 0 VERSION 0.${VERSION} OUTPUT_NAME "portmidi")
- target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
- 
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-   INSTALL(TARGETS portmidi-dynamic
-    LIBRARY DESTINATION /usr/local/lib
-    ARCHIVE DESTINATION /usr/local/lib)
-+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
-   INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
-    DESTINATION /usr/local/include)
-+    DESTINATION ${INCLUDE_INSTALL_DIR})
- endif(UNIX)
-diff -rupN portmidi.old/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
--- portmidi.old/pm_java/CMakeLists.txt	2009-11-04 10:20:44.000000000 -0500
-+++ portmidi/pm_java/CMakeLists.txt	2011-06-23 22:35:54.000000000 -0400
-@@ -16,12 +16,12 @@ if(UNIX)
-         COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
- 	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
- 	DEPENDS pmdefaults/PmDefaults.java
-	WORKING_DIRECTORY pm_java)
-+	)
-     add_custom_command(OUTPUT pmdefaults/PmDefaults.class
-         COMMAND javac -classpath . pmdefaults/PmDefaults.java
- 	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
- 	DEPENDS pmdefaults/PmDefaultsFrame.java
-	WORKING_DIRECTORY pm_java)
-+	)
-     add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
-         COMMAND	cp pmdefaults/portmusic_logo.png .
-         COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
-@@ -32,7 +32,7 @@ if(UNIX)
- 	COMMAND rm portmusic_logo.png
- 	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
- 	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
-	WORKING_DIRECTORY pm_java)
-+	)
-     add_custom_target(pmdefaults_target ALL 
-         DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
-     # message(STATUS "add_custom_target: pmdefaults.jar")
-@@ -41,7 +41,7 @@ if(UNIX)
-     INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
-       DESTINATION /usr/share/java)
-     INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
-      DESTINATION /usr/local/bin)
-+      DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-   endif(APPLE)
- endif(UNIX)
- # In windows, use pm_java/make.bat
-diff -rupN portmidi.old/pm_test/CMakeLists.txt portmidi/pm_test/CMakeLists.txt
--- portmidi.old/pm_test/CMakeLists.txt	2010-09-20 15:57:48.000000000 -0400
-+++ portmidi/pm_test/CMakeLists.txt	2011-06-23 22:35:41.000000000 -0400
-@@ -12,7 +12,7 @@ endif(WIN32)
- 
- macro(make_a_test name)
-   add_executable(${name} ${name}.c)
-  target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
-+  target_link_libraries(${name} portmidi-dynamic)
-   add_dependencies(${name} portmidi-static)
- endmacro(make_a_test)
- 
-
--- a/recipes-support/portmidi/portmidi_217.bb
+++ b/recipes-support/portmidi/portmidi_217.bb
@@ -1,36 +0,0 @@
-SUMMARY = "Real-time Midi I/O Library"
-HOMEPAGE = "http://portmedia.sourceforge.net"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://license.txt;md5=a0c1c261bc48165d48388e3a121a31e9"
-
-inherit cmake dos2unix
-
-DEPENDS += " \
-    alsa-lib \
-"
-
-SRC_URI = " \
-    ${SOURCEFORGE_MIRROR}/project/portmedia/${BPN}/${PV}/${BPN}-src-${PV}.zip \
-    file://fedora-portmidi-cmake.patch \
-    file://0001-do-not-build-java-application-to-set-midi-defaults.patch \
-    file://0002-fix-compilation-du-to-unkown-functions.patch \
-    file://0003-fix-format-security..patch \
-"
-SRC_URI[md5sum] = "03f46fd3947e2ef4c8c465baaf832241"
-SRC_URI[sha256sum] = "08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f"
-
-S = "${WORKDIR}/${BPN}"
-
-EXTRA_OECMAKE += " \
-    -DLIB_INSTALL_DIR=${libdir} \
-    -DINCLUDE_INSTALL_DIR=${includedir} \
-    -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \
-    -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \
-    -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release \
-"
-
-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/files/0001-Align-Makefiles-for-cross-compiling.patch
+++ b/recipes-support/xa/files/0001-Align-Makefiles-for-cross-compiling.patch
@@ -1,107 +0,0 @@
-From 59fbf0c8d72e22caa7e19afa48c031f8822f276e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Wed, 6 Jun 2018 23:38:38 +0200
-Subject: [PATCH] Align Makefiles for cross compiling
-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>
-
---
- Makefile      | 39 ++++++---------------------------------
- misc/Makefile | 10 +++++-----
- 2 files changed, 11 insertions(+), 38 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0cda4d6..5b9ead0 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1,30 +1,4 @@
-# Unix gcc or DOS go32 cross-compiling gcc
-#
-CC = gcc
-LD = gcc
-# for testing. not to be used; build failures in misc/.
-#CFLAGS = -O2 -W -Wall -pedantic -ansi
-CFLAGS = -O2
-LDFLAGS = -lc
-
-# for DOS?
-# CC = gcc-go32
-# LD = gcc-go32
-# CFLAGS = -W -Wall -pedantic 
-
-# Other cc
-#CC = cc
-#CFLAGS =
-#LD = ld
-
-DESTDIR = /usr/local
-
-BINDIR = $(DESTDIR)/bin
-MANDIR = $(DESTDIR)/share/man/man1
-DOCDIR = $(DESTDIR)/share/doc
-
-MKDIR = mkdir -p
-INSTALL = install
-+LD = $(CC)
- 
- all: killxa xa uncpk
- 
-@@ -32,7 +6,7 @@ killxa:
- 	rm -f xa
- 
- xa:
-	(cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
-+	(cd src && LD="${LD}" CC="${CC} ${CFLAGS}" ${MAKE})
- 
- load:	
- 	(cd loader && CC="${CC} ${CFLAGS}" ${MAKE})
-@@ -56,11 +30,10 @@ clean:
- 	rm -f xa *.exe *.o65
- 
- install: xa uncpk
-	$(MKDIR) $(BINDIR)
-	$(MKDIR) $(MANDIR)
-	$(INSTALL) xa reloc65 ldo65 file65 printcbm uncpk $(BINDIR)
-	$(INSTALL) man/file65.1 man/ldo65.1 man/printcbm.1 man/reloc65.1 man/uncpk.1 man/xa.1 $(MANDIR)
-	#$(MKDIR) $(DOCDIR)/xa65
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install -m 755 xa reloc65 ldo65 file65 printcbm uncpk $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(PREFIX)/share/man/man1
-+	install -m 644 man/file65.1 man/ldo65.1 man/printcbm.1 man/reloc65.1 man/uncpk.1 man/xa.1 $(DESTDIR)$(PREFIX)/share/man/man1
- 
- dist: clean
- 	cd .. ; tar cvf xa-2.3.11.tar xa-2.3.11 ; gzip xa-2.3.11.tar
-diff --git a/misc/Makefile b/misc/Makefile
-index 2b450e0..6967dad 100644
--- a/misc/Makefile
-+++ b/misc/Makefile
-@@ -10,19 +10,19 @@ LIBS = #-lncurses -ltermcap -lm
- all: ../mkrom.sh ../uncpk ../printcbm ../file65 ../reloc65 ../ldo65
- 
- ../uncpk: uncpk.c
-	${CC} ${CFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
-+	${CC} ${CFLAGS} $(LDFLAGS) uncpk.c -o $(XCBMLIB)/uncpk
- 
- ../printcbm: printcbm.c
-	${CC} ${CFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
-+	${CC} ${CFLAGS} $(LDFLAGS) printcbm.c -o $(XCBMLIB)/printcbm
- 
- ../file65: file65.c
-	${CC} ${CFLAGS} file65.c -o $(XCBMLIB)/file65
-+	${CC} ${CFLAGS} $(LDFLAGS) file65.c -o $(XCBMLIB)/file65
- 
- ../ldo65: ldo65.c
-	${CC} ${CFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
-+	${CC} ${CFLAGS} $(LDFLAGS) ldo65.c -o $(XCBMLIB)/ldo65
- 
- ../reloc65: reloc65.c
-	${CC} ${CFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
-+	${CC} ${CFLAGS} $(LDFLAGS) reloc65.c -o $(XCBMLIB)/reloc65
- 
- ../mkrom.sh: mkrom.sh
- 	cp mkrom.sh ../mkrom.sh
--- a/recipes-support/xa/xa_2.3.11.bb
+++ b/recipes-support/xa/xa_2.3.11.bb
@@ -1,19 +0,0 @@
-SUMMARY = "Open-source 6502 cross assembler"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1f67e705f4eb5064027b8c40ccfdb43e"
-
-# They move old versions to a different folder
-MIRRORS =+ "http://www.floodgap.com/retrotech/xa/dists/ http://www.floodgap.com/retrotech/xa/dists/unsupported/"
-
-SRC_URI = " \
-    http://www.floodgap.com/retrotech/xa/dists/${BPN}-${PV}.tar.gz \
-    file://0001-Align-Makefiles-for-cross-compiling.patch \
-"
-SRC_URI[md5sum] = "72cbd5619f75b0c9839b90c41d0f9ea6"
-SRC_URI[sha256sum] = "32f2164c99e305218e992970856dd8e2309b5cb6ac4758d7b2afe3bfebc9012d"
-
-BBCLASSEXTEND = "native"
-
-do_install() {
-    oe_runmake DESTDIR=${D} PREFIX=${prefix} install
-}
--- a/recipes-wayland/cage/cage.bb
+++ b/recipes-wayland/cage/cage.bb
@@ -1,26 +0,0 @@
-SUMMARY = "Cage: a Wayland kiosk"
-HOMEPAGE = "https://www.hjdskes.nl/projects/cage/" 
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3d06ce025701c9a0b391f15902ce8ed" 
-
-DEPENDS = " \
-    wayland-native \
-    wayland \
-    wayland-protocols \
-    wlroots \
-    pixman \
-    libxkbcommon \
-"
-
-inherit meson pkgconfig features_check
-
-REQUIRED_DISTRO_FEATURES = "wayland"
-
-SRC_URI = "git://github.com/Hjdskes/${BPN}.git;branch=master;protocol=https"
-SRCREV = "646b3e80b45a011676eb4190652b8c506d56e7a4"
-PV = "0.1.4"
-S = "${WORKDIR}/git"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland','',d)}"
-PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,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
@@ -1,32 +0,0 @@
-SUMMARY = "Modules for building a Wayland compositor"
-HOMEPAGE = "https://github.com/swaywm/wlroots" 
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" 
-
-DEPENDS = " \
-    wayland-native \
-    wayland \
-    wayland-protocols \
-    virtual/egl \
-    virtual/libgles2 \
-    libdrm \
-    virtual/libgbm \
-    libinput \
-    libxkbcommon \
-    udev \
-    pixman \
-    seatd \
-"
-
-inherit meson pkgconfig 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"
-
-SRC_URI = "git://github.com/swaywm/${BPN}.git;branch=0.14;protocol=https"
-SRCREV = "49a574420138646845fb664862db03982cfd9f5b"
-PV = "0.14.1"
-S = "${WORKDIR}/git"