Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 51 insertions, 25 deletions

diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index aa971d872..71ead8b7e 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -4,27 +4,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
-PKG_VERSION:=		12.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		489f3877decae4e265ece54f9eaef0ba
+PKG_VERSION:=		12.3
+PKG_RELEASE:=		1
+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 dbus
-PKG_DEPENDS+=		libjpeg libogg libvorbis libmodplug libcurl
+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 libusb-compat libbluray libgpg-error
-PKG_DEPENDS+=		libssh libcec libnfs librtmp
+PKG_DEPENDS+=		omxplayer 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 jpeg libogg libvorbis libmodplug
+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 dbus libusb-compat libbluray
-PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump
+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/
 PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
@@ -32,13 +32,15 @@ PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
+WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 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 \
@@ -53,20 +55,23 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-samba \
 			--enable-ssh \
 			--enable-nfs \
-			--enable-libusb \
+			--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
 
-post-extract:
-	(cd $(WRKDIR) && ${BASH} $(TOPDIR)/scripts/xbmc-fix.sh)
+pre-configure:
+	(cd $(WRKBUILD)/lib/cpluff && ./autogen.sh)
 
 xbmc-install:
 	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc
diff --git a/package/xbmc/files/xbmc.init b/package/xbmc/files/xbmc.init
new file mode 100644
index 000000000..ed8a49bd6
--- /dev/null
+++ b/package/xbmc/files/xbmc.init
@@ -0,0 +1,29 @@
+#!/bin/sh
+#PKG xbmc 
+#INIT 95
+
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${xbmc:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	export LD_LIBRARY_PATH=/opt/vc/lib
+	xbmc &
+	;;
+stop)
+	kill $(pgrep -f /usr/bin/xbmc)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/xbmc/files/xbmc.postinst b/package/xbmc/files/xbmc.postinst
new file mode 100644
index 000000000..60fffdadc
--- /dev/null
+++ b/package/xbmc/files/xbmc.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf xbmc xbmc NO
diff --git a/package/xbmc/patches/patch-configure b/package/xbmc/patches/patch-configure
deleted file mode 100644
index 23c0e4bdb..000000000
--- a/package/xbmc/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- xbmc-12.2.orig/configure	2013-05-03 07:57:46.000000000 +0200
-+++ xbmc-12.2/configure	2013-07-31 14:45:10.000000000 +0200
-@@ -18629,7 +18629,7 @@ $as_echo "#define HAVE_LIBGLESV2 1" >>co
- 
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: == WARNING: OpenGLES support is assumed." >&5
- $as_echo "== WARNING: OpenGLES support is assumed." >&6; }
--      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
-+      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lkhrn_static -lpthread -lm"
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lEGL" >&5
- $as_echo_n "checking for main in -lEGL... " >&6; }
diff --git a/package/xbmc/patches/patch-xbmc_Application_cpp b/package/xbmc/patches/patch-xbmc_Application_cpp
index dd350c3b6..26d7d800e 100644
--- a/package/xbmc/patches/patch-xbmc_Application_cpp
+++ b/package/xbmc/patches/patch-xbmc_Application_cpp
@@ -13,7 +13,7 @@
      userName = "root";
  
    CStdString userHome;
-+  userHome = "/etc/xbmc";
++  userHome = "/data/xbmc";
 +/*
    if (getenv("HOME"))
      userHome = getenv("HOME");