testing/omxplayer: upgrade to git snapshot 2014-09-22

3 files changed, 38 insertions, 34 deletions

diff --git a/testing/omxplayer/APKBUILD b/testing/omxplayer/APKBUILD
index 4584bbc5e7..46adaad9e8 100644
--- a/testing/omxplayer/APKBUILD
+++ b/testing/omxplayer/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=omxplayer
-pkgver=0.20140302
-_commitid=16d8b48aff320be42cb792165bc4a444b69f05a7
+pkgver=0.20140922
+_commitid=6ee9a0a5488119786990b6f91990d59d6e35427c
 pkgrel=0
 pkgdesc="Commandline OMX player for Raspberry Pi"
 url="https://github.com/popcornmix/omxplayer"
@@ -37,7 +37,7 @@ LDFLAGS:=-L/opt/vc/lib -Wl,-rpath,/opt/vc/lib
 LDFLAGS+=$(pkg-config --libs freetype2 dbus-1)
 STRIP:=/usr/bin/strip
 EOF
-	make
+	make omxplayer.bin omxplayer.1
 }
 
 package() {
@@ -46,12 +46,12 @@ package() {
 	rm -rf "$pkgdir"/usr/lib/omxplayer
 }
 
-md5sums="3f4d07681e3d066ab853fe3a1586aebe  omxplayer-0.20140302.tar.gz
-a105ca8848de5d302832b5ceba037681  fix-makefile.patch
-b5bdfa2b2f86770bc33e46620b6e0c67  default-font.patch"
-sha256sums="e1d47c4da56cbb9c47e296f93b1c3a759fc9e4bca8fd5b8fb86d76c3be59699e  omxplayer-0.20140302.tar.gz
-df53982e679d43f8a344575ad6008e2beba3135265c12c1c8728303822d76863  fix-makefile.patch
-e25f1053f59bc3eeae246cc8d229044e6924acfddbff3252b9b3635c7bed74bb  default-font.patch"
-sha512sums="bee0d10ad7e5215f04ac542519e4cadbaca9552171a803f43349f9811a8589c97bc7943b03e606a4810fb2f9e5e3294544f98b8266e37fd7035c2f2e60db22af  omxplayer-0.20140302.tar.gz
-f9b83c3981261eea9a257c6bab596b105d62f3fa94f20c4a0567f8f32931b4fa7bbbf9d2ca8716aaeb4a2b34bbbe44e013c1cf22e916c8d35355f247e67fcc48  fix-makefile.patch
-bdea38f5c7df35bab9a788a060de8151e63c1fcba314fd6f48e2fad3c3af1484553f1aad61790412212a7fa49bfd442f0542e830a2e022f7699605929ef75c23  default-font.patch"
+md5sums="abaf77da1d74cc7147291b1167ccc3da  omxplayer-0.20140922.tar.gz
+d8f335e1dff4b34faf36c25ad2c2b881  fix-makefile.patch
+79197742a37d4493e1224675c6803eba  default-font.patch"
+sha256sums="31dd025e169857436ab2bad36322c259f96814144c5d94321c0096078282965e  omxplayer-0.20140922.tar.gz
+799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422  fix-makefile.patch
+0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631  default-font.patch"
+sha512sums="94fb58cbaa67ac0aaf60b0439a216553b03f4c8be5d053f926e50e94ae723bcb717737b9fdafdaed6b9cf66d603359e67e8c5ca888ebe82438cde396253fcde3  omxplayer-0.20140922.tar.gz
+3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517  fix-makefile.patch
+70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f  default-font.patch"
diff --git a/testing/omxplayer/default-font.patch b/testing/omxplayer/default-font.patch
index 2141bd448f..f5cf99cf8b 100644
--- a/testing/omxplayer/default-font.patch
+++ b/testing/omxplayer/default-font.patch
@@ -11,14 +11,16 @@
  std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
  bool              m_asked_for_font      = false;
  bool              m_asked_for_italic_font = false;
-@@ -170,8 +170,8 @@
-   printf("              --no-osd                  do not display status information on screen\n");
-   printf("              --subtitles path          external subtitles in UTF-8 srt format\n");
-   printf("              --font path               subtitle font\n");
--  printf("                                        (default: /usr/share/fonts/truetype/freefont/FreeSans.ttf)\n");
--  printf("              --italic-font path        (default: /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf)\n");
-+  printf("                                        (default: /usr/share/fonts/TTF/DejaVuSans.ttf)\n");
-+  printf("              --italic-font path        (default: /usr/share/fonts/TTF/DejaVuSans-Oblique.ttf)\n");
-   printf("              --font-size size          font size as thousandths of screen height\n");
-   printf("                                        (default: 55)\n");
-   printf("              --align left/center       subtitle alignment (default: left)\n");
+--- 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/testing/omxplayer/fix-makefile.patch b/testing/omxplayer/fix-makefile.patch
index cc9f466784..96d57a2620 100644
--- a/testing/omxplayer/fix-makefile.patch
+++ b/testing/omxplayer/fix-makefile.patch
@@ -1,7 +1,7 @@
---- omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98.orig/Makefile
-+++ omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98/Makefile
-@@ -46,7 +48,7 @@
- 	$(CXX) $(CFLAGS) $(INCLUDES) -c $< -o $@ -Wno-deprecated-declarations
+--- omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/Makefile.orig
++++ omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/Makefile
+@@ -48,7 +48,7 @@
+ omxplayer.o: help.h keys.h
  
  version:
 -	bash gen_version.sh > version.h 
@@ -9,18 +9,20 @@
  
  omxplayer.bin: version $(OBJS)
  	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
-@@ -64,12 +66,9 @@
+@@ -79,14 +79,12 @@
  	make -f Makefile.ffmpeg
  	make -f Makefile.ffmpeg install
  
--dist: omxplayer.bin
--	mkdir -p $(DIST)/usr/lib/omxplayer
-+install: omxplayer.bin
+-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
+ 	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/
- 	cp README.md $(DIST)/usr/share/doc/README
+ 	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 *