summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/xorg-server/files/xorg-conf-example.patch')
-rw-r--r--x11-base/xorg-server/files/xorg-conf-example.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/xorg-conf-example.patch b/x11-base/xorg-server/files/xorg-conf-example.patch
new file mode 100644
index 0000000..8ec7476
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-conf-example.patch
@@ -0,0 +1,56 @@
+--- configure.ac.old 2006-09-24 11:30:40.000000000 -0600
++++ configure.ac 2006-09-24 11:31:11.000000000 -0600
+@@ -806,6 +806,7 @@
+
+ AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
+ AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
++AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
+ AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
+ AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
+ AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
+--- hw/xfree86/xorgconf.cpp.old 2006-09-29 19:02:00.000000000 -0600
++++ hw/xfree86/xorgconf.cpp 2006-09-29 19:02:07.000000000 -0600
+@@ -54,10 +54,7 @@
+
+ FontPath LOCALFONTPATH
+ FontPath MISCFONTPATH
+- FontPath DPI75USFONTPATH
+- FontPath DPI100USFONTPATH
+ FontPath T1FONTPATH
+- FontPath TRUETYPEFONTPATH
++ FontPath TRUETYPEFONTPATH
+ FontPath CIDFONTPATH
+- FontPath SPFONTPATH
+ FontPath DPI75FONTPATH
+--- hw/xfree86/Makefile.am.old 2006-09-24 11:59:57.000000000 -0600
++++ hw/xfree86/Makefile.am 2006-09-24 11:59:51.000000000 -0600
+@@ -1,3 +1,5 @@
++include $(top_srcdir)/cpprules.in
++
+ if DRI
+ DRI_SUBDIR = dri
+ endif
+@@ -75,7 +77,23 @@
+ optionsdir = $(libdir)/X11
+ dist_options_DATA = Options
+
++BUILT_SOURCES = xorg.conf.example
++CLEAN = xorg.conf.example xorg.conf.example.pre
+ EXTRA_DIST = xorgconf.cpp
+
++CPP_FILES_FLAGS = \
++ -DRGBPATH=\"$(RGB_DB)\" \
++ -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
++ -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
++ -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
++ -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
++ -DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
++ -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
++ -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
++ -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
++
+ relink:
+ rm -f Xorg && $(MAKE) Xorg
++
++xorg.conf.example.pre: xorgconf.cpp
++ cp $< $@