MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

omxplayer: Bump SRCREV

Browse Source 
Add a patch to fix the pkg-config mechanism in ffmpeg.

Change-Id: Ib506bb4e26a8a0c5c294ed55da0a0da8dc67a2d7
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
This commit is contained in:
Andrei Gherzan 2015-02-10 00:52:18 +01:00 committed by Andrei Gherzan
parent d8bf60ce6c
commit b7c3a935cc
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch Normal file
View File

@ -0,0 +1,19 @@
Force the pkg-config native tool. Strangely ffmpeg prepends cross_prefix
to the default value which obviously is wrong.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Index: git/Makefile.ffmpeg
===================================================================
--- git.orig/Makefile.ffmpeg
+++ git/Makefile.ffmpeg
@@ -245,7 +245,8 @@ configure:
--disable-decoder=idf \
--enable-decoder=opus \
--cross-prefix=$(HOST)- \
- --disable-stripping
+ --disable-stripping \
+ --pkg-config=pkg-config
.PHONY : clean
clean:

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

@ -7,22 +7,23 @@ SECTION = "console/utils"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl" DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh"
PR = "r3" PR = "r3"
SRCREV = "1817503430b8f195bef12bd7a3542bdd251f8389" SRCREV = "18f051d64d9c837edbf718bc4935204583cfa030"
SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \
file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
file://0003-Remove-strip-step-in-Makefile.patch \ file://0003-Remove-strip-step-in-Makefile.patch \
file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \ file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
file://fix-tar-command-with-DIST.patch \ file://fix-tar-command-with-DIST.patch \
file://use-native-pkg-config.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = "raspberrypi" COMPATIBLE_MACHINE = "raspberrypi"
inherit autotools-brokensep inherit autotools-brokensep pkgconfig
# Needed in ffmpeg configure # Needed in ffmpeg configure
export TEMPDIR = "${S}/tmp" export TEMPDIR = "${S}/tmp"