From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <eric@eukrea.com>
Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2])
	by yocto-www.yoctoproject.org (Postfix) with ESMTP id CCFA9E01518
	for <meta-freescale@yoctoproject.org>;
	Mon, 27 May 2013 17:02:22 -0700 (PDT)
Received: from buildor.local.eukrea.com (unknown [82.240.38.71])
	by smtp2-g21.free.fr (Postfix) with ESMTP id 95EF74B0045
	for <meta-freescale@yoctoproject.org>;
	Tue, 28 May 2013 02:02:17 +0200 (CEST)
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
To: meta-freescale@yoctoproject.org
Date: Tue, 28 May 2013 02:02:51 +0200
Message-Id: <1369699372-1398-3-git-send-email-eric@eukrea.com>
X-Mailer: git-send-email 1.7.10.4
In-Reply-To: <1369699372-1398-1-git-send-email-eric@eukrea.com>
References: <1369699372-1398-1-git-send-email-eric@eukrea.com>
MIME-Version: 1.0
Subject: [meta-fsl-arm][PATCH RFC 3/4] amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES
X-BeenThere: meta-freescale@yoctoproject.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Usage and development list for the meta-fsl-* layers
	<meta-freescale.yoctoproject.org>
List-Unsubscribe: <https://lists.yoctoproject.org/options/meta-freescale>,
	<mailto:meta-freescale-request@yoctoproject.org?subject=unsubscribe>
List-Archive: <http://lists.yoctoproject.org/pipermail/meta-freescale>
List-Post: <mailto:meta-freescale@yoctoproject.org>
List-Help: <mailto:meta-freescale-request@yoctoproject.org?subject=help>
List-Subscribe: <https://lists.yoctoproject.org/listinfo/meta-freescale>,
	<mailto:meta-freescale-request@yoctoproject.org?subject=subscribe>
X-List-Received-Date: Tue, 28 May 2013 00:02:24 -0000
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this prevent warnings and parse errors

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 .../amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb             |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
index 2dee47a..e50d691 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
@@ -6,9 +6,11 @@ LICENSE = "Proprietary"
 SECTION = "libs"
 PR = "r12"
 
+RCONFLICTS_${PN} = "amd-gpu-bin-mx51"
+
 # FIXME: Replace for correct AMD license
 LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
-DEPENDS = "virtual/libx11 libxrender"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender', '', d)}"
 
 PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
 
@@ -84,5 +86,5 @@ FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}"
 FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}"
 FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"
 
-COMPATIBLE_MACHINE = "(mx5)"
+COMPATIBLE_MACHINE = "{@base_contains('DISTRO_FEATURES', 'x11', (mx5), '', d)}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.7.10.4