diff --git a/packages/emulation/libretro-yabause/package.mk b/packages/emulation/libretro-yabause/package.mk index 618c6d3d44..909c46a610 100644 --- a/packages/emulation/libretro-yabause/package.mk +++ b/packages/emulation/libretro-yabause/package.mk @@ -9,14 +9,26 @@ PKG_SITE="https://github.com/libretro/yabause" PKG_URL="https://github.com/libretro/yabause/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.yabause: Yabause for Kodi" -PKG_TOOLCHAIN="manual" +PKG_TOOLCHAIN="make" PKG_LIBNAME="yabause_libretro.so" -PKG_LIBPATH="libretro/$PKG_LIBNAME" -PKG_LIBVAR="YABAUSE_LIB" +PKG_LIBPATH="yabause/src/libretro/${PKG_LIBNAME}" -make_target() { - make -C libretro +PKG_MAKE_OPTS_TARGET="-C yabause/src/libretro GIT_VERSION=${PKG_VERSION:0:7}" + +pre_configure_target() { + if [ "${ARCH}" = "arm" ]; then + PKG_MAKE_OPTS_TARGET+=" platform=armv" + # ARM NEON support + if target_has_feature neon; then + PKG_MAKE_OPTS_TARGET+="-neon" + fi + PKG_MAKE_OPTS_TARGET+="-${TARGET_FLOAT}float-${TARGET_CPU}" + fi +} + +pre_make_target() { + make CC=${HOST_CC} -C yabause/src/libretro generate-files } makeinstall_target() { diff --git a/packages/emulation/libretro-yabause/patches/libretro-yabause-999.01-armv-unix.patch b/packages/emulation/libretro-yabause/patches/libretro-yabause-999.01-armv-unix.patch new file mode 100644 index 0000000000..c5a39dcb56 --- /dev/null +++ b/packages/emulation/libretro-yabause/patches/libretro-yabause-999.01-armv-unix.patch @@ -0,0 +1,24 @@ +From cb5fd9a497a8ad624bf4f4950723d6da63a1f1d1 Mon Sep 17 00:00:00 2001 +From: 5schatten +Date: Thu, 29 Aug 2019 12:01:31 +0200 +Subject: [PATCH] libretro/Makefile: add platform unix if platform armv + +--- + yabause/src/libretro/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/yabause/src/libretro/Makefile b/yabause/src/libretro/Makefile +index 5589969fd..0ca2752c1 100644 +--- a/yabause/src/libretro/Makefile ++++ b/yabause/src/libretro/Makefile +@@ -51,6 +51,10 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),) + system_platform = win + endif + ++ifneq (,$(findstring armv,$(platform))) ++ override platform += unix ++endif ++ + CORE_DIR := . + + TARGET_NAME = yabause