dosbox-staging: Avoid file clashes in do_rootfs with dosbox

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
meta-retro-world: Initial add
2021-07-28 20:11:06 +02:00 · 2021-07-28 15:35:32 +02:00 · 2021-07-28 15:16:54 +02:00 · 2021-07-28 15:08:40 +02:00 · 2021-07-28 13:06:34 +02:00 · 2021-07-28 13:05:20 +02:00
19 changed files with 189 additions and 496 deletions
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ Policies
 * **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-retro/issues).
 * Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
  * Use 4 spaces for indentation always (shell and python code)
-  * For splitting of long list values use four-space indentation on 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.
+  * For splitting of long list values use four-space indentation on successive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
+  * Pull-requests with patches fixing issues for musl, clang or gold-linker are accepted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.


 Maintainers
--- a/recipes-emulators/dosbox/dosbox-staging.bb
+++ b/recipes-emulators/dosbox/dosbox-staging.bb
@@ -0,0 +1,51 @@
+SUMMARY = "DOS/x86 emulator focusing on ease of use"
+HOMEPAGE = "https://dosbox-staging.github.io/" 
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a75e9ff85f9de2c690521c2b6ddd26cf" 
+
+DEPENDS = " \
+    libsdl2 \
+    libsdl2-net \
+    libpcap \
+    libxkbfile \
+    libpng \
+    alsa-lib \
+    fluidsynth \
+    opusfile \
+    munt \
+"
+
+inherit meson gtk-icon-cache features_check
+
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
+
+SRC_URI = " \
+    git://github.com/dosbox-staging/dosbox-staging.git \
+    file://0001-Fix-missing-include.patch \
+"
+SRCREV = "15a57e26c4d1123606a7ac455d2ccbce15e976b9"
+PV = "0.77.0"
+S = "${WORKDIR}/git"
+
+DYNCORE ?= "-Ddynamic_core=dynrec"
+
+EXTRA_OEMESON = " \
+    -Duse_pcap=true \
+    ${DYNCORE} \
+"
+
+do_install_append() {
+    # avoid clashes
+    mv ${D}${bindir}/dosbox ${D}${bindir}/dosbox-staging
+    sed -i 's:Exec=dosbox:Exec=dosbox-staging:g' ${D}${datadir}/applications/dosbox-staging.desktop
+}
+
+# sorry - but it does not make sense
+COMPATIBLE_HOST_armv4 = 'null'
+COMPATIBLE_HOST_armv5 = 'null'
+COMPATIBLE_HOST_armv6 = 'null'
+
+FILES_${PN} += "${datadir}/metainfo"
+FILES_${PN}-doc += "${datadir}/licenses"
+
--- a/recipes-emulators/dosbox/dosbox-staging/0001-Fix-missing-include.patch
+++ b/recipes-emulators/dosbox/dosbox-staging/0001-Fix-missing-include.patch
@@ -0,0 +1,25 @@
+From 5b23877f74f9cbfc8a6442e19c672ba91229f923 Mon Sep 17 00:00:00 2001
+From: Dan Church <amphetamachine@gmail.com>
+Date: Thu, 8 Jul 2021 16:15:37 -0500
+Subject: [PATCH] Fix missing include
+
+Upstream-Status: Accepted[https://github.com/dosbox-staging/dosbox-staging/commit/5b23877f74f9cbfc8a6442e19c672ba91229f923]
+---
+ src/hardware/ne2000.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/hardware/ne2000.cpp b/src/hardware/ne2000.cpp
+index 7b4dcec4..3f68fe79 100644
+--- a/src/hardware/ne2000.cpp
+++ b/src/hardware/ne2000.cpp
+@@ -26,6 +26,7 @@
+ 
+ #if C_NE2000
+ 
+#include <cstdarg>
+ #include <cstdio>
+ #include <cstring>
+ 
+-- 
+2.31.1
+
--- a/recipes-emulators/dosbox/dosbox-x.bb
+++ b/recipes-emulators/dosbox/dosbox-x.bb
@@ -23,8 +23,8 @@ SRC_URI = " \
    file://0001-use-pkgconfig-to-find-sdl2.patch \
    file://0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch \
 "
-SRCREV = "54e9600993656635357a6886efe4a42ded07f11e"
-PV = "0.83.11"
+SRCREV = "0605e1c0f908ba89685b19ea567753be18478ccc"
+PV = "0.83.15"
 S = "${WORKDIR}/git"

 EXTRA_OECONF = " \
--- a/recipes-emulators/mame/mame.bb
+++ b/recipes-emulators/mame/mame.bb
@@ -9,8 +9,8 @@ SRC_URI = " \
    file://mame.desktop \
    file://mame32k.desktop \
 "
-PV = "0231"
-SRCREV = "1f2211366135e116c4a92aa2f49b9b81184a8726"
+PV = "0234"
+SRCREV = "2633c19a68fbe5c3c47750b4ac83992545e7e733"
 S = "${WORKDIR}/git"

 inherit siteinfo gtk-icon-cache
--- a/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch
+++ b/recipes-emulators/stella/stella/0001-custtomize-configure-and-Makefile-to-our-needs.patch
@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 7 insertions(+), 5 deletions(-)

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

 CLEANBROKEN = "1"
--- a/recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch
+++ b/recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch
@@ -0,0 +1,37 @@
+From a9bdc7d166851eb032af187b5873f2e74b6deaaa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 8 May 2021 16:23:08 +0200
+Subject: [PATCH] Hack build with gcc11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| common/2d/canvas.cpp:58:19: error: '<unknown>' may be used uninitialized [-Werror=maybe-uninitialized]
+|    58 |     gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
+|       |     ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ common/2d/canvas.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/common/2d/canvas.cpp b/common/2d/canvas.cpp
+index b32b31902..c47aa3ce1 100644
+--- a/common/2d/canvas.cpp
+++ b/common/2d/canvas.cpp
+@@ -55,7 +55,10 @@ void gr_init_canvas(grs_canvas &canv, unsigned char *const pixdata, const bm_mod
+ 	canv.cv_font_fg_color = 0;
+ 	canv.cv_font_bg_color = 0;
+ 	auto wreal = w;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ 	gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
+#pragma GCC diagnostic pop	
+ }
+ 
+ void gr_init_sub_canvas(grs_canvas &n, grs_canvas &src, uint16_t x, uint16_t y, uint16_t w, uint16_t h)
+-- 
+2.30.2
+
--- a/recipes-games/dxx-rebirth/d1x-rebirth/0001-clipper.cpp-Fix-build-with-gcc10.patch
+++ b/recipes-games/dxx-rebirth/d1x-rebirth/0001-clipper.cpp-Fix-build-with-gcc10.patch
@@ -1,32 +0,0 @@
-From 14d6a8f0f48b7e6d134389581d5ba5dbaa288258 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 9 Jun 2020 18:44:54 +0200
-Subject: [PATCH] clipper.cpp: Fix build with gcc10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| common/3d/clipper.cpp:29:14: error: 'out_of_range' is not a member of 'std'
-
-Upstream-Status: Submitted[https://github.com/dxx-rebirth/dxx-rebirth/pull/512]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- common/3d/clipper.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/common/3d/clipper.cpp b/common/3d/clipper.cpp
-index 111514c9e..188885e18 100644
--- a/common/3d/clipper.cpp
-+++ b/common/3d/clipper.cpp
-@@ -11,6 +11,7 @@
- #include "dxxerror.h"
- 
- #include "compiler-range_for.h"
-+#include <stdexcept>
- 
- namespace dcx {
- 
-- 
-2.26.2
-
--- a/recipes-games/dxx-rebirth/d1x-rebirth_git.bb
+++ b/recipes-games/dxx-rebirth/d1x-rebirth_git.bb
@@ -20,9 +20,9 @@ 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-clipper.cpp-Fix-build-with-gcc10.patch \
+    file://0001-Hack-build-with-gcc11.patch \
 "
-SRCREV = "6212b914cb2dfb78e1fc4dcbc574b9b1d329783b"
+SRCREV = "48589d0fb019eb971818c15665358e30fa778dc4"
 PV = "v0.59+git${SRCPV}"
 S = "${WORKDIR}/git"

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

--- a/recipes-wayland/sway/wlroots.bb
+++ b/recipes-wayland/sway/wlroots.bb
@@ -22,7 +22,7 @@ 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[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xwayland"
 PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg"

 SRC_URI = " \
Author	SHA1	Message	Date
Andreas Müller	aa72123e12	dosbox-staging: Avoid file clashes in do_rootfs with dosbox Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-28 20:11:06 +02:00
Andreas Müller	68669c2c1b	meta-retro-world: Initial add Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-28 15:35:32 +02:00
Andreas Müller	37289dfccd	dosbox-staging: initial add 0.77.0 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-28 15:16:54 +02:00
Andreas Müller	c927bbb699	munt: Initial add 2.5.0 It is a dependency for upcoming dosbox-staging Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-28 15:08:40 +02:00
Andreas Müller	0ff9ba3a8e	pangox-compat: remove it is not used any more Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-28 13:06:34 +02:00
Andreas Müller	e2a6b5b492	gtkglext: remove it is not used any more Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-28 13:05:20 +02:00
Andreas Müller	98ea806374	mame: upgrade 0233 -> 0234 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-28 12:00:16 +02:00
Andreas Müller	f0755285e3	README.md: fix typo Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-16 23:54:58 +02:00
Andreas Müller	1de25643cf	stella: upgrade 6.1.2 -> 6.5.3 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-06 23:17:28 +02:00
Andreas Müller	362438cb49	dosbox-x: upgrade 0.83.14 -> 0.83.15 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-04 17:53:36 +02:00
Andreas Müller	663630c4ce	mame: upgrade 0232 -> 0233 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-07-04 17:48:34 +02:00
Andreas Müller	521bca485e	dosbox-x: upgrade 0.83.13 -> 0.83.14 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-06-03 17:52:12 +02:00
Andreas Müller	3a3f8188c9	mame: upgrade 0231 -> 0232 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-05-28 23:10:44 +02:00
Andreas Müller	7f96da9298	d1x-rebirth: various enhancements * upgrade to latest * fix build with gcc11 * enable parallel make Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-05-08 16:32:10 +02:00
Andreas Müller	1a762aa0fc	dosbox-x: upgrade 0.83.11 -> 0.83.13 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-05-02 20:30:31 +02:00
Andreas Müller	17ea76c314	recipes-wayland: replace xserver-xorg-xwayland by standalone xwayland Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>	2021-05-02 17:42:05 +02:00