summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Heidelberger <david.heidelberger@ixit.cz>2013-05-24 01:00:38 +0200
committerDavid Heidelberger <david.heidelberger@ixit.cz>2013-05-24 01:00:38 +0200
commit140c045fa14f0620f95ebe67f6df14d049897304 (patch)
treeb9b7ead7b3a8fe194b9c39019ea12b323ba5f36a /media-libs
parentdev-libs/weston: update dependency list (diff)
downloadx11-140c045fa14f0620f95ebe67f6df14d049897304.tar.gz
x11-140c045fa14f0620f95ebe67f6df14d049897304.tar.bz2
x11-140c045fa14f0620f95ebe67f6df14d049897304.zip
media-libs/mesa: revert to ilo_dri.so, not build i915g and ilo, when only i965 is selected
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/mesa/files/eselect-mesa.conf.9.22
-rw-r--r--media-libs/mesa/mesa-9999.ebuild5
2 files changed, 4 insertions, 3 deletions
diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 b/media-libs/mesa/files/eselect-mesa.conf.9.2
index 4058b68a..ff590f59 100644
--- a/media-libs/mesa/files/eselect-mesa.conf.9.2
+++ b/media-libs/mesa/files/eselect-mesa.conf.9.2
@@ -20,7 +20,7 @@ MESA_DRIVERS[i915,default]="gallium"
MESA_DRIVERS[i965,description]="i965 (Intel GMA 965, G/Q3x, G/Q4x, HD)"
MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
-MESA_DRIVERS[i965,galliumdriver]="i965g_dri.so"
+MESA_DRIVERS[i965,galliumdriver]="ilo_dri.so"
MESA_DRIVERS[i965,default]="classic"
MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1994217b..0f02e718 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE="
xorg? ( gallium )
video_cards_intel? ( || ( classic gallium ) )
video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
video_cards_ilo? ( gallium )
video_cards_nouveau? ( || ( classic gallium ) )
video_cards_radeon? ( || ( classic gallium ) )
@@ -239,7 +239,8 @@ src_configure() {
gallium_enable video_cards_i915 i915
gallium_enable video_cards_ilo ilo
if ! use video_cards_i915 && \
- ! use video_cards_ilo; then
+ ! use video_cards_i965 && \
+ ! use video_cards_ilo; then
gallium_enable video_cards_intel i915 ilo
fi