| 1 |
battousai 09/03/27 22:24:25 |
| 2 |
|
| 3 |
Modified: ChangeLog x11-drm-20090320.ebuild |
| 4 |
Log: |
| 5 |
Fix linux-mod usage regression, remove nv flag/nouveau module, add ewarn for missing intel. Fixes bug #263259. |
| 6 |
(Portage version: 2.2_rc25/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.71 x11-base/x11-drm/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?rev=1.71&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?rev=1.71&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?r1=1.70&r2=1.71 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v |
| 18 |
retrieving revision 1.70 |
| 19 |
retrieving revision 1.71 |
| 20 |
diff -u -r1.70 -r1.71 |
| 21 |
--- ChangeLog 21 Mar 2009 00:23:02 -0000 1.70 |
| 22 |
+++ ChangeLog 27 Mar 2009 22:24:25 -0000 1.71 |
| 23 |
@@ -1,6 +1,13 @@ |
| 24 |
# ChangeLog for x11-base/x11-drm |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.70 2009/03/21 00:23:02 battousai Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.71 2009/03/27 22:24:25 battousai Exp $ |
| 28 |
+ |
| 29 |
+ 27 Mar 2009; Bryan Stine <battousai@g.o> x11-drm-20090320.ebuild: |
| 30 |
+ Removed nouveau.ko and nv VIDEO_CARDS flag. There are no supporting |
| 31 |
+ packages in the portage tree for those yet. Fixed linux-mod config check |
| 32 |
+ usage regression, bug #263259 (thanks kouyu). Added ewarn for the |
| 33 |
+ disappearance of the intel driver, which happened upstream. It's in the |
| 34 |
+ kernel now (thanks Andres Sandoval, comment in above bug). |
| 35 |
|
| 36 |
*x11-drm-20090320 (20 Mar 2009) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.2 x11-base/x11-drm/x11-drm-20090320.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild?rev=1.2&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild?rev=1.2&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild?r1=1.1&r2=1.2 |
| 46 |
|
| 47 |
Index: x11-drm-20090320.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild,v |
| 50 |
retrieving revision 1.1 |
| 51 |
retrieving revision 1.2 |
| 52 |
diff -u -r1.1 -r1.2 |
| 53 |
--- x11-drm-20090320.ebuild 21 Mar 2009 00:23:02 -0000 1.1 |
| 54 |
+++ x11-drm-20090320.ebuild 27 Mar 2009 22:24:25 -0000 1.2 |
| 55 |
@@ -1,13 +1,12 @@ |
| 56 |
# Copyright 1999-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild,v 1.1 2009/03/21 00:23:02 battousai Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20090320.ebuild,v 1.2 2009/03/27 22:24:25 battousai Exp $ |
| 60 |
|
| 61 |
inherit eutils x11 linux-mod autotools |
| 62 |
|
| 63 |
IUSE_VIDEO_CARDS=" |
| 64 |
video_cards_mach64 |
| 65 |
video_cards_mga |
| 66 |
- video_cards_nv |
| 67 |
video_cards_r128 |
| 68 |
video_cards_radeon |
| 69 |
video_cards_radeonhd |
| 70 |
@@ -46,6 +45,9 @@ |
| 71 |
RDEPEND="" |
| 72 |
|
| 73 |
pkg_setup() { |
| 74 |
+ ewarn "The intel DRM module has been removed from x11-drm. Please use the in-kernel" |
| 75 |
+ ewarn "DRM module. This package is no longer useful for intel video cards." |
| 76 |
+ |
| 77 |
# Setup the kernel's stuff. |
| 78 |
kernel_setup |
| 79 |
|
| 80 |
@@ -131,8 +133,6 @@ |
| 81 |
K_RV=${CHOST/*-freebsd/} |
| 82 |
elif use kernel_linux |
| 83 |
then |
| 84 |
- linux-mod_pkg_setup |
| 85 |
- |
| 86 |
if kernel_is 2 4 |
| 87 |
then |
| 88 |
eerror "Upstream support for 2.4 kernels has been removed, so this package will no" |
| 89 |
@@ -140,11 +140,11 @@ |
| 90 |
die "Please use in-kernel DRM or switch to a 2.6 kernel." |
| 91 |
fi |
| 92 |
|
| 93 |
- linux_chkconfig_builtin "DRM" && \ |
| 94 |
- die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)" |
| 95 |
- |
| 96 |
- CONFIG_CHECK="AGP" |
| 97 |
+ CONFIG_CHECK="!DRM AGP" |
| 98 |
+ ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)" |
| 99 |
ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)" |
| 100 |
+ |
| 101 |
+ linux-mod_pkg_setup |
| 102 |
fi |
| 103 |
} |
| 104 |
|
| 105 |
@@ -156,8 +156,6 @@ |
| 106 |
VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}" |
| 107 |
use video_cards_mga && \ |
| 108 |
VIDCARDS="${VIDCARDS} mga.${KV_OBJ}" |
| 109 |
- use video_cards_nv && \ |
| 110 |
- VIDCARDS="${VIDCARDS} nouveau.${KV_OBJ}" |
| 111 |
use video_cards_r128 && \ |
| 112 |
VIDCARDS="${VIDCARDS} r128.${KV_OBJ}" |
| 113 |
use video_cards_radeon || use video_cards_radeonhd && \ |
Archives