(FFMPeg) add webm to supported file types for ffmpeg core

Add new rebased fceumm port
This commit is contained in:
twinaphex 2014-04-14 05:53:23 +02:00
parent 8b49ab8dc0
commit 855784bab9
15 changed files with 31 additions and 27 deletions

View file

@ -1,5 +1,5 @@
display_name = "FFmpeg"
supported_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a"
supported_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a|webm"
corename = "FFmpeg"
license = "LGPLv2, GPLv2"
permissions = ""

View file

@ -214,20 +214,20 @@ build_libretro_vba_next()
fi
}
build_libretro_fceu()
build_libretro_fceumm()
{
cd $BASE_DIR
if [ -d "libretro-fceu" ]; then
echo "=== Building FCEU ==="
cd libretro-fceu
cd fceumm-code/src/drivers/libretro/jni
if [ -d "libretro-fceumm" ]; then
echo "=== Building FCEUmm ==="
cd libretro-fceumm
cd src/drivers/libretro/jni
ndk-build clean APP_ABI="armeabi-v7a mips x86"
ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86"
cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/fceumm_libretro${FORMAT}.${FORMAT_EXT}
cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/fceumm_libretro${FORMAT}.${FORMAT_EXT}
cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/fceumm_libretro${FORMAT}.${FORMAT_EXT}
else
echo "FCEU not fetched, skipping ..."
echo "FCEUmm not fetched, skipping ..."
fi
}
@ -607,7 +607,7 @@ else
build_libretro_vbam
build_libretro_vba_next
#build_libretro_bnes
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_meteor
build_libretro_nx

View file

@ -150,17 +150,17 @@ build_libretro_mame078() {
fi
}
build_libretro_fceu()
build_libretro_fceumm()
{
cd $BASE_DIR
if [ -d "libretro-fceu" ]; then
echo "=== Building FCEU ==="
cd libretro-fceu
cd fceumm-code/src/drivers/libretro/msvc
if [ -d "libretro-fceumm" ]; then
echo "=== Building FCEUmm ==="
cd libretro-fceumm
cd src/drivers/libretro/msvc
cmd.exe /k $MSVC_NAME.bat
cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/fceumm_libretro$FORMAT.$FORMAT_EXT
else
echo "FCEU not fetched, skipping ..."
echo "FCEUmm not fetched, skipping ..."
fi
}

View file

@ -494,11 +494,11 @@ build_libretro_vba_next() {
fi
}
build_libretro_fceu() {
build_libretro_fceumm() {
cd "${BASE_DIR}"
if [ -d 'libretro-fceu' ]; then
echo '=== Building FCEUmm ==='
cd libretro-fceu
cd libretro-fceumm
"${MAKE}" -C fceumm-code -f Makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean FCEUmm'
"${MAKE}" -C fceumm-code -f Makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build FCEUmm'

View file

@ -14,7 +14,11 @@ MAKE=make
CXX11="clang++ -std=c++11 -stdlib=libc++ -miphoneos-version-min=5.0"
IOS=1
IOSVER=71
ifeq ($(IOSVER),71)
export IOSSDK=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/
el
. ./libretro-build-common.sh
@ -33,7 +37,7 @@ else
build_libretro_fba_full
build_libretro_vbam
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
#build_libretro_meteor
build_libretro_nx

View file

@ -22,7 +22,7 @@ else
build_libretro_genplus
build_libretro_fba
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_nx
build_libretro_prboom

View file

@ -21,7 +21,7 @@ else
build_libretro_genplus
build_libretro_fba_full
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_nx
build_libretro_prboom

View file

@ -22,7 +22,7 @@ else
#build_libretro_fba_full
build_libretro_fba_cps2
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_nx
build_libretro_prboom

View file

@ -28,7 +28,7 @@ else
build_libretro_vbam
build_libretro_vba_next
#build_libretro_bnes
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
#build_libretro_meteor
build_libretro_nx

View file

@ -22,7 +22,7 @@ else
build_libretro_genplus
build_libretro_fba
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_nx
build_libretro_prboom

View file

@ -30,7 +30,7 @@ else
build_libretro_genplus
#build_libretro_fba
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_nx
build_libretro_prboom

View file

@ -87,7 +87,7 @@ else
build_libretro_genplus
build_libretro_fba
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_nx
build_libretro_prboom

View file

@ -43,7 +43,7 @@ else
build_libretro_genplus
build_libretro_fba
build_libretro_vba_next
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_nx
build_libretro_prboom

View file

@ -107,7 +107,7 @@ else
build_libretro_vbam
build_libretro_vba_next
build_libretro_bnes
build_libretro_fceu
build_libretro_fceumm
build_libretro_gambatte
build_libretro_meteor
build_libretro_nx

View file

@ -83,7 +83,7 @@ fetch_project "$REPO_BASE/libretro/vba-next.git" "libretro-vba-next" "libretro/V
fetch_project "$REPO_BASE/libretro/vbam-libretro.git" "libretro-vbam" "libretro/VBA-M"
fetch_project "$REPO_BASE/libretro/libretro-handy.git" "libretro-handy" "libretro/Handy"
fetch_project "$REPO_BASE/libretro/bnes-libretro.git" "libretro-bnes" "libretro/bNES"
fetch_project "$REPO_BASE/libretro/fceu-next.git" "libretro-fceu" "libretro/FCEU"
fetch_project "$REPO_BASE/libretro/libretro-fceumm.git" "libretro-fceumm" "libretro/FCEUmm"
fetch_project "$REPO_BASE/libretro/gambatte-libretro.git" "libretro-gambatte" "libretro/Gambatte"
fetch_project "$REPO_BASE/libretro/meteor-libretro.git" "libretro-meteor" "libretro/Meteor"
fetch_project "$REPO_BASE/libretro/nxengine-libretro.git" "libretro-nx" "libretro/NX"