xbmc: update ffmpeg patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-02-05 20:19:31 +01:00
parent 5fa79809df
commit a17933383a
2 changed files with 67 additions and 12 deletions

View File

@ -0,0 +1,67 @@
diff -Naur xbmc-13.alpha-65ad3ae/configure.in xbmc-13.alpha-65ad3ae.patch/configure.in
--- xbmc-13.alpha-65ad3ae/configure.in 2014-02-03 16:36:26.000000000 +0100
+++ xbmc-13.alpha-65ad3ae.patch/configure.in 2014-02-05 02:38:47.233903531 +0100
@@ -622,24 +622,22 @@
use_sdl=no
use_x11=no
build_shared_lib=yes
- ;;
+ ;;
i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
ARCH="i486-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
use_arch="x86"
use_cpu="i686"
- else
- target_platform=target_linux
fi
+ use_static_ffmpeg=yes
;;
x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
ARCH="x86_64-linux"
if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then
use_arch="x86_64"
use_cpu="x86_64"
- else
- target_platform=target_linux
fi
+ use_static_ffmpeg=yes
;;
i386-*-freebsd*)
ARCH="x86-freebsd"
@@ -695,6 +693,7 @@
use_sdl=no
use_x11=no
use_wayland=no
+ use_static_ffmpeg=yes
;;
arm*-*linux-android*)
target_platform=target_android
@@ -872,9 +871,8 @@
fi
fi
fi
-if test "$target_platform" = "target_linux"; then
+if test "$use_static_ffmpeg" = "yes"; then
USE_STATIC_FFMPEG=1
- use_static_ffmpeg=yes
AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically])
# ffmpeg may depend on gnutls and vorbisenc, we add those libs at the end of linker
# command in order to resolve any missing symbols
@@ -2795,7 +2793,6 @@
LDFLAGS="$(echo "$LDFLAGS" | sed "s/-Wl,-Bsymbolic-functions//g")" \
./configure \
--extra-cflags="$PASSED_CFLAGS $FFMPEG_EXTRACFLAGS" \
- --disable-static \
`if test "$use_debug" = "no"; then echo --disable-debug; fi` \
`if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
`if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
@@ -2819,7 +2816,7 @@
--disable-ffserver \
--disable-ffmpeg \
--disable-crystalhd \
- `if test "$use_static_ffmpeg" = "yes"; then echo --enable-static; else echo --enable-shared; fi` \
+ `if test "$use_static_ffmpeg" = "yes"; then echo --enable-static --disable-shared; else echo --disable-static --enable-shared; fi` \
--disable-doc \
--enable-postproc \
--enable-gpl \

View File

@ -1,12 +0,0 @@
diff -Naur xbmc-13.alpha-65ad3ae/configure.in xbmc-13.alpha-65ad3ae.patch/configure.in
--- xbmc-13.alpha-65ad3ae/configure.in 2014-02-03 16:36:26.000000000 +0100
+++ xbmc-13.alpha-65ad3ae.patch/configure.in 2014-02-04 20:15:33.927101424 +0100
@@ -872,7 +872,7 @@
fi
fi
fi
-if test "$target_platform" = "target_linux"; then
+if test "$target_platform" = "target_linux" -o "$target_platform" = "target_raspberry_pi"; then
USE_STATIC_FFMPEG=1
use_static_ffmpeg=yes
AC_DEFINE([USE_STATIC_FFMPEG], [1], [link ffmpeg statically])