5 files changed, 181 insertions, 19 deletions
diff --git a/package/afpfs-ng/Makefile b/package/afpfs-ng/Makefile
new file mode 100644
index 000000000..7954bd7c3
--- /dev/null
+++ b/package/afpfs-ng/Makefile
@@ -0,0 +1,48 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		afpfs-ng
+PKG_VERSION:=		0.8.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1bdd9f8a06e6085ea4cc38ce010ef60b
+PKG_DESCR:=		client for apple filing protocol
+PKG_SECTION:=		net/fs
+PKG_DEPENDS:=		libgcrypt
+PKG_BUILDDEP:=		fuse libgcrypt
+PKG_URL:=		https://sites.google.com/site/alexthepuffin/home
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=afpfs-ng/}
+PKG_LIBNAME:=		libafpclient
+PKG_OPTS:=		dev
+
+PKG_SUBPKGS:=		AFPFS_NG LIBAFPCLIENT
+PKGSD_LIBAFPCLIENT:=	afp client library
+PKGSC_LIBAFPCLIENT:=	libs/net
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,AFPFS_NG,afpfs-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAFPCLIENT,libafpclient,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBAFPCLIENT},${PKGSD_LIBAFPCLIENT},${PKGSC_LIBAFPCLIENT}))
+
+AUTOTOOL_STYLE:=	autoreconf
+CONFIGURE_ARGS+=	--enable-gcrypt
+
+post-build:
+	$(INSTALL_DIR) ${WRKINST}/usr/include/afpfs-ng
+	$(CP) ${WRKBUILD}/include/*.h \
+		${WRKINST}/usr/include/afpfs-ng
+
+afpfs-ng-install:
+	$(INSTALL_DIR) $(IDIR_AFPFS_NG)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/* \
+		$(IDIR_AFPFS_NG)/usr/bin
+
+libafpclient-install:
+	$(INSTALL_DIR) $(IDIR_LIBAFPCLIENT)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libafpclient.so* \
+		$(IDIR_LIBAFPCLIENT)/usr/lib
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/afpfs-ng/patches/patch-cmdline_Makefile_am b/package/afpfs-ng/patches/patch-cmdline_Makefile_am
new file mode 100644
index 000000000..48977643f
--- /dev/null
+++ b/package/afpfs-ng/patches/patch-cmdline_Makefile_am
@@ -0,0 +1,17 @@
+--- afpfs-ng-0.8.1.orig/cmdline/Makefile.am	2008-02-18 04:25:34.000000000 +0100
++++ afpfs-ng-0.8.1/cmdline/Makefile.am	2014-07-01 16:44:16.732400653 +0200
+@@ -3,12 +3,12 @@ bin_PROGRAMS = afpcmd afpgetstatus
+ 
+ afpgetstatus_SOURCES = getstatus.c
+ afpgetstatus_LDADD = $(top_builddir)/lib/libafpclient.la
+-afpgetstatus_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@ 
++afpgetstatus_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64
+ 
+ afpcmd_SOURCES = cmdline_afp.c  cmdline_main.c cmdline_testafp.c
+ 
+ afpcmd_LDADD = -lreadline -lncurses  $(top_builddir)/lib/libafpclient.la
+-afpcmd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@ 
++afpcmd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64
+ 
+ install-data-hook:
+ 	mkdir -p $(DESTDIR)/$(mandir)/man1
diff --git a/package/afpfs-ng/patches/patch-fuse_Makefile_am b/package/afpfs-ng/patches/patch-fuse_Makefile_am
new file mode 100644
index 000000000..6b1fe5f8f
--- /dev/null
+++ b/package/afpfs-ng/patches/patch-fuse_Makefile_am
@@ -0,0 +1,18 @@
+--- afpfs-ng-0.8.1.orig/fuse/Makefile.am	2008-03-04 21:13:56.000000000 +0100
++++ afpfs-ng-0.8.1/fuse/Makefile.am	2014-07-01 16:00:05.580170430 +0200
+@@ -1,13 +1,13 @@
+ bin_PROGRAMS = afpfsd mount_afp
+ 
+ mount_afp_SOURCES = client.c
+-mount_afp_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
++mount_afp_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64
+ mount_afp_LDADD = $(top_builddir)/lib/libafpclient.la
+ 
+ afpfsd_SOURCES = commands.c daemon.c fuse_int.c fuse_error.c
+ afpfsd_LDADD = $(top_builddir)/lib/libafpclient.la -lfuse
+ afpfsd_LDFLAGS = -export-dynamic -lfuse
+-afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 @CFLAGS@
++afpfsd_CFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64
+ 
+ install-data-hook:
+ 	mkdir -p $(DESTDIR)/$(mandir)/man1
diff --git a/package/afpfs-ng/patches/patch-lib_Makefile_am b/package/afpfs-ng/patches/patch-lib_Makefile_am
new file mode 100644
index 000000000..27504b4dd
--- /dev/null
+++ b/package/afpfs-ng/patches/patch-lib_Makefile_am
@@ -0,0 +1,10 @@
+--- afpfs-ng-0.8.1.orig/lib/Makefile.am	2008-02-18 04:34:32.000000000 +0100
++++ afpfs-ng-0.8.1/lib/Makefile.am	2014-07-01 16:00:15.564193342 +0200
+@@ -1,6 +1,6 @@
+ 
+ 
+-libafpclient_la_CFLAGS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/include @CFLAGS@
++libafpclient_la_CFLAGS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/include
+ 
+ lib_LTLIBRARIES = libafpclient.la
+ 
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 636a5acf1..8ffcd113f 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
 PKG_VERSION:=		13.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		9ce6b6ac89b6aa0b111a1acdf3606e06
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
@@ -13,25 +13,53 @@ PKG_DEPENDS:=		boost python2 libstdcxx glibc-gconv
 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+=		yajl tinyxml libsqlite libpcrecpp libpng libncurses
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+=		libbluray libgpg-error libudev python2-mod-sqlite
-PKG_DEPENDS+=		libssh libcec libnfs librtmp samba-lib libncurses
+PKG_DEPENDS+=		libgpg-error libudev python2-mod-sqlite
 PKG_DEPENDS+=		libxslt libvorbisenc alsa-lib glib libglu librt
 PKG_BUILDDEP:=		boost python2 mesalib libglew libass
-PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
+PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis
 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+=		libssh libcec libnfs samba rtmpdump eudev
-PKG_BUILDDEP+=		libgpg-error libbluray dbus libxslt libvorbis
+PKG_BUILDDEP+=		eudev alsa-lib glib glu libmodplug
+PKG_BUILDDEP+=		libgpg-error dbus libxslt libvorbis
 PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
-PKG_BUILDDEP+=		zip-host unzip-host alsa-lib glib glu
+PKG_BUILDDEP+=		zip-host unzip-host
 PKG_URL:=		http://xbmc.org/
 #PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_FLAVOURS_XBMC:=	WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC 
+PKG_FLAVOURS_XBMC+=	WITH_AFP WITH_WEBSERVER WITH_RTMP WITH_BLURAY
+
+PKGFD_WITH_SMB:=	enable samba support
+PKGFB_WITH_SMB:=	samba
+PKGFS_WITH_SMB:=	samba-lib
+PKGFD_WITH_NFS:=	enable nfs support
+PKGFB_WITH_NFS:=	libnfs
+PKGFS_WITH_NFS:=	libnfs
+PKGFD_WITH_SSH:=	enable ssh support
+PKGFB_WITH_SSH:=	libssh
+PKGFS_WITH_SSH:=	libssh
+PKGFD_WITH_AVAHI:=	enable avahi support
+PKGFB_WITH_AVAHI:=	avahi
+PKGFS_WITH_AVAHI:=	libavahi
+PKGFD_WITH_CEC:=	enable cec support
+PKGFB_WITH_CEC:=	libcec
+PKGFS_WITH_CEC:=	libcec
+PKGFD_WITH_AFP:=	enable afp support
+PKGFB_WITH_AFP:=	afpfs-ng
+PKGFS_WITH_AFP:=	libafpclient
+PKGFD_WITH_RTMP:=	enable rtmp support
+PKGFB_WITH_RTMP:=	rtmpdump
+PKGFS_WITH_RTMP:=	librtmp
+PKGFD_WITH_BLURAY:=	enable bluray support
+PKGFB_WITH_BLURAY:=	libbluray
+PKGFS_WITH_BLURAY:=	libbluray
+PKGFD_WITH_WEBSERVER:=	enable internal webserver support
+
 PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
 PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
 PKG_DEPENDS_IBM_X40:=	libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice
@@ -49,7 +77,9 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 
 HOST_CXXFLAGS+=		$(HOST_CPPFLAGS)
 XAKE_FLAGS+=		V=1 TIXML_USE_STL=1 GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I. -I./utils -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
+TARGET_CPPFLAGS+=	-I. -I./utils \
+			-I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
+			-I$(STAGING_TARGET_DIR)/usr/include/afpfs-ng \
 			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
 
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
@@ -65,7 +95,6 @@ CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
 CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-optimizations \
 			--disable-mysql \
-			--disable-avahi \
 			--disable-rsxs \
 			--disable-projectm \
 			--disable-crystalhd \
@@ -74,7 +103,7 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-libcap \
 			--disable-joystick \
 			--disable-dvdcss \
-			--disable-debug \
+			--enable-debug \
 			--disable-gtest \
 			--disable-ccache \
 			--disable-wayland \
@@ -83,14 +112,54 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-alsa \
 			--enable-libmp3lame \
 			--enable-libvorbisenc \
-			--enable-samba \
-			--enable-ssh \
-			--enable-nfs \
 			--enable-udev \
-			--enable-libbluray \
-			--enable-external-libraries \
-			--enable-rtmp \
-			--enable-libcec
+			--enable-external-libraries
+
+ifneq ($(ADK_PACKAGE_XBMC_WITH_BLURAY),)
+CONFIGURE_ARGS+=	--enable-libbluray
+else
+CONFIGURE_ARGS+=	--disable-libbluray
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_AFP),)
+CONFIGURE_ARGS+=	--enable-afpclient
+else
+CONFIGURE_ARGS+=	--disable-afpclient
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_SMB),)
+CONFIGURE_ARGS+=	--enable-samba
+else
+CONFIGURE_ARGS+=	--disable-samba
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_SSH),)
+CONFIGURE_ARGS+=	--enable-ssh
+else
+CONFIGURE_ARGS+=	--disable-ssh
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_NFS),)
+CONFIGURE_ARGS+=	--enable-nfs
+else
+CONFIGURE_ARGS+=	--disable-nfs
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_CEC),)
+CONFIGURE_ARGS+=	--enable-libcec
+else
+CONFIGURE_ARGS+=	--disable-libcec
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_RTMP),)
+CONFIGURE_ARGS+=	--enable-rtmp
+else
+CONFIGURE_ARGS+=	--disable-rtmp
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_AVAHI),)
+CONFIGURE_ARGS+=	--enable-avahi
+else
+CONFIGURE_ARGS+=	--disable-avahi
+endif
+ifneq ($(ADK_PACKAGE_XBMC_WITH_WEBSERVER),)
+CONFIGURE_ARGS+=	--enable-webserver
+else
+CONFIGURE_ARGS+=	--disable-webserver
+endif
 
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
@@ -107,7 +176,7 @@ pre-configure:
 	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
 
 xbmc-install:
-	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc
+	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc/addons
 	$(CP) $(WRKINST)/usr/lib/xbmc/* \
 		$(IDIR_XBMC)/usr/lib/xbmc
 	$(INSTALL_DIR) $(IDIR_XBMC)/usr/share/xbmc