xa: upgrade 2.3.9 -> 2.3.10

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

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 = "thud warrior"
+LAYERSERIES_COMPAT_meta-retro = "thud warrior zeus"

recipes-emulators/mame/mame.bb

@@ -9,8 +9,8 @@ SRC_URI = " \
     file://no-upstream/0001-pokey-Make-step_one_clock-inline.patch \
     file://mame.desktop \
 "
-PV = "0212"
-SRCREV = "1182bd9325bd3381cc94cce6d7d9a1b510ed6ae4"
+PV = "0215"
+SRCREV = "e9ef4808dd1fe9e5d3c26bc0c1144209503222ab"
 S = "${WORKDIR}/git"
 
 inherit siteinfo gtk-icon-cache

recipes-emulators/vice/vice-3.2_3.2.bb

@@ -6,6 +6,8 @@ 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 \
@@ -66,3 +68,6 @@ do_install_append() {
 }
 
 FILES_${PN} += "${datadir}/icons"
+
+RREPLACES_${PN} += "vice"
+RCONFLICTS_${PN} += "vice"

recipes-emulators/vice/vice_3.3.bb

@@ -0,0 +1,71 @@
+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://c64_16.png \
+    file://c64_32.png \
+    file://c64_48.png \
+    file://vice_64.desktop \
+"
+SRC_URI[md5sum] = "b0797f534b33f638220418207d606cf5"
+SRC_URI[sha256sum] = "1a55b38cc988165b077808c07c52a779d181270b28c14b5c9abf4e569137431d"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+DEPENDS = " \
+    glib-2.0-native \
+    bdftopcf-native \
+    mkfontdir-native \
+    mkfontscale-native \
+    xa-native \
+    bison-native \
+    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 = " \
+    --disable-option-checking \
+    --enable-external-ffmpeg \
+    --enable-parsid \
+    --enable-fullscreen \
+    --enable-gnomeui \
+    --with-uithreads \
+    --without-oss \
+    --libdir=${libdir} \
+"
+
+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-games/dxx-rebirth/d1x-rebirth_git.bb

@@ -2,18 +2,28 @@ 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 \
+    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 \
 "
-SRC_URI[md5sum] = "8f43e66191fdedd0c7ff9278719accf1"
-SRC_URI[sha256sum] = "5befc8a2ab1159fdb4d4141ba9f0e229450592d5ada209e832101da5b0b3e38e"
+SRCREV = "211a172c1dc5f939a3ed387bea57b1d0ee679192"
+PV = "v0.59+git${SRCPV}"
+S = "${WORKDIR}/git"
+
 SRC_URI[data.md5sum] = "010815be5d87d61150a938ad593102fe"
 SRC_URI[data.sha256sum] = "17d2fdefc06a96a50f54d4eba745835b619115e5327ddc3d23052bf4ec0e3300"
 SRC_URI[sound.md5sum] = "474fdf1c1f8d2bbbc68f271cb9aa28b8"
@@ -21,8 +31,6 @@ 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() {
@@ -31,16 +39,16 @@ do_compile() {
 
 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-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

@@ -6,5 +6,6 @@ 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/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.8A.tar xa-2.3.8 ; gzip xa-2.3.8A.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

recipes-support/xa/xa_2.3.10.bb

@@ -2,12 +2,15 @@ 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] = "884c3dc5bcc8e8f10b05a6907781623d"
-SRC_URI[sha256sum] = "3b97d2fe8891336676ca28ff127b69e997f0b5accf2c7009b4517496929b462a"
+SRC_URI[md5sum] = "14265129071922dd964d89599775d13e"
+SRC_URI[sha256sum] = "867b5b26b6524be8bcfbad8820ab3efe422b3e0cc9775dcb743284778868ba78"
 
 BBCLASSEXTEND = "native"