Attachment 37723 Details for Bug 27840 – Make XF86VIDMODE extension optional

[patch] Make XF86VIDMODE extension optional

0001-Make-XF86VIDMODE-extension-optional.patch (text/plain), 2.88 KB, created by Jon Turney on 2010-08-09 06:35:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2010-08-09 06:35:04 UTC

Size: 2.88 KB

patch

obsolete

>From 75bef2de7f0e4b6a91b9060dddd81d0de3bc4539 Mon Sep 17 00:00:00 2001
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Wed, 21 Apr 2010 12:58:54 +0100
>Subject: [PATCH 1/3] Make XF86VIDMODE extension optional
>
>Code in glx/glxcmds.c which uses the XF86VIDMODE extension is already guarded.  Also use
>that guard to control inclusion of the xf86vmode.h header, and only enable that guard if the
>XF86VIDMODE extension is found by pkgconfig.
>
>This changes the behaviour on platforms which XF86VIDMODE exists, in that XF86VIDMODE used to
>be mandatory, but is now optional.
>
>Presumably other build systems are already arranging for -DXF86VIDMODE to be supplied to the
>complier when glxcmds.c is compiled, so are not affected by this change
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> configs/autoconf.in |    2 ++
> configure.ac        |   11 ++++++++++-
> src/glx/Makefile    |    6 +++++-
> src/glx/glxcmds.c   |    2 ++
> 4 files changed, 19 insertions(+), 2 deletions(-)
>
>diff --git a/configs/autoconf.in b/configs/autoconf.in
>index c7611a6..42a64a3 100644
>--- a/configs/autoconf.in
>+++ b/configs/autoconf.in
>@@ -192,3 +192,5 @@ ifneq ($(LLVM_VERSION),)
>   HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
>   DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
> endif
>+
>+HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
>diff --git a/configure.ac b/configure.ac
>index 9f30062..c68b002 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -599,8 +599,15 @@ dri)
> 
>     # find the DRI deps for libGL
>     if test "$x11_pkgconfig" = yes; then
>+        dri_modules="x11 xext xdamage xfixes"
>+
>+        # add xf86vidmode if available
>+        PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
>+        if test "$HAVE_XF86VIDMODE" = yes ; then
>+            dri_modules="$dri_modules xxf86vm"
>+        fi
>+
>         # add xcb modules if necessary
>-        dri_modules="x11 xext xxf86vm xdamage xfixes"
>         if test "$enable_xcb" = yes; then
>             dri_modules="$dri_modules x11-xcb xcb-glx"
>         fi
>@@ -649,6 +656,8 @@ AC_SUBST([GLESv2_LIB_DEPS])
> AC_SUBST([GLESv2_PC_LIB_PRIV])
> 
> 
>+AC_SUBST([HAVE_XF86VIDMODE])
>+
> dnl
> dnl More X11 setup
> dnl
>diff --git a/src/glx/Makefile b/src/glx/Makefile
>index 9a22d0c..f627285 100644
>--- a/src/glx/Makefile
>+++ b/src/glx/Makefile
>@@ -1,7 +1,11 @@
> TOP = ../..
> include $(TOP)/configs/current
> 
>-EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT \
>+ifeq ($(HAVE_XF86VIDMODE),yes)
>+EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
>+endif
>+
>+EXTRA_DEFINES = $(EXTRA_DEFINES_XF86VIDMODE) -D_REENTRANT \
>                 -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
> 
> SOURCES = \
>diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
>index d4aa8b5..3d4fdc0 100644
>--- a/src/glx/glxcmds.c
>+++ b/src/glx/glxcmds.c
>@@ -44,7 +44,9 @@
> #include "glx_error.h"
> #else
> #include <sys/time.h>
>+#ifdef XF86VIDMODE
> #include <X11/extensions/xf86vmode.h>
>+#endif
> #include "xf86dri.h"
> #endif
> #else
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 27840: 35294 | 35295 | 35296 | 37723 | 37724 | 37725 | 37726 | 38479 | 38525

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.