From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 28 Oct 2016 17:38:23 +0000 (-0200)
Subject: gstreamer1.0-plugins-bad: Refactor code to use the new overrides
X-Git-Tag: 2.2~163
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2adbced1a3ec33c35612bdcdf228c4fb502041d9;p=meta-freescale.git

gstreamer1.0-plugins-bad: Refactor code to use the new overrides

The recipe has been reworked to use the 'imxgpu2d' and 'imxgpu3d'
feature overrides.

Change-Id: Ib91231cfaff479cd185741b12ff8da56145e6327
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index adc75b72..c663d94b 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -2,22 +2,23 @@
 # defines to be set for each platform
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-CFLAGS_append_mx6 = " -DLINUX \
-                      ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                         bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DEGL_API_FB -DWL_EGL_PLATFORM', '-DEGL_API_FB', d), d)}"
+CFLAGS_append_imxgpu2d = " -DLINUX ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
+                            bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DEGL_API_FB -DWL_EGL_PLATFORM', '-DEGL_API_FB', d), d)}"
 
-PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
-                           bb.utils.contains('DISTRO_FEATURES', 'x11', \
-                                    'opengl', '', d), '', d)}"
+PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl', '', d)}"
 
-SRC_URI_append = " file://0001-glplugin-Change-wayland-default-res-to-1024x768.patch \
-                   file://0002-Add-directviv-to-glimagesink-to-improve-playback-per.patch \
-                   file://0003-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch \
-                   file://0004-Fix-dependence-issue-between-gst-plugin-.patch \
-                   file://0005-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch \
-                   file://0006-glwindow-work-around-for-no-frame-when-imxplayer-use.patch \
-                   file://0007-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch \
+PACKAGECONFIG_GL_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
+
+
+SRC_URI_append_imxgpu3d = " \
+    file://0001-glplugin-Change-wayland-default-res-to-1024x768.patch \
+    file://0002-Add-directviv-to-glimagesink-to-improve-playback-per.patch \
+    file://0003-MMFMWK-6930-glplugin-Accelerate-gldownload-with-dire.patch \
+    file://0004-Fix-dependence-issue-between-gst-plugin-.patch \
+    file://0005-glcolorconvert-convert-YUV-to-RGB-use-directviv.patch \
+    file://0006-glwindow-work-around-for-no-frame-when-imxplayer-use.patch \
+    file://0007-glplugin-glcolorconvert-fix-MRT-cannot-work-in-GLES3.patch \
 "
 
 
-PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH_imxgpu2d = "${MACHINE_SOCARCH}"