summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/xbmc/Makefile9
-rw-r--r--package/xbmc/patches/patch-m4_ax_python_devel_m415
2 files changed, 20 insertions, 4 deletions
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 47264e74e..b4f96f47f 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -16,18 +16,19 @@ PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo
PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng
PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate
PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+= omxplayer libusb-compat libbluray
-PKG_BUILDDEP:= boost ffmpeg python2 MesaLib libglew libass
+PKG_DEPENDS+= omxplayer libusb-compat libbluray libgpg-error
+PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass
PKG_BUILDDEP+= libmpeg2 libmad jpeg libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype
PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
PKG_BUILDDEP+= bcm2835-vc libgpg-error dbus libusb-compat libbluray
+PKG_BUILDDEP+= libgpg-error
PKG_URL:= http://xbmc.org/
PKG_SITES:= http://mirrors.xbmc.org/releases/source/
PKG_SYSTEM_DEPENDS:= raspberry-pi
-PKG_LIBC_DEPENDS:= eglibc glibc
+PKG_LIBC_DEPENDS:= eglibc glibc musl
include $(TOPDIR)/mk/package.mk
@@ -41,7 +42,7 @@ TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \
-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static
-#TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static -lX11
+AUTOTOOL_STYLE:= autoreconf
CONFIGURE_ARGS+= --disable-optical-drive \
--disable-ssh \
--disable-samba \
diff --git a/package/xbmc/patches/patch-m4_ax_python_devel_m4 b/package/xbmc/patches/patch-m4_ax_python_devel_m4
new file mode 100644
index 000000000..c54320c0e
--- /dev/null
+++ b/package/xbmc/patches/patch-m4_ax_python_devel_m4
@@ -0,0 +1,15 @@
+--- xbmc-12.2.orig/m4/ax_python_devel.m4 2013-05-03 07:57:40.000000000 +0200
++++ xbmc-12.2/m4/ax_python_devel.m4 2013-12-03 09:41:55.000000000 +0100
+@@ -151,10 +151,9 @@ $ac_distutils_result])
+ #
+ AC_MSG_CHECKING([for Python include path])
+ if test -z "$PYTHON_CPPFLAGS"; then
+- python_path=`$PYTHON -c "import distutils.sysconfig; \
+- print (distutils.sysconfig.get_python_inc ());"`
++ python_path=`python2-config --includes`
+ if test -n "${python_path}"; then
+- python_path="-I$python_path"
++ python_path="$python_path"
+ fi
+ PYTHON_CPPFLAGS=$python_path
+ fi