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

5 files changed, 67 insertions, 38 deletions

diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index 3949c8387..b40db3674 100644
--- a/package/omxplayer/Makefile
+++ b/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
diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile
index d674d4d1c..f7caae300 100644
--- a/package/omxplayer/patches/patch-Makefile
+++ b/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
diff --git a/package/omxplayer/patches/patch-Makefile_include b/package/omxplayer/patches/patch-Makefile_include
index fbcbbeb89..14673c15f 100644
--- a/package/omxplayer/patches/patch-Makefile_include
+++ b/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
diff --git a/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp b/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp
index 4ecea91ad..c23d1c9b3 100644
--- a/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp
+++ b/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
diff --git a/package/omxplayer/patches/patch-omxplayer b/package/omxplayer/patches/patch-omxplayer
index cea125e57..10e11243b 100644
--- a/package/omxplayer/patches/patch-omxplayer
+++ b/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