summaryrefslogtreecommitdiff
path: root/package/xbmc/patches/patch-configure_in
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-16 18:01:44 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-16 18:02:33 +0200
commite7260308e776f7db889a83eb7a6c437e295ad797 (patch)
tree6e895e570a12cc7172ce9b313a486370934e3ecb /package/xbmc/patches/patch-configure_in
parent3d31baf4a109a7a7b2626449e8327286963c15cd (diff)
update to 13.1
Diffstat (limited to 'package/xbmc/patches/patch-configure_in')
-rw-r--r--package/xbmc/patches/patch-configure_in43
1 files changed, 29 insertions, 14 deletions
diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in
index c8e47aaf2..a2598b211 100644
--- a/package/xbmc/patches/patch-configure_in
+++ b/package/xbmc/patches/patch-configure_in
@@ -1,20 +1,15 @@
---- xbmc-13.0.orig/configure.in 2014-05-07 15:29:25.000000000 +0200
-+++ xbmc-13.0/configure.in 2014-05-08 20:43:08.000000000 +0200
-@@ -600,7 +600,12 @@ PKG_PROG_PKG_CONFIG
+--- xbmc-13.1.orig/configure.in 2014-06-08 08:40:24.000000000 +0200
++++ xbmc-13.1/configure.in 2014-06-08 11:12:35.190431752 +0200
+@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG
MAKE="${MAKE:-make}"
OBJDUMP="${OBJDUMP:-objdump}"
-use_external_ffmpeg=no
-+if test "x$use_external_libraries" != no;then
-+ use_external_ffmpeg=yes
-+else
-+ use_external_ffmpeg=no
-+fi
-+
++use_external_ffmpeg=yes
use_static_ffmpeg=no
# ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
-@@ -626,21 +631,21 @@ case $host in
+@@ -626,21 +626,21 @@ case $host in
use_x11=no
build_shared_lib=yes
;;
@@ -40,8 +35,16 @@
;;
i386-*-freebsd*)
ARCH="x86-freebsd"
-@@ -686,7 +691,7 @@ case $host in
- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
+@@ -680,13 +680,13 @@ case $host in
+ ARCH="powerpc-osx"
+ use_arch="ppc"
+ ;;
+- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
++ powerpc-*-linux-*)
+ ARCH="powerpc-linux"
+ ;;
+- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
++ powerpc64-*-linux-*)
ARCH="powerpc64-linux"
;;
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
@@ -49,7 +52,7 @@
ARCH="arm"
use_arch="arm"
ffmpeg_target_os=linux
-@@ -696,7 +701,7 @@ case $host in
+@@ -696,7 +696,7 @@ case $host in
use_sdl=no
use_x11=no
use_wayland=no
@@ -58,7 +61,7 @@
;;
arm*-*linux-android*)
target_platform=target_android
-@@ -1048,7 +1053,7 @@ if test "$use_gles" = "yes"; then
+@@ -1048,7 +1048,7 @@ if test "$use_gles" = "yes"; then
AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
@@ -67,3 +70,15 @@
else
AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
+@@ -2532,11 +2532,8 @@ OUTPUT_FILES="Makefile \
+ xbmc/cores/AudioEngine/Makefile \
+ xbmc/cores/paplayer/Makefile \
+ xbmc/cores/omxplayer/Makefile \
+- lib/timidity/Makefile \
+ lib/asap/Makefile \
+- lib/nosefart/Makefile \
+ lib/libsidplay2/Makefile \
+- lib/vgmstream/Makefile \
+ lib/snesapu/SNES/SNESAPU/Makefile \
+ lib/stsound/StSoundLibrary/Makefile \
+ xbmc/cores/playercorefactory/Makefile \