diff --git a/0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch b/0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch deleted file mode 100644 index 48dec37..0000000 --- a/0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b275bb75020c653598bf510d2c9b566543666f8a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= -Date: Mon, 16 Nov 2015 10:52:49 +0100 -Subject: [PATCH v2] Xorg.wrap: activate libdrm based detection for KMS drivers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Xorg.wrap includes code guarded with WITH_LIBDRM for detecting KMS drivers. -Unfortunately it is never activated since code missed to include file -which defines WITH_LIBDRM. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92894 -Signed-off-by: Arkadiusz Miśkiewicz -Reviewed-by: Michel Dänzer -Signed-off-by: Hans de Goede ---- -Changes in v2: --Fix bugzilla reference in commit message --Add Michel Dänzer's Reviewed-by ---- - hw/xfree86/xorg-wrapper.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c -index 4c37cfc..d930962 100644 ---- a/hw/xfree86/xorg-wrapper.c -+++ b/hw/xfree86/xorg-wrapper.c -@@ -24,6 +24,7 @@ - */ - - #include "dix-config.h" -+#include "xorg-config.h" - - #include - #include --- -2.5.0 - diff --git a/sources b/sources index 27fc943..bf90f6e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3c1c1057d3ad27380d8dd87ffcc182cd xorg-server-1.18.0.tar.bz2 +1b9e85420c3790dd487addd50313f4da xorg-server-1.18.1.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1562dc8..6db860d 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -44,8 +44,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.18.0 -Release: 3%{?gitdate:.%{gitdate}}%{dist} +Version: 1.18.1 +Release: 1%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -91,9 +91,6 @@ Patch7027: xserver-autobind-hotplug.patch # submitted: http://lists.x.org/archives/xorg-devel/2013-October/037996.html Patch9100: exa-only-draw-valid-trapezoids.patch -# submitted: http://lists.freedesktop.org/archives/xorg-devel/2015-November/047811.html -Patch9200: 0001-Xorg.wrap-activate-libdrm-based-detection-for-KMS-dr.patch - # because the display-managers are not ready yet, do not upstream Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch @@ -633,6 +630,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Mon Feb 08 2016 Adam Jackson 1.18.1-1 +- xserver 1.18.1 + * Fri Feb 05 2016 Fedora Release Engineering - 1.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild