/[gentoo-x86]/x11-base/xorg-server/files/xorg-conf-example.patch
Gentoo

Contents of /x11-base/xorg-server/files/xorg-conf-example.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Sep 9 10:34:45 2007 UTC (6 years, 11 months ago) by dberkholz
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Drop 1.1, everyone's stable on 1.2 or 1.3.
(Portage version: 2.1.3.8)

1 --- configure.ac.old 2006-09-24 11:30:40.000000000 -0600
2 +++ configure.ac 2006-09-24 11:31:11.000000000 -0600
3 @@ -806,6 +806,7 @@
4
5 AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
6 AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
7 +AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
8 AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
9 AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
10 AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
11 --- hw/xfree86/xorgconf.cpp.old 2006-09-29 19:02:00.000000000 -0600
12 +++ hw/xfree86/xorgconf.cpp 2006-09-29 19:02:07.000000000 -0600
13 @@ -54,10 +54,7 @@
14
15 FontPath LOCALFONTPATH
16 FontPath MISCFONTPATH
17 - FontPath DPI75USFONTPATH
18 - FontPath DPI100USFONTPATH
19 FontPath T1FONTPATH
20 - FontPath TRUETYPEFONTPATH
21 + FontPath TRUETYPEFONTPATH
22 FontPath CIDFONTPATH
23 - FontPath SPFONTPATH
24 FontPath DPI75FONTPATH
25 --- hw/xfree86/Makefile.am.old 2006-09-24 11:59:57.000000000 -0600
26 +++ hw/xfree86/Makefile.am 2006-09-24 11:59:51.000000000 -0600
27 @@ -1,3 +1,5 @@
28 +include $(top_srcdir)/cpprules.in
29 +
30 if DRI
31 DRI_SUBDIR = dri
32 endif
33 @@ -75,7 +77,23 @@
34 optionsdir = $(libdir)/X11
35 dist_options_DATA = Options
36
37 +BUILT_SOURCES = xorg.conf.example
38 +CLEAN = xorg.conf.example xorg.conf.example.pre
39 EXTRA_DIST = xorgconf.cpp
40
41 +CPP_FILES_FLAGS = \
42 + -DRGBPATH=\"$(RGB_DB)\" \
43 + -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
44 + -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
45 + -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
46 + -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
47 + -DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
48 + -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
49 + -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
50 + -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
51 +
52 relink:
53 rm -f Xorg && $(MAKE) Xorg
54 +
55 +xorg.conf.example.pre: xorgconf.cpp
56 + cp $< $@

  ViewVC Help
Powered by ViewVC 1.1.20