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
This commit is contained in:
Matt Turner
2018-08-14 13:29:55 -07:00
parent ed5f6696ba
commit c38db89c56
2 changed files with 16 additions and 8 deletions

View File

@@ -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

View File

@@ -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