From 087d55ec7a0bfa0713873a07a03d415fa58da525 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 31 Jan 2014 03:41:22 +0000
Subject: [PATCH] aur/omxplayer-git to 285.1091db2-1

---
 aur/omxplayer-git/PKGBUILD       | 29 +++++++++++++++++------------
 aur/omxplayer-git/omxplayer.arch | 20 --------------------
 2 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100755 aur/omxplayer-git/omxplayer.arch

diff --git a/aur/omxplayer-git/PKGBUILD b/aur/omxplayer-git/PKGBUILD
index 63f1573b9..5ba39c9a6 100644
--- a/aur/omxplayer-git/PKGBUILD
+++ b/aur/omxplayer-git/PKGBUILD
@@ -1,26 +1,26 @@
 # Maintainer:   Huulivoide      <gmail.com: jesse.jaara>
 # Contributor:  Jonathan Hudson <daria.co.uk: jh+arch>
 
-buildarch=18
+
+# If you are building this on the original 256MB Raspberry Pi
+# you need to enable some swap (100MB ?) or the build will fail
+# on OMXPlayerSubtitles.cpp
+
 
 pkgname=omxplayer-git
-pkgver=284.583f016
+pkgver=285.1091db2
 pkgrel=1
 pkgdesc="omxplayer is a command line media player for the RaspberryPi"
 arch=('arm' 'armv6h')
 url="https://github.com/popcornmix/omxplayer"
 license=(GPL2)
-depends=(ffmpeg raspberrypi-firmware-tools fbset dbus)
-makedepends=(git boost)
-optdepends=(ttf-freefont)
+depends=('ffmpeg' 'raspberrypi-firmware-tools' 'fbset')
+makedepends=('git' 'boost')
+optdepends=('ttf-freefont')
 provides=(omxplayer)
-conflicts=(omxplayer omxplayer-bin)
+conflicts=('omxplayer' 'omxplayer-bin')
 source=(git://github.com/popcornmix/omxplayer.git
-        omxplayer.arch Makefile.arch Makefile.include.arch)
-md5sums=('SKIP'
-         'b256bd3a81a974543a0afc62b62e5c28'
-         '462e40e8da2e2b10cb32138e7885d285'
-         'a8635442d02665944c04c18606453a04')
+        Makefile.arch Makefile.include.arch)
 
 pkgver() {
   cd omxplayer
@@ -32,7 +32,8 @@ prepare() {
 
   cp ../Makefile.arch Makefile
   cp ../Makefile.include.arch Makefile.include
-  cp ../omxplayer.arch omxplayer
+
+  sed 's|truetype/freefont|TTF|g' -i omxplayer.cpp
 }
 
 build() {
@@ -46,3 +47,7 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
+
+md5sums=('SKIP'
+         '462e40e8da2e2b10cb32138e7885d285'
+         'a8635442d02665944c04c18606453a04')
diff --git a/aur/omxplayer-git/omxplayer.arch b/aur/omxplayer-git/omxplayer.arch
deleted file mode 100755
index 089d6280d..000000000
--- a/aur/omxplayer-git/omxplayer.arch
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-[ -e /usr/bin/omxplayer.bin ] && OMXPLAYER="/usr/bin/omxplayer.bin" || exit 255
-
-FNTOPT=
-if [ -e /usr/share/fonts/TTF/FreeSans.ttf ]; then
-  FNTOPT=$FNTOPT" --font /usr/share/fonts/TTF/FreeSans.ttf"
-fi
-
-if [ -e /usr/share/fonts/TTF/FreeSansOblique.ttf ]; then
-  FNTOPT=$FNTOPT" --italic-font /usr/share/fonts/TTF/FreeSansOblique.ttf"
-fi
-
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval $(dbus-launch --sh-syntax)
-fi
-
-[ $# = 0 ] &&  exec $OMXPLAYER --help || \
- [ "$1" = '-h' -o "$1" = '--help' ] && exec $OMXPLAYER --help || \
-   clear ; exec $OMXPLAYER$FNTOPT "$@" #>/dev/null 2>&1