Move libgl workaround to libsdl

libsdl tries to pull in mesa, so workaround was added to machines
configs to prevent that. Now remove dependency to libgl from libsdl
that was causing that.

Change-Id: I425aa45cdc32842d573354eaaab7ed67ee5bb7b5
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>

12 files changed, 1 insertions, 39 deletions

diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 36f28d0..5799db7 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -22,7 +22,6 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
-PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index a48ad21..dab0c5a 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -30,7 +30,6 @@ BOOT_SCRIPTS = "\
 SDCARD_GENERATION_COMMAND = "generate_imx_sdcard"
 UBOOT_SUFFIX = "img"
 
-PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 243532b..ba13aaa 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -17,7 +17,6 @@
 ############################################################################
 IMAGE_FSTYPES = "tar.gz"
 
-PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "5.01.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01"
 
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index 261bc29..d83f6b4 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -22,8 +22,6 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
-PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51"
-
 MACHINE_EXTRA_INSTALL = "\
         amd-gpu-bin-mx51 \
         "
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 8a72f7e..97513a8 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -23,7 +23,6 @@
 IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg"
 
 PREFERRED_PROVIDER_virtual/libgles1 = "userland"
-PREFERRED_PROVIDER_virtual/libgl = "userland"
 
 MACHINE_EXTRA_INSTALL = "\
         userland \
diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
index 9950930..40075c0 100644
--- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
+++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
@@ -22,5 +22,3 @@
 
 # dependency to x11 only when distro features have it
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
-
-PROVIDES += "virtual/libgl"
diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
index 2c689f1..73a2408 100644
--- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
+++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
@@ -27,8 +27,6 @@ TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " file://0001-Add-GLchar-typedef.patch"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 do_install_append() {
diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
index 8ab3608..6a37c89 100644
--- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
@@ -22,8 +22,6 @@
 
 BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 do_install_append() {
diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
index efdfeca..5446ffa 100644
--- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
@@ -25,8 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
 BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 do_install_append() {
diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
index 7edb38f..82bfdb2 100644
--- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
@@ -25,8 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
 BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 # Inhibit warnings about files being stripped.
diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend
new file mode 100644
index 0000000..36424fd
--- /dev/null
+++ b/recipes/libsdl/libsdl_1.2.15.bbappend
@@ -0,0 +1 @@
+DEPENDS_remove = "virtual/libgl"
diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend
deleted file mode 100644
index c13c3a9..0000000
--- a/recipes/userland/userland_git.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"