From 78c66c9fcbdf35d76a0a9a9e4d5d291591c32e40 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 10 Jan 2014 18:35:43 +0100 Subject: update omxplayer, fix compile of xbmc after boost update --- package/xbmc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/xbmc/Makefile') diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index fe4aa15c2..71ead8b7e 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 7ae385ebf8e5cfcb917393235e6efbdb PKG_DESCR:= software media player PKG_SECTION:= multimedia PKG_DEPENDS:= boost libffmpeg python2 libstdcxx bcm2835-vc -PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad +PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad dbus PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng @@ -23,7 +23,7 @@ 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 PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd -PKG_BUILDDEP+= bcm2835-vc libgpg-error libbluray +PKG_BUILDDEP+= bcm2835-vc libgpg-error libbluray dbus PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump systemd PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host PKG_URL:= http://xbmc.org/ @@ -40,7 +40,7 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS XAKE_FLAGS+= V=1 TIXML_USE_STL=1 XAKE_FLAGS+= GCC_HONOUR_COPTS=s -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \ +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \ -DTIXML_USE_STL=1 \ -I$(STAGING_DIR)/opt/vc/include \ -I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \ -- cgit v1.2.3 From df6e1dfc6d23ae8b46f7da64e07e5a1e06460d12 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Jan 2014 16:17:44 +0100 Subject: enable xbmc for ibmx40+musl, add system specific dependency for pkgmaker/depmaker, port eudev and rework systemd package (not ready) --- package/xbmc/Makefile | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'package/xbmc/Makefile') diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 71ead8b7e..b663fde8e 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -9,27 +9,30 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7ae385ebf8e5cfcb917393235e6efbdb PKG_DESCR:= software media player PKG_SECTION:= multimedia -PKG_DEPENDS:= boost libffmpeg python2 libstdcxx bcm2835-vc +PKG_DEPENDS:= boost libffmpeg python2 libstdcxx PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad dbus PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl 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 libbluray libgpg-error libudev +PKG_DEPENDS+= libbluray libgpg-error libudev PKG_DEPENDS+= libssh libcec libnfs librtmp samba-lib libncurses PKG_BUILDDEP:= autotool boost ffmpeg 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 PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd -PKG_BUILDDEP+= bcm2835-vc libgpg-error libbluray dbus -PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump systemd +PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump eudev +PKG_BUILDDEP+= libgpg-error libbluray dbus PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host PKG_URL:= http://xbmc.org/ PKG_SITES:= http://mirrors.xbmc.org/releases/source/ -PKG_SYSTEM_DEPENDS:= raspberry-pi +PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc omxplayer +PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc omxplayer +PKG_BUILDDEP_IBM_X40:= nasm-host +PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40 PKG_LIBC_DEPENDS:= eglibc glibc musl WRKDIST= $(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo @@ -41,12 +44,15 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS XAKE_FLAGS+= V=1 TIXML_USE_STL=1 XAKE_FLAGS+= GCC_HONOUR_COPTS=s TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \ - -DTIXML_USE_STL=1 \ - -I$(STAGING_DIR)/opt/vc/include \ + -DTIXML_USE_STL=1 + +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) +TARGET_CPPFLAGS+= -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 \ - -L$(STAGING_DIR)/usr/lib/samba +TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static +endif + AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= DESTDIR='${WRKINST}' \ TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr' @@ -58,20 +64,25 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --enable-udev \ --enable-libbluray \ --enable-external-libraries \ - --enable-player=omxplayer \ - --enable-gles \ --enable-rtmp \ --disable-libusb \ --disable-libcap \ --disable-sdl \ --disable-joystick \ --disable-dvdcss \ - --disable-x11 \ - --disable-debug \ - --with-platform=raspberry-pi + --disable-debug + +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) +CONFIGURE_ARGS+= --with-platform=raspberry-pi \ + --enable-player=omxplayer \ + --enable-gles \ + --disable-x11 +else +CONFIGURE_ARGS+= --enable-x11 +endif pre-configure: - (cd $(WRKBUILD)/lib/cpluff && ./autogen.sh) + (cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh) xbmc-install: $(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc -- cgit v1.2.3 From 08a80f1b46d586e54fb775029efcace979cc1e5b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Jan 2014 12:54:04 +0100 Subject: implement simple shutdown for xbmc via reboot/poweroff --- package/xbmc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xbmc/Makefile') diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index b663fde8e..9f45cd633 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -44,7 +44,7 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS XAKE_FLAGS+= V=1 TIXML_USE_STL=1 XAKE_FLAGS+= GCC_HONOUR_COPTS=s TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \ - -DTIXML_USE_STL=1 + -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) TARGET_CPPFLAGS+= -I$(STAGING_DIR)/opt/vc/include \ -- cgit v1.2.3 From 5edfb8067ec793a2a0361fe215a1498902b14a1a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 15 Jan 2014 17:20:57 +0100 Subject: fix xbmc youtube addon, now plays fine. python2-sqlite needed, and bios param start_x=1 --- package/xbmc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/xbmc/Makefile') diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 9f45cd633..05026e12b 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -5,18 +5,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xbmc PKG_VERSION:= 12.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 7ae385ebf8e5cfcb917393235e6efbdb PKG_DESCR:= software media player PKG_SECTION:= multimedia PKG_DEPENDS:= boost libffmpeg python2 libstdcxx -PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad dbus +PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad libdbus PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl 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+= libbluray libgpg-error libudev +PKG_DEPENDS+= libbluray libgpg-error libudev python2-mod-sqlite PKG_DEPENDS+= libssh libcec libnfs librtmp samba-lib libncurses PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug -- cgit v1.2.3