From b38a77938a40a340ab77aafc0fbde12fcded7e4c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 20 Nov 2018 23:40:21 -0800 Subject: userland: Merge userland-nogl into userland itself Control the installs via MACHINE_FEATURES and avoid almost duplicate recipe Adjust other recipes to depend on userland now Signed-off-by: Khem Raj --- recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend | 4 ++-- recipes-multimedia/omxplayer/omxplayer_git.bb | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index 19cd259..f892c66 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -1,4 +1,4 @@ -DEPENDS_append_rpi = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " userland-nogl", "", d)}" +DEPENDS_append_rpi = " userland" GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" # How to make this RPI specific? @@ -6,4 +6,4 @@ EXTRA_OECONF_append_rpi = " CFLAGS="$CFLAGS -I${STAGING_DIR_TARGET}/usr/include #examples only build with GL but not GLES, so disable it for RPI EXTRA_OECONF_append_rpi = " --disable-examples" -RDEPENDS_${PN}_append_rpi = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " userland-nogl", "", d)}" +RDEPENDS_${PN}_append_rpi = " userland" diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index 4ec0b24..f557207 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -7,8 +7,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh libomxil coreutils-native curl-native" -DEPENDS += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " userland-nogl", "", d)}" +DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh libomxil coreutils-native curl-native userland" PR = "r4" @@ -105,5 +104,4 @@ FILES_${PN} = "${bindir}/omxplayer* \ FILES_${PN}-dev += "${libdir}/omxplayer/*.so" -RDEPENDS_${PN} += "bash procps" -RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " userland-nogl", "", d)}" +RDEPENDS_${PN} += "bash procps userland" -- cgit v1.2.3-54-g00ecf