From 00b718bd213fe32c632869af29227bc59adfd53c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 26 Jun 2014 22:13:02 +0200
Subject: use internal static ffmpeg, it is optimized for rpi

---
 package/xbmc/patches/patch-Makefile_in  |  6 ++---
 package/xbmc/patches/patch-configure_in | 46 ++++++++++++++-------------------
 2 files changed, 22 insertions(+), 30 deletions(-)

(limited to 'package/xbmc/patches')

diff --git a/package/xbmc/patches/patch-Makefile_in b/package/xbmc/patches/patch-Makefile_in
index 581ff950b..e2c85f7a2 100644
--- a/package/xbmc/patches/patch-Makefile_in
+++ b/package/xbmc/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
---- xbmc-13.1.orig/Makefile.in	2014-06-08 08:40:24.000000000 +0200
-+++ xbmc-13.1/Makefile.in	2014-06-09 11:14:17.917685925 +0200
+--- xbmc-13.1.orig/Makefile.in	2014-06-12 10:26:27.000000000 +0200
++++ xbmc-13.1/Makefile.in	2014-06-26 15:18:53.463409058 +0200
 @@ -191,13 +191,7 @@ ifeq (@USE_LIBAV_HACKS@,1)
  DIRECTORY_ARCHIVES += lib/xbmc-libav-hacks/dll-libavhacks.a
  endif
@@ -89,4 +89,4 @@
 -endif
  	@# Icons and links
  	@install -d $(DESTDIR)$(datarootdir)/applications
- 	@install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
+ 	@install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in
index a2598b211..ed9d8fa83 100644
--- a/package/xbmc/patches/patch-configure_in
+++ b/package/xbmc/patches/patch-configure_in
@@ -1,15 +1,24 @@
---- 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}"
+--- xbmc-13.1.orig/configure.in	2014-06-12 10:25:21.000000000 +0200
++++ xbmc-13.1/configure.in	2014-06-26 20:29:26.343281621 +0200
+@@ -601,7 +601,7 @@ MAKE="${MAKE:-make}"
  OBJDUMP="${OBJDUMP:-objdump}"
  
--use_external_ffmpeg=no
-+use_external_ffmpeg=yes
- use_static_ffmpeg=no
+ use_external_ffmpeg=no
+-use_static_ffmpeg=no
++use_static_ffmpeg=yes
  
  # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os
-@@ -626,21 +626,21 @@ case $host in
+ # there is no autoconf variable which will give
+@@ -609,7 +609,7 @@ use_static_ffmpeg=no
+ # so we have to use our own var here
+ # defaults to the build side target_os
+ # and should be overridden for cross below (see android)
+-ffmpeg_target_os=$(tolower $(uname -s))
++ffmpeg_target_os=linux
+ 
+ # host detection and setup
+ case $host in
+@@ -626,7 +626,7 @@ case $host in
       use_x11=no
       build_shared_lib=yes    
       ;;
@@ -18,23 +27,15 @@
       ARCH="i486-linux"
       if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
          use_arch="x86"
-         use_cpu="i686"
+@@ -634,7 +634,7 @@ case $host in
       fi
--     use_static_ffmpeg=yes
-+     use_static_ffmpeg=no
+      use_static_ffmpeg=yes
       ;;
 -  x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
 +  x86_64-*-linux-*)
       ARCH="x86_64-linux"
       if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
          use_arch="x86_64"
-         use_cpu="x86_64"
-      fi
--     use_static_ffmpeg=yes
-+     use_static_ffmpeg=no
-      ;;
-   i386-*-freebsd*)
-      ARCH="x86-freebsd"
 @@ -680,13 +680,13 @@ case $host in
       ARCH="powerpc-osx"
       use_arch="ppc"
@@ -52,15 +53,6 @@
       ARCH="arm"
       use_arch="arm"
       ffmpeg_target_os=linux
-@@ -696,7 +696,7 @@ case $host in
-      use_sdl=no
-      use_x11=no
-      use_wayland=no
--     use_static_ffmpeg=yes
-+     use_static_ffmpeg=no
-      ;;
-   arm*-*linux-android*)
-      target_platform=target_android
 @@ -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)."])
-- 
cgit v1.2.3