diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-05-02 10:33:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-05-02 10:33:49 +0000 |
| commit | 63fd696dd17f5f353b5df5c33bae1312061b54d2 (patch) | |
| tree | 2a8baeeb8dcad3df90a8a831d17c3e0ab1c95dc4 /x11-misc | |
| parent | Cleanup (diff) | |
| download | gentoo-2-63fd696dd17f5f353b5df5c33bae1312061b54d2.tar.gz gentoo-2-63fd696dd17f5f353b5df5c33bae1312061b54d2.tar.bz2 gentoo-2-63fd696dd17f5f353b5df5c33bae1312061b54d2.zip | |
Include XRandR 1.2 patch by Brian Tarricone wrt #249680.
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.08-randr12.patch | 11 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.08-r2.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild) | 11 |
3 files changed, 25 insertions, 8 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/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} |