diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 08:43:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 08:43:51 +0100 |
| commit | 043601ef5ccc17b3aac714be38889c07b6b5b6f3 (patch) | |
| tree | 3581a07a1a001b919b7515e5baf2d78d0151a6e5 /package/omxplayer | |
| parent | 6b521744a3b178dc910a46191aed8cf75de1cee7 (diff) | |
| parent | 69d9bac9dad423e4cabf7bfa97a7765e4c442104 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/omxplayer')
| -rw-r--r-- | package/omxplayer/Makefile | 14 | ||||
| -rw-r--r-- | package/omxplayer/patches/patch-omxplayer | 29 |
2 files changed, 7 insertions, 36 deletions
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index b40db3674..a4da71aef 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -4,14 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= omxplayer -# actually 5777879e9ee26f3e7c4e8746e07824ade629f152 from 4.10.2013 -PKG_VERSION:= 0.2 +# actually d1a4a0e1030249e40e2e9bb04518f1b786b18488 from 7.01.2014 +PKG_VERSION:= 0.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= c1fddbafb837fe6fa50270d7d1ece6cb +PKG_MD5SUM:= 1882cac6032baa59291068af30df1702 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 dbus +PKG_DEPENDS+= librt zlib libpthread libstdcxx libgcc libdbus PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus PKG_URL:= https://github.com/popcornmix/omxplayer PKG_SITES:= http://openadk.org/distfiles/ @@ -25,7 +25,7 @@ $(eval $(call PKG_template,OMXPLAYER,omxplayer,$(PKG_VERSION)-${PKG_RELEASE},${P CONFIG_STYLE:= manual INSTALL_STYLE:= manual -TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \ +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_55 \ -I$(STAGING_DIR)/usr/include/freetype2 \ -I$(STAGING_DIR)/usr/include/dbus-1.0 \ -I$(STAGING_DIR)/opt/vc/include \ @@ -35,8 +35,8 @@ TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib omxplayer-install: $(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/bin - $(INSTALL_BIN) $(WRKSRC)/omxplayer{,.bin} \ - $(IDIR_OMXPLAYER)/usr/bin + $(INSTALL_BIN) $(WRKSRC)/omxplayer.bin \ + $(IDIR_OMXPLAYER)/usr/bin/omxplayer $(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/ $(INSTALL_DATA) $(WRKSRC)/fonts/* \ $(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/ diff --git a/package/omxplayer/patches/patch-omxplayer b/package/omxplayer/patches/patch-omxplayer deleted file mode 100644 index 10e11243b..000000000 --- a/package/omxplayer/patches/patch-omxplayer +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 - --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 "$@" - --if [ -e $FBSET ]; then -- fbset -xres ${XRES} -yres ${YRES} -- echo 1 > /sys/class/vtconsole/vtcon1/bind --fi |