z80: move to sdl2

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

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

@@ -0,0 +1,39 @@
+From b3db2aa6b762711015f2d504006b44e698a4de0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 31 Jul 2016 01:36:52 +0200
+Subject: [PATCH] bx/float4_neon.h: Remove neon_reinterpret, use casts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See gcc6;
+
+commit da08cb5504f0b791ada8889b16620055672999b8
+Author: alalaw01 <alalaw01@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Thu Feb 4 14:49:02 2016 +0000
+
+    [ARM] Remove neon_reinterpret, use casts
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ 3rdparty/bx/include/bx/float4_neon.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/3rdparty/bx/include/bx/float4_neon.h b/3rdparty/bx/include/bx/float4_neon.h
+index c3545d0..811c4ff 100644
+--- a/3rdparty/bx/include/bx/float4_neon.h
++++ b/3rdparty/bx/include/bx/float4_neon.h
+@@ -6,6 +6,10 @@
+ #ifndef BX_FLOAT4_NEON_H_HEADER_GUARD
+ #define BX_FLOAT4_NEON_H_HEADER_GUARD
+ 
++/* gcc6 hacks */
++#define __builtin_neon_vreinterpretv4sfv4si(a) ((float4_t)a)
++#define __builtin_neon_vreinterpretv4siv4sf(a) ((_i32x4_t)a)
++
+ namespace bx
+ {
+ 	typedef __builtin_neon_sf  float4_t __attribute__( (__vector_size__(16) ) );
+-- 
+2.5.5
+

recipes-emulators/mame/mame_0176.bb

@@ -8,9 +8,10 @@ SRC_URI = " \
     https://github.com/mamedev/mame/archive/${BPN}${PV}.tar.gz \
     file://0001-use-pkg-config-for-finding-sdl-library-settings.patch \
     file://0002-float4_neon.h-refactor-buildins-for-later-gcc-s.patch \
+    file://0003-bx-float4_neon.h-Remove-neon_reinterpret-use-casts.patch \
 "
-SRC_URI[md5sum] = "299b77d7be7e303c8bfc71237fcf84b2"
-SRC_URI[sha256sum] = "249dc43d27f435b47e6bd30754eaa2b52253da37aa04498cb9cc6df5c2041cfa"
+SRC_URI[md5sum] = "b2aed655e1ea2bccf26bf96f189257ba"
+SRC_URI[sha256sum] = "e8837ae9c21ac6ca289c0214747a6d7ff7cc4683b9426377f42cda318fddcb25"
 
 S = "${WORKDIR}/${BPN}-${BPN}${PV}"
 

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

@@ -8,46 +8,58 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
- src/gfxoutputdrv/gifdrv.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ src/gfxoutputdrv/gifdrv.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
 
 diff --git a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
-index 7f7f3bc..5056b55 100644
+index 7f7f3bc..725e1f0 100644
 --- a/src/gfxoutputdrv/gifdrv.c
 +++ b/src/gfxoutputdrv/gifdrv.c
-@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *screenshot, const char *filename)
+@@ -114,7 +114,11 @@ static int gifdrv_open(screenshot_t *screenshot, const char *filename)
    if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
        EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
    {
--    EGifCloseFile(sdata->fd);
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
 +    EGifCloseFile(sdata->fd, 0);
++#else
+     EGifCloseFile(sdata->fd);
++#endif
      VICE_FreeMapObject(gif_colors);
      lib_free(sdata->data);
      lib_free(sdata->ext_filename);
-@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *screenshot)
+@@ -145,7 +149,11 @@ static int gifdrv_close(screenshot_t *screenshot)
  
      sdata = screenshot->gfxoutputdrv_data;
  
--    EGifCloseFile(sdata->fd);
++ #if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
 +    EGifCloseFile(sdata->fd, 0);
++#else
+     EGifCloseFile(sdata->fd);
++#endif
      VICE_FreeMapObject(gif_colors);
  
      /* for some reason giflib will create a file with unexpected
-@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
+@@ -184,7 +192,11 @@ static char *gifdrv_memmap_ext_filename;
  
  static int gifdrv_close_memmap(void)
  {
--  EGifCloseFile(gifdrv_memmap_fd);
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
 +  EGifCloseFile(gifdrv_memmap_fd, 0);
++#else
+   EGifCloseFile(gifdrv_memmap_fd);
++#endif
    VICE_FreeMapObject(gif_colors);
    lib_free(gifdrv_memmap_ext_filename);
  
-@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE
+@@ -231,7 +243,11 @@ static int gifdrv_open_memmap(const char *filename, int x_size, int y_size, BYTE
    if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
        EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
    {
--    EGifCloseFile(gifdrv_memmap_fd);
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
 +    EGifCloseFile(gifdrv_memmap_fd, 0);
++#else
+     EGifCloseFile(gifdrv_memmap_fd);
++#endif
      VICE_FreeMapObject(gif_colors);
      lib_free(gifdrv_memmap_ext_filename);
      return -1;

recipes-emulators/z80/files/0001-use-pkg-config-to-find-sdl.patch

@@ -1,7 +1,7 @@
 From c12487107cc52aa13841533fd151362e37f37ff6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Fri, 13 Mar 2015 01:40:33 +0100
-Subject: [PATCH] use pkg-config to find sdl
+Subject: [PATCH] use pkg-config to find sdl2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,20 +12,20 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index de4782b..0dfc7ce 100644
+index 1144f9b..9bfef24 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -27,8 +27,8 @@ LIBS:=		-L/usr/lib -lz
- CFLAGS+=	-DDEBUG=$(DEBUG)
+@@ -27,8 +27,8 @@ LIBS:=		-lz
+ #CFLAGS+=	-DDEBUG=$(DEBUG)
  
  # SDL libraries and cflags
--SDL_LIB:=	$(shell sdl-config --libs)
--SDL_INC:=	$(shell sdl-config --cflags)
-+SDL_LIB:=	$(shell pkg-config --libs sdl)
-+SDL_INC:=	$(shell pkg-config --cflags sdl)
+-SDL_LIB:=	$(shell sdl2-config --libs)
+-SDL_INC:=	$(shell sdl2-config --cflags)
++SDL_LIB:=	$(shell pkg-config --libs sdl2)
++SDL_INC:=	$(shell pkg-config --cflags sdl2)
  
  # Expat libraries and cflags
  EXPAT_LIB:=	-L/usr/pkg/lib -lexpat
 -- 
-1.9.3
+2.5.5
 

recipes-emulators/z80/z80_git.bb

@@ -5,26 +5,26 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 SRC_URI = " \
-    git://github.com/schnitzeltony/z80.git;branch=master \
+    git://github.com/schnitzeltony/z80.git;branch=sdl2 \
     file://0001-use-pkg-config-to-find-sdl.patch \
     file://cgenie.desktop \
     file://trs80.desktop \
 "
 
-SRCREV= "413ca44336c4423ac0e39b55d75fce95ff4c31fc"
+SRCREV= "ec721e4a7f06f22a67e1a9c48f4d681143852e42"
 PV = "0.3.1+git${SRCPV}"
 
 inherit pkgconfig
 
-DEPENDS = "expat libsdl"
+DEPENDS = "expat libsdl2"
 
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 do_compile() {
-	SDL_INC=$(pkg-config --cflags sdl)
-	SDL_LIB=$(pkg-config --libs sdl)
+	SDL_INC=$(pkg-config --cflags sdl2)
+	SDL_LIB=$(pkg-config --libs sdl2)
 	EXPAT_LIB=$(pkg-config --libs expat)
 
 	mkdir -p ${S}/obj/trs80

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
+

recipes-games/opentyrian/opentyrian_2.1.20130907.bb

@@ -13,6 +13,7 @@ SRC_URI = " \
     http://camanis.net/opentyrian/tyrian21.zip;name=data \
     file://0001-Makefile-use-pkgconfig-to-find-sdl.patch \
     file://0002-Fix-several-uninitialized-variable-warnings.patch \
+    file://0003-fix-build-with-pedantic-gcc6.patch \
 "
 SRC_URI[md5sum] = "978686c5a1dfbac69a2161aadf084c2b"
 SRC_URI[sha256sum] = "f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f"