emulation: Fix build errors from libretro-ppsspp.

Fix 404 from libretro-ppsspp.
Fix ffmeg compilation
This commit is contained in:
CGarces 2017-10-26 23:35:21 +02:00 committed by Carlos Garces
parent f3e5a7d296
commit df82e2b77d
2 changed files with 38 additions and 13 deletions

View File

@ -17,8 +17,8 @@
################################################################################ ################################################################################
PKG_NAME="libretro-ppsspp" PKG_NAME="libretro-ppsspp"
PKG_VERSION="9145287" PKG_VERSION="5f7bcf7"
PKG_SHA256="e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" PKG_SHA256="09e61300c05705b1f98e1b575e44d366e5a243cc3be97b3a09ad420581459f87"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPLv2" PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/libretro/libretro-ppsspp" PKG_SITE="https://github.com/libretro/libretro-ppsspp"
@ -45,17 +45,27 @@ pre_make_target() {
} }
make_target() { make_target() {
case $TARGET_CPU in if [ -z "$DEVICE" ]; then
arm1176jzf-s) PKG_DEVICE_NAME=$PROJECT
make -C libretro platform=armv6-gles-hardfloat-$TARGET_CPU else
;; PKG_DEVICE_NAME=$DEVICE
cortex-a7|cortex-a9) fi
make -C libretro platform=armv7-neon-gles-hardfloat-$TARGET_CPU
;; if [ "$PKG_DEVICE_NAME" = "RPi" ]; then
x86-64) make -C libretro platform=${DEVICE,,}
make -C libretro else
;; case $TARGET_CPU in
esac arm1176jzf-s)
make -C libretro CC=$CC CXX=$CXX platform=armv6-gles-hardfloat-$TARGET_CPU
;;
cortex-a7|cortex-a9)
make -C libretro CC=$CC CXX=$CXX platform=armv7-neon-gles-hardfloat-$TARGET_CPU
;;
x86-64)
make -C libretro CC=$CC CXX=$CXX
;;
esac
fi
} }
makeinstall_target() { makeinstall_target() {

View File

@ -0,0 +1,15 @@
--- a/Core/HLE/sceMpeg.cpp
+++ b/Core/HLE/sceMpeg.cpp
@@ -768,10 +768,10 @@
// GE_CMODE_16BIT_ABGR5551 <--> AV_PIX_FMT_BGR555LE;
// GE_CMODE_16BIT_ABGR4444 <--> AV_PIX_FMT_BGR444LE;
// GE_CMODE_32BIT_ABGR8888 <--> AV_PIX_FMT_RGBA;
- pmp_want_pix_fmt = PIX_FMT_RGBA;
+ pmp_want_pix_fmt = AV_PIX_FMT_RGBA;
// Create H264 video codec
- AVCodec * pmp_Codec = avcodec_find_decoder(CODEC_ID_H264);
+ AVCodec * pmp_Codec = avcodec_find_decoder(AV_CODEC_ID_H264);
if (pmp_Codec == NULL){
ERROR_LOG(ME, "Can not find H264 codec, please update ffmpeg");
return false;