repositories
/
deb_xorg-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ODROID-U3 xorg-server debian package fork :
[deb_xorg-server.git]
/
debian
/
patches
/
105_nvidia_fglrx_autodetect.patch
diff --git
a/debian/patches/105_nvidia_fglrx_autodetect.patch
b/debian/patches/105_nvidia_fglrx_autodetect.patch
index 1d082053941c8d03e8a8a1c6da95547e5e9d53d6..5462eb1a5704b795fe968e6aa20da204f07432b0 100644
(file)
--- a/
debian/patches/105_nvidia_fglrx_autodetect.patch
+++ b/
debian/patches/105_nvidia_fglrx_autodetect.patch
@@
-1,8
+1,6
@@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 43c746b..750b425 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -7
5,6 +75
,13 @@
+@@ -7
6,6 +76
,13 @@
"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
"EndSection\n\n"
"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
"EndSection\n\n"
@@
-16,7
+14,7
@@
index 43c746b..750b425 100644
#define BUILTIN_LAYOUT_SECTION_PRE \
"Section \"ServerLayout\"\n" \
"\tIdentifier\t\"Builtin Default Layout\"\n"
#define BUILTIN_LAYOUT_SECTION_PRE \
"Section \"ServerLayout\"\n" \
"\tIdentifier\t\"Builtin Default Layout\"\n"
-@@ -15
3,7 +160
,11 @@ xf86AutoConfig(void)
+@@ -15
4,7 +161
,11 @@ xf86AutoConfig(void)
for (p = deviceList; *p; p++) {
snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
AppendToConfig(buf);
for (p = deviceList; *p; p++) {
snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
AppendToConfig(buf);
@@
-29,11
+27,9
@@
index 43c746b..750b425 100644
AppendToConfig(buf);
}
AppendToConfig(buf);
}
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index e52f1da..bd62a7e 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -11
07,7 +1107,8 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -11
32,7 +1132,8 @@ xf86VideoPtrToDriverList(struct pci_devi
driverList[0] = "ast";
break;
case 0x1002:
driverList[0] = "ast";
break;
case 0x1002:
@@
-43,7
+39,7
@@
index e52f1da..bd62a7e 100644
break;
case 0x102c:
driverList[0] = "chips";
break;
case 0x102c:
driverList[0] = "chips";
-@@ -1
143,6 +1144,7 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -1
216,6 +1217,7 @@ xf86VideoPtrToDriverList(struct pci_devi
{
int idx = 0;
{
int idx = 0;