mame: upgrade 0231 -> 0232

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit 3a3f8188c9)

README

@@ -1,9 +0,0 @@
-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>

README.md

@@ -0,0 +1,27 @@
+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 sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
+  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
+
+
+Maintainers
+-----------
+
+Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>

conf/layer.conf

@@ -7,3 +7,6 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb"
 BBFILE_COLLECTIONS += "meta-retro"
 BBFILE_PATTERN_meta-retro := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-retro = "10"
+
+LAYERDEPENDS_meta-retro = "core openembedded-layer filesystems-layer"
+LAYERSERIES_COMPAT_meta-retro = "dunfell gatesgarth hardknott"

recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch

@@ -0,0 +1,32 @@
+From ccf4abdd7b2e521e0665186e620a606277682597 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Tue, 18 Feb 2020 00:07:24 +0100
+Subject: [PATCH] Do no search for cross g-ir-compiler but
+ g-ir-compiler-wrapper
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ core/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index c4982de9..80fdd309 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -66,7 +66,7 @@ set_target_properties("${LIBCORE}" PROPERTIES
+                       VERSION ${LIBCORE_VERSION}
+                       )
+ 
+-find_program (GIR_COMPILER_BIN g-ir-compiler)
++find_program (GIR_COMPILER_BIN g-ir-compiler-wrapper)
+ add_custom_target(${LIBCORE_GIR}.typelib ALL
+                   COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir
+                   --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib
+-- 
+2.21.0
+

recipes-browser/midori/midori_git.bb

@@ -0,0 +1,61 @@
+SUMMARY = "A lightweight web browser"
+HOMEPAGE = "https://www.midori-browser.org/"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
+
+DEPENDS = " \
+    intltool-native \
+    gcr \
+    webkitgtk \
+    json-glib \
+    libarchive \
+    libsoup-2.4 \
+    libpeas \
+    sqlite \
+"
+
+inherit cmake pkgconfig gtk-icon-cache gettext vala python3native features_check gobject-introspection mime-xdg
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+# Midori requires gobject-introspection to build. Check below is not the whole
+# story: There are some extra machine-specific disable entries in webkitgtk
+# recipe and there is nothing we can do to check here...
+python () {
+    if d.getVar('GI_DATA_ENABLED') != 'True':
+        raise bb.parse.SkipRecipe('Midori needs gobject-introspection but it is either disabled or machine does not support it!' )
+}
+
+SRC_URI = " \
+    git://github.com/midori-browser/core.git \
+    file://0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch \
+"
+SRCREV = "f6b3b1e030db7eb2de7faf73ec4ccc18949b668d"
+PV = "9.0"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = " \
+    -DCMAKE_INSTALL_PREFIX=${prefix} \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+"
+
+do_configure_prepend() {
+    export VALAC=${STAGING_BINDIR_NATIVE}/valac
+}
+
+RRECOMMENDS_${PN} += " \
+    glib-networking ca-certificates \
+    adwaita-icon-theme \
+"
+
+# No project but oe packs gstreamer plugins that fine as we do. Cannot say
+# which plugins are # really necessary so use gstreamer1.0-plugins-*-meta.
+# These are necessary to make video streaming work - see [1]
+# [1] https://github.com/midori-browser/core/issues/329
+RRECOMMENDS_${PN} += " \
+    gstreamer1.0-plugins-base-meta \
+    gstreamer1.0-plugins-good-meta \
+    gstreamer1.0-libav \
+"
+
+FILES_${PN} += "${datadir}/metainfo"

recipes-emulators/dosbox/dosbox-x.bb

@@ -0,0 +1,43 @@
+SUMMARY = "DOSBox-X fork of the DOSBox project"
+HOMEPAGE = "https://dosbox-x.com/" 
+
+LICENSE = "GPLv2"
+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
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+SRC_URI = " \
+    git://github.com/joncampbell123/dosbox-x.git \
+    file://0001-use-pkgconfig-to-find-sdl2.patch \
+    file://0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch \
+"
+SRCREV = "9c950893419b387425172c2f532c45cb81cd709a"
+PV = "0.83.13"
+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"

recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch

@@ -0,0 +1,102 @@
+From 94c1308880c9bed9f7ddecf930e8f1e771a9f552 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 16 Oct 2020 23:41:09 +0200
+Subject: [PATCH] use pkgconfig to find sdl2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ acinclude.m4 | 64 ++++------------------------------------------------
+ 1 file changed, 4 insertions(+), 60 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index a7424b901..edf15214e 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 vs2015/sdl2/linux-host/bin/sdl2-config ; then
+-      SDL2_CONFIG=vs2015/sdl2/linux-host/bin/sdl2-config
+-      PATH=vs2015/sdl2/linux-host/bin:$PATH
+-    fi
+-
+-    AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no)
+-    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)
+@@ -67,37 +39,9 @@ AC_ARG_ENABLE(sdl, [  --enable-sdl            Enable SDL 1.x],
+ 
+   AH_TEMPLATE(C_SDL1,[Set to 1 to enable SDL 1.x support])
+ 
+-  SDL_CONFIG=no
+   if test x$enable_sdlenable = xyes ; then
+-    if test x$sdl_exec_prefix != x ; then
+-      sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-      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 vs2015/sdl/linux-host/bin/sdl-config ; then
+-      SDL_CONFIG=vs2015/sdl/linux-host/bin/sdl-config
+-      PATH=vs2015/sdl/linux-host/bin:$PATH
+-    fi
+-
+-    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+-    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.26.2
+

recipes-emulators/dosbox/dosbox-x/0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch

@@ -0,0 +1,34 @@
+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
+

recipes-emulators/dosbox/dosbox-x/configs/win98/win98_install.conf

@@ -0,0 +1,58 @@
+[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

recipes-emulators/dosbox/dosbox-x/configs/win98/win98_run.conf

@@ -0,0 +1,59 @@
+[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

recipes-emulators/dosbox/dosbox.bb

@@ -1,4 +1,4 @@
-SUMMARY = "OSBox is a DOS-emulator that uses the SDL-library"
+SUMMARY = "DOSBox is a DOS-emulator that uses the SDL-library"
 HOMEPAGE = "http://www.dosbox.com/" 
 
 LICENSE = "GPLv2+"
@@ -13,10 +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[md5sum] = "b9b240fa87104421962d14eee71351e8"
-SRC_URI[sha256sum] = "13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05"
+SRC_URI[sha256sum] = "c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a"
+PV = "0.74-3"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
+PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
 
 do_install_append() {
 	install -d ${D}/${datadir}/applications

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@googlemail.com>
-Date: Fri, 26 Feb 2016 22:49:19 +0100
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 9 Sep 2018 22:31:41 +0200
 Subject: [PATCH] use pkgconfig to find sdl
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -8,19 +8,20 @@ Content-Transfer-Encoding: 8bit
 
 Upstream-Status: Inappropriate [oe specific]
 
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- configure.in | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
+ configure.ac | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
 
-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
+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"
  fi
  
- dnl Check for SDL
+-dnl Check for SDL
 -SDL_VERSION=1.2.0
 -AM_PATH_SDL($SDL_VERSION,
 -            :,
@@ -32,7 +33,7 @@ index 016ea95..79341e5 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_COMPILE_IFELSE([AC_LANG_SOURCE([
 -#include "SDL.h"
 -void blah(){
 -#if SDL_MINOR_VERSION != 2
@@ -40,7 +41,7 @@ index 016ea95..79341e5 100644
 -#endif
 -;
 -}
--],AC_MSG_RESULT([yes]),[
+-])],AC_MSG_RESULT([yes]),[
 - AC_MSG_RESULT([no]) 
 - AC_MSG_ERROR([Only libSDL 1.2.X supported])])
 -
@@ -48,5 +49,5 @@ index 016ea95..79341e5 100644
  
  dnl Checks for typedefs, structures, and compiler characteristics.
 -- 
-2.5.0
+2.14.4
 

recipes-emulators/dosbox/dosbox/dosbox.desktop

@@ -5,4 +5,4 @@ Exec=dosbox
 Icon=dosbox.png
 Terminal=false
 Type=Application
-Categories=System;Emulator;Game;
+Categories=Emulator;Game;

recipes-emulators/dosbox/files/0002-include-dos_inc.h-add-missing-include.patch

@@ -1,35 +0,0 @@
-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
-

recipes-emulators/mame/files/0001-use-pkg-config-for-finding-sdl-library-settings.patch

@@ -1,68 +0,0 @@
-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
-

recipes-emulators/mame/files/0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch

@@ -1,327 +0,0 @@
-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
-

recipes-emulators/mame/files/0003-bx-float4_neon.h-Remove-neon_reinterpret-use-casts.patch

@@ -1,39 +0,0 @@
-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
-

recipes-emulators/mame/mame.bb

@@ -0,0 +1,224 @@
+SUMMARY = "Multiple Arcade Machine Emulator"
+HOMEPAGE = "http://www.mamedev.org/index.php" 
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=417c683350df4c63046fee551c461bd4"
+
+SRC_URI = " \
+    git://github.com/mamedev/mame.git \
+    file://mame.desktop \
+    file://mame32k.desktop \
+"
+PV = "0232"
+SRCREV = "2b0f01bc3aee493b3c05cf34c15af7cf5521210a"
+S = "${WORKDIR}/git"
+
+inherit siteinfo gtk-icon-cache
+
+DEPENDS = " \
+    libsdl2 \
+    libsdl2-ttf \
+    fontconfig \
+    libxinerama \
+    \
+    expat \
+    zlib \
+    flac \
+    jpeg \
+    glm \
+    lua lua-native \
+    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_LUA=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 mess.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 \
+"

recipes-emulators/mame/mame/mame.desktop

@@ -0,0 +1,9 @@
+[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

recipes-emulators/mame/mame/mame32k.desktop

@@ -0,0 +1,9 @@
+[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

recipes-emulators/mame/mame_0176.bb

@@ -1,80 +0,0 @@
-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
-}

recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch

@@ -0,0 +1,70 @@
+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 4fb2cf0..37f502e 100755
+--- a/configure
++++ b/configure
+@@ -331,6 +331,7 @@ mingw32-cross)
+ 	_host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ 	_host_os=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 	_host_vendor=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++	_host_prefix=$_host
+ 	;;
+ esac
+ 
+@@ -557,8 +558,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
+ 
+@@ -802,7 +804,7 @@ fi
+ # Now, add the appropriate defines/libraries/headers
+ #
+ echo
+-find_sdlconfig
++#find_sdlconfig
+ 
+ SRC="src"
+ CORE="$SRC/emucore"
+@@ -821,7 +823,7 @@ SQLITE="$SRC/common/repository/sqlite"
+ 
+ INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER"
+ 
+-INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
++INCLUDES="$INCLUDES `pkg-config --cflags sdl2`"
+ if test "$_build_static" = yes ; then
+ 	_sdl_conf_libs="--static-libs"
+ 	LDFLAGS="-static $LDFLAGS"
+@@ -829,7 +831,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
+

recipes-emulators/stella/stella/cross_compile_support.patch

@@ -1,105 +0,0 @@
-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)

recipes-emulators/stella/stella_4.6.1.bb

@@ -1,18 +0,0 @@
-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

recipes-emulators/stella/stella_6.1.2.bb

@@ -0,0 +1,19 @@
+SUMMARY = "Multi-platform Atari 2600 VCS emulator"
+HOMEPAGE = "https://stella-emu.github.io/" 
+SECTION = "emulators"
+
+LICENSE = "GPLv2" 
+LIC_FILES_CHKSUM = "file://License.txt;md5=878e3965c7b52d85827c75f5a2f3b314" 
+
+inherit autotools-brokensep 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[md5sum] = "36b927c46ca0be0ae7dee06760b9091b"
+SRC_URI[sha256sum] = "8086e57c231625f0b840ca361f493969247d20476cbb53609d778d37bda17c34"
+
+CLEANBROKEN = "1"

recipes-emulators/vice/files/0001-gifdrv.c-fix-build-with-giflib-5.1.0.patch

@@ -1,68 +0,0 @@
-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
-

recipes-emulators/vice/vice/0001-fix-autoreconfig.patch

@@ -0,0 +1,34 @@
+From 701abed61ce01e2d91394bc266b98281f006efe7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 21 Oct 2016 18:15:31 +0200
+Subject: [PATCH] fix autoreconfig
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes:
+
+| gnu-configize: 'configure.ac' or 'configure.in' is required
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b5403d2..3b7f0bb 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -2360,7 +2360,6 @@ if test x"$FFMPEG_DO_SUBDIRS" = "xyes"; then
+   else
+       ac_configure_args="$ac_configure_args --enable-yasm-command=${YASM} --enable-make-command=${MAKE-make} --enable-full-host=${ac_cv_host} --enable-compiler=${CC} --prefix=${prefix}"
+   fi
+-  AC_CONFIG_SUBDIRS(src/lib/ffmpeg)
+ fi
+ 
+ if test x"$HAVE_SHARED_FFMPEG" = "xyes"; then
+-- 
+2.5.5
+

recipes-emulators/vice/vice/0002-use-extern-for-the-declarations.patch

@@ -0,0 +1,43 @@
+From 7570ff1980acb288e11ae91221b89bfdc5b396d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 7 Sep 2020 21:06:16 +0200
+Subject: [PATCH] use extern for the declarations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37520/]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/arch/gtk3/widgets/base/carthelpers.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/arch/gtk3/widgets/base/carthelpers.h b/src/arch/gtk3/widgets/base/carthelpers.h
+index 1de1d40..cfee67a 100644
+--- a/src/arch/gtk3/widgets/base/carthelpers.h
++++ b/src/arch/gtk3/widgets/base/carthelpers.h
+@@ -31,13 +31,13 @@
+ #include "vice.h"
+ #include <gtk/gtk.h>
+ 
+-int (*carthelpers_save_func)(int type, const char *filename);
+-int (*carthelpers_flush_func)(int type);
+-int (*carthelpers_is_enabled_func)(int type);
+-int (*carthelpers_enable_func)(int type);
+-int (*carthelpers_disable_func)(int type);
+-int (*carthelpers_can_save_func)(int type);
+-int (*carthelpers_can_flush_func)(int type);
++extern int (*carthelpers_save_func)(int type, const char *filename);
++extern int (*carthelpers_flush_func)(int type);
++extern int (*carthelpers_is_enabled_func)(int type);
++extern int (*carthelpers_enable_func)(int type);
++extern int (*carthelpers_disable_func)(int type);
++extern int (*carthelpers_can_save_func)(int type);
++extern int (*carthelpers_can_flush_func)(int type);
+ 
+ 
+ void carthelpers_set_functions(
+-- 
+2.26.2
+

recipes-emulators/vice/vice/0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch

@@ -0,0 +1,46 @@
+From 1936dac13d3019ecb2fc07fb7b61106f5164cac4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Mon, 7 Sep 2020 21:22:32 +0200
+Subject: [PATCH] two more fixes to fix -fno-common compiliation, patch #217
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37527/]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/c128/z80.c       | 3 ++-
+ src/rs232drv/rs232.h | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/c128/z80.c b/src/c128/z80.c
+index 3a7eba3..f53f55d 100644
+--- a/src/c128/z80.c
++++ b/src/c128/z80.c
+@@ -444,7 +444,8 @@ static const uint8_t SZP[256] = {
+ 
+ /* ------------------------------------------------------------------------- */
+ 
+-z80_regs_t z80_regs;
++/* This struct variable is exported by ../c64/cart/cpmcart.c */
++/* z80_regs_t z80_regs; */
+ 
+ static void import_registers(void)
+ {
+diff --git a/src/rs232drv/rs232.h b/src/rs232drv/rs232.h
+index 1c5e6ff..e21fbaf 100644
+--- a/src/rs232drv/rs232.h
++++ b/src/rs232drv/rs232.h
+@@ -78,7 +78,7 @@ extern int rs232_cmdline_options_init(void);
+ #define RS232_NUM_DEVICES 4
+ 
+ extern char *rs232_devfile[RS232_NUM_DEVICES];
+-int rs232_useip232[RS232_NUM_DEVICES];
++extern int rs232_useip232[RS232_NUM_DEVICES];
+ 
+ /* the "ip232" protocol used by tcpser 
+  
+-- 
+2.26.2
+

recipes-emulators/vice/vice/vice_64.desktop

@@ -1,7 +1,9 @@
 [Desktop Entry]
 Type=Application
-Name=Vice C64 Emulator
+Name=X64-old (Vice)
+Comment=Commodore 64 Emulator (performing best currently)
 Exec=x64
+Icon=c64
 Terminal=false
 StartupNotify=false
 Categories=Game

recipes-emulators/vice/vice/vice_64dtv.desktop

@@ -0,0 +1,10 @@
+[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

recipes-emulators/vice/vice/vice_64sc.desktop

@@ -0,0 +1,10 @@
+[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

recipes-emulators/vice/vice_2.4.bb

@@ -1,51 +0,0 @@
-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"

recipes-emulators/vice/vice_3.4.bb

@@ -0,0 +1,85 @@
+SUMMARY = "Versatile Commodore Emulator"
+HOMEPAGE = "http://vice-emu.sourceforge.net"
+LICENSE = "GPLv2"
+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-fix-autoreconfig.patch \
+    file://0002-use-extern-for-the-declarations.patch \
+    file://0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch \
+    file://c64_16.png \
+    file://c64_32.png \
+    file://c64_48.png \
+    file://vice_64.desktop \
+    file://vice_64dtv.desktop \
+    file://vice_64sc.desktop \
+"
+SRC_URI[md5sum] = "24d83f692910f5d87de19857e8095f0b"
+SRC_URI[sha256sum] = "4bd00c1c63d38cd1fe01b90032834b52f774bc29e4b67eeb1e525b14fee07aeb"
+
+inherit autotools pkgconfig gtk-icon-cache features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl x11"
+
+DEPENDS = " \
+    glib-2.0-native \
+    bdftopcf-native \
+    mkfontdir-native \
+    mkfontscale-native \
+    xa-native \
+    bison-native \
+    glew \
+    gtk+3 \
+    libav \
+    libsdl \
+    libpng \
+    jpeg \
+    giflib \
+    libxxf86vm \
+    portaudio-v19 \
+    mpg123 \
+    virtual/libgl \
+    vte9 \
+"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
+PACKAGECONFIG[pulseaudio] = "--with-pulse,--without-pulse,pulseaudio,pulseaudio-server"
+
+EXTRA_OECONF = " \
+    --enable-external-ffmpeg \
+    --enable-parsid \
+    --enable-native-gtk3ui \
+    --without-oss \
+    --libdir=${libdir} \
+    --enable-x64 \
+"
+
+EXTRA_OECONF_remove = " \
+    --disable-static \
+"
+
+CONFIGUREOPTS_remove = " \
+    --disable-silent-rules \
+    ${@append_libtool_sysroot(d)} \
+"
+
+export ar_check="no"
+
+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"

recipes-emulators/z80/cass80.bb

@@ -0,0 +1,21 @@
+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"
+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
+}
+
+

recipes-emulators/z80/z80_git.bb

@@ -11,7 +11,7 @@ SRC_URI = " \
     file://trs80.desktop \
 "
 
-SRCREV= "413ca44336c4423ac0e39b55d75fce95ff4c31fc"
+SRCREV= "a9658c2fd33e862adc618d9dcbccf55a52d0c89d"
 PV = "0.3.1+git${SRCPV}"
 
 inherit pkgconfig

recipes-games/doomretro/doomretro.bb

@@ -0,0 +1,26 @@
+SUMMARY = "The classic, refined DOOM source port"
+HOMEPAGE = "https://www.doomretro.com" 
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=435fa6b85536eff97b3594b76fd0048f" 
+
+DEPENDS = "libsdl2 libsdl2-image libsdl2-mixer"
+
+inherit cmake
+
+SRC_URI = " \
+    git://github.com/bradharding/doomretro.git \
+    file://doomretro.png \
+    file://doomretro.desktop \
+"
+SRCREV = "2655445b7a82643568bd58192185b25a864e5380"
+PV = "3.5.10"
+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
+}

recipes-games/doomretro/doomretro/doomretro.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Doomretro
+Comment=The classic, refined DOOM source port
+Exec=doomretro
+Icon=doomretro
+Terminal=false
+StartupNotify=false
+Categories=Game

recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch

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

recipes-games/dxx-rebirth/d1x-rebirth_git.bb

@@ -2,18 +2,30 @@ 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=022f1bfd6fd458067b51b10cd3186e78"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7077769a51d612f2edcc6abd1e5dfa6d"
 
-DEPENDS = "python-scons-native libsdl libsdl-mixer physfs"
+inherit python3native
+
+DEPENDS = " \
+    python3-scons-native \
+    libsdl \
+    libsdl-mixer \
+    libsdl-image \
+    physfs \
+    libpng \
+"
 
 SRC_URI = " \
-    http://www.dxx-rebirth.com/download/dxx/${BPN}_${PV}-src.tar.gz \
+    git://github.com/dxx-rebirth/dxx-rebirth.git \
     http://www.dxx-rebirth.com/download/dxx/content/descent-mac-demo.zip;name=data \
     http://www.descent2.de/files/sound/hires-sounds.7z;name=sound \
     http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa;name=music;unpack=0 \
+    file://0001-Hack-build-with-gcc11.patch \
 "
-SRC_URI[md5sum] = "8f43e66191fdedd0c7ff9278719accf1"
-SRC_URI[sha256sum] = "5befc8a2ab1159fdb4d4141ba9f0e229450592d5ada209e832101da5b0b3e38e"
+SRCREV = "48589d0fb019eb971818c15665358e30fa778dc4"
+PV = "v0.59+git${SRCPV}"
+S = "${WORKDIR}/git"
+
 SRC_URI[data.md5sum] = "010815be5d87d61150a938ad593102fe"
 SRC_URI[data.sha256sum] = "17d2fdefc06a96a50f54d4eba745835b619115e5327ddc3d23052bf4ec0e3300"
 SRC_URI[sound.md5sum] = "474fdf1c1f8d2bbbc68f271cb9aa28b8"
@@ -21,24 +33,24 @@ SRC_URI[sound.sha256sum] = "39cab9e2aed4c6ec9e3b811bbdf2c880d4acd87e4c66a9e1f80f
 SRC_URI[music.md5sum] = "bf54b45a648052b2531bbb95c001403b"
 SRC_URI[music.sha256sum] = "b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745529d7867962f"
 
-S = "${WORKDIR}/${BPN}_${PV}-src"
+do_unpack[depends] += "p7zip-native:do_populate_sysroot"
 
 do_compile() {
-    scons opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
+    scons ${PARALLEL_MAKE} opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
 }
 
 do_install() {
     install -d ${D}${bindir}
-    install ${BPN} ${D}${bindir}
+    install ${S}/${BPN}/${BPN} ${D}${bindir}
 
     install -d ${D}${datadir}/applications
-    install ${BPN}.desktop ${D}${datadir}/applications
+    install ${S}/${BPN}/${BPN}.desktop ${D}${datadir}/applications
 
     install -d ${D}${datadir}/pixmaps
-    install ${BPN}.xpm ${D}${datadir}/pixmaps
+    install ${S}/${BPN}/${BPN}.xpm ${D}${datadir}/pixmaps
 
     install -d ${D}${datadir}/${BPN}
-    install ../descent.hog ../descent.pig ../d1xr-sc55-music.dxa ${D}${datadir}/${BPN}
+    install ${WORKDIR}/descent.hog ${WORKDIR}/descent.pig ${WORKDIR}/d1xr-sc55-music.dxa ${D}${datadir}/${BPN}
 }
 
 RRECOMMENDS_${PN} = "tremor"

recipes-games/opentyrian/files/0001-Makefile-use-pkgconfig-to-find-sdl.patch

@@ -1,42 +0,0 @@
-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
-

recipes-games/opentyrian/files/0002-Fix-several-uninitialized-variable-warnings.patch

@@ -1,63 +0,0 @@
-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
-

recipes-games/opentyrian/files/0003-fix-build-with-pedantic-gcc6.patch

@@ -1,28 +0,0 @@
-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
-

recipes-games/opentyrian/opentyrian.bb

@@ -0,0 +1,48 @@
+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 = "libsdl2 libsdl2-net"
+
+inherit autotools-brokensep pkgconfig
+
+SRC_URI = " \
+    git://github.com/opentyrian/opentyrian.git \
+    http://camanis.net/opentyrian/tyrian21.zip;name=data \
+    file://0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch \
+    file://0002-fix-build-with-gcc8.patch \
+"
+S = "${WORKDIR}/git"
+SRCREV = "822c71943f6a06bc2599a0478ea41b6d413648d6"
+PV = "2.1.20130907+git${SRCPV}"
+
+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}/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"

recipes-games/opentyrian/opentyrian/0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch

@@ -0,0 +1,73 @@
+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
+

recipes-games/opentyrian/opentyrian/0002-fix-build-with-gcc8.patch

@@ -0,0 +1,67 @@
+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
+

recipes-games/opentyrian/opentyrian_2.1.20130907.bb

@@ -1,46 +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 = "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 {} \; 
-}

recipes-support/gtkglext/files/0001-gtkglwidget-various-fixes.patch

@@ -0,0 +1,173 @@
+From be3b1dcbe0d9920eff4094e0a2ef8cd736051dff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 21 Dec 2016 08:20:27 +0100
+Subject: [PATCH] gtkglwidget: various fixes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taken from [1]
+
+[1] http://pkgs.fedoraproject.org/cgit/rpms/gtkglext.git/plain/gtkglext-1.2.0-bz677457.diff
+
+Upstream Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ gtk/gtkglwidget.c | 31 +++++++++++++++++++------------
+ 1 file changed, 19 insertions(+), 12 deletions(-)
+
+diff --git a/gtk/gtkglwidget.c b/gtk/gtkglwidget.c
+index ecb41ef..2e5e9f6 100644
+--- a/gtk/gtkglwidget.c
++++ b/gtk/gtkglwidget.c
+@@ -16,7 +16,9 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gtk/gtkmain.h>
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif /* HAVE_CONFIG_H */
+ 
+ #include "gtkglprivate.h"
+ #include "gtkglwidget.h"
+@@ -68,6 +70,7 @@
+ gtk_gl_widget_realize (GtkWidget       *widget,
+                        GLWidgetPrivate *private)
+ {
++  GdkWindow *window;
+   GdkGLWindow *glwindow;
+ 
+   GTK_GL_NOTE_FUNC_PRIVATE ();
+@@ -77,9 +80,10 @@
+    * handlers.
+    */
+ 
+-  if (!gdk_window_is_gl_capable (widget->window))
++  window = gtk_widget_get_window (widget);
++  if (!gdk_window_is_gl_capable (window))
+     {
+-      glwindow = gdk_window_set_gl_capability (widget->window,
++      glwindow = gdk_window_set_gl_capability (window,
+                                                private->glconfig,
+                                                NULL);
+       if (glwindow == NULL)
+@@ -127,9 +131,9 @@
+    * Synchronize OpenGL and window resizing request streams.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
++  if (gtk_widget_get_realized (widget) && private->is_realized)
+     {
+-      gldrawable = gdk_window_get_gl_drawable (widget->window);
++      gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));
+       gdk_gl_drawable_wait_gdk (gldrawable);
+     }
+ }
+@@ -146,7 +150,7 @@
+ 
+   if (private->glcontext != NULL)
+     {
+-      gdk_gl_context_destroy (private->glcontext);
++      g_object_unref (private->glcontext);
+       private->glcontext = NULL;
+     }
+ 
+@@ -154,8 +158,8 @@
+    * Remove OpenGL-capability from widget->window.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
+-    gdk_window_unset_gl_capability (widget->window);
++  if (gtk_widget_get_realized (widget))
++    gdk_window_unset_gl_capability (gtk_widget_get_window (widget));
+ 
+   private->is_realized = FALSE;
+ }
+@@ -174,7 +178,7 @@
+    */
+ 
+   toplevel = gtk_widget_get_toplevel (widget);
+-  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
++  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
+     {
+       GTK_GL_NOTE (MISC,
+         g_message (" - Install colormap to the top-level window."));
+@@ -188,23 +192,27 @@
+                          GtkStyle  *previous_style,
+                          gpointer   user_data)
+ {
++  GdkWindow *window;
++
+   GTK_GL_NOTE_FUNC_PRIVATE ();
+ 
+   /* 
+    * Set a background of "None" on window to avoid AIX X server crash.
+    */
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
++  if (gtk_widget_get_realized (widget))
+     {
++      window = gtk_widget_get_window (widget);
++
+       GTK_GL_NOTE (MISC,
+         g_message (" - window->bg_pixmap = %p",
+-                   ((GdkWindowObject *) (widget->window))->bg_pixmap));
++                   ((GdkWindowObject *) window)->bg_pixmap));
+ 
+-      gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
++      gdk_window_set_back_pixmap (window, NULL, FALSE);
+ 
+       GTK_GL_NOTE (MISC,
+         g_message (" - window->bg_pixmap = %p",
+-                   ((GdkWindowObject *) (widget->window))->bg_pixmap));
++                   ((GdkWindowObject *) window)->bg_pixmap));
+     }
+ }
+ 
+@@ -250,8 +258,8 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
+-  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
++  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
++  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
+   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
+ 
+   /* 
+@@ -432,9 +440,9 @@
+   GTK_GL_NOTE_FUNC ();
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+-  gldrawable = gdk_window_get_gl_drawable (widget->window);
++  gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));
+   if (gldrawable == NULL)
+     return NULL;
+ 
+@@ -474,7 +482,7 @@
+   GLWidgetPrivate *private;
+ 
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
+   if (private == NULL)
+@@ -501,7 +509,7 @@
+ gtk_widget_get_gl_window (GtkWidget *widget)
+ {
+   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
++  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
+ 
+-  return gdk_window_get_gl_window (widget->window);
++  return gdk_window_get_gl_window (gtk_widget_get_window (widget));
+ }
+-- 
+2.5.5
+

recipes-support/gtkglext/files/0002-Fix-variable-name-conflict.patch

@@ -0,0 +1,51 @@
+From 9cbea61c54ee97b6a92263f6392cd84a4918aa54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 6 Jun 2018 14:10:19 +0200
+Subject: [PATCH] Fix variable name conflict
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| ../../gtkglext-1.2.0/gdk/gdkglshapes.c:547:12: error: 'index' redeclared as different kind of symbol
+|  static int index[20][3] =
+|             ^~~~~
+| In file included from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/string.h:431:0,
+|                  from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/glib-2.0/glib/gtestutils.h:30,
+|                  from /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/glib-2.0/glib.h:82,
+|                  from ../../gtkglext-1.2.0/gdk/gdkglshapes.c:21:
+| /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/gtkglext/1.2.0-r0/recipe-sysroot/usr/include/strings.h:68:14: note: previous declaration of 'index' was here
+|  extern char *index (const char *__s, int __c)
+|               ^~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ gdk/gdkglshapes.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
+index f72abba..d468b05 100644
+--- a/gdk/gdkglshapes.c
++++ b/gdk/gdkglshapes.c
+@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
+   {-Z, -X, 0}
+ };
+ 
+-static int index[20][3] =
++static int _index[20][3] =
+ {
+   {0, 4, 1},
+   {0, 9, 4},
+@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
+   int i;
+ 
+   for (i = 19; i >= 0; i--) {
+-    drawtriangle(i, idata, index, shadeType);
++    drawtriangle(i, idata, _index, shadeType);
+   }
+ }
+ 
+-- 
+2.14.3
+

recipes-support/gtkglext/gtkglext_1.2.0.bb

@@ -0,0 +1,20 @@
+SUMMARY = "OpenGL Extension to GTK"
+LICENSE = "GPLv2 | LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"
+
+inherit gnomebase pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+DEPENDS += "gtk+ glib-2.0-native pangox-compat libglu libxmu"
+
+SRC_URI += " \
+    file://0001-gtkglwidget-various-fixes.patch \
+    file://0002-Fix-variable-name-conflict.patch \
+"
+SRC_URI[archive.md5sum] = "ed7ba24ce06a8630c07f2d0ee5f04ab4"
+SRC_URI[archive.sha256sum] = "16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51"
+GNOME_COMPRESS_TYPE="bz2"
+
+FILES_${PN}-dev += "${libdir}/gtkglext-1.0"

recipes-support/pangox-compat/pangox-compat/0001-Hack-to-build-with-recent-pango.patch

@@ -0,0 +1,189 @@
+From 23b4318e2836d82c04b3bead9d21ab2e53d0dd5f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 25 Aug 2019 22:12:39 +0200
+Subject: [PATCH] Hack to build with recent pango
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inapropriate [dead-project]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ pango-impl-utils.h | 145 +++++++++++++++++++++++++++++++++++++++++++++
+ pangox.c           |   2 +
+ 2 files changed, 147 insertions(+)
+
+diff --git a/pango-impl-utils.h b/pango-impl-utils.h
+index 6d6c8ff..55af764 100644
+--- a/pango-impl-utils.h
++++ b/pango-impl-utils.h
+@@ -27,6 +27,151 @@
+ #include <glib-object.h>
+ #include <pango/pango.h>
+ 
++/* pango plays remove and oops don't remove with PangoFontClass so add our own fallback [1]
++ * [1] https://gitlab.gnome.org/GNOME/pango/commit/db1e5dae6e355db792e75cdcca0b7845c89ac4a4 */
++
++#include <pango/pango-font.h>
++
++#ifndef PANGO_FONT_CLASS
++#define PANGO_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT, PangoFontClass))
++#define PANGO_IS_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT))
++#define PANGO_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT, PangoFontClass))
++
++typedef struct _PangoFontClass       PangoFontClass;
++
++struct _PangoFontMetrics
++{
++  /* <private> */
++  guint ref_count;
++
++  int ascent;
++  int descent;
++  int height;
++  int approximate_char_width;
++  int approximate_digit_width;
++  int underline_position;
++  int underline_thickness;
++  int strikethrough_position;
++  int strikethrough_thickness;
++};
++
++struct _PangoFontClass
++{
++  GObjectClass parent_class;
++
++  /*< public >*/
++
++  PangoFontDescription *(*describe)           (PangoFont      *font);
++  PangoCoverage *       (*get_coverage)       (PangoFont      *font,
++                                               PangoLanguage  *language);
++  void                  (*get_glyph_extents)  (PangoFont      *font,
++                                               PangoGlyph      glyph,
++                                               PangoRectangle *ink_rect,
++                                               PangoRectangle *logical_rect);
++  PangoFontMetrics *    (*get_metrics)        (PangoFont      *font,
++                                               PangoLanguage  *language);
++  PangoFontMap *        (*get_font_map)       (PangoFont      *font);
++  PangoFontDescription *(*describe_absolute)  (PangoFont      *font);
++  void                  (*get_features)       (PangoFont      *font,
++                                               hb_feature_t   *features,
++                                               guint           len,
++                                               guint          *num_features);
++  hb_font_t *           (*create_hb_font)     (PangoFont      *font);
++};
++#endif /* PANGO_FONT_CLASS */
++
++
++#ifndef PANGO_FONT_FAMILY_CLASS
++#define PANGO_FONT_FAMILY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
++#define PANGO_IS_FONT_FAMILY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FAMILY))
++#define PANGO_FONT_FAMILY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FAMILY, PangoFontFamilyClass))
++
++typedef struct _PangoFontFamily      PangoFontFamily;
++typedef struct _PangoFontFamilyClass PangoFontFamilyClass;
++
++#ifndef PANGO_DISABLE_DEPRECATED
++
++/**
++ * PangoFontFamily:
++ *
++ * The #PangoFontFamily structure is used to represent a family of related
++ * font faces. The faces in a family share a common design, but differ in
++ * slant, weight, width and other aspects.
++ */
++struct _PangoFontFamily
++{
++  GObject parent_instance;
++};
++
++struct _PangoFontFamilyClass
++{
++  GObjectClass parent_class;
++
++  /*< public >*/
++
++  void  (*list_faces)      (PangoFontFamily  *family,
++                            PangoFontFace  ***faces,
++                            int              *n_faces);
++  const char * (*get_name) (PangoFontFamily  *family);
++  gboolean (*is_monospace) (PangoFontFamily *family);
++  gboolean (*is_variable)  (PangoFontFamily *family);
++
++  /*< private >*/
++
++  /* Padding for future expansion */
++  void (*_pango_reserved2) (void);
++  void (*_pango_reserved3) (void);
++};
++
++#endif /* PANGO_DISABLE_DEPRECATED */
++#endif /* PANGO_FONT_FAMILY_CLASS */
++
++#ifndef PANGO_FONT_FACE_CLASS
++
++#define PANGO_FONT_FACE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
++#define PANGO_IS_FONT_FACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_FACE))
++#define PANGO_FONT_FACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_FACE, PangoFontFaceClass))
++
++typedef struct _PangoFontFaceClass   PangoFontFaceClass;
++
++#ifndef PANGO_DISABLE_DEPRECATED
++
++/**
++ * PangoFontFace:
++ *
++ * The #PangoFontFace structure is used to represent a group of fonts with
++ * the same family, slant, weight, width, but varying sizes.
++ */
++struct _PangoFontFace
++{
++  GObject parent_instance;
++};
++
++struct _PangoFontFaceClass
++{
++  GObjectClass parent_class;
++
++  /*< public >*/
++
++  const char           * (*get_face_name)  (PangoFontFace *face);
++  PangoFontDescription * (*describe)       (PangoFontFace *face);
++  void                   (*list_sizes)     (PangoFontFace  *face,
++                                            int           **sizes,
++                                            int            *n_sizes);
++  gboolean               (*is_synthesized) (PangoFontFace *face);
++
++  /*< private >*/
++
++  /* Padding for future expansion */
++  void (*_pango_reserved3) (void);
++  void (*_pango_reserved4) (void);
++};
++
++#endif /* PANGO_DISABLE_DEPRECATED */
++#endif /* PANGO_FONT_FACE_CLASS */
++
++/* end of pango fallback */
++
+ G_BEGIN_DECLS
+ 
+ #define PANGO_DEFINE_TYPE_FULL(name, prefix,				   \
+diff --git a/pangox.c b/pangox.c
+index 1a98fa5..1362c14 100644
+--- a/pangox.c
++++ b/pangox.c
+@@ -279,7 +279,9 @@ pango_x_font_class_init (PangoXFontClass *class)
+ 
+   font_class->describe = pango_x_font_describe;
+   font_class->get_coverage = pango_x_font_get_coverage;
++#ifndef PANGO_VERSION_1_44
+   font_class->find_shaper = pango_x_font_find_shaper;
++#endif
+   font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
+   font_class->get_metrics = pango_x_font_get_metrics;
+   font_class->get_font_map = pango_x_font_get_font_map;
+-- 
+2.21.0
+

recipes-support/pangox-compat/pangox-compat_0.0.2.bb

@@ -0,0 +1,11 @@
+SUMMARY = "Compatibility library for pangox"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+inherit gnomebase pkgconfig
+
+DEPENDS += "pango"
+
+SRC_URI += "file://0001-Hack-to-build-with-recent-pango.patch"
+SRC_URI[archive.md5sum] = "7bcbd0187f03e1e27af9a81e07249c33"
+SRC_URI[archive.sha256sum] = "552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046"

recipes-support/portmidi/files/0001-do-not-build-java-application-to-set-midi-defaults.patch

@@ -0,0 +1,97 @@
+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
+

recipes-support/portmidi/files/0002-fix-compilation-du-to-unkown-functions.patch

@@ -0,0 +1,48 @@
+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
+

recipes-support/portmidi/files/0003-fix-format-security..patch

@@ -0,0 +1,124 @@
+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
+

recipes-support/portmidi/files/fedora-portmidi-cmake.patch

@@ -0,0 +1,107 @@
+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)
+ 
+

recipes-support/portmidi/portmidi_217.bb

@@ -0,0 +1,36 @@
+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."
+}

recipes-support/xa/files/0001-Align-Makefiles-for-cross-compiling.patch

@@ -0,0 +1,107 @@
+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

recipes-support/xa/xa_2.3.11.bb

@@ -0,0 +1,19 @@
+SUMMARY = "Open-source 6502 cross assembler"
+LICENSE = "GPLv2"
+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
+}

recipes-wayland/cage/cage.bb

@@ -0,0 +1,26 @@
+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 features_check
+
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+SRC_URI = "git://github.com/Hjdskes/${BPN}.git"
+SRCREV = "d09739373288adef901cdd58c983c0d02302932c"
+PV = "0.1.2.1"
+S = "${WORKDIR}/git"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland','',d)}"
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xserver-xorg-xwayland"
+

recipes-wayland/sway/wlroots.bb

@@ -0,0 +1,34 @@
+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 \
+"
+
+inherit meson features_check
+
+REQUIRED_DISTRO_FEATURES = "wayland opengl"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland x11-backend','',d)}"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xserver-xorg-xwayland"
+PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg"
+
+SRC_URI = " \
+    git://github.com/swaywm/${BPN}.git \
+    file://0001-Adjust-meson.build-to-meson-0.54.patch \
+"
+SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285"
+PV = "0.12.0"
+S = "${WORKDIR}/git"

recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch

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