diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-17 14:55:37 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-17 14:55:37 +0100 |
| commit | 3cd4a03f27da57d2317c5b285cf8ad1990bcdac2 (patch) | |
| tree | 2a09e93c07595459a8ac8c637d8126eddcb85cb4 /package/xbmc | |
| parent | 86534f8753b2dcac52f1ceb3bfc01ccca6697f80 (diff) | |
| parent | 2f3dbff3a8283fd1307ec71b6e4d5c70e80f56dc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xbmc')
| -rw-r--r-- | package/xbmc/Makefile | 18 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile | 13 |
2 files changed, 26 insertions, 5 deletions
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index e0b509178..aa971d872 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xbmc PKG_VERSION:= 12.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba PKG_DESCR:= software media player PKG_SECTION:= multimedia @@ -17,13 +17,15 @@ 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 libgpg-error +PKG_DEPENDS+= libssh libcec libnfs librtmp 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_BUILDDEP+= libssh libcec libnfs samba rtmpdump +PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host PKG_URL:= http://xbmc.org/ PKG_SITES:= http://mirrors.xbmc.org/releases/source/ @@ -41,19 +43,25 @@ TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \ -I$(STAGING_DIR)/opt/vc/include \ -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 \ + -L$(STAGING_DIR)/usr/lib/samba AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ENV+= DESTDIR='${WRKINST}' \ + TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr' CONFIGURE_ARGS+= --disable-optical-drive \ - --disable-ssh \ - --disable-samba \ --disable-mysql \ + --enable-samba \ + --enable-ssh \ + --enable-nfs \ --enable-libusb \ --enable-libbluray \ --enable-external-libraries \ --enable-player=omxplayer \ --enable-gles \ + --enable-rtmp \ --disable-sdl \ --disable-joystick \ + --disable-dvdcss \ --disable-x11 \ --with-platform=raspberry-pi diff --git a/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile new file mode 100644 index 000000000..799e54eeb --- /dev/null +++ b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile @@ -0,0 +1,13 @@ +--- xbmc-12.2.orig/lib/libdvd/libdvdread/Makefile 2013-05-03 07:57:40.000000000 +0200 ++++ xbmc-12.2/lib/libdvd/libdvdread/Makefile 2013-12-15 12:24:12.000000000 +0100 +@@ -131,8 +131,8 @@ distclean: clean + dvdread-config: $(.OBJDIR)/dvdread-config + $(.OBJDIR)/dvdread-config: $(BUILDDEPS) + @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config +- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config +- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config ++ @echo 'prefix='$(DESTDIR)$(PREFIX) >> $(.OBJDIR)/dvdread-config ++ @echo 'libdir='$(DESTDIR)$(shlibdir) >> $(.OBJDIR)/dvdread-config + @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config + @echo >> $(.OBJDIR)/dvdread-config + cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config |