aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-01-01 19:31:50 +0200
committerTimo Teräs <timo.teras@iki.fi>2015-01-01 19:29:16 +0000
commit802d99e3e3ecbc5fa0af188d523259df9bbdb90c (patch)
tree2b300b7543f16728c594b804214d210638b5d709
parent7b43e5c665d4d5dcf08ec077a295e2ebe7c831c3 (diff)
downloadaports-802d99e3e3ecbc5fa0af188d523259df9bbdb90c.tar.bz2
aports-802d99e3e3ecbc5fa0af188d523259df9bbdb90c.tar.xz
main/omxplayer: enable -dbg, add sleep time to conf.d
(cherry picked from commit ea53ed7649514f5d1b8ca16d09f2240fe6084e45)
-rw-r--r--main/omxplayer/APKBUILD16
-rw-r--r--main/omxplayer/omxplayer.confd1
-rw-r--r--main/omxplayer/omxplayer.initd2
3 files changed, 10 insertions, 9 deletions
diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD
index 31efc579f5..e677a02632 100644
--- a/main/omxplayer/APKBUILD
+++ b/main/omxplayer/APKBUILD
@@ -2,7 +2,7 @@
pkgname=omxplayer
pkgver=0.20141203
_commitid=a4ee0743ecf49ffa1818510e8cc7872282ca66a8
-pkgrel=0
+pkgrel=1
pkgdesc="Commandline OMX player for Raspberry Pi"
url="https://github.com/popcornmix/omxplayer"
arch="armhf"
@@ -11,7 +11,7 @@ depends="ttf-dejavu"
makedepends="linux-headers raspberrypi-dev ffmpeg-dev pcre-dev
boost-dev freetype-dev dbus-dev"
install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-dbg"
source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archive/$_commitid.tar.gz
issue-260.patch
fix-makefile.patch
@@ -60,17 +60,17 @@ md5sums="f4948ec2dd587d1e5d7ce0bbcfb8a20a omxplayer-0.20141203.tar.gz
a900cdded87b7df503c6599ac43bd8de issue-260.patch
d8f335e1dff4b34faf36c25ad2c2b881 fix-makefile.patch
79197742a37d4493e1224675c6803eba default-font.patch
-cf9c426387a8e9f6370773843f61f4e3 omxplayer.initd
-0577b20f61ef5fcdf5533f45cba64f1a omxplayer.confd"
+16d302fa96dc8d20ec9c3d2c7064d2e3 omxplayer.initd
+80e37e7ac04402808015084e26e6072d omxplayer.confd"
sha256sums="e91eedf5da43cca5940a54229102dc9f68f7bfc5c8dfdafbc332dab6ec981758 omxplayer-0.20141203.tar.gz
5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63 issue-260.patch
799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422 fix-makefile.patch
0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631 default-font.patch
-d5bdafc40a542a389a6a9ee03987017742b84fb7309c547763127d8deffa6dac omxplayer.initd
-4f680e77e3cb2ba30d137f1e7d8ece59e6a7b628ae9460d7e4dff4927b02ba08 omxplayer.confd"
+4634b5593967ddbcaf2386db6230a5385ecf72ab0ef81644a70b7b68405f018e omxplayer.initd
+530eb9aa50e72fb4828af410b965e0ec7653d1bed87aa86bf04fc340ff3232bd omxplayer.confd"
sha512sums="4deefb8a380cc2bc3dcc4ec8624ed54374780e614918ceedef1cd5c554fa765d3596613276fe132a0ff30d08a700f3d30a4dd74417f70e4fa42605bee2d80885 omxplayer-0.20141203.tar.gz
c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch
3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517 fix-makefile.patch
70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f default-font.patch
-dda43c5d9fa8473d795c7c57330f4746cdce54269e6e4f2500bffc8fa03b6f1f7f7431a812ad3237e7983f7608044cec11f38d0d768570ba51a65bbbf95a4500 omxplayer.initd
-0bd40d53d8deda9a34ffaea4234d82480dcb8b02cace97c472062c5a6c27059c6916915ad4f48114245c3aa74689ddcdb13633cbd44e8c03a84187a061af8abb omxplayer.confd"
+416248b02002ce46a07406cbdffdbc940006d7d82f1cdf6a85b7954a25e5c0024c0d54186e9f4d5ea76398f22e7b46a214ed306deb873e1988e4d8872f0b758c omxplayer.initd
+4f906ada035869a0e515e7615056b18b0f6906ce4b3a2d34081c0efa79bb9455380f729e7c5270180f5ace89c53a7ac7c93f609e6761825f639f44aa22346bb2 omxplayer.confd"
diff --git a/main/omxplayer/omxplayer.confd b/main/omxplayer/omxplayer.confd
index 96571aae32..8baf0a6e26 100644
--- a/main/omxplayer/omxplayer.confd
+++ b/main/omxplayer/omxplayer.confd
@@ -1,2 +1,3 @@
# OMXPLAYER_OPTS="--live"
# OMXPLAYER_URL="http://10.0.0.1/"
+# OMXPLAYER_DELAY=5
diff --git a/main/omxplayer/omxplayer.initd b/main/omxplayer/omxplayer.initd
index 2b2c1b8743..ed47b24749 100644
--- a/main/omxplayer/omxplayer.initd
+++ b/main/omxplayer/omxplayer.initd
@@ -10,7 +10,7 @@ omxplayer_run_loop() {
status=$?
echo "exited: $status"
[ "$status" -eq 129 ] && exit 0
- sleep 0.2
+ [ "$status" -ne 0 ] && sleep ${OMXPLAYER_DELAY:-5}
done
}