Fix build with --disable-present

This commit is contained in:
Adam Jackson 2013-11-07 12:04:04 -05:00
parent c11d4db11a
commit a275b7e511
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 77c2d915c571894d1b17127ba29924fabb5a0fd8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 7 Nov 2013 12:00:37 -0500
Subject: [PATCH] present: Don't try to initialize when building without
present support
There's a --disable-present, so it'd be nice if it worked.
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
mi/miinitext.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 6366182..67511b8 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -287,7 +287,9 @@ static ExtensionModule staticExtensions[] = {
#ifdef DPMSExtension
{DPMSExtensionInit, DPMSExtensionName, &noDPMSExtension},
#endif
+#ifdef PRESENT
{present_extension_init, PRESENT_NAME, NULL},
+#endif
#ifdef DRI3
{dri3_extension_init, DRI3_NAME, NULL},
#endif
--
1.8.3.1

View File

@ -42,7 +42,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.14.99.901
Release: 1%{?gitdate:.%{gitdate}}%{dist}
Release: 2%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -156,6 +156,9 @@ Patch8041: 0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch
Patch9001: 0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch
Patch9002: 0001-xwayland-Just-send-the-bounding-box-of-the-damage.patch
# submitted: http://lists.x.org/archives/xorg-devel/2013-November/038768.html
Patch9003: 0001-present-Don-t-try-to-initialize-when-building-withou.patch
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
%global sdkdir %{_includedir}/xorg
@ -651,6 +654,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Thu Nov 07 2013 Adam Jackson <ajax@redhat.com> 1.14.99.901-2
- Fix build with --disable-present
* Thu Nov 07 2013 Adam Jackson <ajax@redhat.com
- Don't bother trying to build the unit tests for now