@@ -77,7 +71,6 @@ if [[ "${MESALIB_BUILD}" == "dri" ]]; then
"--enable-gbm" "--disable-gbm"
config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x
API?" n \
"--enable-gles2" "--disable-gles2"
- fi
if list_find "${MESALIB_GALLIUM}" "i915"; then
sub_depends libdrm INTEL
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index b2ca200..f23c3ca 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2018-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * SUB_DEPENDS PRE_SUB_DEPENDS:: delete WAYLAND
+ * DEPENDS: delete wayland stuff
+
2018-03-27 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 18.0.0
diff --git a/graphics-libs/mesalib/PRE_SUB_DEPENDS
b/graphics-libs/mesalib/PRE_SUB_DEPENDS
index 5372493..bf78a14 100755
--- a/graphics-libs/mesalib/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesalib/PRE_SUB_DEPENDS
@@ -1,9 +1,4 @@
case $THIS_SUB_DEPENDS in
DRI) [[ $MESALIB_BUILD == dri ]] && return 0 ;;
- WAYLAND)
- if list_find "$MESA_EGL" wayland;then
- return 0
- fi
- ;;
esac
return 1
diff --git a/graphics-libs/mesalib/SUB_DEPENDS
b/graphics-libs/mesalib/SUB_DEPENDS
index 08c625e..43eb386 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -19,11 +19,6 @@ case $THIS_SUB_DEPENDS in
MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
fi
fi ;;
- WAYLAND)
- if ! list_find "$MESA_EGL" wayland;then
- list_add MESA_EGL wayland
- fi
-
;;
*) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;
esac
diff --git a/kde-frameworks/kwayland/DEPENDS b/kde-frameworks/kwayland/DEPENDS
index 8ffabed..a11d5c1 100755
--- a/kde-frameworks/kwayland/DEPENDS
+++ b/kde-frameworks/kwayland/DEPENDS
@@ -1,3 +1,3 @@
source $GRIMOIRE/KDE5_DEPENDS
depends wayland &&
-depends -sub WAYLAND MESA
+depends MESA
diff --git a/kde-frameworks/kwayland/HISTORY b/kde-frameworks/kwayland/HISTORY
index e04d7e9..cfbf740 100644
--- a/kde-frameworks/kwayland/HISTORY
+++ b/kde-frameworks/kwayland/HISTORY
@@ -1,3 +1,6 @@
+2018-04-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: remove '-sub WAYLAND'
+
2018-03-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.44.0