From 530132c9427e5e15cbb9e64f89c438389a4e7672 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.oss.09@gmail.com>
Date: Tue, 31 Mar 2015 19:18:32 +0200
Subject: gpu-viv-bin: package has been renamed and split

gpu-viv-bin-mx6q -> imx-gpu-viv
with a bunch of subpackages.
---
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend           | 14 --------------
 recipes/images/angstrom-lxde-image.bb                      |  2 +-
 recipes/images/angstrom-qt-x11-image.bb                    |  5 ++++-
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend
deleted file mode 100644
index 690f420..0000000
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-# meta package to pull in the libries, but not the (huge) samples
-PACKAGES =+ "gpu-viv-bin-mx6q-libraries "
-FILES_gpu-viv-bin-mx6q-libraries = ""
-ALLOW_EMPTY_gpu-viv-bin-mx6q-libraries = "1"
-RDEPENDS_gpu-viv-bin-mx6q-libraries = " \
-    libclc-mx6 \
-    libegl-mx6 \
-    libgles-mx6 \
-    libgles2-mx6 \
-    libglslc-mx6 \
-    libopencl-mx6 \
-    libopenvg-mx6 \
-    libvdk-mx6 \
-"
\ No newline at end of file
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb
index 09fd026..b71c6af 100644
--- a/recipes/images/angstrom-lxde-image.bb
+++ b/recipes/images/angstrom-lxde-image.bb
@@ -102,7 +102,6 @@ GSTREAMER_append_mx6 = " \
     gst-plugins-base-xvimagesink \
     gst-plugins-gl \
     gst-fsl-plugin \
-    gpu-viv-bin-mx6q-libraries \
 "
 GSTREAMER_colibri-vf = ""
 
@@ -116,6 +115,7 @@ IMAGE_INSTALL_append_apalis-imx6 = " \
     gpioconfig \
 "
 IMAGE_INSTALL_append_mx6 = " \
+    packagegroup-fsl-tools-gpu \
     gnome-disk-utility \
     mime-support \
 "
diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb
index f561535..73845c4 100644
--- a/recipes/images/angstrom-qt-x11-image.bb
+++ b/recipes/images/angstrom-qt-x11-image.bb
@@ -93,7 +93,6 @@ GSTREAMER_append_mx6 = " \
     gst-plugins-base-xvimagesink \
     gst-plugins-gl \
     gst-fsl-plugin \
-    gpu-viv-bin-mx6q-libraries \
 "
 GSTREAMER_colibri-vf = ""
 
@@ -134,6 +133,10 @@ IMAGE_INSTALL_QT4 = " \
     icu \
 "
 
+IMAGE_INSTALL_append_mx6 = " \
+    packagegroup-fsl-tools-gpu \
+"
+
 IMAGE_INSTALL += " \
     ${IMAGE_INSTALL_QT4} \
     \
-- 
cgit v1.2.3