main/omxplayer: move from testing, refresh snapshot

4 files changed, 25 insertions, 5 deletions

diff --git a/testing/omxplayer/APKBUILD b/main/omxplayer/APKBUILD
index 46adaad9e8..c95843cc34 100644
--- a/testing/omxplayer/APKBUILD
+++ b/main/omxplayer/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=omxplayer
-pkgver=0.20140922
-_commitid=6ee9a0a5488119786990b6f91990d59d6e35427c
+pkgver=0.20141118
+_commitid=381e05871b2a633675fdab8972b068757e588691
 pkgrel=0
 pkgdesc="Commandline OMX player for Raspberry Pi"
 url="https://github.com/popcornmix/omxplayer"
@@ -12,6 +12,7 @@ makedepends="raspberrypi-dev ffmpeg-dev pcre-dev boost-dev freetype-dev dbus-dev
 install=""
 subpackages="$pkgname-doc"
 source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archive/$_commitid.tar.gz
+	issue-260.patch
 	fix-makefile.patch
 	default-font.patch
 	"
@@ -46,12 +47,15 @@ package() {
 	rm -rf "$pkgdir"/usr/lib/omxplayer
 }
 
-md5sums="abaf77da1d74cc7147291b1167ccc3da  omxplayer-0.20140922.tar.gz
+md5sums="82a1869267091d54f0e63b2c148c68a4  omxplayer-0.20141118.tar.gz
+a900cdded87b7df503c6599ac43bd8de  issue-260.patch
 d8f335e1dff4b34faf36c25ad2c2b881  fix-makefile.patch
 79197742a37d4493e1224675c6803eba  default-font.patch"
-sha256sums="31dd025e169857436ab2bad36322c259f96814144c5d94321c0096078282965e  omxplayer-0.20140922.tar.gz
+sha256sums="9c1c9fc8ff51ba1c9eb318fc1b847d6a4202022f53e3e78a225ef3984329588c  omxplayer-0.20141118.tar.gz
+5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63  issue-260.patch
 799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422  fix-makefile.patch
 0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631  default-font.patch"
-sha512sums="94fb58cbaa67ac0aaf60b0439a216553b03f4c8be5d053f926e50e94ae723bcb717737b9fdafdaed6b9cf66d603359e67e8c5ca888ebe82438cde396253fcde3  omxplayer-0.20140922.tar.gz
+sha512sums="afd87aa00efbe5d74f53770a2395c2251c389e5a1de163c90355c8cf5f03d7a1b5151426272dbf0472978328d0a63253f4856ecdc7f18136b59cc39f00937646  omxplayer-0.20141118.tar.gz
+c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8  issue-260.patch
 3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517  fix-makefile.patch
 70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f  default-font.patch"
diff --git a/testing/omxplayer/default-font.patch b/main/omxplayer/default-font.patch
index f5cf99cf8b..f5cf99cf8b 100644
--- a/testing/omxplayer/default-font.patch
+++ b/main/omxplayer/default-font.patch
diff --git a/testing/omxplayer/fix-makefile.patch b/main/omxplayer/fix-makefile.patch
index 96d57a2620..96d57a2620 100644
--- a/testing/omxplayer/fix-makefile.patch
+++ b/main/omxplayer/fix-makefile.patch
diff --git a/main/omxplayer/issue-260.patch b/main/omxplayer/issue-260.patch
new file mode 100644
index 0000000000..4e8e77ad1c
--- /dev/null
+++ b/main/omxplayer/issue-260.patch
@@ -0,0 +1,16 @@
+https://github.com/popcornmix/omxplayer/issues/260
+
+Not a fix, but improves the situation a little bit.
+
+--- omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c.orig/omxplayer.cpp
++++ omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/omxplayer.cpp
+@@ -1543,6 +1543,9 @@
+         }
+       }
+ 
++      if (audio_pts < stamp) audio_pts = DVD_NOPTS_VALUE;
++      if (video_pts < stamp) video_pts = DVD_NOPTS_VALUE;
++
+       float audio_fifo = audio_pts == DVD_NOPTS_VALUE ? 0.0f : audio_pts / DVD_TIME_BASE - stamp * 1e-6;
+       float video_fifo = video_pts == DVD_NOPTS_VALUE ? 0.0f : video_pts / DVD_TIME_BASE - stamp * 1e-6;
+       float threshold = std::min(0.1f, (float)m_player_audio.GetCacheTotal() * 0.1f);