summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/xbmc/Makefile7
-rw-r--r--package/xbmc/patches/patch-Makefile_in6
-rw-r--r--package/xbmc/patches/patch-configure_in46
3 files changed, 26 insertions, 33 deletions
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index dd0c50c..86211c3 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= 9ce6b6ac89b6aa0b111a1acdf3606e06
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
-PKG_DEPENDS:= boost libffmpeg python2 libstdcxx glibc-gconv
+PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv
PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad libdbus
PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl
PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo
@@ -19,7 +19,7 @@ PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd
PKG_DEPENDS+= libbluray libgpg-error libudev python2-mod-sqlite
PKG_DEPENDS+= libssh libcec libnfs librtmp samba-lib libncurses
PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib libglu librt
-PKG_BUILDDEP:= boost ffmpeg python2 mesalib libglew libass
+PKG_BUILDDEP:= boost python2 mesalib libglew libass
PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
@@ -51,7 +51,7 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
HOST_CXXFLAGS+= $(HOST_CPPFLAGS)
XAKE_FLAGS+= V=1 TIXML_USE_STL=1 GCC_HONOUR_COPTS=s
TARGET_CPPFLAGS+= -I. -I./utils -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
- -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 -DUSE_EXTERNAL_FFMPEG=1
+ -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/opt/vc/include \
@@ -64,6 +64,7 @@ AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ENV+= DESTDIR='${WRKINST}' \
TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
CONFIGURE_ARGS+= --disable-optical-drive \
+ --disable-optimizations \
--disable-mysql \
--disable-avahi \
--disable-rsxs \
diff --git a/package/xbmc/patches/patch-Makefile_in b/package/xbmc/patches/patch-Makefile_in
index 581ff95..e2c85f7 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 a2598b2..ed9d8fa 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)."])