diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch deleted file mode 100644 index 682ddf7006..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -commit ca29a9f3e689f3840426897f58aaa3974932ae78 -Author: Ross Burton <ross.burton@intel.com> -Date: Mon Jul 7 12:53:35 2014 +0100 - - configure.ac: add option for xshmfence - - xshmfence is usable outside of DRI3, and is currently autodetected which isn't - good for distributions where deterministic builds are aspired to. - - Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index c214638..a1ca9ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d - AC_ARG_ENABLE(kdrive-mouse, AS_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto]) - AC_ARG_ENABLE(kdrive-evdev, AS_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto]) - AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) -+AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [WANT_XSHMFENCE="$enableval"], [WANT_XSHMFENCE="auto"]) - - - dnl chown/chmod to be setuid root as part of build -@@ -1235,18 +1236,21 @@ esac - - AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes) - --PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, -- [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) - --AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes) -+PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) -+if test "x$WANT_XSHMFENCE" = "xauto"; then -+ WANT_XSHMFENCE="$HAVE_XSHMFENCE" -+fi - --case x"$HAVE_XSHMFENCE" in -- xyes) -- AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library]) -- REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" -- ;; --esac -+if test "x$WANT_XSHMFENCE" = "xyes"; then -+ if test "x$HAVE_XSHMFENCE" != "xyes"; then -+ AC_MSG_ERROR([xshmfence requested but not installed.]) -+ fi -+ AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support]) -+ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" -+fi - -+AM_CONDITIONAL(XSHMFENCE, [test "x$WANT_XSHMFENCE" = xyes]) - - case "$DRI3,$HAVE_XSHMFENCE" in - yes,yes | auto,yes) |