omxplayer: Update to remote's HEAD

Rebase a patch for this version and fix "unsafe for cross-compilation"
warnings.

Change-Id: Idcc9f188bc716982ede9dfb5f87870d9f5a2f9a3
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>

2 files changed, 24 insertions, 16 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 7f7927f..9bc137f 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
@@ -8,37 +8,45 @@ Don't search for libraries and headers in /usr/local.
 Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
 
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile
-+++ git/Makefile
-@@ -1,9 +1,9 @@
+---
+ Makefile        | 6 +++---
+ Makefile.ffmpeg | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 87cb775..abe9923 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,9 +2,9 @@ include Makefile.include
  
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
  
 -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
 +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
  
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
-+INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
++INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/ -I=/usr/include/dbus-1.0 -I=/usr/lib/arm-linux-gnueabihf/dbus-1.0/include
  
  DIST ?= omxplayer-dist
  
-@@ -70,5 +70,5 @@ dist: omxplayer.bin
+@@ -71,5 +71,5 @@ dist: omxplayer.bin
         cp omxplayer omxplayer.bin $(DIST)/usr/bin
-        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 -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
 +       cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
         cd $(DIST); tar -czf ../$(DIST).tgz *
-Index: git/Makefile.ffmpeg
-===================================================================
---- git.orig/Makefile.ffmpeg
-+++ git/Makefile.ffmpeg
-@@ -248,5 +248,5 @@ checkout:
+diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
+index c21b2fa..5518680 100644
+--- a/Makefile.ffmpeg
++++ b/Makefile.ffmpeg
+@@ -249,5 +249,5 @@ checkout:
  
  install:
         cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install
 -       $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so
 +       $(HOST)-strip ffmpeg_compiled/usr/lib/*.so
  
+-- 
+1.8.5.3
+
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb
index cee68e1..5763d8f 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"
 PR = "r3"
 
-SRCREV = "7af21f596378e5efeceebedff9c4a298e2d06d98"
+SRCREV = "f3221825a92f27c5f49a52200ff933e454977ed2"
 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 \