diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-02-16 16:44:35 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2017-02-16 16:45:58 -0800 |
commit | 9aded8f9d432cdc7d57ab5dfd3afd45ebc71d783 (patch) | |
tree | 4f62bb6bf45fdf1e9297048ebf019f6698d456eb | |
parent | c768a3d1aed8d16d08afe12fddb359914e0a203a (diff) | |
download | meta-raspberrypi-9aded8f9d432cdc7d57ab5dfd3afd45ebc71d783.tar.gz |
omxplayer: Update to latest and disable on rpi64
Its uses omaxplayer/mmal APIs from firmware which seems
to not work with 4.9 kernel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 34 insertions, 30 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 75f7254..203f34b 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 | |||
@@ -14,33 +14,33 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
14 | Makefile.ffmpeg | 2 +- | 14 | Makefile.ffmpeg | 2 +- |
15 | 2 files changed, 4 insertions(+), 4 deletions(-) | 15 | 2 files changed, 4 insertions(+), 4 deletions(-) |
16 | 16 | ||
17 | diff --git a/Makefile b/Makefile | 17 | Index: git/Makefile |
18 | index be97c2b..2c120fc 100644 | 18 | =================================================================== |
19 | --- a/Makefile | 19 | --- git.orig/Makefile |
20 | +++ b/Makefile | 20 | +++ git/Makefile |
21 | @@ -1,9 +1,9 @@ | 21 | @@ -1,9 +1,9 @@ |
22 | 22 | ||
23 | 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 | 23 | 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 |
24 | 24 | ||
25 | -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz | 25 | -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound |
26 | +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz | 26 | +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound |
27 | 27 | ||
28 | -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include | 28 | -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include |
29 | +INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/ -I=/usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include | 29 | +INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/ -I=/usr/include/dbus-1.0 |
30 | 30 | ||
31 | DIST ?= omxplayer-dist | 31 | DIST ?= omxplayer-dist |
32 | 32 | ||
33 | @@ -87,5 +87,5 @@ dist: omxplayer.bin omxplayer.1 | 33 | @@ -88,5 +88,5 @@ dist: omxplayer.bin omxplayer.1 |
34 | cp COPYING $(DIST)/usr/share/doc/omxplayer | 34 | cp COPYING $(DIST)/usr/share/doc/omxplayer |
35 | cp README.md $(DIST)/usr/share/doc/omxplayer/README | 35 | cp README.md $(DIST)/usr/share/doc/omxplayer/README |
36 | cp omxplayer.1 $(DIST)/usr/share/man/man1 | 36 | cp omxplayer.1 $(DIST)/usr/share/man/man1 |
37 | - cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ | 37 | - cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ |
38 | + cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ | 38 | + cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ |
39 | cd $(DIST); tar -czf ../$(DIST).tgz * | 39 | cd $(DIST); tar -czf ../$(DIST).tgz * |
40 | diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg | 40 | Index: git/Makefile.ffmpeg |
41 | index 5ccf96f..a7ddd5f 100644 | 41 | =================================================================== |
42 | --- a/Makefile.ffmpeg | 42 | --- git.orig/Makefile.ffmpeg |
43 | +++ b/Makefile.ffmpeg | 43 | +++ git/Makefile.ffmpeg |
44 | @@ -254,5 +254,5 @@ checkout: | 44 | @@ -254,5 +254,5 @@ checkout: |
45 | .PHONY : install | 45 | .PHONY : install |
46 | install: | 46 | install: |
@@ -48,6 +48,3 @@ index 5ccf96f..a7ddd5f 100644 | |||
48 | - $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so | 48 | - $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so |
49 | + $(HOST)-strip ffmpeg_compiled/usr/lib/*.so | 49 | + $(HOST)-strip ffmpeg_compiled/usr/lib/*.so |
50 | 50 | ||
51 | -- | ||
52 | 1.9.3 | ||
53 | |||
diff --git a/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch b/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch index edb388e..ea8530d 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch +++ b/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch | |||
@@ -12,20 +12,26 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | |||
12 | Makefile.ffmpeg | 3 ++- | 12 | Makefile.ffmpeg | 3 ++- |
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | 13 | 1 file changed, 2 insertions(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg | 15 | Index: git/Makefile.ffmpeg |
16 | index abe4b26..c9d42d7 100644 | 16 | =================================================================== |
17 | --- a/Makefile.ffmpeg | 17 | --- git.orig/Makefile.ffmpeg |
18 | +++ b/Makefile.ffmpeg | 18 | +++ git/Makefile.ffmpeg |
19 | @@ -22,7 +22,8 @@ configure: | 19 | @@ -1,6 +1,8 @@ |
20 | |||
21 | CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT | ||
22 | |||
23 | +FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog | ||
24 | + | ||
25 | WORK=$(PWD) | ||
26 | |||
27 | .PHONY : all | ||
28 | @@ -21,7 +23,8 @@ configure: | ||
20 | CFLAGS="$(CFLAGS) ${INCLUDES}" \ | 29 | CFLAGS="$(CFLAGS) ${INCLUDES}" \ |
21 | LDFLAGS="" \ | 30 | LDFLAGS="" \ |
22 | ./configure \ | 31 | ./configure \ |
23 | - --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \ | 32 | - --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \ |
24 | + --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog $(FFMPEG_EXTRA_CFLAGS)" \ | 33 | + --extra-cflags="$(FFMPEG_EXTRA_CFLAGS)" \ |
25 | + --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \ | 34 | + --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \ |
26 | --enable-cross-compile \ | 35 | --enable-cross-compile \ |
27 | --enable-shared \ | 36 | --enable-shared \ |
28 | --disable-static \ | 37 | --disable-static \ |
29 | -- | ||
30 | 2.1.0 | ||
31 | |||
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index d9460de..c196fbf 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb | |||
@@ -7,10 +7,10 @@ SECTION = "console/utils" | |||
7 | LICENSE = "GPLv2" | 7 | LICENSE = "GPLv2" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
9 | 9 | ||
10 | DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh" | 10 | DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh libomxil" |
11 | PR = "r4" | 11 | PR = "r4" |
12 | 12 | ||
13 | SRCREV = "8466acf65f5f444dfa22631fb83c07ac759c02a5" | 13 | SRCREV = "62fb580260adb9b01e5694bb4374fb9a5f6f1021" |
14 | SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ | 14 | SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ |
15 | file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ | 15 | file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ |
16 | file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ | 16 | file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ |
@@ -21,7 +21,9 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master | |||
21 | " | 21 | " |
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
24 | COMPATIBLE_MACHINE = "raspberrypi" | 24 | COMPATIBLE_MACHINE ?= "null" |
25 | COMPATIBLE_MACHINE_rpi_aarch64 = "null" | ||
26 | COMPATIBLE_MACHINE_rpi = "(.*)" | ||
25 | 27 | ||
26 | inherit autotools-brokensep pkgconfig | 28 | inherit autotools-brokensep pkgconfig |
27 | 29 | ||
@@ -31,9 +33,8 @@ export TEMPDIR = "${S}/tmp" | |||
31 | # Needed in Makefile.ffmpeg | 33 | # Needed in Makefile.ffmpeg |
32 | export HOST = "${HOST_SYS}" | 34 | export HOST = "${HOST_SYS}" |
33 | export WORK = "${S}" | 35 | export WORK = "${S}" |
34 | export FLOAT = "${@bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "hard", "softfp", d)}" | 36 | export FFMPEG_EXTRA_CFLAGS = "${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS}" |
35 | export FFMPEG_EXTRA_CFLAGS = "--sysroot=${STAGING_DIR_TARGET}" | 37 | export FFMPEG_EXTRA_LDFLAGS = "${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS}" |
36 | export FFMPEG_EXTRA_LDFLAGS = "--sysroot=${STAGING_DIR_TARGET}" | ||
37 | 38 | ||
38 | # Needed in top Makefile | 39 | # Needed in top Makefile |
39 | export LDFLAGS = "-L${S}/ffmpeg_compiled/usr/lib \ | 40 | export LDFLAGS = "-L${S}/ffmpeg_compiled/usr/lib \ |