From ffd83c0b12088d25e4ac1570f7ecdac263fcfbd8 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 19 Feb 2017 13:24:24 -0800 Subject: [PATCH] media-libs/mesa: Drop VIDEO_CARDS=ilo. Never anything more than a toy. Removed upstream by commit 387942591758. Should never have been added to the ebuild in the first place. --- media-libs/mesa/files/eselect-mesa.conf.9.2 | 1 - media-libs/mesa/mesa-11.0.6.ebuild | 4 +--- media-libs/mesa/mesa-11.0.9.ebuild | 4 +--- media-libs/mesa/mesa-11.2.2.ebuild | 4 +--- media-libs/mesa/mesa-12.0.1.ebuild | 4 +--- media-libs/mesa/mesa-12.0.6.ebuild | 4 +--- media-libs/mesa/mesa-13.0.4.ebuild | 4 +--- media-libs/mesa/mesa-17.0.0.ebuild | 4 +--- media-libs/mesa/mesa-9999.ebuild | 4 +--- profiles/desc/video_cards.desc | 1 - 10 files changed, 8 insertions(+), 26 deletions(-) diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 b/media-libs/mesa/files/eselect-mesa.conf.9.2 index ff590f590fa3..18bfaff86538 100644 --- a/media-libs/mesa/files/eselect-mesa.conf.9.2 +++ b/media-libs/mesa/files/eselect-mesa.conf.9.2 @@ -20,7 +20,6 @@ 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]="ilo_dri.so" MESA_DRIVERS[i965,default]="classic" MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)" diff --git a/media-libs/mesa/mesa-11.0.6.ebuild b/media-libs/mesa/mesa-11.0.6.ebuild index ed3008b6aa81..b453d515d059 100644 --- a/media-libs/mesa/mesa-11.0.6.ebuild +++ b/media-libs/mesa/mesa-11.0.6.ebuild @@ -35,7 +35,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" for card in ${VIDEO_CARDS}; do @@ -62,7 +62,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) @@ -234,7 +233,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo if ! use video_cards_i915 && \ ! use video_cards_i965; then gallium_enable video_cards_intel i915 diff --git a/media-libs/mesa/mesa-11.0.9.ebuild b/media-libs/mesa/mesa-11.0.9.ebuild index b0f098685595..622b9d7df838 100644 --- a/media-libs/mesa/mesa-11.0.9.ebuild +++ b/media-libs/mesa/mesa-11.0.9.ebuild @@ -35,7 +35,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" for card in ${VIDEO_CARDS}; do @@ -62,7 +62,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) @@ -232,7 +231,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo if ! use video_cards_i915 && \ ! use video_cards_i965; then gallium_enable video_cards_intel i915 diff --git a/media-libs/mesa/mesa-11.2.2.ebuild b/media-libs/mesa/mesa-11.2.2.ebuild index ba7f5c692348..cd68cb570e17 100644 --- a/media-libs/mesa/mesa-11.2.2.ebuild +++ b/media-libs/mesa/mesa-11.2.2.ebuild @@ -35,7 +35,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware" for card in ${VIDEO_CARDS}; do @@ -62,7 +62,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) @@ -235,7 +234,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo if ! use video_cards_i915 && \ ! use video_cards_i965; then gallium_enable video_cards_intel i915 diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild index 0f7e3f905151..7daaa1ff73ff 100644 --- a/media-libs/mesa/mesa-12.0.1.ebuild +++ b/media-libs/mesa/mesa-12.0.1.ebuild @@ -35,7 +35,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware" for card in ${VIDEO_CARDS}; do @@ -62,7 +62,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) @@ -240,7 +239,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo if ! use video_cards_i915 && \ ! use video_cards_i965; then gallium_enable video_cards_intel i915 diff --git a/media-libs/mesa/mesa-12.0.6.ebuild b/media-libs/mesa/mesa-12.0.6.ebuild index 78fc3e5154d9..9e5dba866985 100644 --- a/media-libs/mesa/mesa-12.0.6.ebuild +++ b/media-libs/mesa/mesa-12.0.6.ebuild @@ -35,7 +35,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware" for card in ${VIDEO_CARDS}; do @@ -62,7 +62,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) @@ -241,7 +240,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo if ! use video_cards_i915 && \ ! use video_cards_i965; then gallium_enable video_cards_intel i915 diff --git a/media-libs/mesa/mesa-13.0.4.ebuild b/media-libs/mesa/mesa-13.0.4.ebuild index 84081c5be9e3..1a1022c463b1 100644 --- a/media-libs/mesa/mesa-13.0.4.ebuild +++ b/media-libs/mesa/mesa-13.0.4.ebuild @@ -35,7 +35,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware" for card in ${VIDEO_CARDS}; do @@ -65,7 +65,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) @@ -251,7 +250,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo if ! use video_cards_i915 && \ ! use video_cards_i965; then gallium_enable video_cards_intel i915 diff --git a/media-libs/mesa/mesa-17.0.0.ebuild b/media-libs/mesa/mesa-17.0.0.ebuild index d6d58afc0dd6..38ce30d34c69 100644 --- a/media-libs/mesa/mesa-17.0.0.ebuild +++ b/media-libs/mesa/mesa-17.0.0.ebuild @@ -34,7 +34,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware" for card in ${VIDEO_CARDS}; do @@ -63,7 +63,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_imx? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) @@ -261,7 +260,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo gallium_enable video_cards_imx imx if ! use video_cards_i915 && \ ! use video_cards_i965; then diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 2f05b05d304b..385d8f390d7e 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -34,7 +34,7 @@ LICENSE="MIT" SLOT="0" RESTRICT="!bindist? ( bindist )" -INTEL_CARDS="i915 i965 ilo intel" +INTEL_CARDS="i915 i965 intel" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware" for card in ${VIDEO_CARDS}; do @@ -63,7 +63,6 @@ REQUIRED_USE=" video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) video_cards_imx? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) @@ -248,7 +247,6 @@ multilib_src_configure() { gallium_enable video_cards_vmware svga gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo gallium_enable video_cards_imx imx if ! use video_cards_i915 && \ ! use video_cards_i965; then diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc index 4ef928c058a9..4ee4bfcae1ac 100644 --- a/profiles/desc/video_cards.desc +++ b/profiles/desc/video_cards.desc @@ -24,7 +24,6 @@ i128 - VIDEO_CARDS setting to build driver for Number 9 I128 video cards i740 - VIDEO_CARDS setting to build driver for Intel i740 video cards i915 - VIDEO_CARDS setting to build driver for Intel i915 video cards i965 - VIDEO_CARDS setting to build driver for Intel i965 video cards -ilo - VIDEO_CARDS setting to build unofficial gallium driver for Intel gen6/7 video cards imx - VIDEO_CARDS setting to build driver for Freescale i.MX video cards intel - VIDEO_CARDS setting to build driver for Intel video cards mach64 - VIDEO_CARDS setting to build driver for mach64 video cards -- 2.26.2