[arch-commits] Commit in xorg-server/repos (9 files)
Ionut Biru
ibiru at archlinux.org
Sat Dec 12 20:46:30 UTC 2009
Date: Saturday, December 12, 2009 @ 15:46:30
Author: ibiru
Revision: 61166
Merged revisions 61160 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk
........
r61160 | jgc | 2009-12-12 19:01:01 +0200 (Sat, 12 Dec 2009) | 3 lines
upgpkg: xorg-server 1.7.3.901-1
Update to latest RC, remove patches included in the RC
Remove the sigaction patch, as it seems to cause FS#17380
........
Modified:
xorg-server/repos/extra-x86_64/ (properties)
xorg-server/repos/extra-x86_64/PKGBUILD
Deleted:
xorg-server/repos/extra-x86_64/dix-fix-memleak.patch
xorg-server/repos/extra-x86_64/dix-remove-core-devices-on-shutdown.patch
xorg-server/repos/extra-x86_64/exa-fix-defragment.patch
xorg-server/repos/extra-x86_64/exa-fix-mixed-pixmaps.patch
xorg-server/repos/extra-x86_64/fix-repeat-events.patch
xorg-server/repos/extra-x86_64/xserver-1.7.1-sigaction.patch
xorg-server/repos/extra-x86_64/xv-fix-adjustframe-reputimage.patch
-------------------------------------------+
PKGBUILD | 29 --------
dix-fix-memleak.patch | 33 ----------
dix-remove-core-devices-on-shutdown.patch | 31 ---------
exa-fix-defragment.patch | 67 --------------------
exa-fix-mixed-pixmaps.patch | 46 --------------
fix-repeat-events.patch | 26 --------
xserver-1.7.1-sigaction.patch | 91 ----------------------------
xv-fix-adjustframe-reputimage.patch | 38 -----------
8 files changed, 2 insertions(+), 359 deletions(-)
Property changes on: xorg-server/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /xorg-server/trunk:1-60854
+ /xorg-server/trunk:1-61165
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/PKGBUILD 2009-12-12 20:46:30 UTC (rev 61166)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.7.3
+pkgver=1.7.3.901
pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
@@ -21,30 +21,16 @@
xserver-1.7.1-window-pictures.patch
xserver-1.7.1-nvidia-performance.patch
xserver-1.7.1-libcrypto.patch
- xserver-1.7.1-sigaction.patch
xserver-1.7.1-gamma-kdm-fix.patch
- exa-fix-mixed-pixmaps.patch
- exa-fix-defragment.patch
- fix-repeat-events.patch
- dix-remove-core-devices-on-shutdown.patch
- dix-fix-memleak.patch
- xv-fix-adjustframe-reputimage.patch
revert-bug25136.patch
xvfb-run
xvfb-run.1)
-md5sums=('4c63b22cad9ed8ae8b86561f0f92c327'
+md5sums=('cae5564c2f42212346ed4b44d3b97353'
'1a336eb22e27cbf443ec5a2ecddfa93c'
'01507da1a18737a3a9202fbd00213f4c'
'd5c6e2de2e15bcff98d69f4772ee09ac'
'957d429cad03ac87281b7e40d963497c'
- '9de9025a8c93b57188fce137b3262d1e'
'8eae23916552e609c36ecae1827c2e9d'
- 'ba5389a2b0ded91a7e48bd1cd1d16f54'
- '33e209ebfd7ad1ad2489e96a58aa3e2c'
- '2df6d883a22d1c9121618cb90347c21e'
- '29ce13f606fb2de78e34d4317a9634ea'
- 'aa67e7be85a86f922b5582c3bcdb8338'
- '955240ad0a18d77ced04fa5d1514de9f'
'e3b6a19dc7e708b10fac22180a4cb3d3'
'52fd3effd80d7bc6c1660d4ecf23d31c'
'376c70308715cd2643f7bff936d9934b')
@@ -66,20 +52,9 @@
# http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1
- # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-sigaction.patch?view=log
- patch -Np1 -i "${srcdir}/xserver-1.7.1-sigaction.patch" || return 1
-
# http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-gamma-kdm-fix.patch?view=log
patch -Np1 -i "${srcdir}/xserver-1.7.1-gamma-kdm-fix.patch" || return 1
- # Upstream patches from 1.7-nominations branch
- patch -Np1 -i "${srcdir}/exa-fix-mixed-pixmaps.patch" || return 1
- patch -Np1 -i "${srcdir}/exa-fix-defragment.patch" || return 1
- patch -Np1 -i "${srcdir}/fix-repeat-events.patch" || return 1
- patch -Np1 -i "${srcdir}/dix-remove-core-devices-on-shutdown.patch" || return 1
- patch -Np1 -i "${srcdir}/dix-fix-memleak.patch" || return 1
- patch -Np1 -i "${srcdir}/xv-fix-adjustframe-reputimage.patch" || return 1
-
# Fix dbus config path
sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* || return 1
Deleted: extra-x86_64/dix-fix-memleak.patch
===================================================================
--- extra-x86_64/dix-fix-memleak.patch 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/dix-fix-memleak.patch 2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,33 +0,0 @@
-From 21bf1de28c7f10bcee1b199cc976d58319dc9ecd Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Fri, 27 Nov 2009 06:01:53 +0000
-Subject: dix: fix memory leak, free event list on shutdown. (#25028)
-
-X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit c20c8897272427cb3f755a3e28e80a9ad46f08a1)
----
-diff --git a/dix/events.c b/dix/events.c
-index 3e23262..1d7ceef 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -5086,12 +5086,9 @@ InitEvents(void)
- void
- CloseDownEvents(void)
- {
-- int len;
-- EventListPtr list;
--
-- len = GetEventList(&list);
-- while(len--)
-- xfree(list[len].event);
-+ FreeEventList(InputEventList, InputEventListLen);
-+ InputEventListLen = 0;
-+ InputEventList = NULL;
- }
-
- /**
---
-cgit v0.8.3-6-g21f6
Deleted: extra-x86_64/dix-remove-core-devices-on-shutdown.patch
===================================================================
--- extra-x86_64/dix-remove-core-devices-on-shutdown.patch 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/dix-remove-core-devices-on-shutdown.patch 2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,31 +0,0 @@
-From e840999ffc93ecb2d870dfed334e093ca1e5e65b Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Fri, 27 Nov 2009 06:20:13 +0000
-Subject: dix: remove core devices when shutting down. (#25028)
-
-NewInputDeviceRequest (and RemoveDevice) have checks in place to not allow
-removal of the VCP/VCK. When shutting down, they need to be cleaned up
-nonetheless to free the memory associated.
-
-X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 66bb8c6fbdfc0fc0d971aac4ec6f949bb9288c1b)
----
-diff --git a/dix/devices.c b/dix/devices.c
-index 395e19a..e3fd456 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -908,6 +908,9 @@ CloseDownDevices(void)
- DeleteInputDeviceRequest(dev);
- }
-
-+ CloseDevice(inputInfo.pointer);
-+ CloseDevice(inputInfo.keyboard);
-+
- inputInfo.devices = NULL;
- inputInfo.off_devices = NULL;
- inputInfo.keyboard = NULL;
---
-cgit v0.8.3-6-g21f6
Deleted: extra-x86_64/exa-fix-defragment.patch
===================================================================
--- extra-x86_64/exa-fix-defragment.patch 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/exa-fix-defragment.patch 2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,67 +0,0 @@
-From dde1f688006e08e26a8a43d0dbb877b8ea169825 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <daenzer at vmware.com>
-Date: Mon, 30 Nov 2009 12:17:52 +0000
-Subject: EXA: Don't defragment offscreen memory at allocation time.
-
-Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24300 .
-
-Offscreen memory allocation can occur from various places, and apparently
-doing defragmentation from at least some of them can confuse some driver
-acceleration code.
-
-There's still the regular background defragmentation in the WakeupHandler,
-which should manage to keep fragmentation at a reasonable level.
-
-Signed-off-by: Michel Dänzer <daenzer at vmware.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 8754db77d8169e5ea506a963cebee1a651bcf094)
----
-diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
-index eb53b2a..2ec4174 100644
---- a/exa/exa_offscreen.c
-+++ b/exa/exa_offscreen.c
-@@ -169,7 +169,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
- {
- ExaOffscreenArea *area;
- ExaScreenPriv (pScreen);
-- int real_size = 0, free_total = 0, largest_avail = 0;
-+ int real_size = 0, largest_avail = 0;
- #if DEBUG_OFFSCREEN
- static int number = 0;
- ErrorF("================= ============ allocating a new pixmap %d\n", ++number);
-@@ -208,33 +208,10 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
- if (real_size <= area->size)
- break;
-
-- free_total += area->size;
--
- if (area->size > largest_avail)
- largest_avail = area->size;
- }
-
-- if (!area && free_total >= size) {
-- CARD32 now = GetTimeInMillis();
--
-- /* Don't defragment more than once per second, to avoid adding more
-- * overhead than we're trying to prevent
-- */
-- if (abs((INT32) (now - pExaScr->lastDefragment)) > 1000) {
-- area = ExaOffscreenDefragment(pScreen);
-- pExaScr->lastDefragment = now;
--
-- if (area) {
-- /* adjust size to match alignment requirement */
-- real_size = size + (area->base_offset + area->size - size) % align;
--
-- /* does it fit? */
-- if (real_size > area->size)
-- area = NULL;
-- }
-- }
-- }
--
- if (!area)
- {
- area = exaFindAreaToEvict(pExaScr, size, align);
---
-cgit v0.8.3-6-g21f6
Deleted: extra-x86_64/exa-fix-mixed-pixmaps.patch
===================================================================
--- extra-x86_64/exa-fix-mixed-pixmaps.patch 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/exa-fix-mixed-pixmaps.patch 2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,46 +0,0 @@
-From 17a1614c3b7410581d885be5f8f76aa7b3e2c070 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs at redhat.com>
-Date: Sat, 24 Oct 2009 00:45:49 +0000
-Subject: EXA: fix mixed-pixmaps issue where we could do accel with pixmap mapped
-
-The problem occurs in the following situation:
-
-1. Create Pixmap
-2. Software fallback on pixmap: pExaPixmap->pDamage created
-3. Accel to pixmap: driver pixmap created, exaPixmapIsOffscreen() now true
-4. Software fallback on pixmap
-4.1: PrepareAccess() from driver succeeds, so no DFS to system memory copy
-4.2: Software rendering...
-4.3: (pExaPixmap->pDamage && exaPixmapIsOffscreen()) is true, so we try
- to (incorrectly) UTS the data back to the driver pixmap, when we
- should just call the driver's FinishAccess() hook.
-4.4: fail
-
-The patch adds an additional check on pExaPixmap->offscreen, which should
-(for the cases exaPixmapIsOffscreen() will return true) only be FALSE
-when we haven't used PrepareAccess() on the pixmap.
-
-Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
-Acked-By: Michel Dänzer <michel at daenzer.net>
-
-[ Michel Dänzer: This is a 'backport' of commit
- 647b79f87a9891225678dc6fc2fbda3bdef8fa9d from master - actually this patch
- was submitted first but didn't apply to master anymore, so technically the
- other change is a 'forward port' of this one ]
----
-diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
-index f42c9c2..52b18b4 100644
---- a/exa/exa_migration_mixed.c
-+++ b/exa/exa_migration_mixed.c
-@@ -202,7 +202,8 @@ void exaFinishAccess_mixed(PixmapPtr pPixmap, int index)
- {
- ExaPixmapPriv(pPixmap);
-
-- if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap)) {
-+ if (pExaPixmap->pDamage && exaPixmapIsOffscreen(pPixmap) &&
-+ !pExaPixmap->offscreen) {
- DamageRegionProcessPending(&pPixmap->drawable);
- exaMoveInPixmap_mixed(pPixmap);
- }
---
-cgit v0.8.3-6-g21f6
Deleted: extra-x86_64/fix-repeat-events.patch
===================================================================
--- extra-x86_64/fix-repeat-events.patch 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/fix-repeat-events.patch 2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,26 +0,0 @@
-From 51aad8bebca938a41837ad73c98a0039665fa22f Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Fri, 30 Oct 2009 02:11:41 +0000
-Subject: Set the source and deviceid for key repeat events (#24785)
-
-X.Org Bug 24785 <http://bugs.freedesktop.org/show_bug.cgi?id=24785>
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Acked-by: Adam Jackson <ajax at redhat.com>
-(cherry picked from commit b584c224a888c9e7f92d7e49021f74232a727c7f)
----
-diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
-index 2fc7642..0d8e4eb 100644
---- a/xkb/xkbAccessX.c
-+++ b/xkb/xkbAccessX.c
-@@ -131,6 +131,8 @@ AccessXKeyboardEvent(DeviceIntPtr keybd,
- event.time = GetTimeInMillis();
- event.length = sizeof(DeviceEvent);
- event.key_repeat = isRepeat;
-+ event.sourceid = keybd->id;
-+ event.deviceid = keybd->id;
-
- if (xkbDebugFlags&0x8) {
- DebugF("[xkb] AXKE: Key %d %s\n", keyCode,
---
-cgit v0.8.3-6-g21f6
Deleted: extra-x86_64/xserver-1.7.1-sigaction.patch
===================================================================
--- extra-x86_64/xserver-1.7.1-sigaction.patch 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/xserver-1.7.1-sigaction.patch 2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,91 +0,0 @@
-From 645de09fc84482a55b5234312027efd007e53d8c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Sat, 7 Nov 2009 15:29:05 -0500
-Subject: [PATCH] xfree86: Use SA_SIGINFO if available for SIGIO handlers
-
-siginfo_t gives us the file descriptor that raised the signal directly,
-so we don't need to select() for it. This gets evdev event processing
-down to exactly one syscall in the common case.
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
- hw/xfree86/os-support/shared/sigio.c | 40 ++++++++++++++++++++++++++++-----
- 1 files changed, 34 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
-index aed5654..4f1ec55 100644
---- a/hw/xfree86/os-support/shared/sigio.c
-+++ b/hw/xfree86/os-support/shared/sigio.c
-@@ -95,12 +95,11 @@ static int xf86SigIOMax;
- static int xf86SigIOMaxFd;
- static fd_set xf86SigIOMask;
-
--/*
-- * SIGIO gives no way of discovering which fd signalled, select
-- * to discover
-- */
-+#ifndef SA_SIGINFO
-+
-+/* plain signals have no way of discovering which fd signalled. */
- static void
--xf86SIGIO (int sig)
-+sigio_handler (int sig)
- {
- int i;
- fd_set ready;
-@@ -126,6 +125,27 @@ xf86SIGIO (int sig)
- errno = save_errno;
- }
-
-+#else /* have SA_SIGINFO */
-+
-+/* siginfo passes the triggering fd in, no need to select() */
-+static void
-+sigio_sigaction(int sig, siginfo_t *si, void *ctx)
-+{
-+ int i;
-+ int save_errno = errno;
-+
-+ for (i = 0; i < MAX_FUNCS; i++) {
-+ if (xf86SigIOFuncs[i].f && xf86SigIOFuncs[i].fd == si->si_fd) {
-+ (*xf86SigIOFuncs[i].f)(si->si_fd, xf86SigIOFuncs[i].closure);
-+ break;
-+ }
-+ }
-+
-+ errno = save_errno;
-+}
-+
-+#endif
-+
- static int
- xf86IsPipe (int fd)
- {
-@@ -164,6 +184,9 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
- xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
- fd, strerror(errno));
- } else {
-+#ifdef SA_SIGINFO
-+ fcntl(fd, F_SETSIG, SIGIO);
-+#endif
- installed = TRUE;
- }
- }
-@@ -184,8 +207,13 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure)
- }
- sigemptyset(&sa.sa_mask);
- sigaddset(&sa.sa_mask, SIGIO);
-+#ifndef SA_SIGINFO
- sa.sa_flags = 0;
-- sa.sa_handler = xf86SIGIO;
-+ sa.sa_handler = sigio_handler;
-+#else
-+ sa.sa_flags = SA_SIGINFO;
-+ sa.sa_sigaction = sigio_sigaction;
-+#endif
- sigaction(SIGIO, &sa, &osa);
- xf86SigIOFuncs[i].fd = fd;
- xf86SigIOFuncs[i].closure = closure;
---
-1.6.5.rc2
-
Deleted: extra-x86_64/xv-fix-adjustframe-reputimage.patch
===================================================================
--- extra-x86_64/xv-fix-adjustframe-reputimage.patch 2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/xv-fix-adjustframe-reputimage.patch 2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,38 +0,0 @@
-From 7ef49cbe702ab00913cb5c55d35b110cd81481aa Mon Sep 17 00:00:00 2001
-From: Luc Verhaegen <libv at skynet.be>
-Date: Wed, 11 Nov 2009 14:52:39 +0000
-Subject: [PATCH] Xv: Fix AdjustFrame when driver implements ReputImage.
-
-Finally fixes fd.o #4653, filed more than 4 years ago.
-
-Patch can be happily applied to all modular Xorg versions.
-
-Signed-off-by: Luc Verhaegen <libv at skynet.be>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 0e084d8c71e697a5cf5d5d7c749455ae14bd6eb7)
----
-diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
-index abbe033..8221659 100644
---- a/hw/xfree86/common/xf86xv.c
-+++ b/hw/xfree86/common/xf86xv.c
-@@ -1297,7 +1297,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
- for(i = pa->nPorts; i > 0; i--, pPort++) {
- pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;
-
-- if(!pPriv->type && (pPriv->isOn == XV_ON)) { /* overlaid still/image */
-+ if(!pPriv->type && (pPriv->isOn != XV_OFF)) { /* overlaid still/image */
-
- if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)
- REGION_DESTROY(pScreen, pPriv->pCompositeClip);
-@@ -1311,7 +1311,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
- (pWin->visibility == VisibilityPartiallyObscured)))
- {
- xf86XVReputImage(pPriv);
-- } else {
-+ } else if (pPriv->isOn == XV_ON) {
- (*pPriv->AdaptorRec->StopVideo)(
- pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);
- xf86XVRemovePortFromWindow(pWin, pPriv);
---
-cgit v0.8.3-6-g21f6
More information about the arch-commits
mailing list