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

package/bcm2835-vc/Makefile

@@ -4,9 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-vc
-PKG_VERSION:=		0.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		d16840805c020af92cd2268a0291228b
+# actually f65a4eef05ee436976f9be219d3db841d3d6b8ec from 05.10.2013
+PKG_VERSION:=		0.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		027d42d1ba803fabdc6bc4ec78d52e67
 PKG_DESCR:=		vc tools for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_DEPENDS:=		libpthread
@@ -15,24 +16,26 @@ PKG_SITES:=		http://openadk.org/distfiles/
 PKG_LIBC_DEPENDS:=	eglibc glibc
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
-PKG_SUBPKGS:=		BCM2835_VC BCM2835_VC_DEV
+PKG_SUBPKGS:=		BCM2835_VC
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,BCM2835_VC_DEV,bcm2835-vc-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=          manual
-BUILD_STYLE:=           manual
-INSTALL_STYLE:=         manual
+
+do-configure:
+	(cd $(WRKBUILD) && cmake .)
 
 bcm2835-vc-install:
-	${CP} ${WRKBUILD}/* ${IDIR_BCM2835_VC}
+	$(INSTALL_DIR) ${IDIR_BCM2835_VC}/opt/vc/{bin,lib}
+	$(CP) ${WRKINST}/opt/vc/lib/* ${IDIR_BCM2835_VC}/opt/vc/lib
+	$(CP) ${WRKINST}/opt/vc/bin/* ${IDIR_BCM2835_VC}/opt/vc/bin
 	# required for xbmc
 	(cd ${IDIR_BCM2835_VC}/opt/vc/lib && ln -sf libEGL.so libEGL.so.1)
-	-rm -rf ${IDIR_BCM2835_VC}/opt/vc/include
+	-rm -rf ${STAGING_DIR}/opt/vc
 	mkdir -p ${STAGING_DIR}/opt/vc
-	${CP} ${WRKBUILD}/opt/vc/lib ${STAGING_DIR}/opt/vc
-	${CP} ${WRKBUILD}/opt/vc/include ${STAGING_DIR}/opt/vc
+	${CP} ${WRKINST}/opt/vc/lib ${STAGING_DIR}/opt/vc
+	${CP} ${WRKINST}/opt/vc/include ${STAGING_DIR}/opt/vc
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/boost/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		efbfbff5a85a9330951f243d0a46e4b9
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		gettext-tiny
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 

package/eglibc/Makefile

@@ -24,16 +24,6 @@ INSTALL_STYLE:=		manual
 
 # compile nothing, eglibc is already build in toolchain directory
 do-install:
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
-	for abi in $(TABI); do \
-		${INSTALL_DIR} $(IDIR_EGLIBC)/lib$${abi/*:/} $(IDIR_EGLIBC)/usr/lib$${abi/*:/} ; \
-		$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib$${abi/*:/} ; \
-		-for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \
-			$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file.so* $(IDIR_EGLIBC)/lib$${abi/*:/}; \
-			$(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib$${abi/*:/}; \
-		done ; \
-	done
-else
 	${INSTALL_DIR} $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH) \
 	    $(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin
 	$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH)
@@ -44,11 +34,10 @@ else
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_EGLIBC)/usr/bin
 ifeq ($(ADK_LOCALES),y)
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_EGLIBC)/usr/bin
-endif
 endif
 	${INSTALL_DIR} $(IDIR_EGLIBC)/etc 
 	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc
-	${INSTALL_DATA} ./files/nssswitch.conf ${IDIR_EGLIBC}/etc
+	${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_EGLIBC}/etc
 
 eglibc-static-install:
 	${INSTALL_DIR} $(IDIR_EGLIBC_STATIC)/usr/lib

package/ffmpeg/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
 PKG_VERSION:=		2.0.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		dd71a1baedb2daa3e4d21e0651daa918
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
@@ -31,7 +31,14 @@ PKGSC_FFPROBE:=		multimedia
 PKGSS_FFPROBE:=		libffmpeg
 
 PKG_FLAVOURS_LIBFFMPEG:=	WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA
-PKG_FLAVOURS_LIBFFMPEG+=	WITH_XVID WITH_VORBIS
+PKG_FLAVOURS_LIBFFMPEG+=	WITH_XVID WITH_VORBIS WITH_X264
+
+PKGFD_WITH_X264:=	with X264 decoding support
+PKGFS_WITH_X264:=	libx264
+PKGFB_WITH_X264:=	libx264
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_X264),y)
+PKG_FDEPENDS+=		libx264
+endif
 
 PKGFD_WITH_AAC:=	with AAC encoding support
 PKGFS_WITH_AAC:=	libfaac
@@ -130,6 +137,9 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-postproc \
 			${CONFIGURE_CPU_OPTS}
 
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_X264),y)
+CONFIGURE_ARGS+=	--enable-libx264
+endif
 ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_AAC),y)
 CONFIGURE_ARGS+=	--enable-libfaac
 endif

package/libstdcxx/Makefile

@@ -20,6 +20,11 @@ PKG_NAME:=		libstdcxx
 PKG_DESCR:=		C++ support library
 PKG_SECTION:=		libs
 PKG_NEED_CXX:=		1
+ifeq ($(ADK_LINUX_AVR32),y)
+PKG_SUBVER:=		14
+else
+PKG_SUBVER:=		17
+endif
 
 NO_DISTFILES:=		1
 
@@ -36,10 +41,10 @@ do-install:
 ifeq ($(ADK_NATIVE),y)
 	$(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib
 else
-	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.1? libstdc++.so.6)
-	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.1? libstdc++.so)
-	(cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.1? libstdc++.so)
-	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.1? ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
+	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${PKG_SUBVER} libstdc++.so.6)
+	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${PKG_SUBVER} libstdc++.so)
+	(cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.${PKG_SUBVER} libstdc++.so)
+	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.${PKG_SUBVER} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
 endif
 

package/libx264/Makefile

@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libx264
+# actually is snapshot x264-snapshot-20131010-2245
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e6718029b4bc955f1dbb9bdafeed3ac0
+PKG_DESCR:=		H264 encoding library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.videolan.org/developers/x264.html
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-cli
+
+libx264-install:
+	$(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libx264*.so* \
+		$(IDIR_LIBX264)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/libx264/patches/patch-configure

@@ -0,0 +1,23 @@
+--- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
++++ libx264-1.0/configure	2013-10-11 11:33:39.000000000 +0200
+@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then
+ elif [ $ARCH = ARM ]; then
+     # arm-gcc-4.2 produces incorrect output with -ffast-math
+     # and it doesn't save any speed anyway on 4.4, so disable it
+-    CFLAGS="-O3 -fno-fast-math $CFLAGS"
++    CFLAGS="-fno-fast-math $CFLAGS"
+ else
+-    CFLAGS="-O3 -ffast-math $CFLAGS"
++    CFLAGS="-ffast-math $CFLAGS"
+ fi
+ 
+ if cc_check '' -fno-tree-vectorize ; then
+@@ -1136,7 +1136,7 @@ LIBX264=$LIBX264
+ AR=$AR
+ RANLIB=$RANLIB
+ STRIP=$STRIP
+-AS=$AS
++AS=$CC
+ ASFLAGS=$ASFLAGS
+ RC=$RC
+ RCFLAGS=$RCFLAGS

package/libx264/patches/patch-configure.orig

@@ -0,0 +1,11 @@
+--- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
++++ libx264-1.0/configure	2013-10-11 11:32:15.000000000 +0200
+@@ -1136,7 +1136,7 @@ LIBX264=$LIBX264
+ AR=$AR
+ RANLIB=$RANLIB
+ STRIP=$STRIP
+-AS=$AS
++AS=$CC
+ ASFLAGS=$ASFLAGS
+ RC=$RC
+ RCFLAGS=$RCFLAGS

package/mpd/files/mpd.conf

@@ -6,6 +6,8 @@ state_file			"/etc/mpd/state"
 db_file				"/etc/mpd/database"
 pid_file			"/var/run/mpd/mpd.pid"
 log_file			"syslog"
+filesystem_charset		"UTF-8"
+id3v1_encoding			"UTF-8"
 # An example of an ALSA output
 audio_output {
 	type			"alsa"

package/omxplayer/Makefile

@@ -4,14 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		omxplayer
-PKG_VERSION:=		0.1
+# actually 5777879e9ee26f3e7c4e8746e07824ade629f152 from 4.10.2013
+PKG_VERSION:=		0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		bb0bcdf1de3aec56d3e0746b91915d90
+PKG_MD5SUM:=		c1fddbafb837fe6fa50270d7d1ece6cb
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
-PKG_DEPENDS+=		librt zlib libpthread libstdcxx libgcc
-PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre
+PKG_DEPENDS+=		librt zlib libpthread libstdcxx libgcc dbus
+PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre dbus
 PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
 
@@ -26,6 +27,7 @@ CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/boost-1_54 \
 			-I$(STAGING_DIR)/usr/include/freetype2 \
+			-I$(STAGING_DIR)/usr/include/dbus-1.0 \
 			-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

package/omxplayer/patches/patch-Makefile

@@ -1,12 +1,13 @@
---- omxplayer-0.1.orig/Makefile	2013-07-18 13:18:41.000000000 +0200
-+++ omxplayer-0.1/Makefile	2013-07-24 10:16:55.000000000 +0200
-@@ -2,8 +2,8 @@ include Makefile.include
+--- omxplayer-0.2.orig/Makefile	2013-10-11 15:17:41.000000000 +0200
++++ omxplayer-0.2/Makefile	2013-10-11 15:30:49.000000000 +0200
+@@ -2,9 +2,9 @@ include Makefile.include
  
- CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
+ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
+ 
+-LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
++LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static
  
--LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
-+LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static
 +INCLUDES+=-I./ -Ilinux
  
  DIST ?= omxplayer-dist

package/omxplayer/patches/patch-Makefile_include

@@ -1,9 +1,28 @@
---- omxplayer-0.1.orig/Makefile.include	2013-07-18 13:18:43.000000000 +0200
-+++ omxplayer-0.1/Makefile.include	2013-07-22 11:11:12.000000000 +0200
-@@ -19,20 +19,20 @@ endif
- 
+--- omxplayer-0.2.orig/Makefile.include	2013-10-11 15:17:41.000000000 +0200
++++ omxplayer-0.2/Makefile.include	2013-10-11 15:34:42.000000000 +0200
+@@ -1,40 +1,16 @@
+-USE_BUILDROOT=0
+-FLOAT=hard
+-
+-ifeq ($(USE_BUILDROOT), 1)
+-BUILDROOT	:=/opt/xbmc-bcm/buildroot
+-SDKSTAGE	:=$(BUILDROOT)/output/staging
+-TARGETFS	:=$(BUILDROOT)/output/target
+-TOOLCHAIN	:=$(BUILDROOT)/output/host/usr/
+-HOST			:=arm-unknown-linux-gnueabi
+-SYSROOT		:=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot
+-else
+-BUILDROOT	:=/opt/bcm-rootfs
+-SDKSTAGE	:=/opt/bcm-rootfs
+-TARGETFS	:=/opt/bcm-rootfs
+-TOOLCHAIN	:=/home/dc4/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/
+-HOST		:=arm-linux-gnueabihf
+-#SYSROOT		:=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot
+-SYSROOT		:=/opt/bcm-rootfs
+-endif
+-
  JOBS=7
- 
+-
 -CFLAGS			:= -isystem$(PREFIX)/include
 -CXXFLAGS		:= $(CFLAGS)
 -CPPFLAGS		:= $(CFLAGS)
@@ -15,22 +34,25 @@
 -RANLIB			:= $(TOOLCHAIN)/bin/$(HOST)-ranlib
 -STRIP				:= $(TOOLCHAIN)/bin/$(HOST)-strip
 -AR 					:= $(TOOLCHAIN)/bin/$(HOST)-ar
+-CXXCP 			:= $(CXX) -E
+-PATH 				:= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
+-
+-CFLAGS			+= -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
+-LDFLAGS			+= -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
+-#INCLUDES		+= -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
+-INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
 +CFLAGS			?= -isystem$(PREFIX)/include
 +CXXFLAGS		?= $(CFLAGS)
-+CPPFLAGS		?= $(CPPFLAGS)
++CPPFLAGS		?= $(CFLAGS)
 +LDFLAGS			?= -L$(BUILDROOT)/lib
 +LD			?= $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT)
 +CC			?= $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT)
-+CXX         		?= $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT)
++CXX    		        ?= $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT)
 +OBJDUMP			?= $(TOOLCHAIN)/bin/$(HOST)-objdump
 +RANLIB			?= $(TOOLCHAIN)/bin/$(HOST)-ranlib
 +STRIP			?= $(TOOLCHAIN)/bin/$(HOST)-strip
 +AR 			?= $(TOOLCHAIN)/bin/$(HOST)-ar
- CXXCP 			:= $(CXX) -E
- PATH 				:= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
- 
--CFLAGS			+= -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -O3 -mstructure-size-boundary=32 -mno-sched-prolog
-+CFLAGS			+= -pipe -fomit-frame-pointer -O3 -mstructure-size-boundary=32 -mno-sched-prolog
- LDFLAGS			+= -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/
--INCLUDES		+= -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
++CXXCP 			?= $(CXX) -E
++PATH			?= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
 +INCLUDES		+= $(CPPFLAGS)
++CFLAGS			+= -mstructure-size-boundary=32 -mno-sched-prolog

package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp

@@ -1,8 +1,8 @@
---- omxplayer-0.1.orig/OMXPlayerSubtitles.cpp	2013-07-18 13:18:41.000000000 +0200
-+++ omxplayer-0.1/OMXPlayerSubtitles.cpp	2013-07-22 11:04:00.000000000 +0200
+--- omxplayer-0.2.orig/OMXPlayerSubtitles.cpp	2013-10-11 15:17:41.000000000 +0200
++++ omxplayer-0.2/OMXPlayerSubtitles.cpp	2013-10-11 15:28:35.000000000 +0200
 @@ -43,11 +43,9 @@ OMXPlayerSubtitles::OMXPlayerSubtitles()
-   m_font_size(),
    m_centered(),
+   m_ghost_box(),
    m_lines(),
 -  m_av_clock(),
 -#ifndef NDEBUG

package/omxplayer/patches/patch-omxplayer

@@ -1,6 +1,14 @@
---- omxplayer-0.1.orig/omxplayer	2013-07-18 13:18:41.000000000 +0200
-+++ omxplayer-0.1/omxplayer	2013-07-22 15:19:43.000000000 +0200
-@@ -36,14 +36,14 @@ YRES=1080
+--- omxplayer-0.2.orig/omxplayer	2013-10-11 15:17:41.000000000 +0200
++++ omxplayer-0.2/omxplayer	2013-10-11 15:31:23.000000000 +0200
+@@ -3,7 +3,6 @@
+ #mount -t nfs -o rsize=32768,wsize=32768,intr 192.168.10.1:/data/video /media
+ 
+ OMXPLAYER="./omxplayer.bin"
+-FBSET="/usr/sbin/fbset"
+ FONT="fonts/FreeSans.ttf"
+ 
+ if [ -e /usr/share/fonts/truetype/freefont/FreeSans.ttf ]; then
+@@ -36,18 +35,9 @@ YRES=1080
  XRES=1600
  YRES=900
  
@@ -8,10 +16,10 @@
 -  echo 0 > /sys/class/vtconsole/vtcon1/bind
 -  fbset -xres 1 -yres 1
 -fi
-+#if [ -e $FBSET ]; then
-+#  echo 0 > /sys/class/vtconsole/vtcon1/bind
-+#  fbset -xres 1 -yres 1
-+#fi
+-
+ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+   eval $(dbus-launch --sh-syntax)
+ fi
  
  $OMXPLAYER --font $FONT --italic-font $ITALIC_FONT "$@"
  
@@ -19,7 +27,3 @@
 -  fbset -xres ${XRES} -yres ${YRES}
 -  echo 1 > /sys/class/vtconsole/vtcon1/bind
 -fi
-+#if [ -e $FBSET ]; then
-+#  fbset -xres ${XRES} -yres ${YRES}
-+#  echo 1 > /sys/class/vtconsole/vtcon1/bind
-+#fi

package/xbmc/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
 PKG_VERSION:=		12.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		489f3877decae4e265ece54f9eaef0ba
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
@@ -56,6 +56,9 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--disable-x11 \
 			--with-platform=raspberry-pi
 
+post-extract:
+	(cd $(WRKDIR) && ${BASH} $(TOPDIR)/scripts/xbmc-fix.sh)
+
 xbmc-install:
 	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc
 	$(CP) $(WRKINST)/usr/lib/xbmc/* \

package/xbmc/patches/patch-xbmc_Application_cpp

@@ -1,5 +1,5 @@
 --- xbmc-12.2.orig/xbmc/Application.cpp	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/xbmc/Application.cpp	2013-10-08 13:55:01.000000000 +0200
++++ xbmc-12.2/xbmc/Application.cpp	2013-10-10 18:43:17.000000000 +0200
 @@ -615,7 +615,7 @@ bool CApplication::Create()
  
    if (!CLog::Init(CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str()))
@@ -35,7 +35,7 @@
 -    CStdString strTempPath = userHome;
 -    strTempPath = URIUtils::AddFileToFolder(strTempPath, ".xbmc/temp");
 +    CStdString strTempPath = "/tmp";
-+    strTempPath = URIUtils::AddFileToFolder(strTempPath, "/.xbmc/temp");
++    strTempPath = URIUtils::AddFileToFolder(strTempPath, "/xbmc");
      if (getenv("XBMC_TEMP"))
        strTempPath = getenv("XBMC_TEMP");
      CSpecialProtocol::SetTempPath(strTempPath);

scripts/scan-pkgs.sh

@@ -179,6 +179,10 @@ if [[ -n $ADK_PACKAGE_GLIB ]]; then
 	NEED_GETTEXT="$NEED_GETTEXT glib"
 fi
 
+if [[ -n $ADK_PACKAGE_BCM2835_VC ]]; then
+	NEED_CMAKE="$NEED_CMAKE bcm2835-vc"
+fi
+
 if [[ -n $ADK_PACKAGE_YAJL ]]; then
 	NEED_RUBY="$NEED_RUBY yajl"
 	NEED_CMAKE="$NEED_CMAKE yajl"

scripts/xbmc-fix.sh

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

target/packages/pkg-available/mpdbox

@@ -20,6 +20,7 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_FFMPEG
 	select ADK_PACKAGE_FFPROBE
 	select ADK_PACKAGE_LIBFFMPEG
+	select ADK_PACKAGE_LIBFFMPEG_WITH_X264
 	select ADK_PACKAGE_LIBFFMPEG_WITH_AAC
 	select ADK_PACKAGE_LIBFFMPEG_WITH_MP3
 	select ADK_PACKAGE_LIBFFMPEG_WITH_VP8