Commit 8f5c2093 authored by Timo Teräs's avatar Timo Teräs

main/omxplayer: add a workaround for issue 297, make -dbg work

parent b49e2ef3
......@@ -2,7 +2,7 @@
pkgname=omxplayer
pkgver=0.20141203
_commitid=a4ee0743ecf49ffa1818510e8cc7872282ca66a8
pkgrel=1
pkgrel=2
pkgdesc="Commandline OMX player for Raspberry Pi"
url="https://github.com/popcornmix/omxplayer"
arch="armhf"
......@@ -14,6 +14,7 @@ install=""
subpackages="$pkgname-doc $pkgname-dbg"
source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archive/$_commitid.tar.gz
issue-260.patch
issue-297.patch
fix-makefile.patch
default-font.patch
......@@ -40,7 +41,7 @@ INCLUDES:=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/
INCLUDES+=$(pkg-config --cflags freetype2 dbus-1)
LDFLAGS:=-L/opt/vc/lib -Wl,-rpath,/opt/vc/lib
LDFLAGS+=$(pkg-config --libs freetype2 dbus-1)
STRIP:=/usr/bin/strip
STRIP:=echo
EOF
make omxplayer.bin omxplayer.1
}
......@@ -58,18 +59,21 @@ package() {
md5sums="f4948ec2dd587d1e5d7ce0bbcfb8a20a omxplayer-0.20141203.tar.gz
a900cdded87b7df503c6599ac43bd8de issue-260.patch
4cd10bfb7e995288f4efc312acbc4252 issue-297.patch
d8f335e1dff4b34faf36c25ad2c2b881 fix-makefile.patch
79197742a37d4493e1224675c6803eba default-font.patch
16d302fa96dc8d20ec9c3d2c7064d2e3 omxplayer.initd
80e37e7ac04402808015084e26e6072d omxplayer.confd"
sha256sums="e91eedf5da43cca5940a54229102dc9f68f7bfc5c8dfdafbc332dab6ec981758 omxplayer-0.20141203.tar.gz
5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63 issue-260.patch
75cf8af95b35bc734550c55036ef49dbff04b6940f3317b51eddea06866ecf3a issue-297.patch
799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422 fix-makefile.patch
0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631 default-font.patch
4634b5593967ddbcaf2386db6230a5385ecf72ab0ef81644a70b7b68405f018e omxplayer.initd
530eb9aa50e72fb4828af410b965e0ec7653d1bed87aa86bf04fc340ff3232bd omxplayer.confd"
sha512sums="4deefb8a380cc2bc3dcc4ec8624ed54374780e614918ceedef1cd5c554fa765d3596613276fe132a0ff30d08a700f3d30a4dd74417f70e4fa42605bee2d80885 omxplayer-0.20141203.tar.gz
c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8 issue-260.patch
606c71dc4e47bd1303ecb21bd6f265f61223f792e45661b724fbdc09619d4c0cf1f9c10fd2680a2889685516849076d1bddabfed5edbcbf09e9a246e92a25c4e issue-297.patch
3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517 fix-makefile.patch
70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f default-font.patch
416248b02002ce46a07406cbdffdbc940006d7d82f1cdf6a85b7954a25e5c0024c0d54186e9f4d5ea76398f22e7b46a214ed306deb873e1988e4d8872f0b758c omxplayer.initd
......
https://github.com/popcornmix/omxplayer/issues/297
Not a proper fix, but works as an ugly hack to workaround the issue.
--- omxplayer-a4ee0743ecf49ffa1818510e8cc7872282ca66a8/omxplayer.cpp.orig
+++ omxplayer-a4ee0743ecf49ffa1818510e8cc7872282ca66a8/omxplayer.cpp
@@ -1683,6 +1683,10 @@
if(m_omx_reader.IsEof() && !m_omx_pkt)
{
+ // EOF before playback started, stop.
+ if (m_av_clock->OMXIsPaused())
+ break;
+
// demuxer EOF, but may have not played out data yet
if ( (m_has_video && m_player_video.GetCached()) ||
(m_has_audio && m_player_audio.GetCached()) )
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment