Include XRandR 1.2 patch by Brian Tarricone wrt #249680.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 28 insertions, 10 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 7121ca5c6e6f..80e40286a966 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.252 2009/04/30 20:16:53 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.253 2009/05/02 10:33:48 ssuominen Exp $
+
+*xscreensaver-5.08-r2 (02 May 2009)
+
+  02 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -xscreensaver-5.08-r1.ebuild, +xscreensaver-5.08-r2.ebuild,
+  +files/xscreensaver-5.08-randr12.patch:
+  Include XRandR 1.2 patch by Brian Tarricone wrt #249680.
 
   30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.08-r1.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 1fb23010b8b8..270d5afde9b2 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -5,10 +5,11 @@ AUX 5.08/02_all_no_intltool.patch 2277 RMD160 a24cef7922cd1cfa1a01aece5536d98ebd
 AUX 5.08/03_all_glforrestfire.patch 518 RMD160 29a69330d3f62c8285f3983e7e925302ed7240e3 SHA1 42af34830bb29b8013408ce0a1b5486c87f54734 SHA256 25ae6a3df4b25ad17c6af34b52927caf1bbc81439c658c4994c2f80e994f2e5f
 AUX xscreensaver-5.08-phosphor-segv.patch 568 RMD160 605a433c613f6bd24537f1c755299b54db3699e2 SHA1 f28df04cd5ad42199b3c1fef3bcfa3a31667184b SHA256 3558ae7747b7e09b07020127526740888674d86a9f1820b1703c3a9acaeff45a
 AUX xscreensaver-5.08-po-recreate.patch 2604 RMD160 d70209d52fbb278ed4831b3d0669ce232be8f778 SHA1 40b8377e2c8244b626e0cc2ad18827c38e04906f SHA256 2626e32a48027fb511db4d047cb7bfe7abf07d3fd4619e590c5db9497adc22c1
+AUX xscreensaver-5.08-randr12.patch 580 RMD160 8ba5997ad2473e1c8dbe052a8c4c259fd2de97d6 SHA1 196069592f790ac061658c0294557bc26b2b0d26 SHA256 f7b8005910c6830309ab34ee8fd7f4b209a381bfe3ee9cc14589ac0f570fa018
 DIST xscreensaver-5.07.tar.gz 5513131 RMD160 d2fee54c3138c717433f5a6ca9a098028082af95 SHA1 82c611ab271807ad871aa46a3a7f6b95706d31aa SHA256 8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
 DIST xscreensaver-5.08.tar.gz 5466460 RMD160 f37ba887a656a4ffd14f3809de3269806271352d SHA1 4e6889d7171eaf18b856c484a87d5701787e5dc6 SHA256 638cb1455cd5fe0c95f53cf048b9b46f5b0ccce026c39246d0dc65ebb09ca9dd
 EBUILD xscreensaver-5.07.ebuild 2667 RMD160 6259a3fef0155424ca6f2c24b98344e0d0421a98 SHA1 1734f61f1ad79deb7f636293a034bb9244fed134 SHA256 d1957f4fbdb055471487023048b2b28145b6b6f34ae06840600f0113de415f6b
-EBUILD xscreensaver-5.08-r1.ebuild 2746 RMD160 c0bd61b760347ef1ff0a6f198df7c64d7c08a0f0 SHA1 2f3b1f2203ba3ab6203b2a262f1999e52f0b63ad SHA256 419e17c43aa54e35d534ff35ea331143626af564ea001fd0a10f25ad6c61eba6
+EBUILD xscreensaver-5.08-r2.ebuild 2750 RMD160 b8ed935eca488cf948657375f11457e01952fbd1 SHA1 38ca2550ea1b5299c1557b2e88ad12fce0af9e18 SHA256 893f1418c4b31d7b24ed3d84eb61246bffa97a2e9e4a76aec83ea177ab9eac86
 EBUILD xscreensaver-5.08.ebuild 2586 RMD160 d2c918065b5096067b88fbcf8aa4430b664617f5 SHA1 b9a31b043622798dc60a7eb6f21ee33404e37776 SHA256 9bb431b105c3d0ef281b30fd1607a8901b1ecbffd203764acc855e8e17c8aa45
-MISC ChangeLog 41738 RMD160 12ebe491c2993c7d885ca1140d004c14ec735cea SHA1 d599b5167ef9039889f662581141612fe0068a04 SHA256 aeb0131be2f9dea0bd84d5fcbc48788deb009a13e32d678eb1618b5e3eb56d64
+MISC ChangeLog 41993 RMD160 f58854f65b06f5524305a7e7e816e95eae71c506 SHA1 b23d48b9bc9c7cba7f0a7250fbc9398a8167b5e8 SHA256 14a52025005a802a1d9b91d806cbf639afc2886a7cf673cf980107ff81aa9a06
 MISC metadata.xml 448 RMD160 53a59f7e462fa8a90b1756a85659855c53402e9d SHA1 7cea2f7e7ef26fd4b9598164efab077cf2c606cd SHA256 dd68ded20236cd8fd643730ffe54b297a64a971442d1d4d842cd12c1168dbc73
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.08-randr12.patch b/x11-misc/xscreensaver/files/xscreensaver-5.08-randr12.patch
new file mode 100644
index 000000000000..d25bebffae6f
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.08-randr12.patch
@@ -0,0 +1,11 @@
+--- driver/screens.c.orig	2009-04-30 17:59:02.000000000 -0700
++++ driver/screens.c	2009-04-30 18:01:32.000000000 -0700
+@@ -436,7 +436,7 @@
+               XRROutputInfo *rroi = XRRGetOutputInfo (dpy, res, 
+                                                       res->outputs[k]);
+               RRCrtc crtc = (rroi->crtc  ? rroi->crtc :
+-                             rroi->crtcs ? rroi->crtcs[0] : 0);
++                             rroi->ncrtc ? rroi->crtcs[0] : 0);
+               XRRCrtcInfo *crtci = (crtc ? XRRGetCrtcInfo(dpy, res, crtc) : 0);
+ 
+               monitors[j] = m;
diff --git a/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.08-r2.ebuild
index 7c9588304b2c..02129c2971be 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.08-r2.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-misc/xscreensaver/xscreensaver-5.08-r1.ebuild,v 1.3 2009/04/30 20:16:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r2.ebuild,v 1.1 2009/05/02 10:33:48 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -44,11 +44,14 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	xinerama? ( x11-proto/xineramaproto )"
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}/01_all_default_settings.patch \
 		"${FILESDIR}"/${PV}/03_all_glforrestfire.patch \
 		"${FILESDIR}"/${P}-phosphor-segv.patch \
-		"${FILESDIR}"/${P}-po-recreate.patch
+		"${FILESDIR}"/${P}-po-recreate.patch \
+		"${FILESDIR}"/${P}-randr12.patch
 	eautoconf
 }
 
@@ -89,10 +92,6 @@ src_configure() {
 		$(use_with jpeg)
 }
 
-src_compile() {
-	emake -j1 || die "emake failed." #155049
-}
-
 src_install() {
 	emake install_prefix="${D}" install || die "emake install failed."
 	dodoc README{,.hacking}