[gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: xorg-server-1.9.0-r2.ebuild ChangeLog xorg-server-1.7.7-r1.ebuild xorg-server-1.8.2.ebuild xorg-server-1.7.6.ebuild

[Michal GArny (mgorny)]

mgorny      10/10/04 20:33:59

  Modified:             xorg-server-1.9.0-r2.ebuild ChangeLog
                        xorg-server-1.7.7-r1.ebuild
                        xorg-server-1.8.2.ebuild xorg-server-1.7.6.ebuild
  Log:
  Replace the tslib build patch with a set of new patches in order to fix bug #318609. The first patch fixes linking with tslib whenever pkg-config fails to find it but fallback check does. The second one fixes overall linking with tslib whenever -Wl,--as-needed is used.
  
  (Portage version: 2.2_rc88_p86/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild?r1=1.2&r2=1.3

Index: xorg-server-1.9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-server-1.9.0-r2.ebuild	30 Sep 2010 02:48:32 -0000	1.2
+++ xorg-server-1.9.0-r2.ebuild	4 Oct 2010 20:33:59 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.9.0-r2.ebuild,v 1.2 2010/09/30 02:48:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0-r2.ebuild,v 1.3 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI=3
 inherit xorg-2 multilib versionator
@@ -105,8 +105,11 @@
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-disable-acpi.patch
 	"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
-	"${FILESDIR}"/1.7.5.902-fix-tslib-1.0-check.patch
 	"${FILESDIR}"/1.9.0-fix-VbeModeInfoBlock-memcpy.patch
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
 	)
 
 pkg_setup() {
@@ -153,6 +156,10 @@
 		--with-os-vendor=Gentoo
 		${conf_opts}"
 
+	if use kdrive && use tslib; then
+		XORG_EAUTORECONF=yes
+	fi
+
 	# Xorg-server requires includes from OS mesa which are not visible for
 	# users of binary drivers.
 	# Due to the limitations of CONFIGURE_OPTIONS, we have to export this



1.541                x11-base/xorg-server/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.541&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.541&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.540&r2=1.541

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -r1.540 -r1.541
--- ChangeLog	30 Sep 2010 02:48:32 -0000	1.540
+++ ChangeLog	4 Oct 2010 20:33:59 -0000	1.541
@@ -1,6 +1,17 @@
 # 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.540 2010/09/30 02:48:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.541 2010/10/04 20:33:59 mgorny Exp $
+
+  04 Oct 2010; Michał Górny <mgorny@g.o> xorg-server-1.7.6.ebuild,
+  xorg-server-1.7.7-r1.ebuild, xorg-server-1.8.2.ebuild,
+  xorg-server-1.9.0-r2.ebuild, -files/1.7.5.902-fix-tslib-1.0-check.patch,
+  +files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch,
+  +files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch,
+  +files/xorg-server-1.7.6-tslib-as-needed.patch:
+  Replace the tslib build patch with a set of new patches in order to fix
+  bug #318609. The first patch fixes linking with tslib whenever pkg-config
+  fails to find it but fallback check does. The second one fixes overall
+  linking with tslib whenever -Wl,--as-needed is used.
 
   30 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
   xorg-server-1.9.0-r2.ebuild:



1.10                 x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild?r1=1.9&r2=1.10

Index: xorg-server-1.7.7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-server-1.7.7-r1.ebuild	26 Sep 2010 19:03:06 -0000	1.9
+++ xorg-server-1.7.7-r1.ebuild	4 Oct 2010 20:33:59 -0000	1.10
@@ -1,6 +1,6 @@
 # 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.7-r1.ebuild,v 1.9 2010/09/26 19:03:06 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v 1.10 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI="2"
 
@@ -126,13 +126,15 @@
 # These have been sent upstream
 UPSTREAMED_PATCHES=(
 	"${WORKDIR}/patches/"
-	# Fix for bug #304067
-	"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
 	"${FILESDIR}"/${PN}-1.8-nouveau-default.patch
 	)
 
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/${PN}-1.7.6-tslib-as-needed.patch
 	)
 
 pkg_setup() {



1.3                  x11-base/xorg-server/xorg-server-1.8.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.2.ebuild?r1=1.2&r2=1.3

Index: xorg-server-1.8.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-server-1.8.2.ebuild	5 Sep 2010 11:59:11 -0000	1.2
+++ xorg-server-1.8.2.ebuild	4 Oct 2010 20:33:59 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.8.2.ebuild,v 1.2 2010/09/05 11:59:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.2.ebuild,v 1.3 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"
@@ -104,6 +104,10 @@
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-disable-acpi.patch
 	"${FILESDIR}"/${PN}-1.8-nouveau-default.patch
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
 	)
 
 pkg_setup() {



1.12                 x11-base/xorg-server/xorg-server-1.7.6.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild?r1=1.11&r2=1.12

Index: xorg-server-1.7.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-server-1.7.6.ebuild	5 Sep 2010 11:59:11 -0000	1.11
+++ xorg-server-1.7.6.ebuild	4 Oct 2010 20:33:59 -0000	1.12
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.11 2010/09/05 11:59:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild,v 1.12 2010/10/04 20:33:59 mgorny Exp $
 
 EAPI="2"
 
@@ -126,12 +126,14 @@
 
 	# 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[@]}"
+
+	# Fixes for bug #318609
+	"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
+	"${FILESDIR}"/${P}-tslib-as-needed.patch
 	)
 
 pkg_setup() {