From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/conf/distro/arago.conf | 9 +++++---
.../conf/distro/include/arago-prefs.inc | 8 ++++---
.../packagegroup-arago-gst-sdk-target.bb | 16 ++++++++++++--
.../packagegroups/packagegroup-arago-gst.bb | 25 ++++++++++++++++------
.../glsdk-example-apps/glsdk-example-apps.bb | 4 ++--
5 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/meta-arago-distro/conf/distro/arago.conf
b/meta-arago-distro/conf/distro/arago.conf
index 450ffe7..5debe0b 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -24,6 +24,9 @@ DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile
pcmcia usbgadget usbh
# Set additional distro features
DISTRO_FEATURES += "pam ${@base_contains('MACHINE_FEATURES', 'screen', 'wayland',
'', d)}"
+# Set preferred gstreamer version (0.10 vs 1.0)
+GST_PROVIDER ?= "1.0"
+
# Set preferred Qt version
QT_PROVIDER ?= "qt5"
@@ -35,8 +38,8 @@ PACKAGECONFIG_pn-weston = "fbdev kms launch libinput"
PACKAGECONFIG_GL_pn-qtbase = "gles2 linuxfb"
PACKAGECONFIG_DISTRO_pn-qtbase = "icu examples"
-# Configure gstreamer-0.10.x as a dependency instead of gstreamer-1.x
-PACKAGECONFIG_pn-qtwebkit = "gstreamer010 qtlocation qtmultimedia qtsensors"
+# Configure gstreamer dependency based on GST_PROVIDER
+PACKAGECONFIG_pn-qtwebkit = "${@base_conditional('GST_PROVIDER', '0.10',
'gstreamer010', 'gstreamer', d)} qtlocation qtmultimedia qtsensors"
# Enable UI and scripting for perf
PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
@@ -86,4 +89,4 @@ ENTERPRISE_DISTRO = "1"
# disable by default the codecs in libav that causes issues with shipping an
# Arago based SDK. No need to prevent gst-ffmpeg from being used since we
# disable troublesome software.
-LICENSE_FLAGS_WHITELIST = "commercial_gst-ffmpeg"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-ffmpeg commercial_gstreamer1.0-libav"
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc
b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 4f2c854..9f12562 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -113,9 +113,11 @@ PREFERRED_PROVIDER_wpa-supplicant_ti33x =
"wpa-supplicant-wl18xx"
PREFERRED_PROVIDER_wpa-supplicant_ti43x = "wpa-supplicant-wl18xx"
PREFERRED_PROVIDER_wpa-supplicant_omap-a15 = "wpa-supplicant-wl18xx"
-PREFERRED_PROVIDER_gstreamer = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gstreamer-mm-accel', 'gstreamer', d)}"
-PREFERRED_PROVIDER_gstreamer-dev = "${@base_contains('MACHINE_FEATURES', 'mmip',
'gstreamer-mm-accel-dev', 'gstreamer-dev', d)}"
-PREFERRED_PROVIDER_gstreamer-dbg = "${@base_contains('MACHINE_FEATURES', 'mmip',
'gstreamer-mm-accel-dbg', 'gstreamer-dbg', d)}"
+GST_MM_ACCEL = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gstreamer-mm-accel',
'gstreamer', d)}"
+PREFERRED_PROVIDER_gstreamer = "${@base_conditional('GST_PROVIDER', '0.10',
"${GST_MM_ACCEL}", 'gstreamer', d)}"
+PREFERRED_PROVIDER_gstreamer-dev = "${@base_conditional('GST_PROVIDER', '0.10',
"${GST_MM_ACCEL}-dev", 'gstreamer-dev', d)}"
+PREFERRED_PROVIDER_gstreamer-dbg = "${@base_conditional('GST_PROVIDER', '0.10',
"${GST_MM_ACCEL}-dbg", 'gstreamer-dbg', d)}"
+
PREFERRED_PROVIDER_gst-plugins-bad = "${@base_contains('MACHINE_FEATURES', 'mmip',
'gst-plugins-bad-mm-accel', 'gst-plugins-bad', d)}"
PREFERRED_PROVIDER_gst-plugins-bad-dev = "${@base_contains('MACHINE_FEATURES',
'mmip', 'gst-plugins-bad-mm-accel-dev', 'gst-plugins-bad-dev', d)}"
PREFERRED_PROVIDER_gst-plugins-bad-meta = "${@base_contains('MACHINE_FEATURES',
'mmip', 'gst-plugins-bad-mm-accel-meta', 'gst-plugins-bad-meta', d)}"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
index 7897b8a..37e63a3 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst-sdk-target.bb
@@ -1,13 +1,25 @@
DESCRIPTION = "Task to build and install header and libs in sdk"
LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
inherit packagegroup
-RDEPENDS_${PN} = "\
+GST_010_DEPS = " \
gstreamer-dev \
gst-plugins-base-dev \
gst-plugins-good-dev \
gst-plugins-bad-dev \
gst-ffmpeg-dev \
"
+
+GST_1X_DEPS = " \
+ gstreamer1.0-dev \
+ gstreamer1.0-plugins-base-dev \
+ gstreamer1.0-plugins-good-dev \
+ gstreamer1.0-plugins-bad-dev \
+ gstreamer1.0-libav-dev \
+"
+
+RDEPENDS_${PN} = " \
+ ${@base_conditional('GST_PROVIDER', '0.10', "${GST_010_DEPS}",
"${GST_1X_DEPS}", d)} \
+"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
index d88e4c8..b449dfe 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb
@@ -1,12 +1,12 @@
DESCRIPTION = "Task to add gstreamer and gstreamer plugins"
LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
-GSTREAMER = " \
+GST_010_DEPS = " \
gstreamer \
gst-plugins-base \
gst-plugins-good \
@@ -14,14 +14,27 @@ GSTREAMER = " \
gst-plugins-base-meta \
gst-plugins-good-meta \
gst-plugins-bad-meta \
+ gst-ffmpeg \
+"
+
+GST_1X_DEPS = " \
+ gstreamer1.0 \
+ gstreamer1.0-plugins-base \
+ gstreamer1.0-plugins-good \
+ gstreamer1.0-plugins-bad \
+ gstreamer1.0-plugins-base-meta \
+ gstreamer1.0-plugins-good-meta \
+ gstreamer1.0-plugins-bad-meta \
+ gstreamer1.0-libav \
"
+GST_PLUGINS_PREFIX = "${@base_conditional('GST_PROVIDER', '0.10', 'gst-plugins', 'gstreamer1.0-plugins', d)}"
+
GSTREAMER_ACCEL_MM = ""
-GSTREAMER_ACCEL_MM_omap-a15 = "${@base_contains('MACHINE_FEATURES', 'mmip',
'gst-plugins-ducati', '', d)}"
-GSTREAMER_ACCEL_MM_append_dra7xx = "${@base_contains('MACHINE_FEATURES', 'mmip', '
gst-plugins-vpe', '', d)}"
+GSTREAMER_ACCEL_MM_omap-a15 = "${@base_contains('MACHINE_FEATURES', 'mmip',
"${GST_PLUGINS_PREFIX}-ducati", '', d)}"
+GSTREAMER_ACCEL_MM_append_dra7xx = "${@base_contains('MACHINE_FEATURES', 'mmip', "
${GST_PLUGINS_PREFIX}-vpe", '', d)}"
RDEPENDS_${PN} = "\
- ${GSTREAMER} \
+ ${@base_conditional('GST_PROVIDER', '0.10', "${GST_010_DEPS}",
"${GST_1X_DEPS}", d)} \
${GSTREAMER_ACCEL_MM} \
- gst-ffmpeg \
"
diff --git
a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
index a6b45b8..9236d6d 100644
---
a/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
+++
b/meta-arago-extras/recipes-graphics/glsdk-example-apps/glsdk-example-apps.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://git.ti.com/glsdk";
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=10a9abb9c5bb19edd83a8cf66eef7148"
-DEPENDS = "gstreamer libdrm ti-ipc"
+DEPENDS = "${@base_conditional('GST_PROVIDER', '0.10', 'gstreamer', 'gstreamer1.0',
d)} libdrm ti-ipc"
COMPATIBLE_MACHINE = "dra7xx-evm"
@@ -14,4 +14,4 @@ inherit autotools pkgconfig
SRC_URI = "git://git.ti.com/glsdk/example-applications.git;protocol=git"
SRCREV = "a21dd98d5686a6c4563f89966cb459158085dd1b"
-PR = "r1"
+PR = "r2"
