1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Check for xextproto 7.1.1 and include headers for X_ShmAttach.
https://sourceforge.net/tracker/?func=detail&aid=2935150&group_id=223021&atid=1057617
http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890
--- configure.in
+++ configure.in
@@ -2192,6 +2192,11 @@
[ X_LIBS="-lXext $X_LIBS";
LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)
+ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+
AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
AC_TRY_LINK([#include <X11/Xlib.h>
#include <X11/extensions/Xvlib.h>],
--- src/arch/unix/x11/xaw/x11video.c
+++ src/arch/unix/x11/xaw/x11video.c
@@ -56,6 +56,7 @@
#include "vice.h"
#include <X11/Xlib.h>
+#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/Intrinsic.h>
#include <X11/cursorfont.h>
@@ -95,6 +96,10 @@
#endif
#ifdef USE_MITSHM
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/shmproto.h>
+#include <X11/extensions/XShm.h>
+#endif
extern int shmhandler(Display* display, XErrorEvent* err);
extern int mitshm_failed; /* will be set to true if XShmAttach() failed */
extern int shmmajor; /* major number of MITSHM error codes */
|
GitWeb
