xorg-server: Update to 1.7.4 + DontLie.

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 7b6aac4d1ac5718087142c88fe53d482eed25822..4a231ba5e78b295af75e9346815295a023c3cff9 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,4 +1,5 @@
 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 xorg-server-dont-lie.patch 3869 RMD160 6c189aed56dc3915259ff12dc42a75556d2b31bd SHA1 1fb3ed5bf29ffc8e7f278339376ab57bfad0a803 SHA256 4f537dd9526315b2d7368e6d6bc0d8c819c6bfa9ed8f57e04300197a476b035d
-DIST xorg-server-1.7.3.902.tar.bz2 4920314 RMD160 81f33b7fa734d887db316e9fe617ff6cf4ef9c41 SHA1 176defecb42912ebae187c347ca2168a3139bc0b SHA256 4ccab4a1dc3290fef3b84687eebffc037c926356711bbfd05981e39c53078741
-EBUILD xorg-server-1.7.3.902.ebuild 7054 RMD160 0420cb4cdf2a7466af4882820b70a6b8f1732c54 SHA1 53cae9e6e43ebf15e736feddd5ef606cbce90fbc SHA256 77b8fe6d432277677ca43d31938a290fd81af9a61898be35aed67ce3b076153f
+AUX xfree86-Add-DontLie-server-flag.patch 4637 RMD160 a9d4b48e7f482a8e9221a78943ff43bd62408966 SHA1 9e42773990cfd61a0700a5a30e7d74e3fc7c7ca3 SHA256 1f4a25f658996cc12de2333293c449487d6d3fd7c9a398bf04a273bbad813459
+DIST xorg-server-1.7.4.tar.bz2 4919597 RMD160 fe65b14831bda0dd8423df2ffbb3634e0f15bce6 SHA1 26de24d7ced735bd717a21c5110d22d662221a58 SHA256 b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
+EBUILD xorg-server-1.7.4.ebuild 7061 RMD160 23756b676274deecd3714f447749de574589e1b1 SHA1 02786a4858ccc868178bd31cec5934bfa99d08d5 SHA256 4ca5caf43c95ea91c97f3bfb46f29c334daea196cf27709499ceca4ee1c5bc7a
+MISC xorg-server-1.7.4.ebuild~ 7050 RMD160 6ba9fe1d214c7ba9777590a27b778e4e9bff5e06 SHA1 a8486ad1fc6332801eb95f3db8bea3c2db2e27dd SHA256 1d0e61f7e0b4d43184ac2c0665ee11ad4eb23c0f1916afa280a3ae63fe6ac63f

diff --git a/x11-base/xorg-server/files/xorg-server-dont-lie.patch b/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
similarity index 83%
rename from x11-base/xorg-server/files/xorg-server-dont-lie.patch
rename to x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
index 9af34d53dc62ca353a0805658ddd614aa91efceb..864ec26f2378499ac48b6733d8a2c26df30f51b0 100644 (file)
--- a/x11-base/xorg-server/files/xorg-server-dont-lie.patch
+++ b/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
@@ -1,3 +1,21 @@
+From 73d915296302f49024bf3d7cab2b11e253d5c8da Mon Sep 17 00:00:00 2001
+From: Nick Bowler <nbowler@draconx.ca>
+Date: Wed, 6 Jan 2010 10:42:17 -0500
+Subject: [PATCH] xfree86: Add DontLie server flag.
+
+Since commit fff00df94d7ebd18a8e24537ec96073717375a3f, RandR 1.2 drivers
+lie about attached screen resolution by default.  The new server flag,
+DontLie, causes the server to be honest by default.
+
+Signed-off-by: Nick Bowler <nbowler@draconx.ca>
+---
+ hw/xfree86/common/xf86Config.c       |    6 +++++-
+ hw/xfree86/common/xf86Globals.c      |    1 +
+ hw/xfree86/common/xf86Privstr.h      |    2 ++
+ hw/xfree86/doc/man/xorg.conf.man.pre |    6 ++++++
+ hw/xfree86/modes/xf86RandR12.c       |   12 ++++++++++++
+ 5 files changed, 26 insertions(+), 1 deletions(-)
+
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
 index 6fbf613..88c8a56 100644
 --- a/hw/xfree86/common/xf86Config.c
@@ -101,3 +119,6 @@ index 1fc63c4..5d8bc29 100644
            else
            {
                /*
+-- 
+1.6.6
+

diff --git a/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild b/x11-base/xorg-server/xorg-server-1.7.4.ebuild
similarity index 97%
rename from x11-base/xorg-server/xorg-server-1.7.3.902.ebuild
rename to x11-base/xorg-server/xorg-server-1.7.4.ebuild
index 31f689e39197c7af228abd595bcf2b019ec7831c..2f655ac12a34484310c7d42afc78f35b6548190d 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3.902.ebuild,v 1.1 2009/12/27 23:42:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.4.ebuild,v 1.1 2010/01/10 22:51:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -128,7 +128,7 @@ UPSTREAMED_PATCHES=(
 
 PATCHES=(
        "${UPSTREAMED_PATCHES[@]}"
-       "${FILESDIR}/xorg-server-dont-lie.patch"
+       "${FILESDIR}/xfree86-Add-DontLie-server-flag.patch"
        )
 
 pkg_setup() {