commit: c38db89c56279684dce2769dad09d23a4ed2cc8f Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Aug 14 20:29:55 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Aug 14 20:31:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38db89c
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 media-libs/mesa/mesa-18.2.0_rc2.ebuild | 12 ++++++++---- media-libs/mesa/mesa-9999.ebuild | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/media-libs/mesa/mesa-18.2.0_rc2.ebuild b/media-libs/mesa/mesa-18.2.0_rc2.ebuild index de26a3b43d2..592501bdb8e 100644 --- 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 6d4fc7f2373..4bdf4c91e6f 100644 --- 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
