diff --git a/srcpkgs/omxplayer/files/Makefile b/srcpkgs/omxplayer/files/Makefile index 19bfb108e61..6d5469f56e7 100644 --- a/srcpkgs/omxplayer/files/Makefile +++ b/srcpkgs/omxplayer/files/Makefile @@ -60,7 +60,7 @@ clean: install: install -d $(DESTDIR)/usr/bin - install -Dm755 omxplayer.sh $(DESTDIR)/usr/bin/omxplayer + install -Dm755 omxplayer $(DESTDIR)/usr/bin/omxplayer install -Dm755 omxplayer.bin $(DESTDIR)/usr/bin diff --git a/srcpkgs/omxplayer/files/omxplayer.sh b/srcpkgs/omxplayer/files/omxplayer.sh deleted file mode 100644 index 9c5319070df..00000000000 --- a/srcpkgs/omxplayer/files/omxplayer.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# OMXPlayer wrapper script. Fixes some common issues. -# -# Author: Sergio Conde -# License: GPLv2 -# - -OMXPLAYER_BIN="/usr/bin/omxplayer.bin" -OMXPLAYER_LIBS="/opt/vc/lib:/usr/lib/omxplayer" - -refresh_regex='(|.* )(-r|--refresh)( .*|$)' -audio_regex='.*\.(mp3|wav|wma|cda|ogg|ogm|aac|ac3|flac)( .*|$)' - -fbset_bin=`which fbset 2>/dev/null` -xset_bin=`which xset 2>/dev/null` -xrefresh_bin=`which xrefresh 2>/dev/null` - -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 installed, 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` - -exec 5> $OMXPLAYER_DBUS_ADDR -exec 6> $OMXPLAYER_DBUS_PID - -dbus-daemon --fork --print-address 5 --print-pid 6 --session - -DBUS_SESSION_BUS_ADDRESS=`cat $OMXPLAYER_DBUS_ADDR` -DBUS_SESSION_BUS_PID=`cat $OMXPLAYER_DBUS_PID` - -export DBUS_SESSION_BUS_ADDRESS -export DBUS_SESSION_BUS_PID - -LD_LIBRARY_PATH="$OMXPLAYER_LIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" $OMXPLAYER_BIN "$@"; true - -if [ -n "$DBUS_SESSION_BUS_PID" ]; then - kill -2 "$DBUS_SESSION_BUS_PID" -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 - DEPTH2=`$fbset_bin | head -3 | tail -1 | cut -d " " -f 10` - - if [ "$DEPTH2" == "8" ]; then - DEPTH1=16 - elif [ "$DEPTH2" == "16" ] || [ "$DEPTH2" == "32" ]; then - DEPTH1=8 - else - DEPTH1=8 - DEPTH2=16 - fi - - $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 diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index 2866a445e82..8766ce60023 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -1,8 +1,8 @@ # Template file for 'omxplayer' -_githash=f666a5d +_githash=7af21f5963 pkgname=omxplayer -version=20140120 +version=20140226 revision=1 short_desc="Commandline OMX player for the Raspberry Pi (git ${_githash})" maintainer="Juan RP "