rapgenic/meta-raspberrypi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

omxplayer: Update to remote HEAD

Browse Source 
* Rebase 0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
to apply on HEAD.
* Add fix-tar-command-with-DIST.patch which reverts a change in tar command
which breaks compilation if DIST is an absolute path.
* Avoid stripping omxplayer binary (let build system take care of strpping).

Change-Id: I95d70094b0069ad19f7d445abaf421756776c4c7
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
This commit is contained in:
Andrei Gherzan
2014-01-19 20:35:29 +02:00
parent 30e3972912
commit ca8a3eeaaf
3 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
View File

@ -8,18 +8,16 @@ Don't search for libraries and headers in /usr/local.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Updated patch to apply to c0dd9502ed2c43c487674939195c69680f3d98b0 revision
diff --git a/Makefile b/Makefile
index 65f7637..5dc1832 100644
--- a/Makefile
+++ b/Makefile
Index: git/Makefile
===================================================================
--- git.orig/Makefile
+++ git/Makefile
@@ -1,9 +1,9 @@
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./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/
+LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/lib/
-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/
@ -32,11 +30,11 @@ index 65f7637..5dc1832 100644
cp README.md $(DIST)/usr/share/doc/README
- cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/
+ cp -a ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/
tar -czf omxplayer-dist.tar.gz $(DIST)
diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 3b31a82..5f30b51 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
cd $(DIST); tar -czf ../$(DIST).tgz *
Index: git/Makefile.ffmpeg
===================================================================
--- git.orig/Makefile.ffmpeg
+++ git/Makefile.ffmpeg
@@ -248,5 +248,5 @@ checkout:
install:

18
recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch Normal file
View File

@ -0,0 +1,18 @@
Revert the tar command change introduced in:
https://github.com/popcornmix/omxplayer/commit/201c77973155861e60492e45d35467b19b69c1c4
This fails if DIST is an absolute path. The old command was working just fine.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Index: git/Makefile
===================================================================
--- git.orig/Makefile
+++ 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/
- cd $(DIST); tar -czf ../$(DIST).tgz *
+ tar -czf omxplayer-dist.tar.gz $(DIST)
\ No newline at end of file

10
recipes-multimedia/omxplayer/omxplayer_git.bb
View File

@ -8,14 +8,16 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libpcre libav virtual/egl boost freetype dbus"
PR = "r2"
PR = "r3"
SRCREV = "74f4be222be05d3ea50be9f5a70846f7c0e9df6e"
SRCREV = "f666a5dfbec36e2af7cd965558ac8643c86277a6"
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 \
file://0003-Remove-strip-step-in-Makefile.patch \
file://mktemp-compatible-with-busybox.patch"
file://mktemp-compatible-with-busybox.patch \
file://fix-tar-command-with-DIST.patch \
"
S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = "raspberrypi"
@ -55,7 +57,7 @@ do_compile() {
}
do_install() {
oe_runmake dist
oe_runmake STRIP='echo skipping strip' dist
mkdir -p ${D}/usr/share/fonts/truetype/freefont/
install ${S}/fonts/* ${D}/usr/share/fonts/truetype/freefont/
}