From f326e24997c33cf9a96eeebda6da6dcdadc23b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 28 Nov 2014 11:57:14 +0200
Subject: main/omxplayer: upgrade to 2014-11-27, add init.d script

---
 main/omxplayer/APKBUILD        | 30 ++++++++++++++++++++++--------
 main/omxplayer/omxplayer.confd |  2 ++
 main/omxplayer/omxplayer.initd | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 main/omxplayer/omxplayer.confd
 create mode 100644 main/omxplayer/omxplayer.initd

(limited to 'main')

diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD
index c95843cc3..8a1132f6a 100644
--- a/main/omxplayer/APKBUILD
+++ b/main/omxplayer/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=omxplayer
-pkgver=0.20141118
-_commitid=381e05871b2a633675fdab8972b068757e588691
+pkgver=0.20141127
+_commitid=bdd69f6d919ea44194fd6cecc53c913cc4e4a982
 pkgrel=0
 pkgdesc="Commandline OMX player for Raspberry Pi"
 url="https://github.com/popcornmix/omxplayer"
@@ -15,6 +15,9 @@ source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archiv
 	issue-260.patch
 	fix-makefile.patch
 	default-font.patch
+
+	omxplayer.initd
+	omxplayer.confd
 	"
 
 _srcdir="$srcdir"/$pkgname-$_commitid
@@ -45,17 +48,28 @@ package() {
 	cd "$_srcdir"
 	make install DIST="$pkgdir" || return 1
 	rm -rf "$pkgdir"/usr/lib/omxplayer
+
+        install -m755 -D "$srcdir"/$pkgname.initd \
+                "$pkgdir"/etc/init.d/$pkgname || return 1
+        install -m644 -D "$srcdir"/$pkgname.confd \
+                "$pkgdir"/etc/conf.d/$pkgname || return 1
 }
 
-md5sums="82a1869267091d54f0e63b2c148c68a4  omxplayer-0.20141118.tar.gz
+md5sums="2749588948d654210be84c7d47a8bc57  omxplayer-0.20141127.tar.gz
 a900cdded87b7df503c6599ac43bd8de  issue-260.patch
 d8f335e1dff4b34faf36c25ad2c2b881  fix-makefile.patch
-79197742a37d4493e1224675c6803eba  default-font.patch"
-sha256sums="9c1c9fc8ff51ba1c9eb318fc1b847d6a4202022f53e3e78a225ef3984329588c  omxplayer-0.20141118.tar.gz
+79197742a37d4493e1224675c6803eba  default-font.patch
+adbe4b0ab56d45c1e9554d266c575d6f  omxplayer.initd
+0577b20f61ef5fcdf5533f45cba64f1a  omxplayer.confd"
+sha256sums="d06dbdae13e595f554bb9e2318f1a4fd01c36776253cbd01811f2e7fa38e33e0  omxplayer-0.20141127.tar.gz
 5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63  issue-260.patch
 799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422  fix-makefile.patch
-0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631  default-font.patch"
-sha512sums="afd87aa00efbe5d74f53770a2395c2251c389e5a1de163c90355c8cf5f03d7a1b5151426272dbf0472978328d0a63253f4856ecdc7f18136b59cc39f00937646  omxplayer-0.20141118.tar.gz
+0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631  default-font.patch
+b6b18afb0a5d5ebe7abb474eb6bcf56f3d2fa7442e9de4e2681f8afa882739e0  omxplayer.initd
+4f680e77e3cb2ba30d137f1e7d8ece59e6a7b628ae9460d7e4dff4927b02ba08  omxplayer.confd"
+sha512sums="4618aaa2502bd044f8ac0124f801c726e2f7bbc7b3d0f975b0278e5a8cfda5fb6eb126c4a4dee23dc9ac5407b6b1d4ccb9b2e5b10036a2975acaeeff36d61086  omxplayer-0.20141127.tar.gz
 c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8  issue-260.patch
 3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517  fix-makefile.patch
-70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f  default-font.patch"
+70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f  default-font.patch
+05a933c64c8489b5644fef6704fcdc4a5654d792f1f57f7ca85e91b5441f6f158570502dff591156fca37a08c3593478250b2bb5c0af5083deed366c0fcdef4f  omxplayer.initd
+0bd40d53d8deda9a34ffaea4234d82480dcb8b02cace97c472062c5a6c27059c6916915ad4f48114245c3aa74689ddcdb13633cbd44e8c03a84187a061af8abb  omxplayer.confd"
diff --git a/main/omxplayer/omxplayer.confd b/main/omxplayer/omxplayer.confd
new file mode 100644
index 000000000..96571aae3
--- /dev/null
+++ b/main/omxplayer/omxplayer.confd
@@ -0,0 +1,2 @@
+# OMXPLAYER_OPTS="--live"
+# OMXPLAYER_URL="http://10.0.0.1/"
diff --git a/main/omxplayer/omxplayer.initd b/main/omxplayer/omxplayer.initd
new file mode 100644
index 000000000..72c632d4f
--- /dev/null
+++ b/main/omxplayer/omxplayer.initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+
+depend() {
+	after net firewall chrony
+}
+
+omxplayer_run_loop() {
+	while true; do
+		/usr/bin/omxplayer "$@"
+		status=$?
+		echo "exited: $status"
+		[ "$status" -eq 129 ] && exit 0
+		sleep 0.2
+	done
+}
+
+checkconfig() {
+	[ -z "$OMXPLAYER_URL" ] && eerror "omxplayer URL not set"
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting omxplayer"
+	omxplayer_run_loop ${OMXPLAYER_OPTS} ${OMXPLAYER_URL} 2>&1 | logger -t omxplayer &
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping omxplayer"
+	killall -HUP omxplayer
+	eend $?
+}
+
-- 
cgit v1.2.3