[arch-commits] Commit in xorg-server/repos (4 files)

Ionut Biru ibiru at archlinux.org
Sat Sep 17 08:05:32 UTC 2011


    Date: Saturday, September 17, 2011 @ 04:05:32
  Author: ibiru
Revision: 138136

update to 1.10.4

Modified:
  xorg-server/repos/extra-i686/PKGBUILD
  xorg-server/repos/extra-x86_64/PKGBUILD
Deleted:
  xorg-server/repos/extra-i686/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
  xorg-server/repos/extra-x86_64/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch

---------------------------------------------------------------------------+
 extra-i686/PKGBUILD                                                       |    7 -
 extra-i686/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch   |   36 ----------
 extra-x86_64/PKGBUILD                                                     |    7 -
 extra-x86_64/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch |   36 ----------
 4 files changed, 4 insertions(+), 82 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-09-17 08:01:40 UTC (rev 138135)
+++ extra-i686/PKGBUILD	2011-09-17 08:05:32 UTC (rev 138136)
@@ -3,7 +3,7 @@
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.10.3.901
+pkgver=1.10.4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -18,7 +18,7 @@
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2'
+sha1sums=('857d6377025c77851a3cc5f8ec2ce84164a2fdc6'
           '571f2925f2f3d1b5cdbb2e5a676205fcea256198'
           '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
           '1b95e91384a57d966428c7db98ed06f4cc562f91'
@@ -29,9 +29,6 @@
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  # Upstream post-release commit
-  patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch"
-
   # Add pointer barrier support, patch from Fedora
   patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
 

Deleted: extra-i686/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
===================================================================
--- extra-i686/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch	2011-09-17 08:01:40 UTC (rev 138135)
+++ extra-i686/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch	2011-09-17 08:05:32 UTC (rev 138136)
@@ -1,36 +0,0 @@
-From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner at nvidia.com>
-Date: Fri, 29 Jul 2011 23:12:06 +0000
-Subject: randr: Compare all the bytes in RRPostPendingProperties
-
-RRPostPendingProperties tries to compare the pending and current
-property values to decide whether they're actually changing.  However,
-it does this using a memcmp that passes in pending_value->size as the
-number of bytes.  This is actually the number of elements, where each
-element is (pending_value->format / 8) bytes long.  This causes the
-pending value to not be propagated if the first pending_value->size
-bytes are the same and only the end of it is changing.
-
-Fix this by computing the total number of bytes to compare in the
-memcmp.
-
-Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d)
----
-diff --git a/randr/rrproperty.c b/randr/rrproperty.c
-index ba04c16..61e7bb4 100644
---- a/randr/rrproperty.c
-+++ b/randr/rrproperty.c
-@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output)
- 	    pending_value->format == current_value->format &&
- 	    pending_value->size == current_value->size &&
- 	    !memcmp (pending_value->data, current_value->data,
--		     pending_value->size))
-+		     pending_value->size * (pending_value->format / 8)))
- 	    continue;
- 
- 	if (RRChangeOutputProperty (output, property->propertyName,
---
-cgit v0.8.3-6-g21f6

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-09-17 08:01:40 UTC (rev 138135)
+++ extra-x86_64/PKGBUILD	2011-09-17 08:05:32 UTC (rev 138136)
@@ -3,7 +3,7 @@
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.10.3.901
+pkgver=1.10.4
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
@@ -18,7 +18,7 @@
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2'
+sha1sums=('857d6377025c77851a3cc5f8ec2ce84164a2fdc6'
           '571f2925f2f3d1b5cdbb2e5a676205fcea256198'
           '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
           '1b95e91384a57d966428c7db98ed06f4cc562f91'
@@ -29,9 +29,6 @@
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  # Upstream post-release commit
-  patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch"
-
   # Add pointer barrier support, patch from Fedora
   patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
 

Deleted: extra-x86_64/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
===================================================================
--- extra-x86_64/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch	2011-09-17 08:01:40 UTC (rev 138135)
+++ extra-x86_64/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch	2011-09-17 08:05:32 UTC (rev 138136)
@@ -1,36 +0,0 @@
-From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner at nvidia.com>
-Date: Fri, 29 Jul 2011 23:12:06 +0000
-Subject: randr: Compare all the bytes in RRPostPendingProperties
-
-RRPostPendingProperties tries to compare the pending and current
-property values to decide whether they're actually changing.  However,
-it does this using a memcmp that passes in pending_value->size as the
-number of bytes.  This is actually the number of elements, where each
-element is (pending_value->format / 8) bytes long.  This causes the
-pending value to not be propagated if the first pending_value->size
-bytes are the same and only the end of it is changing.
-
-Fix this by computing the total number of bytes to compare in the
-memcmp.
-
-Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d)
----
-diff --git a/randr/rrproperty.c b/randr/rrproperty.c
-index ba04c16..61e7bb4 100644
---- a/randr/rrproperty.c
-+++ b/randr/rrproperty.c
-@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output)
- 	    pending_value->format == current_value->format &&
- 	    pending_value->size == current_value->size &&
- 	    !memcmp (pending_value->data, current_value->data,
--		     pending_value->size))
-+		     pending_value->size * (pending_value->format / 8)))
- 	    continue;
- 
- 	if (RRChangeOutputProperty (output, property->propertyName,
---
-cgit v0.8.3-6-g21f6




More information about the arch-commits mailing list