xserver: Branch 'server-1.2-branch'
Donnie Berkholz
dberkholz at kemper.freedesktop.org
Tue Oct 24 19:18:54 EEST 2006
configure.ac | 1 +
hw/xfree86/Makefile.am | 18 ++++++++++++++++++
hw/xfree86/xorgconf.cpp | 5 +----
3 files changed, 20 insertions(+), 4 deletions(-)
New commits:
diff-tree 6e73c87c53f39a2386dc4c1ac4fc354d961e0c45 (from 1ab7fe38df0396e0da96ab67b3d9aa237563b3ca)
Author: Joshua Baergen <joshuabaergen at gentoo.org>
Date: Thu Oct 19 11:14:26 2006 -0700
Create xorg.conf.example (Gentoo bug #138623).
(cherry picked from 62d24097932708fbbb62a23614fe63b4b7acf3bd commit)
diff --git a/configure.ac b/configure.ac
index 2fff524..7945a27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -821,6 +821,7 @@ VENDOR_MAN_VERSION="Version ${VENDOR_VER
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])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 5cce11d..79d2ec5 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/cpprules.in
+
if DRI
DRI_SUBDIR = dri
endif
@@ -82,7 +84,23 @@ endif
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 $< $@
diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
index c94c1e5..6c52213 100644
--- a/hw/xfree86/xorgconf.cpp
+++ b/hw/xfree86/xorgconf.cpp
@@ -54,12 +54,9 @@ XCOMM command (or a combination of both
FontPath LOCALFONTPATH
FontPath MISCFONTPATH
- FontPath DPI75USFONTPATH
- FontPath DPI100USFONTPATH
FontPath T1FONTPATH
- FontPath TRUETYPEFONTPATH
+ FontPath TRUETYPEFONTPATH
FontPath CIDFONTPATH
- FontPath SPFONTPATH
FontPath DPI75FONTPATH
FontPath DPI100FONTPATH
More information about the xorg-commit
mailing list