xorg-server: merge in changes from gentoo-x86

3 files changed, 123 insertions, 28 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d47fffb..9abbae2 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -10,6 +10,10 @@ AUX 05-offscreen-pixmaps.patch 1548 RMD160 e0f87c88379861340524847a57bf72119256a
 MD5 8cae706ff61477f510f9f14b3d64fea9 files/05-offscreen-pixmaps.patch 1548
 RMD160 e0f87c88379861340524847a57bf72119256a610 files/05-offscreen-pixmaps.patch 1548
 SHA256 73be09f2f3756021bd6261fc05733eb39084c2190e7ca107bfa01c7d447a34a6 files/05-offscreen-pixmaps.patch 1548
+AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 SHA1 2d7b8328c695dc179e4f6e1d0e4609bb449159ee SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350
+MD5 f2c08e04fd4d36bf1e9e5fd25102c243 files/xorg-conf-example.patch 1924
+RMD160 04325d6624ad01ee69702b069be3665b5e96b647 files/xorg-conf-example.patch 1924
+SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350 files/xorg-conf-example.patch 1924
 AUX xorg-server-9999-Sbus.patch 2388 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 SHA1 b2f5ca6d167d885282a44cdf700ac51043a92043 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e
 MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-9999-Sbus.patch 2388
 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-9999-Sbus.patch 2388
@@ -22,10 +26,10 @@ AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29
 MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
 SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
-EBUILD xorg-server-9999.ebuild 15576 RMD160 feb681fbf7b9c4d16b4e08d9bba359acbc774f53 SHA1 1eddcd4363b124a9d28fe9973b5f2dbeba2075bb SHA256 516d1c4a93083b75edfa774f9a0d9371e3b56fd13cf983f32eaa27289983523a
-MD5 b24711fcd675e608f1f1d5fee7d112a7 xorg-server-9999.ebuild 15576
-RMD160 feb681fbf7b9c4d16b4e08d9bba359acbc774f53 xorg-server-9999.ebuild 15576
-SHA256 516d1c4a93083b75edfa774f9a0d9371e3b56fd13cf983f32eaa27289983523a xorg-server-9999.ebuild 15576
+EBUILD xorg-server-9999.ebuild 16480 RMD160 cb7be51c74919e35912ead050c365365985e4c12 SHA1 125e5496cc1e45163a05a24a74f2c575cecf2b6a SHA256 7c8f305ae1e96d12e41b02a5943e820847716872cd44fef1a71394166f2303ec
+MD5 336ba0933def6577c8f5f3053d897f3a xorg-server-9999.ebuild 16480
+RMD160 cb7be51c74919e35912ead050c365365985e4c12 xorg-server-9999.ebuild 16480
+SHA256 7c8f305ae1e96d12e41b02a5943e820847716872cd44fef1a71394166f2303ec xorg-server-9999.ebuild 16480
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xorg-server-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xorg-server-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xorg-server-9999 1
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 $< $@
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 8e008e6..dcdec89 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,12 +15,6 @@ OPENGL_DIR="xorg-x11"
 MESA_PN="Mesa"
 MESA_P="${MESA_PN}"
 
-PATCHES="${FILESDIR}/01-no-move-damage.patch
-	${FILESDIR}/02-dont-backfill-bg-none.patch
-	${FILESDIR}/05-offscreen-pixmaps.patch
-	${FILESDIR}/${P}-Sbus.patch
-	${FILESDIR}/${PN/xorg/xorg-x11}-1.1.0-gl-include-inferiors.patch"
-
 DESCRIPTION="X.Org X servers"
 # It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
 RESTRICT="stricter"
@@ -111,6 +105,7 @@ IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
 	${IUSE_SERVERS}
 	3dfx
+	aiglx
 	dri ipv6 minimal nptl sdl xprint"
 RDEPEND="x11-libs/libXfont
 	x11-libs/xtrans
@@ -143,8 +138,7 @@ RDEPEND="x11-libs/libXfont
 		x11-libs/libXres )
 	>=x11-libs/libxkbui-1.0.2
 	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )
-	!media-video/nvidia-glx"
+	kdrive? ( sdl? ( media-libs/libsdl ) )"
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
 	# Xaw is dmx- and xorgcfg-dependent
 	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
@@ -175,13 +169,14 @@ DEPEND="${RDEPEND}
 	x11-proto/inputproto
 	x11-proto/bigreqsproto
 	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.6
+	>=x11-proto/glproto-1.4.8
 	dmx? ( x11-proto/dmxproto )
 	dri? ( x11-proto/xf86driproto
 		>=x11-libs/libdrm-2 )
 	xprint? ( x11-proto/printproto
 		x11-apps/mkfontdir
-		x11-apps/mkfontscale )"
+		x11-apps/mkfontscale
+		x11-apps/xplsprinters )"
 
 # Drivers
 PDEPEND="
@@ -276,12 +271,18 @@ LICENSE="${LICENSE} MIT"
 pkg_setup() {
 	use minimal || ensure_a_server_is_building
 
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
+	PATCHES="${FILESDIR}/xorg-conf-example.patch"
+
+	# Patches required for compiz to work with AIGLX,
+	# but they slow EXA down (bug #147841).
+	if use aiglx; then
+		einfo "AIGLX patches will be applied."
+		ewarn "These patches are known to cause problems with EXA enabled."
+		PATCHES="${FILESDIR}/01-no-move-damage.patch
+			${FILESDIR}/02-dont-backfill-bg-none.patch
+			${FILESDIR}/05-offscreen-pixmaps.patch
+			${PATCHES}"
+	fi
 
 	# SDL only available in kdrive build
 	if use kdrive && use sdl; then
@@ -296,6 +297,10 @@ pkg_setup() {
 		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
 	fi
 
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# --enable-install-setuid needed because sparcs default off
 	CONFIGURE_OPTIONS="
 		$(use_enable ipv6)
 		$(use_enable dmx)
@@ -311,7 +316,7 @@ pkg_setup() {
 		--sysconfdir=/etc/X11
 		--localstatedir=/var
 		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1
+		--with-fontdir=/usr/share/fonts
 		${conf_opts}"
 
 	local diemsg="You must build xorg-server and mesa with the same nptl USE setting."
@@ -337,17 +342,21 @@ src_unpack() {
 	# Don't patch before everything's ready
 	PATCHES="" mesa_cvs_src_unpack
 	git_src_unpack
+	x-modular_patch_source
 
 	# Set up kdrive servers to build
+	# Bug #150052 - anything that uses vm86.h is broken on non-x86 arches.
+	# That translates into the following set:
+	vm86_devices="chips epson glint i810 mach64 mga neomagic
+		nv r128 radeon siliconmotion vesa via"
+
 	if use kdrive; then
 		einfo "Removing unused kdrive drivers ..."
 		for card in ${IUSE_VIDEO_CARDS}; do
-			# (bug #136370) Radeon needs fbdev and vesa
-			if use video_cards_radeon; then
-				if [[ ${card} = video_cards_fbdev ]] \
-					|| [[ ${card} = video_cards_vesa ]]; then
-					continue
-				fi
+			# Skip binary drivers
+			if [[ ${card} = video_cards_nvidia ]] \
+				|| [[ ${card} = video_cards_fglrx ]]; then
+				continue
 			fi
 
 			real_card=${card#video_cards_}
@@ -358,7 +367,26 @@ src_unpack() {
 			real_card=${real_card/%nv/nvidia}
 			real_card=${real_card/siliconmotion/smi}
 			real_card=${real_card/%sis/sis300}
+
+			disable_card=0
 			if ! use ${card}; then
+				# (bug #136370) Radeon needs fbdev and vesa
+				if ! use x86 \
+					&& use video_cards_radeon; then
+					if [[ ${card} = fbdev ]] \
+						|| [[ ${card} = vesa ]]; then
+						continue
+					fi
+				fi
+				disable_card=1
+			# Bug #150052
+			elif ! use x86 &&
+				[[ ${vm86_devices/${card#video_cards_}/} != ${vm86_devices} ]]; then
+				ewarn "  $real_card does not work on your architecture; disabling."
+				disable_card=1
+			fi
+
+			if [[ $disable_card = 1 ]]; then
 				ebegin "  ${real_card}"
 				sed -i \
 					-e "s:\b${real_card}\b::g" \
@@ -378,7 +406,6 @@ src_unpack() {
 		fi
 	fi
 
-	x-modular_patch_source
 	# Make sure eautoreconf gets run if we need the autoconf/make
 	# changes.
 	if [[ ${SNAPSHOT} != "yes" ]]; then
@@ -400,6 +427,14 @@ src_install() {
 	insinto /usr/share/xorg
 	doins hw/xfree86/common/{extra,vesa}modes \
 		|| die "couldn't install extra modes"
+
+	# Bug #151421 - this file is not built with USE="minimal"
+	if ! use minimal; then
+		# Install xorg.conf.example
+		insinto /etc/X11
+		doins hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
 }
 
 pkg_postinst() {