| 1 |
commit: bb54f2447d16fee7882b43bf7c6c9d01e67c7839 |
| 2 |
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 31 18:44:37 2011 +0000 |
| 4 |
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> |
| 5 |
CommitDate: Mon Oct 31 18:44:37 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=bb54f244 |
| 7 |
|
| 8 |
x11-base/xorg-server: re-introduce acpi patch, drop nouveau patch which was merged upstream. |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/xorg-server-1.12-disable-acpi.patch | 11 +++++++ |
| 12 |
.../files/xorg-server-1.9-nouveau-default.patch | 30 -------------------- |
| 13 |
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +- |
| 14 |
3 files changed, 12 insertions(+), 31 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..df43dbd |
| 19 |
--- /dev/null |
| 20 |
+++ b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch |
| 21 |
@@ -0,0 +1,11 @@ |
| 22 |
+diff -ur a/configure.ac b/configure.ac |
| 23 |
+--- a/configure.ac 2011-10-31 19:40:02.000000000 +0100 |
| 24 |
++++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100 |
| 25 |
+@@ -1624,7 +1624,6 @@ |
| 26 |
+ linux_alpha=yes |
| 27 |
+ ;; |
| 28 |
+ i*86|amd64*|x86_64*|ia64*) |
| 29 |
+- linux_acpi="yes" |
| 30 |
+ ;; |
| 31 |
+ *) |
| 32 |
+ ;; |
| 33 |
|
| 34 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch |
| 35 |
deleted file mode 100644 |
| 36 |
index 2b05967..0000000 |
| 37 |
--- a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,30 +0,0 @@ |
| 40 |
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c |
| 41 |
-index 74016af..9c296f5 100644 |
| 42 |
---- a/hw/xfree86/common/xf86pciBus.c |
| 43 |
-+++ b/hw/xfree86/common/xf86pciBus.c |
| 44 |
-@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev, |
| 45 |
- break; |
| 46 |
- case 0x102b: driverList[0] = "mga"; break; |
| 47 |
- case 0x10c8: driverList[0] = "neomagic"; break; |
| 48 |
-- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; |
| 49 |
-+ case 0x10de: case 0x12d2: |
| 50 |
-+ switch (dev->device_id) { |
| 51 |
-+ /* NV1 */ |
| 52 |
-+ case 0x0008: |
| 53 |
-+ case 0x0009: |
| 54 |
-+ driverList[0] = "vesa"; |
| 55 |
-+ break; |
| 56 |
-+ /* NV3 */ |
| 57 |
-+ case 0x0018: |
| 58 |
-+ case 0x0019: |
| 59 |
-+ driverList[0] = "nv"; |
| 60 |
-+ break; |
| 61 |
-+ default: |
| 62 |
-+ driverList[0] = "nouveau"; |
| 63 |
-+ break; |
| 64 |
-+ } |
| 65 |
-+ break; |
| 66 |
- case 0x1106: driverList[0] = "openchrome"; break; |
| 67 |
- case 0x1b36: driverList[0] = "qxl"; break; |
| 68 |
- case 0x1163: driverList[0] = "rendition"; break; |
| 69 |
--- |
| 70 |
|
| 71 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 72 |
index b791678..d65f6da 100644 |
| 73 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 74 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 75 |
@@ -108,7 +108,7 @@ REQUIRED_USE="!minimal? ( |
| 76 |
|
| 77 |
PATCHES=( |
| 78 |
"${UPSTREAMED_PATCHES[@]}" |
| 79 |
- "${FILESDIR}"/${PN}-1.9-nouveau-default.patch |
| 80 |
+ "${FILESDIR}"/${PN}-1.12-disable-acpi.patch |
| 81 |
) |
| 82 |
|
| 83 |
pkg_pretend() { |
Archives