Merge pull request #2983 from CvH/9.0/mames

update mame cores

packages/emulation/libretro-mame2000/package.mk

@@ -2,16 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2000"
-PKG_VERSION="1083de2"
+PKG_VERSION="bd3833c41f6894ba1c5d2f3f35b29190658517a0"
-PKG_SHA256="9942b393d94ea0ddf2c24ee98e2c695cf2fa4217283c33522c9d0db8e219cfee"
+PKG_SHA256="99d25517612f28be117c8a68c581d152a4ea07355eaa7748584c2a84c70f04fb"
-PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2000-libretro"
 PKG_URL="https://github.com/libretro/mame2000-libretro/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="mame2000-libretro-$PKG_VERSION*"
+PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_TARGET="toolchain kodi-platform"
-PKG_SECTION="emulation"
-PKG_SHORTDESC="2000 version of MAME (0.37b5) for libretro"
 PKG_LONGDESC="2000 version of MAME (0.37b5) for libretro"
 
 PKG_LIBNAME="mame2000_libretro.so"

packages/emulation/libretro-mame2003/package.mk

@@ -2,16 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2003"
-PKG_VERSION="69163cc"
+PKG_VERSION="6ca3bdece6f5dac9fbf5be837c7a1a69d99b5bdd"
-PKG_SHA256="5c505590857319cfb7043883afa1965067bfa8387829ff6cbe462927f1262303"
+PKG_SHA256="b4e7badb774b3e80bda70bb825edeec0a9da99d25c7b3d2cf926d68b3922d437"
-PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2003-libretro"
 PKG_URL="https://github.com/libretro/mame2003-libretro/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="mame2003-libretro-$PKG_VERSION*"
+PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_TARGET="toolchain kodi-platform"
-PKG_SECTION="emulation"
-PKG_SHORTDESC="Late 2003 version of MAME (0.78) for libretro"
 PKG_LONGDESC="Late 2003 version of MAME (0.78) for libretro"
 
 PKG_LIBNAME="mame2003_libretro.so"

packages/emulation/libretro-mame2010/package.mk

@@ -2,16 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2010"
-PKG_VERSION="3a9d2ff"
+PKG_VERSION="70732f9137f6bb2bde4014746ea8bc613173dd1e"
-PKG_SHA256="e60cad55518281516778b943723b6d1ae4a17b096124f108dd27520862175f5b"
+PKG_SHA256="36ab11541233c9a4240baf6f0a529d8d335dce23f25b66b950e18373fd8e65fb"
-PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2010-libretro"
 PKG_URL="https://github.com/libretro/mame2010-libretro/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="mame2010-libretro-$PKG_VERSION*"
+PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_TARGET="toolchain kodi-platform"
-PKG_SECTION="emulation"
-PKG_SHORTDESC="Late 2010 version of MAME (0.139) for libretro"
 PKG_LONGDESC="Late 2010 version of MAME (0.139) for libretro"
 
 PKG_LIBNAME="mame2010_libretro.so"

packages/emulation/libretro-mame2010/patches/libretro-mame2010-0001_fix-cross-build.patch

@@ -1,7 +1,8 @@
-diff -Naur a/Makefile b/Makefile
+diff --git a/Makefile b/Makefile
---- a/Makefile	2016-01-14 22:42:59.000000000 +0100
+index deb8820..aa13d3b 100644
-+++ b/Makefile	2016-01-18 11:50:36.918881873 +0100
+--- a/Makefile
-@@ -60,7 +60,7 @@
++++ b/Makefile
+@@ -61,7 +61,7 @@ COBJFLAGS =
  CPPONLYFLAGS =
  # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
  # flags only used when linking the core emulator
@@ -9,9 +10,9 @@ diff -Naur a/Makefile b/Makefile
 +LDFLAGS ?=
  LDFLAGSEMULATOR =
  
- # uncomment next line to build expat as part of MAME build
+ GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
-@@ -90,24 +90,22 @@
+@@ -104,24 +104,22 @@ ifeq ($(VRENDER),opengl)
- 	CCOMFLAGS  += -DHAVE_GL
+ 	CCOMFLAGS  += -DHAVE_OPENGL
  endif
  
 -UNAME=$(shell uname -m)
@@ -40,7 +41,7 @@ diff -Naur a/Makefile b/Makefile
  BIGENDIAN=1
  endif
  
-@@ -124,14 +122,10 @@
+@@ -143,14 +141,10 @@ ifeq ($(VRENDER),opengl)
     LIBS += -lGL
  endif
  LDFLAGS += $(SHARED)
@@ -55,11 +56,11 @@ diff -Naur a/Makefile b/Makefile
 +   CC_AS ?= $(CC)
 +   CC ?= g++
 +   AR ?= @ar
-+   LD ?= g++ 
++   LD ?= g++
     CCOMFLAGS += $(PLATCFLAGS) -ffast-math  
     LIBS += -lstdc++ -lpthread 
  
-@@ -284,10 +278,13 @@
+@@ -345,10 +339,13 @@ else ifneq (,$(findstring rpi,$(platform)))
  
  # ARM
  else ifneq (,$(findstring armv,$(platform)))
@@ -72,10 +73,10 @@ diff -Naur a/Makefile b/Makefile
     fpic = -fPIC
 -   CC = g++
 +   CC ?= g++
- ifneq (,$(findstring cortexa8,$(platform)))
+    LDFLAGS +=  $(SHARED)
-    CFLAGS += -marm -mcpu=cortex-a8
+    ARM_ENABLED = 1
-    ASFLAGS += -mcpu=cortex-a8
+    X86_SH2DRC = 0
-@@ -505,7 +502,7 @@
+@@ -568,7 +565,7 @@ DEFS += -DFLAC__NO_DLL
  
  # CFLAGS is defined based on C or C++ targets
  # (remember, expansion only happens when used, so doing it here is ok)

packages/emulation/libretro-mame2014/package.mk

@@ -2,16 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libretro-mame2014"
-PKG_VERSION="49f55c1"
+PKG_VERSION="62a932c9435ef89fdb9a1b0c41deadd7f04f53f3"
-PKG_SHA256="c1f018dbbf8dcc43df66e4ad10431812981db1e3a794485c41799b2a43f8d834"
+PKG_SHA256="9b38e1c0d75bc4295d9c08288579f2bf58e55e97132308b65d92ca494e55fa67"
-PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame2014-libretro"
 PKG_URL="https://github.com/libretro/mame2014-libretro/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="mame2014-libretro-$PKG_VERSION*"
+PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_TARGET="toolchain kodi-platform"
-PKG_SECTION="emulation"
-PKG_SHORTDESC="Late 2014/Early 2015 version of MAME (0.159-ish) for libretro"
 PKG_LONGDESC="Late 2014/Early 2015 version of MAME (0.159-ish) for libretro"
 
 PKG_LIBNAME="mame2014_libretro.so"

packages/emulation/libretro-mame2014/patches/libretro-mame2014-0001_fix-cross-compile.patch

@@ -1,14 +1,8 @@
-commit 698041d707425226afd2398d0761abb6e7db1215
-Author: Lukas Rusak <lorusak@gmail.com>
-Date:   Sun Feb 5 18:51:55 2017 -0800
-
-    fix cross compile
-
 diff --git a/Makefile b/Makefile
-index 888f368..2b31967 100644
+index 54a6f648c8..4a933d1d01 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -132,15 +132,15 @@ ifneq (,$(findstring unix,$(platform)))
+@@ -132,8 +132,8 @@ ifneq (,$(findstring unix,$(platform)))
        LIBS += -lGL
     endif
     LDFLAGS +=  $(fpic) $(SHARED)
@@ -18,16 +12,25 @@ index 888f368..2b31967 100644
 +   NATIVECC ?= $(CXX)
     NATIVECFLAGS ?= -std=gnu99
     BASELIBS += -lpthread
-    CC ?= g++
+    CXX ?= g++
+@@ -142,13 +142,13 @@ ifneq (,$(findstring unix,$(platform)))
     AR ?= @ar
-    LD ?= g++
+    LD := $(CXX)
     LIBS += -lstdc++ -lpthread -ldl
 -   ifeq ($(firstword $(filter x86_64,$(UNAME))),x86_64)
 +   ifeq ($(firstword $(filter x86_64,$(ARCH))),x86_64)
        PTR64 = 1
     endif
-    ifeq ($(firstword $(filter amd64,$(UNAME))),amd64)
+-   ifeq ($(firstword $(filter amd64,$(UNAME))),amd64)
-@@ -485,7 +485,7 @@ endif
++   ifeq ($(firstword $(filter amd64,$(ARCH))),amd64)
+       PTR64 = 1
+    endif
+-   ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
++   ifeq ($(firstword $(filter ppc64,$(ARCH))),ppc64)
+       PTR64 = 1
+    endif
+    ifneq (,$(findstring ppc,$(UNAME)))
+@@ -487,7 +487,7 @@ endif
  # utilities
  MD = -mkdir$(EXE_EXT)
  RM = @rm -f
@@ -36,3 +39,6 @@ index 888f368..2b31967 100644
  PYTHON ?= @python2
  
  #-------------------------------------------------
+-- 
+2.17.1
+