xa: upgrade 2.3.9 -> 2.3.10

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
xa: Fix source download by adding mirror
2019-12-10 12:40:32 +01:00 · 2019-12-10 10:42:58 +01:00
53 changed files with 578 additions and 815 deletions
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ 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
+see [layer.conf](conf/layer.conf) for dependencies and https://layers.openembedded.org/layerindex/branch/master/layers/ where to find layers


 Contributing
@@ -14,9 +14,9 @@ Contributing

 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).
+* Please do not send private emails to maintainers. For questions/suggestions.. use GitHub 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)
+  * Use 4 spaces for indention always
  * 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.

--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,4 +9,4 @@ 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"
+LAYERSERIES_COMPAT_meta-retro = "thud warrior zeus"
--- a/recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch
+++ b/recipes-browser/midori/midori/0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch
@@ -1,32 +0,0 @@
-From ccf4abdd7b2e521e0665186e620a606277682597 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 18 Feb 2020 00:07:24 +0100
-Subject: [PATCH] Do no search for cross g-ir-compiler but
- g-ir-compiler-wrapper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- core/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index c4982de9..80fdd309 100644
--- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -66,7 +66,7 @@ set_target_properties("${LIBCORE}" PROPERTIES
-                       VERSION ${LIBCORE_VERSION}
-                       )
- 
-find_program (GIR_COMPILER_BIN g-ir-compiler)
-+find_program (GIR_COMPILER_BIN g-ir-compiler-wrapper)
- add_custom_target(${LIBCORE_GIR}.typelib ALL
-                   COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir
-                   --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib
-- 
-2.21.0
-
--- a/recipes-browser/midori/midori_git.bb
+++ b/recipes-browser/midori/midori_git.bb
@@ -1,61 +0,0 @@
-SUMMARY = "A lightweight web browser"
-HOMEPAGE = "https://www.midori-browser.org/"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-
-DEPENDS = " \
-    intltool-native \
-    gcr \
-    webkitgtk \
-    json-glib \
-    libarchive \
-    libsoup-2.4 \
-    libpeas \
-    sqlite \
-"
-
-inherit cmake pkgconfig gtk-icon-cache gettext vala python3native features_check gobject-introspection mime-xdg
-
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-
-# Midori requires gobject-introspection to build. Check below is not the whole
-# story: There are some extra machine-specific disable entries in webkitgtk
-# recipe and there is nothing we can do to check here...
-python () {
-    if d.getVar('GI_DATA_ENABLED') != 'True':
-        raise bb.parse.SkipRecipe('Midori needs gobject-introspection but it is either disabled or machine does not support it!' )
-}
-
-SRC_URI = " \
-    git://github.com/midori-browser/core.git \
-    file://0001-Do-no-search-for-cross-g-ir-compiler-but-g-ir-compil.patch \
-"
-SRCREV = "f6b3b1e030db7eb2de7faf73ec4ccc18949b668d"
-PV = "9.0"
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE = " \
-    -DCMAKE_INSTALL_PREFIX=${prefix} \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-"
-
-do_configure_prepend() {
-    export VALAC=${STAGING_BINDIR_NATIVE}/valac
-}
-
-RRECOMMENDS_${PN} += " \
-    glib-networking ca-certificates \
-    adwaita-icon-theme \
-"
-
-# No project but oe packs gstreamer plugins that fine as we do. Cannot say
-# which plugins are # really necessary so use gstreamer1.0-plugins-*-meta.
-# These are necessary to make video streaming work - see [1]
-# [1] https://github.com/midori-browser/core/issues/329
-RRECOMMENDS_${PN} += " \
-    gstreamer1.0-plugins-base-meta \
-    gstreamer1.0-plugins-good-meta \
-    gstreamer1.0-libav \
-"
-
-FILES_${PN} += "${datadir}/metainfo"
--- a/recipes-emulators/dosbox/dosbox-x.bb
+++ b/recipes-emulators/dosbox/dosbox-x.bb
@@ -1,43 +0,0 @@
-SUMMARY = "DOSBox-X fork of the DOSBox project"
-HOMEPAGE = "https://dosbox-x.com/" 
-
-LICENSE = "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"
--- a/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch
+++ b/recipes-emulators/dosbox/dosbox-x/0001-use-pkgconfig-to-find-sdl2.patch
@@ -1,102 +0,0 @@
-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
-
--- a/recipes-emulators/dosbox/dosbox-x/0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch
+++ b/recipes-emulators/dosbox/dosbox-x/0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch
@@ -1,34 +0,0 @@
-From 7513e63ca7621f730adb41df556af470f9fba372 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 19 Oct 2020 23:02:41 +0200
-Subject: [PATCH] Enable unaligned memory based on recipe's suggestion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CPU detection as dosbox-x handles it does not work here. So set in recipe
-what configure would do.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d832bcc9a..8841e6c4d 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -850,7 +850,7 @@ dnl FEATURE: Whether to enable unaligned memory access
- AH_TEMPLATE(C_UNALIGNED_MEMORY,[Define to 1 to use a unaligned memory access])
- AC_ARG_ENABLE(unaligned_memory,AC_HELP_STRING([--disable-unaligned-memory],[Disable unaligned memory access]),,enable_unaligned_memory=yes)
- AC_MSG_CHECKING(whether to enable unaligned memory access) 
-if test x$enable_unaligned_memory = xyes -a x$c_unalignedmemory = xyes; then 
-+if test x$enable_unaligned_memory = xyes; then
-   AC_DEFINE(C_UNALIGNED_MEMORY,1)
-   AC_MSG_RESULT(yes)
- else
-- 
-2.26.2
-
--- a/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_install.conf
+++ b/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_install.conf
@@ -1,58 +0,0 @@
-[dosbox]
-title=Windows 98
-memsize=64
-
-[sdl]
-priority = higher,higher
-autolock = true
-fullresolution = desktop
-windowresolution = 1024x768
-output = opengl
-mouse_wheel_key = -0
-
-[render]
-scaler = none
-aspect = true
-
-[cpu]
-cycles = fixed 60000
-core = dynamic
-cputype = auto
-dynamic core cache block size = 32
-
-[video]
-vesa modelist width limit=0
-vesa modelist height limit=0
-
-[dos]
-automountall=true
-
-[fdc, primary]
-int13fakev86io=true
-
-[ide, primary]
-enable=true
-pnp=true
-int13fakeio=true
-int13fakev86io=true
-enable pio32=true
-
-[ide, secondary]
-int13fakeio=true
-int13fakev86io=true
-cd-rom insertion delay=2000
-
-[autoexec]
-keyb de
-
-# This is done once only
-imgmake /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hd_2gig
-
-# This will be our C:
-imgmount 2 /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hdd
-
-# Installation CD
-imgmount d /home/morona/Emulators/dosbox-x/win98/install-media/win98-de.iso
-
-# Bootdisc - comment after install
-boot /home/morona/Emulators/dosbox-x/win98/install-media/win98-boot.img
--- a/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_run.conf
+++ b/recipes-emulators/dosbox/dosbox-x/configs/win98/win98_run.conf
@@ -1,59 +0,0 @@
-[dosbox]
-title=Windows 98
-memsize=64
-
-[sdl]
-priority = higher,normal
-autolock = true
-fullresolution = desktop
-windowresolution = 1024x768
-output = opengl
-mouse_wheel_key = -0
-
-[render]
-aspect = true
-
-[cpu]
-cycles = fixed 12000
-#core = dynamic
-core = normal
-
-cputype = auto
-#dynamic core cache block size = 1
-#use dynamic core with paging on = false
-
-[video]
-vesa modelist width limit=0
-vesa modelist height limit=0
-
-[dos]
-automountall=true
-
-[mixer]
-blocksize = 1024
-
-[fdc, primary]
-int13fakev86io=true
-
-[ide, primary]
-enable=true
-pnp=true
-int13fakeio=true
-int13fakev86io=true
-enable pio32=true
-
-[ide, secondary]
-int13fakeio=true
-int13fakev86io=true
-cd-rom insertion delay=2000
-
-[autoexec]
-keyb de
-
-# This is our C:
-imgmount 2 /home/morona/Emulators/dosbox-x/win98/win98hd.img -t hdd
-
-# Installation CD
-imgmount d /home/morona/Emulators/dosbox-x/win98/install-media/win98-de.iso
-
-boot /home/morona/Emulators/dosbox-x/win98/win98hd.img
--- a/recipes-emulators/dosbox/dosbox/dosbox.png
+++ b/recipes-emulators/dosbox/dosbox/dosbox.png
--- a/recipes-emulators/dosbox/dosbox_0.74-2.bb
+++ b/recipes-emulators/dosbox/dosbox_0.74-2.bb
@@ -14,10 +14,13 @@ SRC_URI = " \
    file://dosbox.png \
    file://0001-use-pkgconfig-to-find-sdl.patch \
 "
-SRC_URI[sha256sum] = "c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a"
-PV = "0.74-3"
+SRC_URI[md5sum] = "7110ee24a45a2b4951ad52eb1a3722be"
+SRC_URI[sha256sum] = "7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf"
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
+"

-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
 PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"

 do_install_append() {
--- a/recipes-emulators/dosbox/dosbox/0001-use-pkgconfig-to-find-sdl.patch
+++ b/recipes-emulators/dosbox/dosbox/0001-use-pkgconfig-to-find-sdl.patch
--- a/recipes-emulators/dosbox/dosbox/dosbox.desktop
+++ b/recipes-emulators/dosbox/dosbox/dosbox.desktop
@@ -5,4 +5,4 @@ Exec=dosbox
 Icon=dosbox.png
 Terminal=false
 Type=Application
-Categories=Emulator;Game;
+Categories=System;Emulator;Game;
--- a/recipes-emulators/dosbox/files/dosbox.png
+++ b/recipes-emulators/dosbox/files/dosbox.png
--- a/recipes-emulators/mame/mame.bb
+++ b/recipes-emulators/mame/mame.bb
@@ -2,15 +2,15 @@ SUMMARY = "Multiple Arcade Machine Emulator"
 HOMEPAGE = "http://www.mamedev.org/index.php" 

 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=417c683350df4c63046fee551c461bd4"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=798620970c471a3a6b7b5e9c9192fe12"

 SRC_URI = " \
    git://github.com/mamedev/mame.git \
+    file://no-upstream/0001-pokey-Make-step_one_clock-inline.patch \
    file://mame.desktop \
-    file://mame32k.desktop \
 "
-PV = "0232"
-SRCREV = "2b0f01bc3aee493b3c05cf34c15af7cf5521210a"
+PV = "0215"
+SRCREV = "e9ef4808dd1fe9e5d3c26bc0c1144209503222ab"
 S = "${WORKDIR}/git"

 inherit siteinfo gtk-icon-cache
@@ -30,7 +30,7 @@ DEPENDS = " \
    sqlite3 \
    portaudio-v19 \
    rapidjson \
-    portmidi \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'portmidi', '', d)} \
 "

 CLEANBROKEN = "1"
@@ -74,9 +74,8 @@ EXTRA_OEMAKE = " \
    USE_SYSTEM_LIB_ZLIB=1 \
    USE_SYSTEM_LIB_RAPIDJSON=1 \
    USE_OPENMP=1 \
-    USE_SYSTEM_LIB_PORTMIDI=1 \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-qt5-extra', 'USE_SYSTEM_LIB_PORTMIDI=1', '', d)} \
    SDL_INI_PATH=${sysconfdir}/${BPN} \
-    PYTHON_EXECUTABLE=python3 \
 "

 do_compile_prepend() {
@@ -96,14 +95,13 @@ do_install() {
    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
+    for tool in regrep split src2html 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/{} \;
--- a/recipes-emulators/mame/mame/mame32k.desktop
+++ b/recipes-emulators/mame/mame/mame32k.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Mame (32k RAM)
-Comment=MAME is a multi-purpose emulation framework
-Exec=mame -ramsize 32k
-Icon=MAMElogo.svg
-Terminal=false
-StartupNotify=false
-Categories=Game
--- a/recipes-emulators/mame/mame/no-upstream/0001-pokey-Make-step_one_clock-inline.patch
+++ b/recipes-emulators/mame/mame/no-upstream/0001-pokey-Make-step_one_clock-inline.patch
@@ -0,0 +1,48 @@
+From 0ba9c56e7a27bd926270678e7add074fb00204f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 3 Mar 2019 15:00:41 +0100
+Subject: [PATCH] pokey: Make step_one_clock inline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This gives another small performance win on machines using multiple pokeys. Since
+it ruins our valgind output and upstream will not be keen on:
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/devices/sound/pokey.cpp | 2 +-
+ src/devices/sound/pokey.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp
+index 231dc01e8b..d20c20cc8a 100644
+--- a/src/devices/sound/pokey.cpp
+++ b/src/devices/sound/pokey.cpp
+@@ -562,7 +562,7 @@ void pokey_device::step_pot()
+  *
+  */
+ 
+-void pokey_device::step_one_clock(void)
+inline void pokey_device::step_one_clock(void)
+ {
+ 	/* Clocks only count if we are not in a reset */
+ 	if (m_SKCTL & SK_RESET)
+diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h
+index 7e63e89e54..48858bc743 100644
+--- a/src/devices/sound/pokey.h
+++ b/src/devices/sound/pokey.h
+@@ -264,7 +264,7 @@ private:
+ 
+ 	static constexpr int POKEY_CHANNELS = 4;
+ 
+-	void step_one_clock();
+	inline void step_one_clock();
+ 	void step_keyboard();
+ 	void step_pot();
+ 
+-- 
+2.20.1
+
--- a/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch
+++ b/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch
@@ -1,6 +1,6 @@
 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
+Date: Fri, 30 Jun 2017 09:30:32 +0200
 Subject: [PATCH] custtomize configure and Makefile to our needs
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -11,14 +11,28 @@ Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

 ---
- configure | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
+ Makefile  |  2 +-
+ configure | 39 +++++++++++++++++++++++----------------
+ 2 files changed, 24 insertions(+), 17 deletions(-)

+diff --git a/Makefile b/Makefile
+index 35a1e36..a8984d0 100644
+--- a/Makefile
+++ b/Makefile
+@@ -177,7 +177,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 4fb2cf0..37f502e 100755
+index a1ecfb1..05e5c1c 100755
 --- a/configure
 +++ b/configure
-@@ -331,6 +331,7 @@ mingw32-cross)
+@@ -307,6 +307,7 @@ mingw32-cross)
 	_host_cpu=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 	_host_os=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 	_host_vendor=`echo $guessed_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
@@ -26,8 +40,8 @@ index 4fb2cf0..37f502e 100755
 	;;
 esac
 
-@@ -557,8 +558,9 @@ if test -n "$_host"; then
- 			_host_os=unix
+@@ -511,8 +517,9 @@ if test -n "$_host"; then
+ 			_host_os=win32
 			;;
 		*)
 -			echo "Cross-compiling to unknown target, please add your target to configure."
@@ -38,7 +52,7 @@ index 4fb2cf0..37f502e 100755
 			;;
 	esac
 
-@@ -802,7 +804,7 @@ fi
+@@ -676,7 +683,7 @@ fi
 # Now, add the appropriate defines/libraries/headers
 #
 echo
@@ -47,16 +61,16 @@ index 4fb2cf0..37f502e 100755
 
 SRC="src"
 CORE="$SRC/emucore"
-@@ -821,7 +823,7 @@ SQLITE="$SRC/common/repository/sqlite"
+@@ -698,7 +698,7 @@ ZLIB="$SRC/zlib"
 
- INCLUDES="-I$CORE -I$COMMON -I$TV -I$TIA -I$TIA_FRAME_MANAGER"
+ INCLUDES="-I$CORE -I$COMMON -I$TV -I$GUI -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
+@@ -706,7 +706,7 @@ else
 	_sdl_conf_libs="--libs"
 fi
 
@@ -66,5 +80,5 @@ index 4fb2cf0..37f502e 100755
 
 case $_host_os in
 -- 
-2.21.1
+2.14.3

--- a/recipes-emulators/stella/stella_6.0.1.bb
+++ b/recipes-emulators/stella/stella_6.0.1.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
    https://github.com/stella-emu/stella/releases/download/${PV}/${BPN}-${PV}-src.tar.xz \
    file://0001-custtomize-configure-and-Makefile-to-our-needs.patch \
 "
-SRC_URI[md5sum] = "36b927c46ca0be0ae7dee06760b9091b"
-SRC_URI[sha256sum] = "8086e57c231625f0b840ca361f493969247d20476cbb53609d778d37bda17c34"
+SRC_URI[md5sum] = "9df5fd3af9720115359ebf0171ed36e6"
+SRC_URI[sha256sum] = "d611f98bb35ed9eacfb63826b12b4e8b67b874a2a87019d4bdaf1e7f4724c40d"

 CLEANBROKEN = "1"
--- a/recipes-emulators/vice/files/0001-fix-autoreconfig.patch
+++ b/recipes-emulators/vice/files/0001-fix-autoreconfig.patch
--- a/recipes-emulators/vice/files/c64_16.png
+++ b/recipes-emulators/vice/files/c64_16.png
--- a/recipes-emulators/vice/files/c64_32.png
+++ b/recipes-emulators/vice/files/c64_32.png
--- a/recipes-emulators/vice/files/c64_48.png
+++ b/recipes-emulators/vice/files/c64_48.png
--- a/recipes-emulators/vice/vice/vice_64sc.desktop
+++ b/recipes-emulators/vice/vice/vice_64sc.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Type=Application
-Name=X64sc (Vice)
+Name=X64 (Vice)
 Comment=Commodore 64 Emulator
-Exec=x64sc
+Exec=x64
 Icon=c64
 Terminal=false
 StartupNotify=false
 Categories=Game
-Name[en_US]=vice_64sc
--- a/recipes-emulators/vice/vice-3.2/0002-Hack-build-with-latest-FFMPEG.patch
+++ b/recipes-emulators/vice/vice-3.2/0002-Hack-build-with-latest-FFMPEG.patch
@@ -0,0 +1,101 @@
+From 6f69c122f0ea97b89bb0bb72cb75e97dc24d5506 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 8 Jun 2018 11:10:25 +0200
+Subject: [PATCH] Hack build with latest FFMPEG
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Taking videos in raw format won't work with ne FFMPEG.
+
+| ../../../vice-3.2/src/gfxoutputdrv/ffmpegdrv.c:363:34: error: 'CODEC_CAP_VARIABLE_FRAME_SIZE' undeclared (first use in this function); did you mean 'AV_CODEC_CAP_VARIABLE_FRAME_SIZE'?
+|      if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
+|                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|                                   AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+
+| ../../../vice-3.2/src/gfxoutputdrv/ffmpegdrv.c:461:21: error: 'CODEC_FLAG_GLOBAL_HEADER' undeclared (first use in this function); did you mean 'AV_CODEC_FLAG_GLOBAL_HEADER'?
+|          c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+|                      ^~~~~~~~~~~~~~~~~~~~~~~~
+|                      AV_CODEC_FLAG_GLOBAL_HEADER
+
+| ../../../../../../../../../oe-core/workspace/sources/vice/src/gfxoutputdrv/ffmpegdrv.c:982:40: error: 'AVFMT_RAWPICTURE' undeclared (first use in this function); did you mean 'FF_API_AVPICTURE'?
+|      if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
+|                                         ^~~~~~~~~~~~~~~~
+|                                         FF_API_AVPICTURE
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/gfxoutputdrv/ffmpegdrv.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/gfxoutputdrv/ffmpegdrv.c b/src/gfxoutputdrv/ffmpegdrv.c
+index 4748348..b52e39b 100644
+--- a/src/gfxoutputdrv/ffmpegdrv.c
+++ b/src/gfxoutputdrv/ffmpegdrv.c
+@@ -360,7 +360,11 @@ static int ffmpegdrv_open_audio(AVFormatContext *oc, AVStream *st)
+     }
+ 
+     audio_is_open = 1;
+#ifdef AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+    if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) {
+#else
+     if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) {
+#endif
+         audio_inbuf_samples = 10000;
+     } else {
+         audio_inbuf_samples = c->frame_size;
+@@ -454,7 +458,11 @@ static int ffmpegmovie_init_audio(int speed, int channels, soundmovie_buffer_t *
+ 
+     /* Some formats want stream headers to be separate. */
+     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER)
+#ifdef AV_CODEC_FLAG_GLOBAL_HEADER
+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
+         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
+ 
+     /* create resampler context */
+ #ifndef HAVE_FFMPEG_AVRESAMPLE
+@@ -787,7 +795,11 @@ static void ffmpegdrv_init_video(screenshot_t *screenshot)
+ 
+     /* Some formats want stream headers to be separate. */
+     if (ffmpegdrv_oc->oformat->flags & AVFMT_GLOBALHEADER) {
+#ifdef AV_CODEC_FLAG_GLOBAL_HEADER
+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
+         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
+     }
+ 
+     if (audio_init_done) {
+@@ -967,6 +979,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
+ 
+     video_st.frame->pts = video_st.next_pts++;
+ 
+#ifdef AVFMT_RAWPICTURE
+     if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
+         AVPacket pkt;
+         VICE_P_AV_INIT_PACKET(&pkt);
+@@ -978,6 +991,7 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
+ 
+         ret = VICE_P_AV_INTERLEAVED_WRITE_FRAME(ffmpegdrv_oc, &pkt);
+     } else {
+#endif
+         AVPacket pkt = { 0 };
+         int got_packet;
+ 
+@@ -998,7 +1012,9 @@ static int ffmpegdrv_record(screenshot_t *screenshot)
+         } else {
+             ret = 0;
+         }
+#ifdef AVFMT_RAWPICTURE
+     }
+#endif
+     if (ret < 0) {
+         log_debug("Error while writing video frame");
+         return -1;
+-- 
+2.14.3
+
--- a/recipes-emulators/vice/vice-3.2/0003-Set-fixed-VICEDIR.patch
+++ b/recipes-emulators/vice/vice-3.2/0003-Set-fixed-VICEDIR.patch
@@ -0,0 +1,30 @@
+From f4fa367ab6e79cbfd77254237335f383311006ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 9 Feb 2019 22:16:52 +0100
+Subject: [PATCH] Set fixed VICEDIR
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index c5139fd..402e893 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -5010,6 +5010,7 @@ case "$host_os" in
+     AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
+     ;;  
+ esac
+VICEDIR="$libdir/vice"
+ AC_SUBST(VICEDIR)
+ AC_DEFINE_UNQUOTED(VICEDIR, "$VICEDIR",
+ 		   [Where should we lookup for data files?])
+-- 
+2.20.1
+
--- a/recipes-emulators/vice/vice-3.2_3.2.bb
+++ b/recipes-emulators/vice/vice-3.2_3.2.bb
@@ -0,0 +1,73 @@
+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/
+
+BPN = "vice"
+
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
+    file://0001-fix-autoreconfig.patch \
+    file://0002-Hack-build-with-latest-FFMPEG.patch \
+    file://0003-Set-fixed-VICEDIR.patch \
+    file://c64_16.png \
+    file://c64_32.png \
+    file://c64_48.png \
+    file://vice_64.desktop \
+"
+SRC_URI[md5sum] = "58ba6b6653097898e059e0194615705a"
+SRC_URI[sha256sum] = "28d99f5e110720c97ef16d8dd4219cf9a67661d58819835d19378143697ba523"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+DEPENDS = " \
+    bdftopcf-native \
+    mkfontdir-native \
+    mkfontscale-native \
+    xa-native \
+    bison-native \
+    gtk+ \
+    libav \
+    libsdl \
+    libpng \
+    jpeg \
+    giflib \
+    libxxf86vm \
+    portaudio-v19 \
+    mpg123 \
+    virtual/libgl \
+    vte9 \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "gtkglext", "", d)} \
+"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
+PACKAGECONFIG[pulseaudio] = "--with-pulse,--without-pulse,pulseaudio,pulseaudio-server"
+
+EXTRA_OECONF = " \
+    --disable-option-checking \
+    --enable-external-ffmpeg \
+    --enable-parsid \
+    --enable-fullscreen \
+    --enable-gnomeui \
+    --with-uithreads \
+    --without-oss \
+    --libdir=${libdir} \
+"
+
+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
+}
+
+FILES_${PN} += "${datadir}/icons"
+
+RREPLACES_${PN} += "vice"
+RCONFLICTS_${PN} += "vice"
--- a/recipes-emulators/vice/vice/0002-use-extern-for-the-declarations.patch
+++ b/recipes-emulators/vice/vice/0002-use-extern-for-the-declarations.patch
@@ -1,43 +0,0 @@
-From 7570ff1980acb288e11ae91221b89bfdc5b396d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 7 Sep 2020 21:06:16 +0200
-Subject: [PATCH] use extern for the declarations
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37520/]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/arch/gtk3/widgets/base/carthelpers.h | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/arch/gtk3/widgets/base/carthelpers.h b/src/arch/gtk3/widgets/base/carthelpers.h
-index 1de1d40..cfee67a 100644
--- a/src/arch/gtk3/widgets/base/carthelpers.h
-+++ b/src/arch/gtk3/widgets/base/carthelpers.h
-@@ -31,13 +31,13 @@
- #include "vice.h"
- #include <gtk/gtk.h>
- 
-int (*carthelpers_save_func)(int type, const char *filename);
-int (*carthelpers_flush_func)(int type);
-int (*carthelpers_is_enabled_func)(int type);
-int (*carthelpers_enable_func)(int type);
-int (*carthelpers_disable_func)(int type);
-int (*carthelpers_can_save_func)(int type);
-int (*carthelpers_can_flush_func)(int type);
-+extern int (*carthelpers_save_func)(int type, const char *filename);
-+extern int (*carthelpers_flush_func)(int type);
-+extern int (*carthelpers_is_enabled_func)(int type);
-+extern int (*carthelpers_enable_func)(int type);
-+extern int (*carthelpers_disable_func)(int type);
-+extern int (*carthelpers_can_save_func)(int type);
-+extern int (*carthelpers_can_flush_func)(int type);
- 
- 
- void carthelpers_set_functions(
-- 
-2.26.2
-
--- a/recipes-emulators/vice/vice/0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch
+++ b/recipes-emulators/vice/vice/0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch
@@ -1,46 +0,0 @@
-From 1936dac13d3019ecb2fc07fb7b61106f5164cac4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 7 Sep 2020 21:22:32 +0200
-Subject: [PATCH] two more fixes to fix -fno-common compiliation, patch #217
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37527/]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- src/c128/z80.c       | 3 ++-
- src/rs232drv/rs232.h | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/c128/z80.c b/src/c128/z80.c
-index 3a7eba3..f53f55d 100644
--- a/src/c128/z80.c
-+++ b/src/c128/z80.c
-@@ -444,7 +444,8 @@ static const uint8_t SZP[256] = {
- 
- /* ------------------------------------------------------------------------- */
- 
-z80_regs_t z80_regs;
-+/* This struct variable is exported by ../c64/cart/cpmcart.c */
-+/* z80_regs_t z80_regs; */
- 
- static void import_registers(void)
- {
-diff --git a/src/rs232drv/rs232.h b/src/rs232drv/rs232.h
-index 1c5e6ff..e21fbaf 100644
--- a/src/rs232drv/rs232.h
-+++ b/src/rs232drv/rs232.h
-@@ -78,7 +78,7 @@ extern int rs232_cmdline_options_init(void);
- #define RS232_NUM_DEVICES 4
- 
- extern char *rs232_devfile[RS232_NUM_DEVICES];
-int rs232_useip232[RS232_NUM_DEVICES];
-+extern int rs232_useip232[RS232_NUM_DEVICES];
- 
- /* the "ip232" protocol used by tcpser 
-  
-- 
-2.26.2
-
--- a/recipes-emulators/vice/vice/vice_64.desktop
+++ b/recipes-emulators/vice/vice/vice_64.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=X64-old (Vice)
-Comment=Commodore 64 Emulator (performing best currently)
-Exec=x64
-Icon=c64
-Terminal=false
-StartupNotify=false
-Categories=Game
--- a/recipes-emulators/vice/vice/vice_64dtv.desktop
+++ b/recipes-emulators/vice/vice/vice_64dtv.desktop
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=X64dtv (Vice)
-Comment=Commodore 64 Emulator
-Exec=x64dtv
-Icon=c64
-Terminal=false
-StartupNotify=false
-Categories=Game
-Name[en_US]=vice_64dtv
--- a/recipes-emulators/vice/vice_3.3.bb
+++ b/recipes-emulators/vice/vice_3.3.bb
@@ -9,21 +9,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 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"
+SRC_URI[md5sum] = "b0797f534b33f638220418207d606cf5"
+SRC_URI[sha256sum] = "1a55b38cc988165b077808c07c52a779d181270b28c14b5c9abf4e569137431d"

-inherit autotools pkgconfig gtk-icon-cache features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl x11"
+inherit autotools pkgconfig gtk-icon-cache

 DEPENDS = " \
    glib-2.0-native \
@@ -32,7 +26,6 @@ DEPENDS = " \
    mkfontscale-native \
    xa-native \
    bison-native \
-    glew \
    gtk+3 \
    libav \
    libsdl \
@@ -50,28 +43,21 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
 PACKAGECONFIG[pulseaudio] = "--with-pulse,--without-pulse,pulseaudio,pulseaudio-server"

 EXTRA_OECONF = " \
+    --disable-option-checking \
    --enable-external-ffmpeg \
    --enable-parsid \
-    --enable-native-gtk3ui \
+    --enable-fullscreen \
+    --enable-gnomeui \
+    --with-uithreads \
    --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
+    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
--- a/recipes-emulators/z80/cass80.bb
+++ b/recipes-emulators/z80/cass80.bb
@@ -1,21 +0,0 @@
-DESCRIPTION = "Cas juggler"
-AUTHOR = "Jürgen Buchmüller"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9fa70e05c591cf3ab4016b22aab701df"
-
-SRC_URI = "git://github.com/pullmoll/cass80.git"
-SRCREV= "372455830343e5c8ebd42125cfe13191f976c343"
-PV = "0.0.0+git${SRCPV}"
-S = "${WORKDIR}/git"
-
-inherit qmake5
-
-DEPENDS = "qtbase"
-
-do_install_append() {
-    install -d ${D}${bindir}
-    mv ${D}/opt/cass80/bin/cass80 ${D}${bindir}
-    rm -r ${D}/opt
-}
-
-
--- a/recipes-emulators/z80/z80_git.bb
+++ b/recipes-emulators/z80/z80_git.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
    file://trs80.desktop \
 "

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

 inherit pkgconfig
--- a/recipes-games/doomretro/doomretro.bb
+++ b/recipes-games/doomretro/doomretro.bb
@@ -1,26 +0,0 @@
-SUMMARY = "The classic, refined DOOM source port"
-HOMEPAGE = "https://www.doomretro.com" 
-
-LICENSE = "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
-}
--- a/recipes-games/doomretro/doomretro/doomretro.desktop
+++ b/recipes-games/doomretro/doomretro/doomretro.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Doomretro
-Comment=The classic, refined DOOM source port
-Exec=doomretro
-Icon=doomretro
-Terminal=false
-StartupNotify=false
-Categories=Game
--- a/recipes-games/doomretro/doomretro/doomretro.png
+++ b/recipes-games/doomretro/doomretro/doomretro.png
--- a/recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch
+++ b/recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch
@@ -1,37 +0,0 @@
-From a9bdc7d166851eb032af187b5873f2e74b6deaaa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sat, 8 May 2021 16:23:08 +0200
-Subject: [PATCH] Hack build with gcc11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| common/2d/canvas.cpp:58:19: error: '<unknown>' may be used uninitialized [-Werror=maybe-uninitialized]
-|    58 |     gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
-|       |     ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- common/2d/canvas.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/common/2d/canvas.cpp b/common/2d/canvas.cpp
-index b32b31902..c47aa3ce1 100644
--- a/common/2d/canvas.cpp
-+++ b/common/2d/canvas.cpp
-@@ -55,7 +55,10 @@ void gr_init_canvas(grs_canvas &canv, unsigned char *const pixdata, const bm_mod
- 	canv.cv_font_fg_color = 0;
- 	canv.cv_font_bg_color = 0;
- 	auto wreal = w;
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- 	gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
-+#pragma GCC diagnostic pop	
- }
- 
- void gr_init_sub_canvas(grs_canvas &n, grs_canvas &src, uint16_t x, uint16_t y, uint16_t w, uint16_t h)
-- 
-2.30.2
-
--- a/recipes-games/dxx-rebirth/d1x-rebirth_git.bb
+++ b/recipes-games/dxx-rebirth/d1x-rebirth_git.bb
@@ -10,7 +10,6 @@ DEPENDS = " \
    python3-scons-native \
    libsdl \
    libsdl-mixer \
-    libsdl-image \
    physfs \
    libpng \
 "
@@ -20,9 +19,8 @@ SRC_URI = " \
    http://www.dxx-rebirth.com/download/dxx/content/descent-mac-demo.zip;name=data \
    http://www.descent2.de/files/sound/hires-sounds.7z;name=sound \
    http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa;name=music;unpack=0 \
-    file://0001-Hack-build-with-gcc11.patch \
 "
-SRCREV = "48589d0fb019eb971818c15665358e30fa778dc4"
+SRCREV = "211a172c1dc5f939a3ed387bea57b1d0ee679192"
 PV = "v0.59+git${SRCPV}"
 S = "${WORKDIR}/git"

@@ -36,7 +34,7 @@ SRC_URI[music.sha256sum] = "b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745
 do_unpack[depends] += "p7zip-native:do_populate_sysroot"

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

 do_install() {
--- a/recipes-games/opentyrian/files/0001-Makefile-use-pkgconfig-to-find-sdl.patch
+++ b/recipes-games/opentyrian/files/0001-Makefile-use-pkgconfig-to-find-sdl.patch
@@ -0,0 +1,42 @@
+From de64bf5798755f4ea24cc1b8f1d6197b8a0fc7c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 16 Aug 2015 15:43:44 +0200
+Subject: [PATCH 1/2] Makefile: use pkgconfig to find sdl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [Configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ Makefile | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 88a8bd6..63c2983 100644
+--- a/Makefile
+++ b/Makefile
+@@ -14,8 +14,6 @@ WITH_NETWORK := true
+ 
+ STRIP := strip
+ 
+-SDL_CONFIG := sdl-config
+-
+ SRCS := $(wildcard src/*.c)
+ OBJS := $(SRCS:src/%.c=obj/%.o)
+ 
+@@ -39,8 +37,8 @@ endif
+ 
+ EXTRA_LDLIBS += -lm
+ 
+-SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
+-SDL_LDLIBS := $(shell $(SDL_CONFIG) --libs)
+SDL_CFLAGS := $(shell pkg-config --cflags sdl)
+SDL_LDLIBS := $(shell pkg-config --libs sdl)
+ ifeq ($(WITH_NETWORK), true)
+     SDL_LDLIBS += -lSDL_net
+ endif
+-- 
+2.1.0
+
--- a/recipes-games/opentyrian/files/0002-Fix-several-uninitialized-variable-warnings.patch
+++ b/recipes-games/opentyrian/files/0002-Fix-several-uninitialized-variable-warnings.patch
@@ -0,0 +1,63 @@
+From 7e1c9fb3c30d12139ad531b6b14c53fb5764b24c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 16 Aug 2015 16:04:41 +0200
+Subject: [PATCH 2/2] Fix several uninitialized variable warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://bitbucket.org/opentyrian/opentyrian/commits/03cdbc8922f7856378f2e4b51f9adb5073f6fc9e/raw/
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/mainint.c | 2 +-
+ src/shots.c   | 2 +-
+ src/tyrian2.c | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/mainint.c b/src/mainint.c
+index 2805752..b00074e 100644
+--- a/src/mainint.c
+++ b/src/mainint.c
+@@ -3635,7 +3635,7 @@ redo:
+ 				blit_sprite2x2(VGAScreen, this_player->x - 17, this_player->y - 7, *shapes9ptr_, 220);
+ 				blit_sprite2x2(VGAScreen, this_player->x + 7, this_player->y - 7, *shapes9ptr_, 222);
+ 
+-				int ship_banking;
+				int ship_banking = 0;
+ 				switch (ship_sprite)
+ 				{
+ 				case 5:
+diff --git a/src/shots.c b/src/shots.c
+index 606a19f..7aa6ac5 100644
+--- a/src/shots.c
+++ b/src/shots.c
+@@ -319,7 +319,7 @@ JE_integer player_shot_create( JE_word portNum, uint bay_i, JE_word PX, JE_word
+ 	if (weapon->sound > 0)
+ 		soundQueue[soundChannel[bay_i]] = weapon->sound;
+ 
+-	int shot_id;
+	int shot_id = MAX_PWEAPON;
+ 	/*Rot*/
+ 	for (int multi_i = 1; multi_i <= weapon->multi; multi_i++)
+ 	{
+diff --git a/src/tyrian2.c b/src/tyrian2.c
+index 3a0a101..4d528cf 100644
+--- a/src/tyrian2.c
+++ b/src/tyrian2.c
+@@ -4325,8 +4325,8 @@ void JE_eventSystem( void )
+ 
+ 	case 19: /* Enemy Global Move */
+ 	{
+-		int initial_i, max_i;
+-		bool all_enemies;
+		int initial_i = 0, max_i = 0;
+		bool all_enemies = false;
+ 
+ 		if (eventRec[eventLoc-1].eventdat3 > 79 && eventRec[eventLoc-1].eventdat3 < 90)
+ 		{
+-- 
+2.1.0
+
--- a/recipes-games/opentyrian/files/0003-fix-build-with-pedantic-gcc6.patch
+++ b/recipes-games/opentyrian/files/0003-fix-build-with-pedantic-gcc6.patch
@@ -0,0 +1,28 @@
+From 95788b1b09b0bd8e89cc3c7e5ed769ae3e87ac34 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 31 Jul 2016 04:02:51 +0200
+Subject: [PATCH] fix build with pedantic gcc6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/joystick.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/joystick.c b/src/joystick.c
+index 63dd75d..bf99647 100644
+--- a/src/joystick.c
+++ b/src/joystick.c
+@@ -42,7 +42,6 @@ bool ignore_joystick = false;
+ int joysticks = 0;
+ Joystick *joystick = NULL;
+ 
+-static const char joystick_cfg_version = 1;
+ static const int joystick_analog_max = 32767;
+ 
+ // eliminates axis movement below the threshold
+-- 
+2.5.5
+
--- a/recipes-games/opentyrian/opentyrian/0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch
+++ b/recipes-games/opentyrian/opentyrian/0001-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch
--- a/recipes-games/opentyrian/opentyrian/0002-fix-build-with-gcc8.patch
+++ b/recipes-games/opentyrian/opentyrian/0002-fix-build-with-gcc8.patch
@@ -53,6 +53,21 @@ diff --git a/src/tyrian2.c b/src/tyrian2.c
 index 4d528cf..411d8b6 100644
 --- a/src/tyrian2.c
 +++ b/src/tyrian2.c
+@@ -2088,12 +2088,12 @@ draw_player_shot_loop_end:
+ 	if (debug)
+ 	{
+ 		strcpy(tempStr, "");
+-		for (temp = 0; temp < 9; temp++)
+		/*for (temp = 0; temp < 9; temp++)
+ 		{
+ 			sprintf(tempStr, "%s%c", tempStr,  smoothies[temp] + 48);
+ 		}
+ 		sprintf(buffer, "SM = %s", tempStr);
+-		JE_outText(VGAScreen, 30, 70, buffer, 4, 0);
+		JE_outText(VGAScreen, 30, 70, buffer, 4, 0);*/
+ 
+ 		sprintf(buffer, "Memory left = %d", -1);
+ 		JE_outText(VGAScreen, 30, 80, buffer, 4, 0);
@@ -2608,7 +2608,7 @@ new_game:
 							read_encrypted_pascal_string(s, sizeof(s), ep_f);
 
--- a/recipes-games/opentyrian/files/0006-Fix-build-with-gcc-9.patch
+++ b/recipes-games/opentyrian/files/0006-Fix-build-with-gcc-9.patch
@@ -0,0 +1,64 @@
+From 28a0682bf3af1433ffdcd3c0458fdf4ebd5cc11a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 7 Jun 2019 21:49:17 +0200
+Subject: [PATCH] Fix build with gcc 9
+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/destruct.c         | 2 +-
+ src/game_menu.c        | 4 ++--
+ src/video_scale_hqNx.c | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/destruct.c b/src/destruct.c
+index 873c76b..1150ab5 100644
+--- a/src/destruct.c
+++ b/src/destruct.c
+@@ -2240,7 +2240,7 @@ static void DE_RunTickAI( void )
+ 			ptrUnit = ptrTarget->unit;
+ 			for (j = 0; j < config.max_installations; j++, ptrUnit++)
+ 			{
+-				if (abs(ptrUnit->unitX - ptrCurUnit->unitX) < 8)
+				if (abs(((Sint32)ptrUnit->unitX) - ((Sint32)ptrCurUnit->unitX)) < 8)
+ 				{
+ 					/* I get it.  This makes helicoptors hover over
+ 					 * their enemies. */
+diff --git a/src/game_menu.c b/src/game_menu.c
+index 7d24ad7..438c247 100644
+--- a/src/game_menu.c
+++ b/src/game_menu.c
+@@ -1992,9 +1992,9 @@ void JE_updateNavScreen( void )
+ 	navX = navX + (newNavX - navX) / 2.0f;
+ 	navY = navY + (newNavY - navY) / 2.0f;
+ 
+-	if (abs(newNavX - navX) < 1)
+	if (fabs(newNavX - navX) < 1)
+ 		navX = newNavX;
+-	if (abs(newNavY - navY) < 1)
+	if (fabs(newNavY - navY) < 1)
+ 		navY = newNavY;
+ 
+ 	fill_rectangle_xy(VGAScreen, 314, 0, 319, 199, 230);
+diff --git a/src/video_scale_hqNx.c b/src/video_scale_hqNx.c
+index 51836e6..6c7b5a5 100644
+--- a/src/video_scale_hqNx.c
+++ b/src/video_scale_hqNx.c
+@@ -120,8 +120,8 @@ inline void interp10(Uint32 *pc, Uint32 c1, Uint32 c2, Uint32 c3)
+ 
+ inline bool diff(unsigned int w1, unsigned int w2)
+ {
+-	Uint32 YUV1 = yuv_palette[w1];
+-	Uint32 YUV2 = yuv_palette[w2];
+	Sint32 YUV1 = yuv_palette[w1];
+	Sint32 YUV2 = yuv_palette[w2];
+ 	return ( ( abs((YUV1 & Ymask) - (YUV2 & Ymask)) > trY ) ||
+ 	         ( abs((YUV1 & Umask) - (YUV2 & Umask)) > trU ) ||
+ 	         ( abs((YUV1 & Vmask) - (YUV2 & Vmask)) > trV ) );
+-- 
+2.20.1
+
--- a/recipes-games/opentyrian/opentyrian.bb
+++ b/recipes-games/opentyrian/opentyrian.bb
@@ -1,48 +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 = "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"
--- a/recipes-games/opentyrian/opentyrian_2.1.20130907.bb
+++ b/recipes-games/opentyrian/opentyrian_2.1.20130907.bb
@@ -0,0 +1,51 @@
+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 pkgconfig
+
+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 \
+    file://0004-increase-buffer-size-to-avoid-gcc7-format-overflow-e.patch \
+    file://0005-fix-build-with-gcc8.patch \
+    file://0006-Fix-build-with-gcc-9.patch \
+"
+SRC_URI[md5sum] = "978686c5a1dfbac69a2161aadf084c2b"
+SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"
+
+SRC_URI[data.md5sum] = "2a3b206a6de25ed4b771af073f8ca904"
+SRC_URI[data.sha256sum] = "7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
+
+CFLAGS += "-Wimplicit-fallthrough=0"
+
+do_install() {
+    install -d ${D}${bindir}
+    install ${BPN} ${D}${bindir}
+
+    install -d ${D}${mandir}/man6
+    install linux/man/${BPN}.6 ${D}${mandir}/man6
+
+    install -d ${D}${datadir}/applications
+    install linux/${BPN}.desktop ${D}${datadir}/applications
+
+    install -d ${D}${datadir}/pixmaps
+    install linux/icons/tyrian-128.png ${D}${datadir}/pixmaps/${BPN}.png
+
+    install -d ${D}${datadir}/${BPN}/data
+    install ${WORKDIR}/tyrian21/* ${D}${datadir}/${BPN}/data
+
+    # remove unneeded DOS stuff    
+    find ${D}${datadir}/${BPN}/data -name '*.exe' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name '*.ovl' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name 'setup.*' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name '*.doc' -exec rm -f {} \; 
+    find ${D}${datadir}/${BPN}/data -name '*.tfp' -exec rm -f {} \; 
+}
--- a/recipes-support/gtkglext/gtkglext_1.2.0.bb
+++ b/recipes-support/gtkglext/gtkglext_1.2.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2 | LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                    file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff"

-inherit gnomebase pkgconfig features_check
+inherit gnomebase pkgconfig distro_features_check

 REQUIRED_DISTRO_FEATURES = "x11 opengl"

--- a/recipes-support/xa/files/0001-Align-Makefiles-for-cross-compiling.patch
+++ b/recipes-support/xa/files/0001-Align-Makefiles-for-cross-compiling.patch
@@ -75,7 +75,7 @@ index 0cda4d6..5b9ead0 100644
 +	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
+ 	cd .. ; tar cvf xa-2.3.10.tar xa-2.3.10 ; gzip xa-2.3.10.tar
 diff --git a/misc/Makefile b/misc/Makefile
 index 2b450e0..6967dad 100644
 --- a/misc/Makefile
--- a/recipes-support/xa/xa_2.3.10.bb
+++ b/recipes-support/xa/xa_2.3.10.bb
@@ -9,8 +9,8 @@ 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"
+SRC_URI[md5sum] = "14265129071922dd964d89599775d13e"
+SRC_URI[sha256sum] = "867b5b26b6524be8bcfbad8820ab3efe422b3e0cc9775dcb743284778868ba78"

 BBCLASSEXTEND = "native"

--- a/recipes-wayland/cage/cage.bb
+++ b/recipes-wayland/cage/cage.bb
@@ -1,26 +0,0 @@
-SUMMARY = "Cage: a Wayland kiosk"
-HOMEPAGE = "https://www.hjdskes.nl/projects/cage/" 
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3d06ce025701c9a0b391f15902ce8ed" 
-
-DEPENDS = " \
-    wayland-native \
-    wayland \
-    wayland-protocols \
-    wlroots \
-    pixman \
-    libxkbcommon \
-"
-
-inherit meson 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"
-
--- a/recipes-wayland/sway/wlroots.bb
+++ b/recipes-wayland/sway/wlroots.bb
@@ -1,34 +0,0 @@
-SUMMARY = "Modules for building a Wayland compositor"
-HOMEPAGE = "https://github.com/swaywm/wlroots" 
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" 
-
-DEPENDS = " \
-    wayland-native \
-    wayland \
-    wayland-protocols \
-    virtual/egl \
-    virtual/libgles2 \
-    libdrm \
-    virtual/libgbm \
-    libinput \
-    libxkbcommon \
-    udev \
-    pixman \
-"
-
-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"
--- a/recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch
+++ b/recipes-wayland/sway/wlroots/0001-Adjust-meson.build-to-meson-0.54.patch
@@ -1,43 +0,0 @@
-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
-
Author	SHA1	Message	Date
Andreas Müller	58c33155c2	xa: upgrade 2.3.9 -> 2.3.10 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2019-12-10 12:40:32 +01:00
Andreas Müller	1f264a0a19	xa: Fix source download by adding mirror Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2019-12-10 10:42:58 +01:00