x11-base/xorg-server: really fix tslib support, fixes bug #304067

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 296 insertions, 13 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 51e284c1bc58..dfd73fc04a9e 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.492 2010/03/16 15:01:48 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.493 2010/03/16 22:32:26 remi Exp $
+
+*xorg-server-1.7.5.902-r1 (16 Mar 2010)
+
+  16 Mar 2010; Rémi Cardona <remi@gentoo.org>
+  +files/1.7.5.902-fix-tslib-1.0-check.patch, -files/tslib-1.0-check.patch,
+  +xorg-server-1.7.5.902-r1.ebuild:
+  really fix tslib support, fixes bug #304067
 
   16 Mar 2010; <solar@gentoo.org> xorg-server-1.7.5.902.ebuild:
   comment out tslib patch for a few hours. We ended up making it non
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 63576e3b7876..acf6469de147 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,7 +2,7 @@ AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
 AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f
 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
-AUX tslib-1.0-check.patch 380 RMD160 b63c666848ace7d74c7d951cf7f050d9d980ec49 SHA1 439ac759dd56407528a700048221fbd44cd7e6e6 SHA256 4a630d17711168566f9ec129f198e7d9be21daf13b44d8c42d0a667d9c6bcc35
+AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
 DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414
@@ -13,7 +13,8 @@ DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61fee
 EBUILD xorg-server-1.5.3-r6.ebuild 15605 RMD160 732f7b45d94b65ecc3458e4fb3dc4eea979f35d4 SHA1 92dc0563740107701664442e9273a65399b6f604 SHA256 d6250ae0808d1819ee15c6556a67dacf5c21dee751e35dd0405792fa89745603
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 ea73fe68637ed109806a567347e5dbbecc56b793 SHA1 2765155c3e03a7b1cf6a7509c78264147ef15552 SHA256 2da2a9575319fee5f1d95e1b9cb458be4da148470f72c4bca85659f466b4f813
 EBUILD xorg-server-1.7.5.901.ebuild 6855 RMD160 f89a256b138c3890ade4faea6c1ad7354a03f76f SHA1 741cc130a7cd487f0dbd52d6572ab01503a02423 SHA256 7887444a3ccbdd51b57f6ab425fb021ee55a5c306484567f6d4fc29e542ffadf
+EBUILD xorg-server-1.7.5.902-r1.ebuild 7083 RMD160 2bedfc53fbf4f1a70ed2812236004c9a92451816 SHA1 13966ef883beb6b3b6e1077488a4c055820c3094 SHA256 b7fb60aac8882ebe9a901a3f8b49041623e94b32c6b3b7262d1e2350369f9664
 EBUILD xorg-server-1.7.5.902.ebuild 7007 RMD160 843a0e449dab924c9d9126e845d1b024424b0f80 SHA1 7a02e39ad2546b812b68a28570b23e2e6132e804 SHA256 c0c34e55ffbc07b2707abbd323a853bb3ef0e3ffbcbdfe43264b67dfcea36322
 EBUILD xorg-server-1.7.5.ebuild 7008 RMD160 f8c34443971a9e54e1923497232fe748a5f951e0 SHA1 b1b00b9f1b833fcd9d433e26391008d5371e9450 SHA256 8c4feccc4f43d3f70bd5e08a2471dd4bd718ba90dd9cc4a599907fbd80d4d545
-MISC ChangeLog 111068 RMD160 03bc86d6d2382ec956d5197fc902832a87cce74f SHA1 56169dd08edaa31201a95db86896f6f6f0e52e98 SHA256 2ebf2bbb4f9666f129491c237e05c68eeb02ab362ec11d33fa85761b03bffc0c
+MISC ChangeLog 111314 RMD160 a6625b05dcc8fd7543006adb4c40c5bc17b296c6 SHA1 183b7da412239b0e2ad257ecb0cc96d07c23c00a SHA256 a19042aa10a9764394b8baf371c801197533024cb118c329b99045bd1d01cb02
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
new file mode 100644
index 000000000000..3675822edf28
--- /dev/null
+++ b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
@@ -0,0 +1,19 @@
+--- configure.ac	2010-03-16 22:24:14.000000000 +0100
++++ configure.ac.new	2010-03-16 22:33:10.000000000 +0100
+@@ -1915,8 +1915,14 @@
+         AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
+     fi
+ 
+-
+-    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
++dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files...
++    PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [
++        PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [
++           	PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [
++		    HAVE_TSLIB="no"
++		])
++	])
++    ])
+     if test "x$HAVE_TSLIB" = xno; then
+         AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+     fi
diff --git a/x11-base/xorg-server/files/tslib-1.0-check.patch b/x11-base/xorg-server/files/tslib-1.0-check.patch
deleted file mode 100644
index fb3d3189bc3c..000000000000
--- a/x11-base/xorg-server/files/tslib-1.0-check.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac	2010-03-16 00:52:03.000000000 +0000
-+++ configure.ac	2010-03-16 00:53:30.000000000 +0000
-@@ -1913,6 +1913,7 @@
- 
- 
-     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
-+    PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"])
-     if test "x$HAVE_TSLIB" = xno; then
-         AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
-     fi
diff --git a/x11-base/xorg-server/xorg-server-1.7.5.902-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.5.902-r1.ebuild
new file mode 100644
index 000000000000..890c97a9ec08
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.7.5.902-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.5.902-r1.ebuild,v 1.1 2010/03/16 22:32:26 remi Exp $
+
+EAPI="2"
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular multilib versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl"
+RDEPEND="hal? ( sys-apps/hal )
+	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	dev-libs/openssl
+	>=x11-libs/libXfont-1.3.3
+	>=x11-libs/xtrans-1.2.2
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libpciaccess-0.10.3
+	>=x11-libs/pixman-0.15.20
+	media-libs/freetype
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-1.4
+	x11-apps/xkbcomp
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	>=x11-apps/xinit-1.0.8-r3
+	>=app-admin/eselect-opengl-1.0.8
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.5
+		>=x11-libs/libXfixes-4.0.3
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		>=x11-libs/libXtst-1.0.3
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=x11-libs/libXres-1.0.3
+		>=media-libs/mesa-7.4[nptl=]
+	)
+	>=x11-libs/libxkbui-1.0.2
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		sdl? ( media-libs/libsdl ) )"
+	# Xres is dmx-dependent
+	# Xaw is dmx-dependent
+	# Xpm is dmx-dependent, pulls in Xt
+	# xkbcomp is launched at startup but not checked by ./configure
+
+## Deps that don't have a version in configure.ac but do here:
+# x11-proto/resourceproto
+# x11-proto/fontsproto
+# x11-libs/libXau
+# x11-libs/libXfont
+# x11-libs/libXdmcp
+# x11-libs/libXext
+# x11-libs/libX11
+# x11-libs/libXrender
+# x11-libs/libXmu
+# x11-libs/libXfixes
+# x11-libs/libXtst
+# x11-proto/xineramaproto
+# x11-proto/dmxproto
+## Deps that are larger here than in configure.ac
+# x11-libs/libpciaccess-0.8.0
+#
+
+DEPEND="${RDEPEND}
+	!!net-dialup/dtrace
+	sys-devel/flex
+	>=x11-proto/randrproto-1.2.99.3
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/fixesproto-4.1
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/xextproto-7.0.99.3
+	>=x11-proto/xproto-7.0.13
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/inputproto-1.9.99.902
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/glproto-1.4.9
+	dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.1
+		>=x11-libs/libdrm-2.3.0
+	)"
+
+PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# These have been sent upstream
+UPSTREAMED_PATCHES=(
+	#"${WORKDIR}/patches/"
+
+	# Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400
+	"${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch"
+	# Fix for bug #304067
+	"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
+	)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	)
+
+pkg_setup() {
+	use minimal || ensure_a_server_is_building
+
+	# SDL only available in kdrive build
+	if use kdrive && use sdl; then
+		conf_opts="${conf_opts} --enable-xsdl"
+	else
+		conf_opts="${conf_opts} --disable-xsdl"
+	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)
+		$(use_enable kdrive)
+		$(use_enable tslib)
+		$(use_enable tslib xcalibrate)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xorg)
+		$(use_enable nptl glx-tls)
+		$(use_enable hal config-hal)
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--enable-install-setuid
+		--with-fontdir=/usr/share/fonts
+		--with-xkb-output=/var/lib/xkb
+		--without-dtrace
+		${conf_opts}"
+
+	# (#121394) Causes window corruption
+	filter-flags -fweb
+
+	# Incompatible with GCC 3.x SSP on x86, bug #244352
+	if use x86 ; then
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			filter-flags -fstack-protector
+		fi
+	fi
+
+	OLD_IMPLEM="$(eselect opengl show)"
+	eselect opengl set ${OPENGL_DIR}
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example (see bugs #151421 and #151670)
+		insinto /etc/X11
+		doins hw/xfree86/xorg.conf.example \
+			|| die "couldn't install xorg.conf.example"
+	fi
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+
+	echo
+	ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6"
+	ewarn "or earlier, because the ABI changed. If you cannot start X because"
+	ewarn "of module version mismatch errors, this is your problem."
+
+	echo
+	ewarn "You can generate a list of all installed packages in the x11-drivers"
+	ewarn "category using this command:"
+	ewarn "emerge portage-utils; qlist -I -C x11-drivers/"
+
+	ebeep 5
+	epause 10
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+			rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${D}"/usr/share/man/man1/Xserver.1x \
+			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${D}"/usr/share/man/man1/Xserver.1x
+	fi
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+		eselect opengl set ${OLD_IMPLEM}
+}
+
+ensure_a_server_is_building() {
+	for server in ${IUSE_SERVERS}; do
+		use ${server} && return;
+	done
+	eerror "You need to specify at least one server to build."
+	eerror "Valid servers are: ${IUSE_SERVERS}."
+	die "No servers were specified to build."
+}