forked from pool/xorg-x11-server
Stefan Dirsch
ebdc01ee77
Udpate to Xorg 1.12.1... add 'automatic' ABI provides, which are verified during build to be true to ensure we can't ever publish a package which does not contain correct provides for the ABI OBS-URL: https://build.opensuse.org/request/show/114753 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=383
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
Index: hw/xfree86/common/xf86AutoConfig.c
|
|
===================================================================
|
|
--- hw/xfree86/common/xf86AutoConfig.c.orig
|
|
+++ hw/xfree86/common/xf86AutoConfig.c
|
|
@@ -75,6 +75,13 @@
|
|
"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
|
|
"EndSection\n\n"
|
|
|
|
+#define BUILTIN_SCREEN_SECTION_FOR_FGLRX \
|
|
+ "Section \"Screen\"\n" \
|
|
+ "\tIdentifier\t" BUILTIN_SCREEN_NAME "\n" \
|
|
+ "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
|
|
+ "\tDefaultDepth\t24\n" \
|
|
+ "EndSection\n\n"
|
|
+
|
|
#define BUILTIN_LAYOUT_SECTION_PRE \
|
|
"Section \"ServerLayout\"\n" \
|
|
"\tIdentifier\t\"Builtin Default Layout\"\n"
|
|
@@ -153,7 +160,10 @@ xf86AutoConfig(void)
|
|
for (p = deviceList; *p; p++) {
|
|
snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
|
|
AppendToConfig(buf);
|
|
- snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
|
|
+ if( strcmp(*p, "fglrx") == 0 )
|
|
+ snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_FOR_FGLRX, *p, 0, *p, 0);
|
|
+ else
|
|
+ snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
|
|
AppendToConfig(buf);
|
|
}
|
|
|