From e7260308e776f7db889a83eb7a6c437e295ad797 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 16 Jun 2014 18:01:44 +0200
Subject: update to 13.1

---
 package/xbmc/Makefile | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'package/xbmc/Makefile')

diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index d396f0534..18e38a0a5 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
-PKG_VERSION:=		13.1rc1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		1eb727c04cdc8282e9c2cb1f45ceeaae
+PKG_VERSION:=		13.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9ce6b6ac89b6aa0b111a1acdf3606e06
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
-PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx
+PKG_DEPENDS:=		boost libffmpeg 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
@@ -35,10 +35,10 @@ PKG_SITES:=		http://openadk.org/distfiles/
 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
-PKG_DEPENDS_QEMU_X86:=	libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice
+PKG_DEPENDS_VBOX_X86:=	libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice
 PKG_BUILDDEP_IBM_X40:=	nasm-host sdl sdl-image
-PKG_BUILDDEP_QEMU_X86:=	nasm-host sdl sdl-image
-PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40 qemu-x86
+PKG_BUILDDEP_VBOX_X86:=	nasm-host sdl sdl-image
+PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40 vbox-x86
 PKG_LIBC_DEPENDS:=	glibc
 
 DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
@@ -49,9 +49,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CXXFLAGS_FOR_BUILD+=	$(CPPFLAGS_FOR_BUILD)
-XAKE_FLAGS+=		V=1 TIXML_USE_STL=1
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \
+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 \
 			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 -DUSE_EXTERNAL_FFMPEG=1
 
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
@@ -65,12 +64,25 @@ AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
 			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
 CONFIGURE_ARGS+=	--disable-optical-drive \
+			--disable-optmizations \
 			--disable-mysql \
 			--disable-avahi \
 			--disable-rsxs \
 			--disable-projectm \
+			--disable-crystalhd \
+			--disable-mdnsembedded \
+			--disable-libusb \
+			--disable-libcap \
+			--disable-joystick \
+			--disable-dvdcss \
+			--disable-debug \
+			--disable-gtest \
+			--disable-ccache \
+			--disable-wayland \
+			--disable-pulse \
+			--disable-mid \
+			--with-ffmpeg \
 			--enable-alsa \
-			--enable-mid \
 			--enable-libmp3lame \
 			--enable-libvorbisenc \
 			--enable-samba \
@@ -80,12 +92,7 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-libbluray \
 			--enable-external-libraries \
 			--enable-rtmp \
-			--enable-libcec \
-			--disable-libusb \
-			--disable-libcap \
-			--disable-joystick \
-			--disable-dvdcss \
-			--disable-debug
+			--enable-libcec
 
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
-- 
cgit v1.2.3