update xbmc, add startup script, use /data ext4 rw for xbmc adddons and stuff

package/libcdio/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libcdio
 PKG_VERSION:=		0.90
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1b245b023fb03a58d030fd2800db3247
 PKG_DESCR:=		a library for CD-ROM and CD image access
 PKG_SECTION:=		libs
@@ -17,6 +17,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCDIO,libcdio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_LDFLAGS+=	-ltinfo
+
 libcdio-install:
 	$(INSTALL_DIR) $(IDIR_LIBCDIO)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libcdio*.so* \

package/samba/Makefile

@@ -31,7 +31,7 @@ $(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEAS
 $(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_PASSWD},${PKG_SECTION}))
 $(eval $(call PKG_template,SAMBA_LIB,samba-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_LIB},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-Wl,-rpath -Wl,/usr/lib/samba
+#TARGET_LDFLAGS+=	-Wl,-rpath -Wl,/usr/lib/samba
 CONFIGURE_ENV+=		samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
 			samba_cv_USE_SETRESUID=no \
 			ac_cv_lib_ext_nsl_connect=no \
@@ -39,7 +39,7 @@ CONFIGURE_ENV+=		samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
 			ac_cv_lib_ext_nsl_gethostbyname=no \
 			ac_cv_file__proc_sys_kernel_core_pattern=yes \
 			libreplace_cv_HAVE_GETADDRINFO=no
-CONFIGURE_ARGS+=	--libdir=/usr/lib/samba \
+CONFIGURE_ARGS+=	--libdir=/usr/lib \
 			--localstatedir=/var/log/samba \
 			--with-configdir=/etc/samba \
 			--with-lockdir=/var/run/samba \
@@ -57,13 +57,13 @@ CONFIGURE_ARGS+=	--libdir=/usr/lib/samba \
 
 samba-install:
 	${INSTALL_DIR} ${IDIR_SAMBA}/etc/samba ${IDIR_SAMBA}/usr/sbin
-	${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/samba/{charset,vfs}
+	${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/{charset,vfs}
-	${INSTALL_DATA} ${WRKINST}/usr/lib/samba/charset/CP850.so \
+	${INSTALL_DATA} ${WRKINST}/usr/lib/charset/CP850.so \
-			${IDIR_SAMBA}/usr/lib/samba/charset
+			${IDIR_SAMBA}/usr/lib/charset
 	${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin
-	${CP} ${WRKINST}/usr/lib/samba/vfs/*.so* ${IDIR_SAMBA}/usr/lib/samba/vfs
+	${CP} ${WRKINST}/usr/lib/vfs/*.so* ${IDIR_SAMBA}/usr/lib/vfs
-	${INSTALL_DATA} ${WRKINST}/usr/lib/samba/*.dat ${IDIR_SAMBA}/usr/lib/samba
+	${INSTALL_DATA} ${WRKINST}/usr/lib/*.dat ${IDIR_SAMBA}/usr/lib
 
 samba-passwd-install:
 	${INSTALL_DIR} ${IDIR_SAMBA_PASSWD}/usr/bin
@@ -76,10 +76,10 @@ samba-client-install:
 		${IDIR_SAMBA_CLIENT}/usr/bin
 
 samba-lib-install:
-	${INSTALL_DIR} ${IDIR_SAMBA_LIB}/usr/lib/samba
+	${INSTALL_DIR} ${IDIR_SAMBA_LIB}/usr/lib
-	${CP} ${WRKINST}/usr/lib/samba/{libsmbclient,libsmbsharemodes,libnetapi}.so* \
+	${CP} ${WRKINST}/usr/lib/{libsmbclient,libsmbsharemodes,libnetapi}.so* \
-		${IDIR_SAMBA}/usr/lib/samba
+		${IDIR_SAMBA_LIB}/usr/lib
-	$(CP) ${WRKINST}/usr/lib/samba/{libtalloc,libtdb,libtevent}.* \
+	$(CP) ${WRKINST}/usr/lib/{libtalloc,libtdb,libtevent}.* \
-		${IDIR_SAMBA_LIB}/usr/lib/samba
+		${IDIR_SAMBA_LIB}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/sdl/Makefile

@@ -31,6 +31,7 @@ $(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 HOST_STYLE:=		auto
+HOST_CONFIGURE_ARGS+=	--without-x
 
 ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y)
 CONFIGURE_ARGS+=	--enable-input-tslib

package/xbmc/Makefile

@@ -4,27 +4,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
-PKG_VERSION:=		12.2
+PKG_VERSION:=		12.3
-PKG_RELEASE:=		3
+PKG_RELEASE:=		1
-PKG_MD5SUM:=		489f3877decae4e265ece54f9eaef0ba
+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+=		libglew mesalib libass libmpeg2 libmad
 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+=		omxplayer libbluray libgpg-error libudev
-PKG_DEPENDS+=		libssh libcec libnfs librtmp
+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 dbus libusb-compat libbluray
+PKG_BUILDDEP+=		bcm2835-vc libgpg-error libbluray
-PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump
+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,6 +32,8 @@ 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}))
@@ -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:
+pre-configure:
-	(cd $(WRKDIR) && ${BASH} $(TOPDIR)/scripts/xbmc-fix.sh)
+	(cd $(WRKBUILD)/lib/cpluff && ./autogen.sh)
 
 xbmc-install:
 	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc

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 $?

package/xbmc/files/xbmc.postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf xbmc xbmc NO

package/xbmc/patches/patch-configure

@@ -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; }

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");

scripts/install

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-cmd=$(echo "$@"|sed -e "s#\(-o\|-g\) [0-9]*##g")
-/usr/bin/install $cmd

scripts/xbmc-fix.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-IFS="
-"
-for i in $(find . -name '*)' -print );do
-	j=$(printf "$i"|sed -e 's# ##' -e 's#(#_#' -e 's#)##')
-	mv $i $j
-done