diff options
Diffstat (limited to 'extra/xorg-server')
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 24 | ||||
| -rw-r--r-- | extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch | 36 |
2 files changed, 46 insertions, 14 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 7045d4ed8..7550063d1 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $ +# $Id: PKGBUILD 134875 2011-08-08 08:40:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> 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') +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' 'glproto' 'dri2proto') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - #git-fixes.patch + randr-compare-all-the-bytes-in-rrpostpendingproperties.patch bg-none-revert.patch xserver-1.10-pointer-barriers.patch - xorg-redhat-die-ugly-pattern-die-die-die.patch autoconfig-nvidia.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' - # '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695' +sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2' + '571f2925f2f3d1b5cdbb2e5a676205fcea256198' '629c6d8d52126eab81ee1b72a9e4209535f8cb81' '1b95e91384a57d966428c7db98ed06f4cc562f91' - '0efcdf61bde3c0cd813072b94e2b30ab922775b9' 'f9328fd7bc931bb02c8909ecfcef35403de33782' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' @@ -31,8 +29,8 @@ sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Get rid of the ugly pattern - patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" + # 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" @@ -40,9 +38,6 @@ build() { # 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" @@ -73,6 +68,7 @@ build() { --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 = /' \ diff --git a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch new file mode 100644 index 000000000..36d28ded0 --- /dev/null +++ b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch @@ -0,0 +1,36 @@ +From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001 +From: Aaron Plattner <aplattner@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@nvidia.com> +Reviewed-by: Keith Packard <keithp@keithp.com> +Signed-off-by: Keith Packard <keithp@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 |