diff options
| author | Andrei Gherzan <andrei@gherzan.ro> | 2015-02-10 00:52:18 +0100 |
|---|---|---|
| committer | Andrei Gherzan <andrei@resin.io> | 2015-03-01 00:43:26 +0100 |
| commit | b7c3a935cccbafb7ecf5b4541c1767f69f7b4ff7 (patch) | |
| tree | 3cd23e4f34525084643ca41629f4d320a21168f3 | |
| parent | d8bf60ce6c4a6c6371527c6df2e3243d2771c0cc (diff) | |
| download | meta-raspberrypi-b7c3a935cccbafb7ecf5b4541c1767f69f7b4ff7.tar.gz | |
omxplayer: Bump SRCREV
Add a patch to fix the pkg-config mechanism in ffmpeg.
Change-Id: Ib506bb4e26a8a0c5c294ed55da0a0da8dc67a2d7
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
| -rw-r--r-- | recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch | 19 | ||||
| -rw-r--r-- | recipes-multimedia/omxplayer/omxplayer_git.bb | 7 |
2 files changed, 23 insertions, 3 deletions
diff --git a/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch b/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch new file mode 100644 index 0000000..ed81999 --- /dev/null +++ b/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | Force the pkg-config native tool. Strangely ffmpeg prepends cross_prefix | ||
| 2 | to the default value which obviously is wrong. | ||
| 3 | |||
| 4 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
| 5 | |||
| 6 | Index: git/Makefile.ffmpeg | ||
| 7 | =================================================================== | ||
| 8 | --- git.orig/Makefile.ffmpeg | ||
| 9 | +++ git/Makefile.ffmpeg | ||
| 10 | @@ -245,7 +245,8 @@ configure: | ||
| 11 | --disable-decoder=idf \ | ||
| 12 | --enable-decoder=opus \ | ||
| 13 | --cross-prefix=$(HOST)- \ | ||
| 14 | - --disable-stripping | ||
| 15 | + --disable-stripping \ | ||
| 16 | + --pkg-config=pkg-config | ||
| 17 | |||
| 18 | .PHONY : clean | ||
| 19 | clean: | ||
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index 41ef339..c71a743 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb | |||
| @@ -7,22 +7,23 @@ 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" | 10 | DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh" |
| 11 | PR = "r3" | 11 | PR = "r3" |
| 12 | 12 | ||
| 13 | SRCREV = "1817503430b8f195bef12bd7a3542bdd251f8389" | 13 | SRCREV = "18f051d64d9c837edbf718bc4935204583cfa030" |
| 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 \ |
| 17 | file://0003-Remove-strip-step-in-Makefile.patch \ | 17 | file://0003-Remove-strip-step-in-Makefile.patch \ |
| 18 | file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \ | 18 | file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \ |
| 19 | file://fix-tar-command-with-DIST.patch \ | 19 | file://fix-tar-command-with-DIST.patch \ |
| 20 | file://use-native-pkg-config.patch \ | ||
| 20 | " | 21 | " |
| 21 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
| 22 | 23 | ||
| 23 | COMPATIBLE_MACHINE = "raspberrypi" | 24 | COMPATIBLE_MACHINE = "raspberrypi" |
| 24 | 25 | ||
| 25 | inherit autotools-brokensep | 26 | inherit autotools-brokensep pkgconfig |
| 26 | 27 | ||
| 27 | # Needed in ffmpeg configure | 28 | # Needed in ffmpeg configure |
| 28 | export TEMPDIR = "${S}/tmp" | 29 | export TEMPDIR = "${S}/tmp" |
