From 073f1e845eb1d3807069644bc535fefe8c013a64 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 31 Jan 2018 16:54:59 +0000 Subject: [PATCH] omxplayer: make samba support configureable * samba depends on libpam and it might be useful to disable support for it in DISTROs without pam in DISTRO_FEATURES * disable it by default Signed-off-by: Martin Jansa --- recipes-multimedia/omxplayer/omxplayer_git.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index db01d74..1df41a5 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -7,7 +7,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh libomxil coreutils-native curl-native" +DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh libomxil coreutils-native curl-native" PR = "r4" SRCREV_default = "b8ff59dccd9307f10dad71bec2525a95bd6c603b" @@ -40,6 +40,11 @@ COMPATIBLE_MACHINE_rpi = "(.*)" inherit autotools-brokensep pkgconfig +# This isn't used directly by omxplayer, but applied to Makefile.ffmpeg which +# runs the ffmpeg configuration +PACKAGECONFIG ??= "" +PACKAGECONFIG[samba] = "--enable-libsmbclient,--disable-libsmbclient,samba" + # Needed in ffmpeg configure export TEMPDIR = "${S}/tmp" @@ -66,6 +71,8 @@ do_compile() { # Needed for compiler test in ffmpeg's configure mkdir -p tmp + sed -i 's/--enable-libsmbclient/${@bb.utils.contains("PACKAGECONFIG", "samba", "--enable-libsmbclient", "--disable-libsmbclient", d)}/g' Makefile.ffmpeg + oe_runmake -f Makefile.ffmpeg oe_runmake -f Makefile.ffmpeg install oe_runmake