From b9e5b50b4a3736de36254cc5dbfd5a6ff9660a66 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Feb 23 2010 04:56:00 +0000 Subject: * Tue Feb 23 2010 Peter Hutterer 1.7.99.901-8.0100215 - Require udev >= 148-1 for xorg-x11-server-Xorg, otherwise we don't see any input devices (#566396). This requires is just needed now in the transition period, we still have users with an older udev but newer server. Also, 148-1 didn't actually exist in Fedora, but whatever next one will do. - Update to today's master, re-enables RECORD. --- diff --git a/.cvsignore b/.cvsignore index e4731f1..e2d8d65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20100215.tar.xz +xorg-server-20100223.tar.xz diff --git a/commitid b/commitid index 97120ff..9f21396 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -84905007702da2c05a4f7446b3fc5ff52be49655 +93ff1bc5884cdfca1132af7fbc06c48e06f218c8 diff --git a/sources b/sources index 8141b32..349faa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c195ebdbb8ff91e1e5cded32c4750ec xorg-server-20100215.tar.xz +55513ab7f893cf75c75ffc3186ec1aff xorg-server-20100223.tar.xz diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 83cbc35..2ced7d5 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -14,12 +14,12 @@ # Fix rhpxl to no longer need vesamodes/extramodes %define pkgname xorg-server -%define gitdate 20100215 +%define gitdate 20100223 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.7.99.901 -Release: 7.%{gitdate}%{dist} +Release: 8.%{gitdate}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -82,8 +82,6 @@ Patch6051: xserver-1.7.1-gamma-kdm-fix.patch # Remove this some day. Not today though. Patch6052: xserver-1.8-udev-warning.patch -Patch7000: xserver-1.7.5-exa-mixed.patch - %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri %define sdkdir %{_includedir}/xorg @@ -164,6 +162,7 @@ Requires: xorg-x11-drv-void xorg-x11-drv-evdev >= 2.1.0-3 Requires: xorg-x11-server-common >= %{version}-%{release} Requires: libdrm >= 2.4.0 Requires: system-setup-keyboard +Requires: udev >= 148-1 # Dropped from F9 for being broken, uninstall it. Obsoletes: xorg-x11-drv-magictouch <= 1.0.0.5-5.fc8 # Dropped from F11, use evdev instead @@ -519,6 +518,14 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Tue Feb 23 2010 Peter Hutterer 1.7.99.901-8.0100215 +- Require udev >= 148-1 for xorg-x11-server-Xorg, otherwise we don't see any + input devices (#566396). This requires is just needed now in the + transition period, we still have users with an older udev but newer + server. Also, 148-1 didn't actually exist in Fedora, but whatever next one + will do. +- Update to today's master, re-enables RECORD. + * Mon Feb 22 2010 Ben Skeggs 1.7.99.901-7.20100215 - exa: fix gnome-panel corruption diff --git a/xserver-1.7.5-exa-mixed.patch b/xserver-1.7.5-exa-mixed.patch deleted file mode 100644 index 4f4adea..0000000 --- a/xserver-1.7.5-exa-mixed.patch +++ /dev/null @@ -1,151 +0,0 @@ -From xorg-devel-bounces@lists.x.org Tue Feb 16 14:03:24 2010 -Delivered-To: skeggsb@gmail.com -Received: by 10.142.106.9 with SMTP id e9cs132621wfc; Tue, 16 Feb 2010 - 14:03:24 -0800 (PST) -Received: by 10.141.108.20 with SMTP id k20mr4713141rvm.49.1266357797527; - Tue, 16 Feb 2010 14:03:17 -0800 (PST) -Return-Path: -Received: from gabe.freedesktop.org (gabe.freedesktop.org - [131.252.210.177]) by mx.google.com with ESMTP id - 31si7059272pxi.60.2010.02.16.14.03.11; Tue, 16 Feb 2010 14:03:17 -0800 (PST) -Received-SPF: neutral (google.com: 131.252.210.177 is neither permitted nor - denied by best guess record for domain of xorg-devel-bounces@lists.x.org) - client-ip=131.252.210.177; -Authentication-Results: mx.google.com; spf=neutral (google.com: - 131.252.210.177 is neither permitted nor denied by best guess record for - domain of xorg-devel-bounces@lists.x.org) - smtp.mail=xorg-devel-bounces@lists.x.org -Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by - gabe.freedesktop.org (Postfix) with ESMTP id 933269F0F7; Tue, 16 Feb 2010 - 14:03:09 -0800 (PST) -X-Original-To: xorg-devel@lists.freedesktop.org -Delivered-To: xorg-devel@lists.freedesktop.org -X-Greylist: delayed 438 seconds by postgrey-1.30 at gabe; Tue, 16 Feb 2010 - 14:03:07 PST -Received: from mail-ew0-f212.google.com (mail-ew0-f212.google.com - [209.85.219.212]) by gabe.freedesktop.org (Postfix) with ESMTP id - 143419F0EF for ; Tue, 16 Feb 2010 - 14:03:07 -0800 (PST) -Received: by ewy4 with SMTP id 4so1461826ewy.7 for - ; Tue, 16 Feb 2010 14:03:06 -0800 (PST) -Received: by 10.213.96.221 with SMTP id i29mr1983687ebn.99.1266357348641; - Tue, 16 Feb 2010 13:55:48 -0800 (PST) -Received: from madman2003@gmail.com (82-136-228-38.ip.telfort.nl - [82.136.228.38]) by mx.google.com with ESMTPS id - 7sm7808619eyg.1.2010.02.16.13.55.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); - Tue, 16 Feb 2010 13:55:47 -0800 (PST) -Received: by madman2003@gmail.com (sSMTP sendmail emulation); Tue, 16 Feb - 2010 22:55:45 +0100 -From: Maarten Maathuis -To: xorg-devel@lists.freedesktop.org -Subject: [PATCH] exa/mixed: fix gnome-panel corruption -Date: Tue, 16 Feb 2010 22:55:36 +0100 -Message-Id: <1266357336-18965-1-git-send-email-madman2003@gmail.com> -X-Mailer: git-send-email 1.7.0 -MIME-Version: 1.0 -Cc: =?UTF-8?q?Michel=20D=C3=A4nzer?= -X-BeenThere: xorg-devel@lists.x.org -X-Mailman-Version: 2.1.9 -Precedence: list -List-Id: "X.Org development list" -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Content-Type: text/plain; charset="utf-8" -Sender: xorg-devel-bounces@lists.x.org -Errors-To: xorg-devel-bounces@lists.x.org -X-Evolution-Source: imap://skeggsb%40gmail.com@imap.gmail.com/ -Content-Transfer-Encoding: 8bit - -- A mapped pixmap can't be used for acceleration, any decent memory manager -will refuse this. -- Source pixmaps migrated with a bounding region are incomplete (from the -gpu point of view), so do the upload unconditionally, instead of just for -deferred destination pixmaps. -- Fixes fd.o bug #26076. - -Signed-off-by: Maarten Maathuis -Signed-off-by: Michel Dänzer ---- - exa/exa_migration_mixed.c | 48 ++++++++++++++++++++++++++++---------------- - 1 files changed, 30 insertions(+), 18 deletions(-) - -diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c -index 6816e6c..fb47151 100644 ---- a/exa/exa_migration_mixed.c -+++ b/exa/exa_migration_mixed.c -@@ -165,9 +165,37 @@ void - exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg) - { - ExaPixmapPriv(pPixmap); -+ Bool has_gpu_copy = exaPixmapHasGpuCopy(pPixmap); -+ Bool success; -+ -+ success = ExaDoPrepareAccess(pPixmap, index); -+ -+ if (success && has_gpu_copy && pExaPixmap->pDamage) { -+ /* You cannot do accelerated operations while a buffer is mapped. */ -+ exaFinishAccess(&pPixmap->drawable, index); -+ /* Update the gpu view of both deferred destination pixmaps and of -+ * source pixmaps that were migrated with a bounding region. -+ */ -+ exaMoveInPixmap_mixed(pPixmap); -+ success = ExaDoPrepareAccess(pPixmap, index); -+ -+ if (success) { -+ /* We have a gpu pixmap that can be accessed, we don't need the cpu -+ * copy anymore. Drivers that prefer DFS, should fail prepare -+ * access. -+ */ -+ DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage); -+ DamageDestroy(pExaPixmap->pDamage); -+ pExaPixmap->pDamage = NULL; -+ -+ free(pExaPixmap->sys_ptr); -+ pExaPixmap->sys_ptr = NULL; -+ -+ return; -+ } -+ } - -- if (!ExaDoPrepareAccess(pPixmap, index)) { -- Bool has_gpu_copy = exaPixmapHasGpuCopy(pPixmap); -+ if (!success) { - ExaMigrationRec pixmaps[1]; - - /* Do we need to allocate our system buffer? */ -@@ -228,22 +256,6 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg) - pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr; - pPixmap->devKind = pExaPixmap->sys_pitch; - pExaPixmap->use_gpu_copy = FALSE; -- /* We have a gpu pixmap that can be accessed, we don't need the cpu copy -- * anymore. Drivers that prefer DFS, should fail prepare access. */ -- } else if (pExaPixmap->pDamage && exaPixmapHasGpuCopy(pPixmap)) { -- ExaScreenPriv(pPixmap->drawable.pScreen); -- -- /* Copy back any deferred content if needed. */ -- if (pExaScr->deferred_mixed_pixmap && -- pExaScr->deferred_mixed_pixmap == pPixmap) -- exaMoveInPixmap_mixed(pPixmap); -- -- DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage); -- DamageDestroy(pExaPixmap->pDamage); -- pExaPixmap->pDamage = NULL; -- -- free(pExaPixmap->sys_ptr); -- pExaPixmap->sys_ptr = NULL; - } - } - --- -1.7.0 - -_______________________________________________ -xorg-devel mailing list -xorg-devel@lists.x.org -http://lists.x.org/mailman/listinfo/xorg-devel -