omxplayer: Bump revision

Fixes linking error due to missing vchostif library dependency.
Rebased patches and removed patches already merged upstream.

Signed-off-by: Jonathan Liu <net147@gmail.com>

4 files changed, 12 insertions, 26 deletions

diff --git a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
index 366772e..75f7254 100644
--- a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
+++ b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
@@ -6,14 +6,16 @@ Subject: [PATCH] Libraries and headers from ffmpeg are installed in /usr.
 Don't search for libraries and headers in /usr/local.
 
 Upstream-Status: Inappropriate [embedded specific]
+
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
 ---
  Makefile        | 6 +++---
  Makefile.ffmpeg | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 38e1400..1b15999 100644
+index be97c2b..2c120fc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,9 +1,9 @@
@@ -32,14 +34,14 @@ index 38e1400..1b15999 100644
         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/
-+       cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
+-       cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
++       cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
         cd $(DIST); tar -czf ../$(DIST).tgz *
 diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
-index 4d2d720..9d66a85 100644
+index 5ccf96f..a7ddd5f 100644
 --- a/Makefile.ffmpeg
 +++ b/Makefile.ffmpeg
-@@ -256,5 +256,5 @@ checkout:
+@@ -254,5 +254,5 @@ checkout:
  .PHONY : install
  install:
         cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install
diff --git a/recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch b/recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch
deleted file mode 100644
index 08df12e..0000000
--- a/recipes-multimedia/omxplayer/omxplayer/don-t-preserve-file-attributes-when-cp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-When running install (fakeroot) host-user-contaminated will fail because dist
-rule copies files while preserving file attributes like user ID.
-
-Upstream-Status: Submitted [https://github.com/popcornmix/omxplayer/pull/431]
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -87,5 +87,5 @@ dist: omxplayer.bin omxplayer.1
-        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/lib/*.so* $(DIST)/usr/lib/omxplayer/
-+       cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
-        tar -czf omxplayer-dist.tar.gz $(DIST)
-\ No newline at end of file
diff --git a/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch b/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
index 5b3bd21..ab40e40 100644
--- a/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
+++ b/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
@@ -3,7 +3,10 @@ https://github.com/popcornmix/omxplayer/commit/201c77973155861e60492e45d35467b19
 
 This fails if DIST is an absolute path. The old command was working just fine.
 
+Upstream-Status: Pending
+
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
 
 Index: git/Makefile
 ===================================================================
@@ -12,7 +15,7 @@ Index: git/Makefile
 @@ -71,4 +71,4 @@ dist: omxplayer.bin
         cp COPYING $(DIST)/usr/share/doc/
         cp README.md $(DIST)/usr/share/doc/README
-        cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
+        cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
 -       cd $(DIST); tar -czf ../$(DIST).tgz *
 +       tar -czf omxplayer-dist.tar.gz $(DIST)
 \ No newline at end of file
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb
index c8251fe..7d3b464 100644
--- a/recipes-multimedia/omxplayer/omxplayer_git.bb
+++ b/recipes-multimedia/omxplayer/omxplayer_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh"
 PR = "r4"
 
-SRCREV = "15a490b2397b358776c56b017a137c4716eb6b4e"
+SRCREV = "8466acf65f5f444dfa22631fb83c07ac759c02a5"
 SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
            file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
            file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
            file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
            file://fix-tar-command-with-DIST.patch \
            file://use-native-pkg-config.patch \
-           file://don-t-preserve-file-attributes-when-cp.patch \
            "
 S = "${WORKDIR}/git"