From 78c66c9fcbdf35d76a0a9a9e4d5d291591c32e40 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 10 Jan 2014 18:35:43 +0100
Subject: update omxplayer, fix compile of xbmc after boost update

---
 package/omxplayer/Makefile                |  10 +--
 package/omxplayer/patches/patch-omxplayer | 100 +++++++++++++++++++++++-------
 2 files changed, 83 insertions(+), 27 deletions(-)

(limited to 'package/omxplayer')

diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index b40db3674..6e3c9f7b9 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 dbus xset fbset
 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 \
diff --git a/package/omxplayer/patches/patch-omxplayer b/package/omxplayer/patches/patch-omxplayer
index 10e11243b..94dd052ae 100644
--- a/package/omxplayer/patches/patch-omxplayer
+++ b/package/omxplayer/patches/patch-omxplayer
@@ -1,29 +1,85 @@
---- 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-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="./omxplayer.bin"
--FBSET="/usr/sbin/fbset"
- FONT="fonts/FreeSans.ttf"
+-OMXPLAYER_DBUS_ADDR=`mktemp -t omxplayer-XXXXX`
+-OMXPLAYER_DBUS_PID=`mktemp -t omxplayer-XXXXX`
++OMXPLAYER_DBUS_ADDR=`mktemp`
++OMXPLAYER_DBUS_PID=`mktemp`
  
- if [ -e /usr/share/fonts/truetype/freefont/FreeSans.ttf ]; then
-@@ -36,18 +35,9 @@ YRES=1080
- XRES=1600
- YRES=900
+ 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 [ -e $FBSET ]; then
--  echo 0 > /sys/class/vtconsole/vtcon1/bind
--  fbset -xres 1 -yres 1
+-if [ ! -z $NOREFRESH ] && [ "$NOREFRESH" == "1" ]; then
+-    exit 0
 -fi
 -
- if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-   eval $(dbus-launch --sh-syntax)
- 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`
  
- $OMXPLAYER --font $FONT --italic-font $ITALIC_FONT "$@"
+         if [ "$DEPTH2" == "8" ]; then
+@@ -89,16 +52,5 @@ if [[ $@ =~ $refresh_regex ]]; then
  
--if [ -e $FBSET ]; then
--  fbset -xres ${XRES} -yres ${YRES}
--  echo 1 > /sys/class/vtconsole/vtcon1/bind
--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
++
-- 
cgit v1.2.3


From 5edfb8067ec793a2a0361fe215a1498902b14a1a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 15 Jan 2014 17:20:57 +0100
Subject: fix xbmc youtube addon, now plays fine. python2-sqlite needed, and
 bios param start_x=1

---
 package/omxplayer/Makefile                |  6 +--
 package/omxplayer/patches/patch-omxplayer | 85 -------------------------------
 2 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 package/omxplayer/patches/patch-omxplayer

(limited to 'package/omxplayer')

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
-+
-- 
cgit v1.2.3