|
 |
70130e |
From f348935e7d2c84a438aba08eee2f2c4e0dc77d20 Mon Sep 17 00:00:00 2001
|
|
|
70130e |
From: Keith Packard <keithp@keithp.com>
|
|
|
70130e |
Date: Tue, 5 Nov 2013 18:37:12 -0800
|
|
|
70130e |
Subject: [PATCH 4/5] Link with xshmfence, reference miSyncShmScreenInit in
|
|
|
70130e |
sdksyms
|
|
|
70130e |
|
|
|
70130e |
This gets the server to link with xshmfence again, and also ensures
|
|
|
70130e |
that the miSyncShm code is linked into the server with the reference
|
|
|
70130e |
from sdksyms.
|
|
|
70130e |
|
|
|
70130e |
Signed-off-by: Keith Packard <keithp@keithp.com>
|
|
|
70130e |
---
|
|
|
70130e |
configure.ac | 1 +
|
|
|
70130e |
hw/xfree86/sdksyms.sh | 3 +++
|
|
|
70130e |
include/dix-config.h.in | 3 +++
|
|
|
70130e |
include/xorg-config.h.in | 3 +++
|
|
|
70130e |
4 files changed, 10 insertions(+)
|
|
|
70130e |
|
|
|
70130e |
diff --git a/configure.ac b/configure.ac
|
|
|
70130e |
index a7515a3..feeae04 100644
|
|
|
70130e |
--- a/configure.ac
|
|
|
70130e |
+++ b/configure.ac
|
|
|
70130e |
@@ -1144,6 +1144,7 @@ AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
|
|
|
70130e |
case x"$HAVE_XSHMFENCE" in
|
|
|
70130e |
xyes)
|
|
|
70130e |
AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library])
|
|
|
70130e |
+ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
|
|
|
70130e |
;;
|
|
|
70130e |
esac
|
|
|
70130e |
|
|
|
70130e |
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
|
|
|
70130e |
index 7c9734c..d7f259d 100755
|
|
|
70130e |
--- a/hw/xfree86/sdksyms.sh
|
|
|
70130e |
+++ b/hw/xfree86/sdksyms.sh
|
|
|
70130e |
@@ -44,6 +44,9 @@ cat > sdksyms.c << EOF
|
|
|
70130e |
/* miext/sync/Makefile.am */
|
|
|
70130e |
#include "misync.h"
|
|
|
70130e |
#include "misyncstr.h"
|
|
|
70130e |
+#if HAVE_XSHMFENCE
|
|
|
70130e |
+#include "misyncshm.h"
|
|
|
70130e |
+#endif
|
|
|
70130e |
|
|
|
70130e |
/* Xext/Makefile.am -- half is module, half is builtin */
|
|
|
70130e |
#ifdef XV
|
|
|
70130e |
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
|
|
|
70130e |
index 397ee96..156383b 100644
|
|
|
70130e |
--- a/include/dix-config.h.in
|
|
|
70130e |
+++ b/include/dix-config.h.in
|
|
|
70130e |
@@ -449,4 +449,7 @@
|
|
|
70130e |
#include "dix-config-apple-verbatim.h"
|
|
|
70130e |
#endif
|
|
|
70130e |
|
|
|
70130e |
+/* Have support for X shared memory fence library (xshmfence) */
|
|
|
70130e |
+#undef HAVE_XSHMFENCE
|
|
|
70130e |
+
|
|
|
70130e |
#endif /* _DIX_CONFIG_H_ */
|
|
|
70130e |
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
|
|
|
70130e |
index 487d7ad..e3444da 100644
|
|
|
70130e |
--- a/include/xorg-config.h.in
|
|
|
70130e |
+++ b/include/xorg-config.h.in
|
|
|
70130e |
@@ -145,4 +145,7 @@
|
|
|
70130e |
/* Support APM/ACPI power management in the server */
|
|
|
70130e |
#undef XF86PM
|
|
|
70130e |
|
|
|
70130e |
+/* Have support for X shared memory fence library (xshmfence) */
|
|
|
70130e |
+#undef HAVE_XSHMFENCE
|
|
|
70130e |
+
|
|
|
70130e |
#endif /* _XORG_CONFIG_H_ */
|
|
|
70130e |
--
|
|
|
70130e |
1.8.3.1
|
|
|
70130e |
|