main/omxplayer: move from testing, refresh snapshot

4 files changed, 131 insertions, 0 deletions

diff --git a/main/omxplayer/APKBUILD b/main/omxplayer/APKBUILD
new file mode 100644
index 0000000000..c95843cc34
--- /dev/null
+++ b/main/omxplayer/APKBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=omxplayer
+pkgver=0.20141118
+_commitid=381e05871b2a633675fdab8972b068757e588691
+pkgrel=0
+pkgdesc="Commandline OMX player for Raspberry Pi"
+url="https://github.com/popcornmix/omxplayer"
+arch="armhf"
+license="GPLv2"
+depends="ttf-dejavu"
+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
+	"
+
+_srcdir="$srcdir"/$pkgname-$_commitid
+
+prepare() {
+	local i
+	cd "$_srcdir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_srcdir"
+	cat <<EOF > Makefile.include
+INCLUDES:=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
+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
+EOF
+	make omxplayer.bin omxplayer.1
+}
+
+package() {
+	cd "$_srcdir"
+	make install DIST="$pkgdir" || return 1
+	rm -rf "$pkgdir"/usr/lib/omxplayer
+}
+
+md5sums="82a1869267091d54f0e63b2c148c68a4  omxplayer-0.20141118.tar.gz
+a900cdded87b7df503c6599ac43bd8de  issue-260.patch
+d8f335e1dff4b34faf36c25ad2c2b881  fix-makefile.patch
+79197742a37d4493e1224675c6803eba  default-font.patch"
+sha256sums="9c1c9fc8ff51ba1c9eb318fc1b847d6a4202022f53e3e78a225ef3984329588c  omxplayer-0.20141118.tar.gz
+5eb797de354c63a23847a574b103a28d451a4329320f3335f82dc000adbc5c63  issue-260.patch
+799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422  fix-makefile.patch
+0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631  default-font.patch"
+sha512sums="afd87aa00efbe5d74f53770a2395c2251c389e5a1de163c90355c8cf5f03d7a1b5151426272dbf0472978328d0a63253f4856ecdc7f18136b59cc39f00937646  omxplayer-0.20141118.tar.gz
+c349eea5f7c513a07d82a6cf6467c4d21bcb29c053bc5e39d8f675b1212db9beef0abf5248d50ac5a2f14fda73055786f94f421377ffcf5f6bcf8daa2f1b56e8  issue-260.patch
+3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517  fix-makefile.patch
+70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f  default-font.patch"
diff --git a/main/omxplayer/default-font.patch b/main/omxplayer/default-font.patch
new file mode 100644
index 0000000000..f5cf99cf8b
--- /dev/null
+++ b/main/omxplayer/default-font.patch
@@ -0,0 +1,26 @@
+--- omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98.orig/omxplayer.cpp
++++ omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98/omxplayer.cpp
+@@ -88,8 +88,8 @@
+ bool              m_osd                 = true;
+ std::string       m_external_subtitles_path;
+ bool              m_has_external_subtitles = false;
+-std::string       m_font_path           = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";
+-std::string       m_italic_font_path    = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
++std::string       m_font_path           = "/usr/share/fonts/TTF/DejaVuSans.ttf";
++std::string       m_italic_font_path    = "/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf";
+ std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
+ bool              m_asked_for_font      = false;
+ bool              m_asked_for_italic_font = false;
+--- omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/README.md.orig
++++ omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/README.md
+@@ -80,8 +80,8 @@
+         --no-osd                Do not display status information on screen
+         --no-keys               Disable keyboard input (prevents hangs for certain TTYs)
+         --subtitles path        External subtitles in UTF-8 srt format
+-        --font path             Default: /usr/share/fonts/truetype/freefont/FreeSans.ttf
+-        --italic-font path      Default: /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf
++        --font path             Default: /usr/share/fonts/TTF/FreeSans.ttf
++        --italic-font path      Default: /usr/share/fonts/TTF/FreeSansOblique.ttf
+         --font-size size        Font size in 1/1000 screen height (default: 55)
+         --align left/center     Subtitle alignment (default: left)
+         --no-ghost-box          No semitransparent boxes behind subtitles
diff --git a/main/omxplayer/fix-makefile.patch b/main/omxplayer/fix-makefile.patch
new file mode 100644
index 0000000000..96d57a2620
--- /dev/null
+++ b/main/omxplayer/fix-makefile.patch
@@ -0,0 +1,28 @@
+--- omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/Makefile.orig
++++ omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/Makefile
+@@ -48,7 +48,7 @@
+ omxplayer.o: help.h keys.h
+ 
+ version:
+-	bash gen_version.sh > version.h 
++	sh gen_version.sh > version.h 
+ 
+ omxplayer.bin: version $(OBJS)
+ 	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
+@@ -79,14 +79,12 @@
+ 	make -f Makefile.ffmpeg
+ 	make -f Makefile.ffmpeg install
+ 
+-dist: omxplayer.bin omxplayer.1
++install: omxplayer.bin omxplayer.1
+ 	mkdir -p $(DIST)/usr/lib/omxplayer
+ 	mkdir -p $(DIST)/usr/bin
+ 	mkdir -p $(DIST)/usr/share/doc/omxplayer
+ 	mkdir -p $(DIST)/usr/share/man/man1
+-	cp omxplayer omxplayer.bin $(DIST)/usr/bin
++	cp omxplayer.bin $(DIST)/usr/bin/omxplayer
+ 	cp COPYING $(DIST)/usr/share/doc/omxplayer
+ 	cp README.md $(DIST)/usr/share/doc/omxplayer/README
+ 	cp omxplayer.1 $(DIST)/usr/share/man/man1
+-	cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
+-	cd $(DIST); tar -czf ../$(DIST).tgz *
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);