diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-15 17:20:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-15 17:20:57 +0100 |
| commit | 5edfb8067ec793a2a0361fe215a1498902b14a1a (patch) | |
| tree | 3ad5787e2e7a427d90bb6a84143b01888d431c1b /package/omxplayer | |
| parent | ebf9a6961641072a526b027b8dd42831440397ec (diff) | |
fix xbmc youtube addon, now plays fine. python2-sqlite needed, and bios param start_x=1
Diffstat (limited to 'package/omxplayer')
| -rw-r--r-- | package/omxplayer/Makefile | 6 | ||||
| -rw-r--r-- | package/omxplayer/patches/patch-omxplayer | 85 |
2 files changed, 3 insertions, 88 deletions
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index 6e3c9f7b9..a4da71aef 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -11,7 +11,7 @@ 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 xset fbset +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/ @@ -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 94dd052ae..000000000 --- a/package/omxplayer/patches/patch-omxplayer +++ /dev/null @@ -1,85 +0,0 @@ ---- omxplayer-0.3.orig/omxplayer 2014-01-07 09:24:29.000000000 +0100 -+++ omxplayer-0.3/omxplayer 2014-01-10 17:57:55.229752300 +0100 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # OMXPlayer launcher script. - # -@@ -13,38 +13,10 @@ else - OMXPLAYER_LIBS="$OMXPLAYER_LIBS:/usr/lib/omxplayer" - fi - --refresh_regex='(|.* )(-r|--refresh)( .*|$)' --audio_regex='.*\.(mp3|wav|wma|cda|ogg|ogm|aac|ac3|flac)( .*|$)' -- - fbset_bin=`which fbset` --xset_bin=`which xset` --xrefresh_bin=`which xrefresh` -- --if [ -z $NOREFRESH ] || [ "$NOREFRESH" == "0" ]; then -- if [[ $@ =~ $refresh_regex ]] && [[ ! $@ =~ $audio_regex ]]; then -- check_failed=0 -- -- if [ -z $fbset_bin ]; then -- echo "WARNING: You are going to run omxplayer with -r/--refresh and you don't have fbset installed, this can cause black screen when it finishes playing." -- check_failed=1 -- fi -- -- if [ ! -z $DISPLAY ]; then -- if [ -z $xset_bin ] || [ -z $xrefresh_bin ]; then -- echo "WARNING: You are going to run omxplayer with -r/--refresh and you don't have xset and xrefresh installed (x11-xserver-utils package on Debian/Raspbian), this can cause black screen when it finishes playing." -- check_failed=1 -- fi -- fi -- -- if [ "$check_failed" == "1" ]; then -- read -sn 1 -p "Press any key to continue or Ctrl-C to quit." -- echo -- fi -- fi --fi - --OMXPLAYER_DBUS_ADDR=`mktemp -t omxplayer-XXXXX` --OMXPLAYER_DBUS_PID=`mktemp -t omxplayer-XXXXX` -+OMXPLAYER_DBUS_ADDR=`mktemp` -+OMXPLAYER_DBUS_PID=`mktemp` - - exec 5> $OMXPLAYER_DBUS_ADDR - exec 6> $OMXPLAYER_DBUS_PID -@@ -66,16 +38,7 @@ fi - rm -f $OMXPLAYER_DBUS_ADDR - rm -f $OMXPLAYER_DBUS_PID - --if [ ! -z $NOREFRESH ] && [ "$NOREFRESH" == "1" ]; then -- exit 0 --fi -- --if [[ $@ =~ $audio_regex ]]; then -- exit 0 --fi -- --if [[ $@ =~ $refresh_regex ]]; then -- if [ ! -z $fbset_bin ]; then -+if [ ! -z $fbset_bin ]; then - DEPTH2=`$fbset_bin | head -3 | tail -1 | cut -d " " -f 10` - - if [ "$DEPTH2" == "8" ]; then -@@ -89,16 +52,5 @@ if [[ $@ =~ $refresh_regex ]]; then - - $fbset_bin -depth $DEPTH1 > /dev/null 2>&1 - $fbset_bin -depth $DEPTH2 > /dev/null 2>&1 -- fi -- -- if [ ! -z $xset_bin ] && [ ! -z $xrefresh_bin ]; then -- if [ -z $DISPLAY ]; then -- DISPLAY=":0" -- fi -- -- $xset_bin -display $DISPLAY -q > /dev/null 2>&1 -- if [ "$?" == "0" ]; then -- $xrefresh_bin -display $DISPLAY > /dev/null 2>&1 -- fi -- fi - fi -+ |