46 SOURCE_PATCHES=$(XORG_SOURCE_PATCHES) |
46 SOURCE_PATCHES=$(XORG_SOURCE_PATCHES) |
47 |
47 |
48 # Used in rules shared between Xorg & Xvnc builds in Makefile.inc |
48 # Used in rules shared between Xorg & Xvnc builds in Makefile.inc |
49 # to allow for different source layouts |
49 # to allow for different source layouts |
50 XORG_BUILD_DIR=$(SOURCE_DIR) |
50 XORG_BUILD_DIR=$(SOURCE_DIR) |
|
51 |
|
52 # ARC cases that covered this module |
|
53 # PSARC/2004/187 Xorg Server for Solaris |
|
54 MODULE_ARC_CASES = PSARC/2004/187 |
|
55 # PSARC/2004/685 Xorg server upgrade to X11R6.8 release |
|
56 MODULE_ARC_CASES += PSARC/2004/685 |
|
57 # PSARC/2004/829 Xorg 6.8.2 server upgrade for Solaris |
|
58 MODULE_ARC_CASES += PSARC/2004/829 |
|
59 # PSARC/2005/450 Xorg 6.9 for Solaris |
|
60 MODULE_ARC_CASES += PSARC/2005/450 |
|
61 # PSARC/2006/609 Xserver provider for DTrace |
|
62 MODULE_ARC_CASES += PSARC/2006/609 |
|
63 # PSARC/2007/051 Xorg server upgrade to 7.2 |
|
64 MODULE_ARC_CASES += PSARC/2007/051 |
|
65 # PSARC/2007/434 Xorg server 1.3 |
|
66 MODULE_ARC_CASES += PSARC/2007/434 |
|
67 # PSARC/2007/500 X11 MIT-SHM Extension across zones |
|
68 MODULE_ARC_CASES += PSARC/2007/500 |
|
69 # PSARC/2008/294 Xorg driver selection based on VIS_GETIDENTIFIER |
|
70 MODULE_ARC_CASES += PSARC/2008/294 |
|
71 # PSARC/2009/021 Xorg server 1.5 |
|
72 MODULE_ARC_CASES += PSARC/2009/021 |
|
73 # PSARC/2009/292 Xorg server 1.6 |
|
74 MODULE_ARC_CASES += PSARC/2009/292 |
|
75 # PSARC/2009/679 Xorg server 1.7 |
|
76 MODULE_ARC_CASES += PSARC/2009/679 |
51 |
77 |
52 # Man pages to apply Sun footer to & attributes to list |
78 # Man pages to apply Sun footer to & attributes to list |
53 # XXX: Need to adjust some of these to correct packages/stability |
79 # XXX: Need to adjust some of these to correct packages/stability |
54 SUNTOUCHED_MANPAGES= \ |
80 SUNTOUCHED_MANPAGES= \ |
55 hw/kdrive/ephyr/Xephyr.man.pre \ |
81 hw/kdrive/ephyr/Xephyr.man.pre \ |
57 hw/xfree86/utils/cvt/cvt.man.pre \ |
83 hw/xfree86/utils/cvt/cvt.man.pre \ |
58 hw/xfree86/doc/man/Xorg.man.pre \ |
84 hw/xfree86/doc/man/Xorg.man.pre \ |
59 hw/xfree86/doc/man/xorg.conf.man.pre \ |
85 hw/xfree86/doc/man/xorg.conf.man.pre \ |
60 hw/vfb/Xvfb.man.pre |
86 hw/vfb/Xvfb.man.pre |
61 |
87 |
62 SUN_PACKAGE=SUNWxorg-server |
|
63 MODULE_STABILITY=Volatile |
88 MODULE_STABILITY=Volatile |
|
89 |
|
90 # Override specific attributes for specific man pages |
|
91 MODULE_SUNTOUCH_MAN_FLAGS= \ |
|
92 $(SUNTOUCH_MAN_FLAGS_$(@F:%.man.$(FIXED_MAN_SUFFIX)=%)) |
|
93 # Xephyr & Xvfb are split out into their own packages |
|
94 SUNTOUCH_MAN_FLAGS_Xephyr = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xephyr)}' |
|
95 SUNTOUCH_MAN_FLAGS_Xvfb = -o '{Availability, $(MODULE_PKGNAME:%xorg=%xvfb)}' |
64 |
96 |
65 # Binary built in tree |
97 # Binary built in tree |
66 XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg |
98 XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg |
|
99 XSERVERS = Xorg Xephyr Xvfb |
67 |
100 |
68 BUILD_TARGETS=$(XORGSERVER_BIN) build_mdb set-elf-comments \ |
101 BUILD_TARGETS=$(XORGSERVER_BIN) build_mdb set-elf-comments \ |
69 $(BUILD_DIR)/mapfile-Xorg-externs |
102 $(BUILD_DIR)/mapfile-Xorg-externs |
70 BUILD_TARGETS_SET=yes |
103 BUILD_TARGETS_SET=yes |
71 |
104 |
97 |
130 |
98 # Additional install targets beyond the defaults |
131 # Additional install targets beyond the defaults |
99 MODULE_ADD_INSTALL_TARGETS=install_extras install_mdb install_pc_common \ |
132 MODULE_ADD_INSTALL_TARGETS=install_extras install_mdb install_pc_common \ |
100 install_fix_paths |
133 install_fix_paths |
101 EXTRA_INSTALL_sparc=install_pc_copy |
134 EXTRA_INSTALL_sparc=install_pc_copy |
102 EXTRA_INSTALL_i386= |
135 EXTRA_INSTALL_i386=install_i386_bincompat_link |
103 MODULE_ADD_INSTALL_TARGETS += $(EXTRA_INSTALL_$(MACH)) |
136 MODULE_ADD_INSTALL_TARGETS += $(EXTRA_INSTALL_$(MACH)) |
104 |
137 |
105 # Have to avoid dependency loop between install_pc_copy and |
138 # Have to avoid dependency loop between install_pc_copy and |
106 # install_pkgconfig_uninstalled |
139 # install_pkgconfig_uninstalled |
107 INSTALL_PCU_DEPS = $(INSTALL_TARGETS:install_pc_copy=) |
140 INSTALL_PCU_DEPS = $(INSTALL_TARGETS:install_pc_copy=) |
108 INSTALL_PCU_DEPS_SET=yes |
141 INSTALL_PCU_DEPS_SET=yes |
109 |
142 |
110 # Merge in additional sources from sun-src directory |
143 # Merge in additional sources from sun-src directory |
111 ADDITIONAL_SOURCE_DIR=sun-src |
144 ADDITIONAL_SOURCE_DIR=sun-src |
|
145 |
|
146 # Compatibility links from /usr/X11/bin to /usr/bin |
|
147 MODULE_X11_BINCOMPAT_LINKS = $(XSERVERS) cvt gtf |
|
148 MODULE_X11_BINCOMPAT_LINKS_i386 = amd64 |
|
149 MODULE_X11_BINCOMPAT_LINKS += $(MODULE_X11_BINCOMPAT_LINKS_$(MACH)) |
112 |
150 |
113 include ../Makefile.inc |
151 include ../Makefile.inc |
114 |
152 |
115 $(XORGSERVER_BIN): default_build |
153 $(XORGSERVER_BIN): default_build |
116 |
154 |
127 cp -pf $(SOURCE_DIR)/mi/mioverlay.h $(SDK_INCLUDES_DIR)/mioverlay.h |
165 cp -pf $(SOURCE_DIR)/mi/mioverlay.h $(SDK_INCLUDES_DIR)/mioverlay.h |
128 cp -pf $(SOURCE_DIR)/hw/xfree86/os-support/bus/xf86Sbus.h $(SDK_INCLUDES_DIR)/xf86Sbus.h |
166 cp -pf $(SOURCE_DIR)/hw/xfree86/os-support/bus/xf86Sbus.h $(SDK_INCLUDES_DIR)/xf86Sbus.h |
129 cp -pf $(SOURCE_DIR)/hw/xfree86/dri/*.h $(SDK_INCLUDES_DIR)/ |
167 cp -pf $(SOURCE_DIR)/hw/xfree86/dri/*.h $(SDK_INCLUDES_DIR)/ |
130 -rm -f $(SDK_INCLUDES_DIR)/xf1bpp.h $(SDK_INCLUDES_DIR)/xf4bpp.h |
168 -rm -f $(SDK_INCLUDES_DIR)/xf1bpp.h $(SDK_INCLUDES_DIR)/xf4bpp.h |
131 mkdir -p $(PROTODIR)$(X11_MAN_DIR)/man1 |
169 mkdir -p $(PROTODIR)$(X11_MAN_DIR)/man1 |
132 cp -pf $(SOURCE_DIR)/doc/Xnest.1 \ |
170 cp -pf $(SOURCE_DIR)/hw/xfree86/doc/man/xorgcfg.1 \ |
133 $(SOURCE_DIR)/hw/xfree86/doc/man/xorgcfg.1 \ |
|
134 $(SOURCE_DIR)/hw/xfree86/doc/man/xorgconfig.1 \ |
171 $(SOURCE_DIR)/hw/xfree86/doc/man/xorgconfig.1 \ |
135 $(PROTODIR)$(X11_MAN_DIR)/man1 |
172 $(PROTODIR)$(X11_MAN_DIR)/man1 |
136 mkdir -p $(PROTODIR)/etc/hal/fdi/preprobe/10osvendor |
173 mkdir -p $(PROTODIR)/etc/hal/fdi/preprobe/10osvendor |
137 cp -pf $(SOURCE_DIR)/config/x11-input.fdi \ |
174 cp -pf $(SOURCE_DIR)/config/x11-input.fdi \ |
138 $(PROTODIR)/etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi |
175 $(PROTODIR)/etc/hal/fdi/preprobe/10osvendor/10-x11-input.fdi |
183 install_fix_paths_X: default_install |
220 install_fix_paths_X: default_install |
184 rm -f $(PROTODIR)$(MODULE_PREFIX)/bin/X \ |
221 rm -f $(PROTODIR)$(MODULE_PREFIX)/bin/X \ |
185 $(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/X |
222 $(PROTODIR)$(MODULE_PREFIX)/bin/$(ARCHBINSUBDIR)/X |
186 ln -s Xserver $(PROTODIR)$(MODULE_PREFIX)/bin/X |
223 ln -s Xserver $(PROTODIR)$(MODULE_PREFIX)/bin/X |
187 |
224 |
188 XSERVERS = Xorg Xephyr Xvfb |
|
189 XSERVER_LINKS = $(XSERVERS:%=$(PROTODIR)$(MODULE_PREFIX)/bin/%) |
225 XSERVER_LINKS = $(XSERVERS:%=$(PROTODIR)$(MODULE_PREFIX)/bin/%) |
190 |
226 |
191 $(PROTODIR)/usr/lib/isaexec: |
227 $(PROTODIR)/usr/lib/isaexec: |
192 @rm -f $@ |
228 @rm -f $@ |
193 cp -pf /usr/lib/isaexec $@ |
229 cp -pf /usr/lib/isaexec $@ |
196 @rm -f $@ |
232 @rm -f $@ |
197 ln $(PROTODIR)/usr/lib/isaexec $@ |
233 ln $(PROTODIR)/usr/lib/isaexec $@ |
198 |
234 |
199 install_fix_paths_i386_32: install_fix_paths_Xservers_isaexec |
235 install_fix_paths_i386_32: install_fix_paths_Xservers_isaexec |
200 install_fix_paths_Xservers_isaexec: $(XSERVER_LINKS) |
236 install_fix_paths_Xservers_isaexec: $(XSERVER_LINKS) |
|
237 |
|
238 MESA_MODULE_DIR = /usr/lib/mesa/modules/extensions$(SERVERMOD_subdir) |
|
239 EXT_MODULE_DIR = $(X11_SERVERMODS_DIR)/extensions$(SERVERMOD_subdir) |
|
240 |
|
241 install_fix_paths_glxmodule: default_install |
|
242 @rm -f $(PROTODIR)$(MESA_MODULE_DIR)/libglx.so |
|
243 mkdir -p $(PROTODIR)$(MESA_MODULE_DIR)/ |
|
244 mv -f $(PROTODIR)$(EXT_MODULE_DIR)/libglx.so \ |
|
245 $(PROTODIR)$(MESA_MODULE_DIR)/libglx.so |
|
246 ln -s ../../../../..$(SERVERMOD_subdir:$(SUBDIR64)=..)/var/run/opengl/server/$(SERVERMOD_subdir)/libglx.so \ |
|
247 $(PROTODIR)$(EXT_MODULE_DIR)/libglx.so |
|
248 |
|
249 install_fix_paths: install_fix_paths_glxmodule |
|
250 |
|
251 # Install metadata for Xephyr, Xvfb, & xtsol packages too |
|
252 XEPHYR_PKG_METADATA_DIR = $(MODULE_PKG_METADATA_DIR:%-xorg=%-xephyr) |
|
253 XVFB_PKG_METADATA_DIR = $(MODULE_PKG_METADATA_DIR:%-xorg=%-xvfb) |
|
254 XTSOL_PKG_METADATA_DIR = $(MODULE_PKG_METADATA_DIR:%-server-xorg=%-trusted-trusted-xorg) |
|
255 |
|
256 EXTRA_METADATA_DIRS = $(XEPHYR_PKG_METADATA_DIR) \ |
|
257 $(XVFB_PKG_METADATA_DIR) \ |
|
258 $(XTSOL_PKG_METADATA_DIR) |
|
259 |
|
260 EXTRA_ATTRDATA_FILES = $(EXTRA_METADATA_DIRS:%=%/$(ATTRDATA_FILE_NAME)) |
|
261 EXTRA_LICENSE_FILES = $(EXTRA_METADATA_DIRS:%=%/$(LICENSE_FILE_NAME)) |
|
262 |
|
263 EXTRA_METADATA_TARGETS= $(EXTRA_METADATA_DIRS) \ |
|
264 $(EXTRA_ATTRDATA_FILES) \ |
|
265 $(EXTRA_LICENSE_FILES) |
|
266 |
|
267 install_metadata: $(EXTRA_METADATA_TARGETS) |
|
268 |
|
269 $(EXTRA_ATTRDATA_FILES) $(EXTRA_LICENSE_FILES): $(EXTRA_METADATA_DIRS) |
|
270 |
|
271 $(EXTRA_METADATA_DIRS): |
|
272 mkdir -p $@ |
|
273 |
|
274 # Special compatibility link from /usr/X11/bin/i386 to /usr/bin/i86 |
|
275 install_i386_bincompat_link: $(X11_BINCOMPAT_DIR)/i386 |
|
276 |
|
277 $(X11_BINCOMPAT_DIR)/i386: $(X11_BINCOMPAT_DIR) |
|
278 @rm -f $@ |
|
279 ln -s ../../bin/i86 $@ |
|
280 |
|
281 # Special compatibility links from /usr/X11/include to /usr/include |
|
282 X11_INCLUDE_COMPAT_DIR = $(PROTODIR)/usr/X11/include |
|
283 X11_INCLUDE_COMPAT_LINKS = $(X11_INCLUDE_COMPAT_DIR)/drm \ |
|
284 $(X11_INCLUDE_COMPAT_DIR)/xorg |
|
285 |
|
286 install: $(X11_INCLUDE_COMPAT_LINKS) |
|
287 |
|
288 $(X11_INCLUDE_COMPAT_DIR): |
|
289 mkdir -p $@ |
|
290 |
|
291 $(X11_INCLUDE_COMPAT_LINKS): $(X11_INCLUDE_COMPAT_DIR) |
|
292 @rm -f $@ |
|
293 ln -s ../../include/$(@F) $@ |