From ecc9bab525b5f12ffbfb36f22a5901c048fa5b5c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 9 Sep 2014 10:40:10 +0200 Subject: [PATCH 1/3] Update the versions of obsoletes for dropped drivers This makes sure to not only cover the F20 versions, but also those that were in F21 (rawhide at that time) before getting dropped. --- xorg-x11-server.spec | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 9f4e6b5..e019d8f 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.16.0 -Release: 7%{?gitdate:.%{gitdate}}%{dist} +Release: 8%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -226,22 +226,22 @@ Obsoletes: xorg-x11-drv-tseng <= 1.2.4-12.fc17 %if 0%{?fedora} > 20 # Dropped from F21 -Obsoletes: xorg-x11-drv-apm <= 1.2.5-9.fc20 -Obsoletes: xorg-x11-drv-cirrus <= 1.5.1-10.fc20 -Obsoletes: xorg-x11-drv-glint <= 1.2.8-8.fc20 -Obsoletes: xorg-x11-drv-i128 <= 1.3.6-9.fc20 -Obsoletes: xorg-x11-drv-i740 <= 1.3.4-9.fc20 -Obsoletes: xorg-x11-drv-mach64 <= 6.9.4-7.fc20 -Obsoletes: xorg-x11-drv-mga <= 1.6.2-8.fc20 -Obsoletes: xorg-x11-drv-neomagic <= 1.2.7-7.fc20 -Obsoletes: xorg-x11-drv-r128 <= 6.9.1-6.fc20 -Obsoletes: xorg-x11-drv-rendition <= 4.2.5-9.fc20 -Obsoletes: xorg-x11-drv-s3virge <= 1.10.6-9.fc20 -Obsoletes: xorg-x11-drv-savage <= 2.3.7-1.fc20 -Obsoletes: xorg-x11-drv-siliconmotion <= 1.7.7-8.fc20 -Obsoletes: xorg-x11-drv-sis <= 0.10.7-9.fc20 -Obsoletes: xorg-x11-drv-tdfx <= 1.4.5-8.fc20 -Obsoletes: xorg-x11-drv-trident <= 1.3.6-9.fc20 +Obsoletes: xorg-x11-drv-apm < 1.2.5-18 +Obsoletes: xorg-x11-drv-cirrus < 1.5.2-10 +Obsoletes: xorg-x11-drv-glint < 1.2.8-17 +Obsoletes: xorg-x11-drv-i128 < 1.3.6-18 +Obsoletes: xorg-x11-drv-i740 < 1.3.4-18 +Obsoletes: xorg-x11-drv-mach64 < 6.9.4-16 +Obsoletes: xorg-x11-drv-mga < 1.6.2-17 +Obsoletes: xorg-x11-drv-neomagic < 1.2.8-8 +Obsoletes: xorg-x11-drv-r128 < 6.9.1-15 +Obsoletes: xorg-x11-drv-rendition < 4.2.5-18 +Obsoletes: xorg-x11-drv-s3virge < 1.10.6-18 +Obsoletes: xorg-x11-drv-savage < 2.3.7-7 +Obsoletes: xorg-x11-drv-siliconmotion < 1.7.7-17 +Obsoletes: xorg-x11-drv-sis < 0.10.7-19 +Obsoletes: xorg-x11-drv-tdfx < 1.4.5-17 +Obsoletes: xorg-x11-drv-trident < 1.3.6-18 %endif Requires: xorg-x11-server-common >= %{version}-%{release} @@ -640,6 +640,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Tue Sep 09 2014 Kalev Lember - 1.16.0-8 +- Update the versions of obsoletes for dropped drivers + * Tue Sep 2 2014 Hans de Goede - 1.16.0-7 - Drop Fedora specific xorg-non-pci.patch, replace with solution from upstream From 75c02ba68e925d4d2ea1540e2a74435ff8a766a8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 10 Sep 2014 16:35:51 +0200 Subject: [PATCH 2/3] Fixup Xwayland summary, remove . at end of summaries (rhbz#1140225) --- xorg-x11-server.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e019d8f..0a56100 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.16.0 -Release: 8%{?gitdate:.%{gitdate}}%{dist} +Release: 9%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -256,7 +256,7 @@ upon. %package Xnest -Summary: A nested server. +Summary: A nested server Group: User Interface/X Requires: xorg-x11-server-common >= %{version}-%{release} Provides: Xnest @@ -287,7 +287,7 @@ application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays %package Xvfb -Summary: A X Windows System virtual framebuffer X server. +Summary: A X Windows System virtual framebuffer X server Group: User Interface/X # xvfb-run is GPLv2, rest is MIT License: MIT and GPLv2 @@ -305,7 +305,7 @@ is normally used for testing servers. %package Xephyr -Summary: A nested server. +Summary: A nested server Group: User Interface/X Requires: xorg-x11-server-common >= %{version}-%{release} Provides: Xephyr @@ -323,7 +323,7 @@ Render and Composite. %if 0%{?fedora} > 20 %package Xwayland -Summary: Wayland X Sserver. +Summary: Wayland X Server Group: User Interface/X Requires: xorg-x11-server-common >= %{version}-%{release} @@ -640,6 +640,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Wed Sep 10 2014 Hans de Goede - 1.16.0-9 +- Fixup Xwayland summary, remove . at end of summaries (rhbz#1140225) + * Tue Sep 09 2014 Kalev Lember - 1.16.0-8 - Update the versions of obsoletes for dropped drivers From ee750e0d9a7a555eb1d6fd900bee5a70e493c2c9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 11 Sep 2014 11:10:39 -0400 Subject: [PATCH 3/3] Only send GLX_BufferSwapComplete for PresentCompleteKindPixmap --- patchwork-33052.patch | 77 +++++++++++++++++++++++++++++++++++++++++++ xorg-x11-server.spec | 8 ++++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 patchwork-33052.patch diff --git a/patchwork-33052.patch b/patchwork-33052.patch new file mode 100644 index 0000000..9464970 --- /dev/null +++ b/patchwork-33052.patch @@ -0,0 +1,77 @@ +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: glx/present: Only send GLX_BufferSwapComplete for + PresentCompleteKindPixmap +From: Keith Packard +X-Patchwork-Id: 33052 +Message-Id: <1409844967-19450-1-git-send-email-keithp@keithp.com> +To: xorg-devel@lists.freedesktop.org +Date: Thu, 4 Sep 2014 08:36:07 -0700 + +Present didn't provide the 'kind' argument to the +present_complete_notify hook that GLX uses to construct +GLX_BufferSwapComplete events, so GLX was reporting events for +PresentCompleteKindMSC notifications, which resulted in duplicate +GLX_BufferSwapComplete events and crashes in clutter. + +See the gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=733282 + +Signed-off-by: Keith Packard +Reviewed-by: Eric Anholt + +--- +glx/glxcmds.c | 7 +++++-- + present/present.h | 1 + + present/present_event.c | 2 +- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/glx/glxcmds.c b/glx/glxcmds.c +index 2fc3f4c..d11c667 100644 +--- a/glx/glxcmds.c ++++ b/glx/glxcmds.c +@@ -2508,13 +2508,16 @@ __glXsendSwapEvent(__GLXdrawable *drawable, int type, CARD64 ust, + + #if PRESENT + static void +-__glXpresentCompleteNotify(WindowPtr window, CARD8 present_mode, CARD32 serial, +- uint64_t ust, uint64_t msc) ++__glXpresentCompleteNotify(WindowPtr window, CARD8 present_kind, CARD8 present_mode, ++ CARD32 serial, uint64_t ust, uint64_t msc) + { + __GLXdrawable *drawable; + int glx_type; + int rc; + ++ if (present_kind != PresentCompleteKindPixmap) ++ return; ++ + rc = dixLookupResourceByType((void **) &drawable, window->drawable.id, + __glXDrawableRes, serverClient, DixGetAttrAccess); + +diff --git a/present/present.h b/present/present.h +index 0e3bdc0..aab2e16 100644 +--- a/present/present.h ++++ b/present/present.h +@@ -116,6 +116,7 @@ extern _X_EXPORT Bool + present_screen_init(ScreenPtr screen, present_screen_info_ptr info); + + typedef void (*present_complete_notify_proc)(WindowPtr window, ++ CARD8 kind, + CARD8 mode, + CARD32 serial, + uint64_t ust, +diff --git a/present/present_event.c b/present/present_event.c +index ff57eba..d3a59ea 100644 +--- a/present/present_event.c ++++ b/present/present_event.c +@@ -174,7 +174,7 @@ present_send_complete_notify(WindowPtr window, CARD8 kind, CARD8 mode, CARD32 se + } + } + if (complete_notify) +- (*complete_notify)(window, mode, serial, ust, msc); ++ (*complete_notify)(window, kind, mode, serial, ust, msc); + } + + void + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 0a56100..bb926f0 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.16.0 -Release: 9%{?gitdate:.%{gitdate}}%{dist} +Release: 10%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -104,6 +104,9 @@ Patch10200: 0001-xwayland-Snap-damage-reports-to-the-bounding-box.patch Patch10301: 0001-xfree86-Fallback-to-first-platform-device-as-primary.patch Patch10302: 0002-xfree86-Allow-non-PCI-devices-as-primary.patch +# http://lists.x.org/archives/xorg-devel/2014-September/043722.html +Patch10303: patchwork-33052.patch + %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri %global sdkdir %{_includedir}/xorg @@ -640,6 +643,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Thu Sep 11 2014 Adam Jackson 1.16.0-10 +- Only send GLX_BufferSwapComplete for PresentCompleteKindPixmap + * Wed Sep 10 2014 Hans de Goede - 1.16.0-9 - Fixup Xwayland summary, remove . at end of summaries (rhbz#1140225)