* sync with upstream xorg-server ebuild,

* correct cross pthread patch

3 files changed, 29 insertions, 32 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 82b855e..968ee89 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,6 @@
 AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
 AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
-AUX 1.5.3-fix-cross-pthread.patch 2170 RMD160 58054e1ddd3f0c93566ab61b7357b239091d3df7 SHA1 734061af22c868ce141525785f1fc8f9722ec725 SHA256 cc77562dcbdec99d002250f7d8cc8c6c40e271868128b98f2276615bbfd128ce
+AUX 1.5.3-fix-cross-pthread.patch 1566 RMD160 0b3d15f64f5f799f5eec9ddcd1a3293c74406121 SHA1 43c7e4fb142650e9de0ee6782180831525ec856a SHA256 38c81bb4030513d90cc2124a8e5d6af92f3979949438e9df8cb11cec5517efe8
 DIST xorg-server-1.5.3-gentoo-patches-07.tar.bz2 56276 RMD160 97afcb579d9ee10f4b2c715538557faa5d5f0eb6 SHA1 b48ea89f36e53062c4b903e613da48791bc36f64 SHA256 b80b45acb18068e7b4516cb58253f4cf1cd505f4d1a1b0b1c53e22ec7c12315b
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
-EBUILD xorg-server-1.5.3-r5.ebuild 16713 RMD160 8f8c77fc832ca1a393e08e26bba30ab45d9ba0ea SHA1 badf776677792d32b11d8fdf1cc99d6865830e54 SHA256 2affd88cfbc200312c0db5fe666796414853a51eef35eec5db1a1124e116efdb
+EBUILD xorg-server-1.5.3-r5.ebuild 16793 RMD160 e79008b8639b1ba771cf0cade2fd417a7bcc1447 SHA1 b5eb6e901d2aa9b3d3f049cd5bca3943752c76d8 SHA256 68237bdd5dcda559ddc08f7fce7e5c636d3e521bb8965f9e108a05d659bd118c
diff --git a/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch b/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch
index 2f6ffb9..5b9a6d7 100644
--- a/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch
+++ b/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch
@@ -1,40 +1,36 @@
---- xorg-server-1.5.3/configure.ac.old	2009-03-05 23:44:46.000000000 +0200
-+++ xorg-server-1.5.3/configure.ac	2009-03-05 23:50:27.000000000 +0200
-@@ -1206,7 +1206,8 @@
- 
+--- xorg-server-1.5.3/configure.ac.old	2009-03-25 11:48:59.000000000 +0200
++++ xorg-server-1.5.3/configure.ac	2009-03-25 11:57:23.000000000 +0200
+@@ -1207,6 +1207,10 @@
  if test "x$XVFB" = xyes; then
  	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
--	XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
-+	XVFB_SYS_LIBS="$XVFBMODULES_LIBS -lpthread"
-+	XVFB_DEFINES="-DPTHREADS"
+ 	XVFB_SYS_LIBS="$XVFBMODULES_LIBS"
++	if test "x$GLX_USE_TLS" = xyes; then
++		XVFB_SYS_LIBS="$XVFB_SYS_LIBS -lpthread"
++		XVFB_DEFINES="-DPTHREADS"
++	fi
  	AC_SUBST([XVFB_LIBS])
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
-@@ -1224,7 +1225,8 @@
- 
+@@ -1225,6 +1229,10 @@
  if test "x$XNEST" = xyes; then
  	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
--	XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
-+	XNEST_SYS_LIBS="$XNESTMODULES_LIBS -lpthread"
-+	XNEST_DEFINES="-DPTHREADS"
+ 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
++	if test "x$GLX_USE_TLS" = xyes; then
++		XNEXT_SYS_LIBS="$XNEXT_SYS_LIBS -lpthread"
++		XNEXT_DEFINES="-DPTHREADS"
++	fi
  	AC_SUBST([XNEST_LIBS])
  	AC_SUBST([XNEST_SYS_LIBS])
  fi
-@@ -1941,7 +1943,7 @@
-     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
-     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
-     
--    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
-+    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS -DPTHREADS"
- 
-     KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
-     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
-@@ -1955,7 +1957,7 @@
-     KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
-     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+@@ -1957,6 +1965,11 @@
      KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
--    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
-+    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS -lpthread"
+     KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS"
  
++    if test "x$GLX_USE_TLS" = xyes; then
++	KDRIVE_LIBS="$KDRIVE_LIBS -lpthread"
++	KDRIVE_CFLAGS="$KDRIVE_CFLAGS -DPTHREADS"
++    fi
++
      # check if we can build Xephyr
      PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
+ 
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
index bea02ba..d10742e 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.5.3-r5.ebuild,v 1.1 2009/03/16 13:22:45 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r5.ebuild,v 1.2 2009/03/19 17:51:11 solar Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -106,7 +106,7 @@ IUSE="${IUSE_VIDEO_CARDS}
 	3dfx tslib
 	hal ipv6 minimal nptl sdl"
 RDEPEND="hal? ( sys-apps/hal )
-	tslib? ( x11-libs/tslib )
+	tslib? ( x11-libs/tslib x11-libs/libXCalibrate )
 	>=x11-libs/libXfont-1.3.3
 	>=x11-libs/xtrans-1.2.2
 	>=x11-libs/libXau-1.0.4
@@ -202,7 +202,7 @@ PDEPEND="
 		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
 		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
 		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
-		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
+		input_devices_tslib? ( x11-drivers/xf86-input-tslib x11-libs/libXCalibrate )
 		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
@@ -277,6 +277,7 @@ EPATCH_SUFFIX="patch"
 GENTOO_PATCHES=(
 	"${FILESDIR}/1.4-fpic-libxf86config.patch"
 	"${FILESDIR}/1.4-fix-kdrive-automake.patch"
+	"${FILESDIR}/1.5.3-fix-cross-pthread.patch"
 	)
 
 # These have been sent upstream
@@ -287,7 +288,6 @@ UPSTREAMED_PATCHES=(
 PATCHES=(
 	"${GENTOO_PATCHES[@]}"
 	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}/1.5.3-fix-cross-pthread.patch"
 	)
 
 pkg_setup() {
@@ -309,6 +309,7 @@ pkg_setup() {
 		$(use_enable dmx)
 		$(use_enable kdrive)
 		$(use_enable tslib)
+		$(use_enable tslib xcalibrate)
 		$(use_enable !minimal xvfb)
 		$(use_enable !minimal xnest)
 		$(use_enable !minimal xtrap)