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

2017-10-04 Thread Laurent Carlier 
Date: Thursday, October 5, 2017 @ 04:00:28
  Author: lcarlier
Revision: 306777

upgpkg: xorg-server 1.19.4-1

upstream update 1.19.4

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/CVE-2017-10971.patch
  xorg-server/trunk/CVE-2017-10972.patch
  xorg-server/trunk/bug99708.patch
  xorg-server/trunk/modesetting-Set-correct-DRM-event-context-version.patch

-+
 CVE-2017-10971.patch|  153 --
 CVE-2017-10972.patch|   35 ---
 PKGBUILD|   25 --
 bug99708.patch  |   33 ---
 modesetting-Set-correct-DRM-event-context-version.patch |   38 ---
 5 files changed, 5 insertions(+), 279 deletions(-)

Deleted: CVE-2017-10971.patch
===
--- CVE-2017-10971.patch2017-10-05 03:19:09 UTC (rev 306776)
+++ CVE-2017-10971.patch2017-10-05 04:00:28 UTC (rev 306777)
@@ -1,153 +0,0 @@
-From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001
-From: Michal Srb 
-Date: Wed, 24 May 2017 15:54:40 +0300
-Subject: dix: Disallow GenericEvent in SendEvent request.
-
-The SendEvent request holds xEvent which is exactly 32 bytes long, no more,
-no less. Both ProcSendEvent and SProcSendEvent verify that the received data
-exactly match the request size. However nothing stops the client from passing
-in event with xEvent::type = GenericEvent and any value of
-xGenericEvent::length.
-
-In the case of ProcSendEvent, the event will be eventually passed to
-WriteEventsToClient which will see that it is Generic event and copy the
-arbitrary length from the receive buffer (and possibly past it) and send it to
-the other client. This allows clients to copy unitialized heap memory out of X
-server or to crash it.
-
-In case of SProcSendEvent, it will attempt to swap the incoming event by
-calling a swapping function from the EventSwapVector array. The swapped event
-is written to target buffer, which in this case is local xEvent variable. The
-xEvent variable is 32 bytes long, but the swapping functions for GenericEvents
-expect that the target buffer has size matching the size of the source
-GenericEvent. This allows clients to cause stack buffer overflows.
-
-Signed-off-by: Michal Srb 
-Reviewed-by: Peter Hutterer 
-Signed-off-by: Peter Hutterer 
-
-diff --git a/dix/events.c b/dix/events.c
-index 3e3a01e..d3a33ea 100644
 a/dix/events.c
-+++ b/dix/events.c
-@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client)
- client->errorValue = stuff->event.u.u.type;
- return BadValue;
- }
-+/* Generic events can have variable size, but SendEvent request holds
-+   exactly 32B of event data. */
-+if (stuff->event.u.u.type == GenericEvent) {
-+client->errorValue = stuff->event.u.u.type;
-+return BadValue;
-+}
- if (stuff->event.u.u.type == ClientMessage &&
- stuff->event.u.u.detail != 8 &&
- stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) {
-diff --git a/dix/swapreq.c b/dix/swapreq.c
-index 719e9b8..6785059 100644
 a/dix/swapreq.c
-+++ b/dix/swapreq.c
-@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client)
- swapl(>destination);
- swapl(>eventMask);
- 
-+/* Generic events can have variable size, but SendEvent request holds
-+   exactly 32B of event data. */
-+if (stuff->event.u.u.type == GenericEvent) {
-+client->errorValue = stuff->event.u.u.type;
-+return BadValue;
-+}
-+
- /* Swap event */
- proc = EventSwapVector[stuff->event.u.u.type & 0177];
- if (!proc || proc == NotImplemented)/* no swapping proc; invalid 
event type? */
--- 
-cgit v0.10.2
-
-From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001
-From: Michal Srb 
-Date: Wed, 24 May 2017 15:54:41 +0300
-Subject: Xi: Verify all events in ProcXSendExtensionEvent.
-
-The requirement is that events have type in range
-EXTENSION_EVENT_BASE..lastEvent, but it was tested
-only for first event of all.
-
-Signed-off-by: Michal Srb 
-Reviewed-by: Peter Hutterer 
-Signed-off-by: Peter Hutterer 
-
-diff --git a/Xi/sendexev.c b/Xi/sendexev.c
-index 1cf118a..5e63bfc 100644
 a/Xi/sendexev.c
-+++ b/Xi/sendexev.c
-@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client)
- int
- ProcXSendExtensionEvent(ClientPtr client)
- {
--int ret;
-+int ret, i;
- DeviceIntPtr dev;
- xEvent *first;
- XEventClass *list;
-@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client)
- /* The client's event type must be one defined by an extension. */
- 
- first = ((xEvent *) [1]);
--if (!((EXTENSION_EVENT_BASE <= first->u.u.type)

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

2016-03-25 Thread Laurent Carlier 
Date: Friday, March 25, 2016 @ 10:01:36
  Author: lcarlier
Revision: 262515

upgpkg: xorg-server 1.18.2-4

Use upstream fix for FS#48549

Added:
  xorg-server/trunk/0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
(from rev 262514, 
xorg-server/trunk/0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch)
  
xorg-server/trunk/0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch
Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
  
xorg-server/trunk/0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch

-+
 0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch |  374 
++
 0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch |   43 +
 0002-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch |  374 
--
 0003-Revert-present-Requeue-if-flip-driver-hook-fails-and.patch |   39 -
 PKGBUILD|   16 
 5 files changed, 424 insertions(+), 422 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 262514:262515 to see the changes.

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

2015-06-08 Thread Laurent Carlier 
Date: Monday, June 8, 2015 @ 21:29:45
  Author: lcarlier
Revision: 240425

upgpkg: xorg-server 1.17.1-6

fix FS#45245, FS#45229, CVE-2015-3164

Added:
  
xorg-server/trunk/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
  xorg-server/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
  xorg-server/trunk/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
  xorg-server/trunk/fix-CVE-2015-3164.patch
Modified:
  xorg-server/trunk/PKGBUILD

+
 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch |  210 ++
 0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch   |   51 +
 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch|  134 
 PKGBUILD   |   27 
 fix-CVE-2015-3164.patch|  311 
++
 5 files changed, 727 insertions(+), 6 deletions(-)

Added: 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
===
--- 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch  
(rev 0)
+++ 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch  
2015-06-08 19:29:45 UTC (rev 240425)
@@ -0,0 +1,210 @@
+From e1a7f4bb5333b0271d29f785eb55f1c3273e626a Mon Sep 17 00:00:00 2001
+From: Peter Hutterer peter.hutte...@who-t.net
+Date: Tue, 5 May 2015 14:18:54 +1000
+Subject: [PATCH] dix: Add unaccelerated valuators to the ValuatorMask
+
+Allows a mask to carry both accelerated and unaccelerated motion at the same
+time.
+
+This is required for xf86-input-libinput where the pointer acceleration
+happens in libinput already, but parts of the server, specifically raw events
+and DGA rely on device-specific unaccelerated data.
+
+To ease integration add this as a second set to the ValuatorMask rather than
+extending all APIs to carry a second, possibly NULL set of valuators.
+
+Note that a valuator mask should only be used in either accel/unaccel or
+standard mode at any time. Switching requires either a valuator_mask_zero()
+call or unsetting all valuators one-by-one. Trying to mix the two will produce
+a warning.
+
+The server has a shortcut for changing a mask with the
+valuator_mask_drop_unaccelerated() call. This saves us from having to loop
+through all valuators on every event, we can just drop the bits we know we
+don't want.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Hans de Goede hdego...@redhat.com
+---
+ dix/inpututils.c   | 82 +++---
+ hw/xfree86/common/xf86Module.h |  2 +-
+ include/input.h| 15 
+ include/inpututils.h   |  2 ++
+ 4 files changed, 95 insertions(+), 6 deletions(-)
+
+diff --git a/dix/inpututils.c b/dix/inpututils.c
+index 5c2a32d..1363988 100644
+--- a/dix/inpututils.c
 b/dix/inpututils.c
+@@ -505,11 +505,8 @@ valuator_mask_isset(const ValuatorMask *mask, int 
valuator)
+ return mask-last_bit = valuator  BitIsOn(mask-mask, valuator);
+ }
+ 
+-/**
+- * Set the valuator to the given floating-point data.
+- */
+-void
+-valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
++static inline void
++_valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
+ {
+ mask-last_bit = max(valuator, mask-last_bit);
+ SetBit(mask-mask, valuator);
+@@ -517,6 +514,17 @@ valuator_mask_set_double(ValuatorMask *mask, int 
valuator, double data)
+ }
+ 
+ /**
++ * Set the valuator to the given floating-point data.
++ */
++void
++valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
++{
++BUG_WARN_MSG(mask-has_unaccelerated,
++ Do not mix valuator types, zero mask first\n);
++_valuator_mask_set_double(mask, valuator, data);
++}
++
++/**
+  * Set the valuator to the given integer data.
+  */
+ void
+@@ -594,11 +602,15 @@ valuator_mask_unset(ValuatorMask *mask, int valuator)
+ 
+ ClearBit(mask-mask, valuator);
+ mask-valuators[valuator] = 0.0;
++mask-unaccelerated[valuator] = 0.0;
+ 
+ for (i = 0; i = mask-last_bit; i++)
+ if (valuator_mask_isset(mask, i))
+ lastbit = max(lastbit, i);
+ mask-last_bit = lastbit;
++
++if (mask-last_bit == -1)
++mask-has_unaccelerated = FALSE;
+ }
+ }
+ 
+@@ -611,6 +623,66 @@ valuator_mask_copy(ValuatorMask *dest, const ValuatorMask 
*src)
+ valuator_mask_zero(dest);
+ }
+ 
++Bool
++valuator_mask_has_unaccelerated(const ValuatorMask *mask)
++{
++return mask-has_unaccelerated;
++}
++
++void
++valuator_mask_drop_unaccelerated(ValuatorMask *mask)
++{
++memset(mask-unaccelerated, 0, sizeof(mask-unaccelerated));
++mask-has_unaccelerated = FALSE;
++}
++
++/**
++ * Set both accelerated and unaccelerated value for this mask.
++ */
++void

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

2013-12-28 Thread Andreas Radke 
Date: Saturday, December 28, 2013 @ 09:18:14
  Author: andyrtr
Revision: 202784

upgpkg: xorg-server 1.15.0-0.1

upstream update 1.15.0

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/bug59825.patch
  xorg-server/trunk/fb-rename-wfbDestroyGlyphCache.patch
  xorg-server/trunk/xephyr-glx.patch
  xorg-server/trunk/xserver-1.6.0-less-acpi-brokenness.patch

--+
 PKGBUILD |   56 ++---
 bug59825.patch   |   12 --
 fb-rename-wfbDestroyGlyphCache.patch |   27 -
 xephyr-glx.patch |   39 
 xserver-1.6.0-less-acpi-brokenness.patch |   25 
 5 files changed, 21 insertions(+), 138 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-28 07:50:45 UTC (rev 202783)
+++ PKGBUILD2013-12-28 08:18:14 UTC (rev 202784)
@@ -4,35 +4,29 @@
 
 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.14.5
-pkgrel=2
+pkgver=1.15.0
+pkgrel=0.1 # build first with 0.1 and then rebuild it after xf86-input-evdev 
rebuild
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
-makedepends=('pixman' 'libx11' 'mesa' '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' 'libgcrypt') 
+makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 
'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
+ 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 
'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' 'libgcrypt'
+ 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms') 
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
 autoconfig-nvidia.patch
 autoconfig-sis.patch
-xserver-1.6.0-less-acpi-brokenness.patch
-bug59825.patch
-xephyr-glx.patch
 xvfb-run
 xvfb-run.1
-10-quirks.conf
-fb-rename-wfbDestroyGlyphCache.patch)
-sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1'
+10-quirks.conf)
+sha256sums=('613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8'
 '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
-'26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
-'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619'
 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
 '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-'d0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
+'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
@@ -41,18 +35,6 @@
 
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i ../autoconfig-sis.patch
-
-  # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with 
vboxvideo
-#  patch -Np1 -i ../bug59825.patch
-
-  # From Fedora. Do not build acpid code, it is buggy and we do not need it
-  patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch
-
-  # Add GLX support for Xephyr - 
https://bugs.freedesktop.org/show_bug.cgi?id=62346
-  patch -Np0 -i ../xephyr-glx.patch
-
-  # 
http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219
-  patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch
 }
 
 build() {
@@ -85,6 +67,10 @@
   --with-xkb-path=/usr/share/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
   --with-fontrootdir=/usr/share/fonts
+  
+# --without-dtrace \
+#  --disable-linux-acpi --disable-linux-apm \
+
   make
 
   # Disable subdirs for make install rule to make splitting easier
@@ -114,10 +100,10 @@
 
 package_xorg-server() {

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

2010-08-23 Thread Jan de Groot 
Date: Monday, August 23, 2010 @ 11:01:59
  Author: jgc
Revision: 88428

Prepare for 1.9.0:
- Upstream evdev configuration file is used
- Package has been split to give each server its own package
- Dependencies redefined

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/10-evdev.conf
  xorg-server/trunk/xorg-server.install
  xorg-server/trunk/xserver-1.7.1-gamma-kdm-fix.patch
  xorg-server/trunk/xserver-1.7.1-libcrypto.patch

---+
 10-evdev.conf |   39 ---
 PKGBUILD  |  125 +++-
 xorg-server.install   |   14 
 xserver-1.7.1-gamma-kdm-fix.patch |   34 -
 xserver-1.7.1-libcrypto.patch |   32 -
 5 files changed, 95 insertions(+), 149 deletions(-)

Deleted: 10-evdev.conf
===
--- 10-evdev.conf   2010-08-23 12:42:44 UTC (rev 88427)
+++ 10-evdev.conf   2010-08-23 15:01:59 UTC (rev 88428)
@@ -1,39 +0,0 @@
-# Catchall classes for input devices
-# We don't simply match on any device since that also adds accelerometers
-# and other devices that we don't really want to use. The list below
-# matches everything but joysticks.
-
-Section InputClass
-Identifier evdev pointer catchall
-MatchIsPointer on
-MatchDevicePath /dev/input/event*
-Driver evdev
-EndSection
-
-Section InputClass
-Identifier evdev keyboard catchall
-MatchIsKeyboard on
-MatchDevicePath /dev/input/event*
-Driver evdev
-EndSection
-
-Section InputClass
-Identifier evdev touchpad catchall
-MatchIsTouchpad on
-MatchDevicePath /dev/input/event*
-Driver evdev
-EndSection
-
-Section InputClass
-Identifier evdev tablet catchall
-MatchIsTablet on
-MatchDevicePath /dev/input/event*
-Driver evdev
-EndSection
-
-Section InputClass
-Identifier evdev touchscreen catchall
-MatchIsTouchscreen on
-MatchDevicePath /dev/input/event*
-Driver evdev
-EndSection

Modified: PKGBUILD
===
--- PKGBUILD2010-08-23 12:42:44 UTC (rev 88427)
+++ PKGBUILD2010-08-23 15:01:59 UTC (rev 88428)
@@ -1,48 +1,38 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 
-pkgname=xorg-server
-pkgver=1.8.1.902
+pkgbase=xorg-server
+pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 
'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common')
+pkgver=1.9.0
 pkgrel=1
-pkgdesc=X.Org X servers
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
-depends=('libgl' 'libxfont=1.4.1' 'libgcrypt=1.4.5' 'udev=151' 
'libpciaccess=0.10.9' 'libxv=1.0.5' 'pixman=0.18.0' 'xcursor-themes=1.0.2' 
'xkeyboard-config=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 
'diffutils' 'xf86-input-evdev=2.3.2-2' 'inputproto=2.0')
-makedepends=('libx11=1.3.3' 'mesa=7.8.2' 'xf86driproto=2.1.0' 
'xtrans=1.2.5' 'libxkbfile=1.0.6' 'randrproto=1.3.1' 'renderproto=0.11' 
'xcmiscproto=1.2.0' 'bigreqsproto=1.1.0' 'resourceproto=1.1.0' 
'videoproto=2.3.0' 'compositeproto=0.4.1' 'scrnsaverproto=1.2.0' 
'xf86dgaproto=2.1' 'libgl=7.8.2' 'glproto=1.4.11' 'xorg-util-macros=1.6.1' 
'xineramaproto=1.2' 'recordproto')
-conflicts=('catalyst-utils=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 
'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 
'xf86-input-elo2300'
-   'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 
'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 
'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 
'xf86-video-intel-legacy' 'nvidia-96xx-utils96.43.14' 
'nvidia-173xx-utils173.14.21')
+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')
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')
-install=xorg-server.install
-backup=('etc/X11/xorg.conf.d/10-evdev.conf' 
'etc/X11/xorg.conf.d/10-quirks.conf')
-source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
+source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
 xorg-redhat-die-ugly-pattern-die-die-die.patch
 xvfb-run
 xvfb-run.1
-10-evdev.conf
 10-quirks.conf)
-md5sums=('8a851466d13e4ee527cc782308532119'
+md5sums=('ba1173998a5a4216fd7b40eded96697e'
  '1a336eb22e27cbf443ec5a2ecddfa93c'
  '52fd3effd80d7bc6c1660d4ecf23d31c'
  '376c70308715cd2643f7bff936d9934b'
- 'e930e153d69968a795fe4e2ef5d9a5dc'
  'd4f7dfc6be4ef4e2c6dd7632a9d88abe')

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

2010-01-31 Thread Jan de Groot 
Date: Sunday, January 31, 2010 @ 06:41:57
  Author: jgc
Revision: 66500

upgpkg: xorg-server 1.7.4.901-1
Remove outdated patches, add git fixes from the nomination branch. Update 
to 1.7.4.901

Added:
  xorg-server/trunk/git-fixes.patch
Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/revert-bug25136.patch
  xorg-server/trunk/xserver-1.7.1-nvidia-performance.patch
  xorg-server/trunk/xserver-1.7.1-window-pictures.patch

+
 PKGBUILD   |   18 -
 git-fixes.patch|  206 +++
 revert-bug25136.patch  |  331 ---
 xserver-1.7.1-nvidia-performance.patch |   58 -
 xserver-1.7.1-window-pictures.patch|   58 -
 5 files changed, 216 insertions(+), 455 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-31 11:21:38 UTC (rev 66499)
+++ PKGBUILD2010-01-31 11:41:57 UTC (rev 66500)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=xorg-server
-pkgver=1.7.3.902
+pkgver=1.7.4.901
 pkgrel=1
 pkgdesc=X.Org X servers
 arch=('i686' 'x86_64')
 license=('custom')
 url=http://xorg.freedesktop.org;
-depends=('hal=0.5.14' 'libgl' 'libxfont=1.4.1' 'openssl=0.9.8k' 
'libpciaccess=0.10.9' 'libxv=1.0.5' 'pixman=0.16.2' 'xcursor-themes=1.0.2' 
'xkeyboard-config=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 
'diffutils' 'xf86-input-evdev=2.2.5' 'inputproto=2.0-1')
+depends=('hal=0.5.14' 'libgl' 'libxfont=1.4.1' 'openssl=0.9.8k' 
'libpciaccess=0.10.9' 'libxv=1.0.5' 'pixman=0.16.4' 'xcursor-themes=1.0.2' 
'xkeyboard-config=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 
'diffutils' 'xf86-input-evdev=2.2.5' 'inputproto=2.0')
 makedepends=('libx11=1.3' 'mesa=7.7' 'xf86driproto=2.1.0' 'xtrans=1.2.4' 
'libxkbfile=1.0.6' 'randrproto=1.3.1' 'renderproto=0.11' 
'xcmiscproto=1.2.0' 'bigreqsproto=1.1.0' 'resourceproto=1.1.0' 
'videoproto=2.3.0' 'compositeproto=0.4.1' 'scrnsaverproto=1.2.0' 
'xf86dgaproto=2.1' 'libgl=7.7' 'glproto=1.4.10' 'xorg-util-macros=1.3.0' 
'xineramaproto=1.2')
 conflicts=('catalyst-utils=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 
'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 
'xf86-input-elo2300'
'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 
'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 
'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 
'xf86-video-intel-legacy' 'nvidia-96xx-utils96.43.14' 
'nvidia-173xx-utils173.14.21')
@@ -20,8 +20,16 @@
 xorg-redhat-die-ugly-pattern-die-die-die.patch
 xserver-1.7.1-libcrypto.patch
 xserver-1.7.1-gamma-kdm-fix.patch
+git-fixes.patch
 xvfb-run
 xvfb-run.1)
+md5sums=('e1656bd2fd362299dc7bae489525a9da'
+ '1a336eb22e27cbf443ec5a2ecddfa93c'
+ '957d429cad03ac87281b7e40d963497c'
+ '8eae23916552e609c36ecae1827c2e9d'
+ 'fb936bccf2d385da4946c4137eca5d2f'
+ '52fd3effd80d7bc6c1660d4ecf23d31c'
+ '376c70308715cd2643f7bff936d9934b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -84,9 +92,3 @@
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums=('5806bd9d1ed734a60db2e32473a720b4'
- '1a336eb22e27cbf443ec5a2ecddfa93c'
- '957d429cad03ac87281b7e40d963497c'
- '8eae23916552e609c36ecae1827c2e9d'
- '52fd3effd80d7bc6c1660d4ecf23d31c'
- '376c70308715cd2643f7bff936d9934b')

Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2010-01-31 11:41:57 UTC (rev 66500)
@@ -0,0 +1,206 @@
+From a191318f8dde2a4ff47c051244e8c88e8f92883a Mon Sep 17 00:00:00 2001
+From: Christian Zander chzan...@nvidia.com
+Date: Mon, 11 Jan 2010 20:29:07 +
+Subject: x86emu: Respect the LEA 67h address size prefix.
+
+Signed-off-by: Christian Zander chzan...@nvidia.com
+Signed-off-by: Aaron Plattner aplatt...@nvidia.com
+Tested-by: Tiago Vignatti tiago.vigna...@nokia.com
+Signed-off-by: Keith Packard kei...@keithp.com
+(cherry picked from commit f57bc0ede8e018c7e264b917927c42a018cd1d5a)
+---
+diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
+index 37ae2c9..21a0347 100644
+--- a/hw/xfree86/x86emu/ops.c
 b/hw/xfree86/x86emu/ops.c
+@@ -6567,42 +6567,62 @@ Handles opcode 0x8d
+ static void x86emuOp_lea_word_R_M(u8 X86EMU_UNUSED(op1))
+ {
+ int mod, rl, rh;
+-u16 *srcreg;
+ uint destoffset;
+ 
+-/*
+- * TODO: Need to handle address size prefix!
+- *
+- * lea  eax,[eax+ebx*2] ??
+- */
+-
+ START_OF_INSTR();
+ DECODE_PRINTF(LEA\t);
+ FETCH_DECODE_MODRM(mod, rh, rl);
+ switch (mod) {
+ case 0:
+-srcreg = DECODE_RM_WORD_REGISTER(rh);
+-