From a887fe61af1594816f91a7948eb3298bb6645376 Mon Sep 17 00:00:00 2001 From: CvH Date: Thu, 20 Sep 2018 15:19:28 +0200 Subject: [PATCH] libretro-mame2014: update to latest --- .../emulation/libretro-mame2014/package.mk | 10 ++----- ...etro-mame2014-0001_fix-cross-compile.patch | 30 +++++++++++-------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/emulation/libretro-mame2014/package.mk b/packages/emulation/libretro-mame2014/package.mk index a328eed8ad..aa4685476e 100644 --- a/packages/emulation/libretro-mame2014/package.mk +++ b/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_SHA256="c1f018dbbf8dcc43df66e4ad10431812981db1e3a794485c41799b2a43f8d834" -PKG_ARCH="any" +PKG_VERSION="62a932c9435ef89fdb9a1b0c41deadd7f04f53f3" +PKG_SHA256="9b38e1c0d75bc4295d9c08288579f2bf58e55e97132308b65d92ca494e55fa67" 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 kodi-platform" -PKG_SECTION="emulation" -PKG_SHORTDESC="Late 2014/Early 2015 version of MAME (0.159-ish) for libretro" +PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Late 2014/Early 2015 version of MAME (0.159-ish) for libretro" PKG_LIBNAME="mame2014_libretro.so" diff --git a/packages/emulation/libretro-mame2014/patches/libretro-mame2014-0001_fix-cross-compile.patch b/packages/emulation/libretro-mame2014/patches/libretro-mame2014-0001_fix-cross-compile.patch index 352b519a54..ca0bea7a77 100644 --- a/packages/emulation/libretro-mame2014/patches/libretro-mame2014-0001_fix-cross-compile.patch +++ b/packages/emulation/libretro-mame2014/patches/libretro-mame2014-0001_fix-cross-compile.patch @@ -1,14 +1,8 @@ -commit 698041d707425226afd2398d0761abb6e7db1215 -Author: Lukas Rusak -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) -@@ -485,7 +485,7 @@ endif +- ifeq ($(firstword $(filter amd64,$(UNAME))),amd64) ++ 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 +