media-libs/mesa: Default to classic i915

The new meson build system does not like it if you ask it to build both
the classic and gallium versions of i915 and fails to configure. If both
classic and gallium are enabled build only the classic i915 driver since
it is better supported and supports more hardware.

Closes: https://bugs.gentoo.org/663400

diff --git a/media-libs/mesa/mesa-18.2.0_rc2.ebuild b/media-libs/mesa/mesa-18.2.0_rc2.ebuild
index de26a3b43d21e2f296e72b7d1ee1c981315a696b..592501bdb8e2f06d6e20050a1805dd533e0fb8c0 100644 (file)
--- a/media-libs/mesa/mesa-18.2.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-18.2.0_rc2.ebuild
@@ -311,11 +311,15 @@ multilib_src_configure() {
                gallium_enable video_cards_vivante etnaviv
                gallium_enable video_cards_vmware svga
                gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
                gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
+
+               # Only one i915 driver (classic vs gallium). Default to classic.
+               if ! use classic; then
+                       gallium_enable video_cards_i915 i915
+                       if ! use video_cards_i915 && \
+                               ! use video_cards_i965; then
+                               gallium_enable video_cards_intel i915
+                       fi
                fi
 
                gallium_enable video_cards_r300 r300

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6d4fc7f23736aaf7376e2767955ee5075c1588cd..4bdf4c91e6f42f3277ec6d53b888891bbb7136ab 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -311,11 +311,15 @@ multilib_src_configure() {
                gallium_enable video_cards_vivante etnaviv
                gallium_enable video_cards_vmware svga
                gallium_enable video_cards_nouveau nouveau
-               gallium_enable video_cards_i915 i915
                gallium_enable video_cards_imx imx
-               if ! use video_cards_i915 && \
-                       ! use video_cards_i965; then
-                       gallium_enable video_cards_intel i915
+
+               # Only one i915 driver (classic vs gallium). Default to classic.
+               if ! use classic; then
+                       gallium_enable video_cards_i915 i915
+                       if ! use video_cards_i915 && \
+                               ! use video_cards_i965; then
+                               gallium_enable video_cards_intel i915
+                       fi
                fi
 
                gallium_enable video_cards_r300 r300