summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-09 11:06:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-10 16:44:31 +0100
commit3ce139b5d6d2769066f27ece4b54919e3264f419 (patch)
tree4ef96cc022db7d9bec35c58e67c570ab51942de7
parent1d00f3e0d9c7450dcf84688c3ab260d5b1fb5389 (diff)
downloadpoky-3ce139b5d6d2769066f27ece4b54919e3264f419.tar.gz
xserver-xorg: update patch to match upstream
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch32
1 files changed, 17 insertions, 15 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
index 55e09134ce..682ddf7006 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch
@@ -1,7 +1,7 @@
1Upstream-Status: Submitted 1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3 3
4commit 1affe20d5c82befc3b1626e557409dab5343c47b 4commit ca29a9f3e689f3840426897f58aaa3974932ae78
5Author: Ross Burton <ross.burton@intel.com> 5Author: Ross Burton <ross.burton@intel.com>
6Date: Mon Jul 7 12:53:35 2014 +0100 6Date: Mon Jul 7 12:53:35 2014 +0100
7 7
@@ -13,7 +13,7 @@ Date: Mon Jul 7 12:53:35 2014 +0100
13 Signed-off-by: Ross Burton <ross.burton@intel.com> 13 Signed-off-by: Ross Burton <ross.burton@intel.com>
14 14
15diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
16index 2daa6be..fd1cf3f 100644 16index c214638..a1ca9ec 100644
17--- a/configure.ac 17--- a/configure.ac
18+++ b/configure.ac 18+++ b/configure.ac
19@@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d 19@@ -648,6 +648,7 @@ AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd d
@@ -24,24 +24,18 @@ index 2daa6be..fd1cf3f 100644
24 24
25 25
26 dnl chown/chmod to be setuid root as part of build 26 dnl chown/chmod to be setuid root as part of build
27@@ -1235,18 +1236,19 @@ esac 27@@ -1235,18 +1236,21 @@ esac
28 28
29 AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes) 29 AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes)
30 30
31-PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, 31-PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE,
32- [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) 32- [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no])
33+HAVE_XSHMFENCE=no 33
34+if test "x$WANT_XSHMFENCE" != "xno"; then 34-AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
35+ PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, 35+PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE, [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no])
36+ [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) 36+if test "x$WANT_XSHMFENCE" = "xauto"; then
37 37+ WANT_XSHMFENCE="$HAVE_XSHMFENCE"
38+ if test "$WANT_XSHMFENCE,$HAVE_XSHMFENCE" = "yes,no"; then
39+ AC_MSG_ERROR([libxshmfence requested but not found.])
40+ fi
41+ AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library])
42+ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
43+fi 38+fi
44 AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
45 39
46-case x"$HAVE_XSHMFENCE" in 40-case x"$HAVE_XSHMFENCE" in
47- xyes) 41- xyes)
@@ -49,7 +43,15 @@ index 2daa6be..fd1cf3f 100644
49- REQUIRED_LIBS="$REQUIRED_LIBS xshmfence" 43- REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
50- ;; 44- ;;
51-esac 45-esac
52- 46+if test "x$WANT_XSHMFENCE" = "xyes"; then
47+ if test "x$HAVE_XSHMFENCE" != "xyes"; then
48+ AC_MSG_ERROR([xshmfence requested but not installed.])
49+ fi
50+ AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support])
51+ REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
52+fi
53
54+AM_CONDITIONAL(XSHMFENCE, [test "x$WANT_XSHMFENCE" = xyes])
53 55
54 case "$DRI3,$HAVE_XSHMFENCE" in 56 case "$DRI3,$HAVE_XSHMFENCE" in
55 yes,yes | auto,yes) 57 yes,yes | auto,yes)