ppsspp buildfix and add armv8 (#1811)

Author: spleen1981

packages/lakka/libretro_cores/ppsspp/package.mk

@@ -1,5 +1,5 @@
 PKG_NAME="ppsspp"
-PKG_VERSION="9fe6338e3bf397f8a009a51a282c139dfa180eb6" #v1.13.2
+PKG_VERSION="d66c5c11c1532c2850552e8eb2095994021d055c" #v1.13.2 merged to master to include libretro buildfix
 PKG_LICENSE="GPL-2.0-or-later"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
@@ -43,9 +43,13 @@ if [ "${OPENGL_SUPPORT}" = "no" -a "${OPENGLES_SUPPORT}" = "yes" ]; then
 fi
 
 if [ "${TARGET_ARCH}" = "arm" ]; then
-  PKG_CMAKE_OPTS_TARGET+=" -DARMV7=ON"
+  if [[ "${TARGET_NAME}" =~ "armv8" ]]; then
+    PKG_CMAKE_OPTS_TARGET+=" -DFORCED_CPU=armv8"
+  else
+    PKG_CMAKE_OPTS_TARGET+=" -DFORCED_CPU=armv7"
+  fi
 elif [ "${TARGET_ARCH}" = "aarch64" ]; then
-  PKG_CMAKE_OPTS_TARGET+=" -DARM64=ON"
+  PKG_CMAKE_OPTS_TARGET+=" -DFORCED_CPU=aarch64"
 fi
 
 pre_make_target() {

packages/lakka/libretro_cores/ppsspp/patches/01_add_armv8.patch

@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90cd57ace..2ace6b70a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,6 +58,10 @@ if(CMAKE_SYSTEM_PROCESSOR)
+ 				set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -target armv7a-none-linux-android")
+ 			endif()
+ 		endif()
++		if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv8")
++			add_compile_options(-march=armv8-a+crc -mtune=cortex-a53 -mfloat-abi=hard -mfpu=neon-fp-armv8 -fomit-frame-pointer)
++			add_definitions(-DPPSSPP_ARCH_ARM_NEON=1 -DPPSSPP_ARCH_ARMV8=1)
++		endif()
+ 	elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^AMD64")
+ 		set(X86_DEVICE ON)
+ 		set(X86_64_DEVICE ON)
+diff --git a/Common/ArmCPUDetect.cpp b/Common/ArmCPUDetect.cpp
+index 437bd3158..d46cf19db 100644
+--- a/Common/ArmCPUDetect.cpp
++++ b/Common/ArmCPUDetect.cpp
+@@ -337,6 +337,13 @@ void CPUInfo::Detect()
+ 	bNEON = true;
+ 	bASIMD = true;
+ #endif
++
++#if PPSSPP_ARCH(ARMV8)
++	bNEON = true;
++	bASIMD = true;
++	bFP = true;
++#endif
++
+ }
+
+ // Turn the cpu info into a string we can show
+