[arch-commits] Commit in xorg-server/trunk (2 files)

[Jan de Groot]

    Date: Monday, August 8, 2011 @ 04:19:16
  Author: jgc
Revision: 134869

Prepare 1.10.3.901 release

Added:
  xorg-server/trunk/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
Modified:
  xorg-server/trunk/PKGBUILD

--------------------------------------------------------------+
 PKGBUILD                                                     |   14 ++-
 randr-compare-all-the-bytes-in-rrpostpendingproperties.patch |   36 ++++++++++
 2 files changed, 44 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-08 07:57:41 UTC (rev 134868)
+++ PKGBUILD	2011-08-08 08:19:16 UTC (rev 134869)
@@ -3,21 +3,23 @@
 
 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
-pkgrel=2
+pkgver=1.10.3.901
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
 makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
+        randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
         bg-none-revert.patch
         xserver-1.10-pointer-barriers.patch
         autoconfig-nvidia.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf)
-sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
+sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2'
+          '571f2925f2f3d1b5cdbb2e5a676205fcea256198'
           '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
           '1b95e91384a57d966428c7db98ed06f4cc562f91'
           'f9328fd7bc931bb02c8909ecfcef35403de33782'
@@ -27,6 +29,8 @@
 
 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"
@@ -34,9 +38,6 @@
   # Patches from ~ajax/xserver xserver-next branch
   patch -Np1 -i "${srcdir}/bg-none-revert.patch"
 
-  # Upstream fixes from 1.10 branch
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
@@ -67,6 +68,7 @@
       --with-fontrootdir=/usr/share/fonts
   make
 
+  # Disable subdirs for make install rule to make splitting easier
   sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
       -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
       -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \

Added: randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
===================================================================
--- randr-compare-all-the-bytes-in-rrpostpendingproperties.patch	                        (rev 0)
+++ randr-compare-all-the-bytes-in-rrpostpendingproperties.patch	2011-08-08 08:19:16 UTC (rev 134869)
@@ -0,0 +1,36 @@
+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