Update mupen64plus, enable it on mali

This commit is contained in:
Jean-André Santoni 2015-05-13 02:21:02 +02:00
parent a5310d6344
commit 0dd5700e93
7 changed files with 29 additions and 10 deletions

View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/lakkatv/Lakka"
PKG_URL=""
PKG_DEPENDS_TARGET="retroarch lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_DEPENDS_TARGET="retroarch mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_PRIORITY="optional"
PKG_SECTION="virtual"
PKG_SHORTDESC="Lakka metapackage for Bananapi"

View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/lakkatv/Lakka"
PKG_URL=""
PKG_DEPENDS_TARGET="retroarch lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_DEPENDS_TARGET="retroarch mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_PRIORITY="optional"
PKG_SECTION="virtual"
PKG_SHORTDESC="Lakka metapackage for OdroidC1"

View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/lakkatv/Lakka"
PKG_URL=""
PKG_DEPENDS_TARGET="retroarch lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_DEPENDS_TARGET="retroarch mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_PRIORITY="optional"
PKG_SECTION="virtual"
PKG_SHORTDESC="Lakka metapackage for OdroidXU3"

View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/lakkatv/Lakka"
PKG_URL=""
PKG_DEPENDS_TARGET="retroarch lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_DEPENDS_TARGET="retroarch mupen64plus lutro gpsp ppsspp 2048 beetle-vb beetle-wswan beetle-ngp pcsx_rearmed vecx snes9x-next dinothawr prboom beetle-pce handy picodrive nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_PRIORITY="optional"
PKG_SECTION="virtual"
PKG_SHORTDESC="Lakka metapackage for WeTek_Play"

View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/lakkatv/Lakka"
PKG_URL=""
PKG_DEPENDS_TARGET="retroarch lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_DEPENDS_TARGET="retroarch mupen64plus lutro gpsp 2048 pcsx_rearmed snes9x-next vecx dinothawr prboom beetle-pce handy picodrive pocketsnes nxengine nestopia gambatte stella fba libretro-ffmpeg retroarch-joypad-autoconfig core-info common-shaders"
PKG_PRIORITY="optional"
PKG_SECTION="virtual"
PKG_SHORTDESC="Lakka metapackage for Cubieboard2 and Cubietruck"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="mupen64plus"
PKG_VERSION="e0b091c"
PKG_VERSION="0ac5fed"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
@ -48,13 +48,10 @@ make_target() {
if [ "$PROJECT" == "RPi" ]; then
make platform=rpi
elif [ "$PROJECT" == "RPi2" ]; then
CFLAGS="$CFLAGS -U__ARM_NEON__"
make platform=rpi2
elif [[ "$TARGET_FPU" =~ "neon" ]]; then
CFLAGS="$CFLAGS -DGL_BGRA_EXT=0x80E1" # Fix build for platforms where GL_BGRA_EXT is not defined
CFLAGS="$CFLAGS -U__ARM_NEON__"
make platform=rpi2
make platform=lakka
else
make WITH_DYNAREC=$DYNAREC
fi

View File

@ -0,0 +1,22 @@
--- mupen64plus.git/Makefile 2015-05-07 04:36:22.998292090 +0200
+++ mupen64plus.patch/Makefile 2015-05-07 06:13:07.779298191 +0200
@@ -81,6 +81,19 @@
PLATFORM_EXT := unix
WITH_DYNAREC=arm
+# Lakka build fix for arm neon
+else ifneq (,$(findstring lakka,$(platform)))
+ TARGET := $(TARGET_NAME)_libretro.so
+ LDFLAGS += -shared -Wl,--version-script=$(LIBRETRO_DIR)/link.T
+ fpic = -fPIC
+ GLES = 1
+ GL_LIB := -lGLESv2
+ CPUFLAGS += -DNO_ASM -DARM -D__arm__ -DARM_ASM -D__NEON_OPT -DNOSSE
+ GLIDE2GL = 1
+ HAVE_NEON = 0
+ PLATFORM_EXT := unix
+ WITH_DYNAREC=arm
+
# ODROIDs
else ifneq (,$(findstring odroid,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so