summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-07 14:40:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:13 +0100
commit9192fc10e48d9169b0aad706b5b3f44d2869471c (patch)
tree73b43bc2b58977a1e6d4a0dc2b6eb716ce5628d3 /meta/recipes-graphics
parent6bb1bef66f71e70ac6d967bbb7a78ad98beee504 (diff)
downloadpoky-9192fc10e48d9169b0aad706b5b3f44d2869471c.tar.gz
xserver-xorg: fix xshmfence autodetection
Add a PACKAGECONFIG for xshmfence. If DRI3 is enabled, xshmfence also needs to be enabled. [ YOCTO #6507 ] (From OE-Core rev: ff2e96cacc116cf362d4c5dc36f1b846672f98e0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc4
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch55
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb1
3 files changed, 59 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 48ab347128..8b5747e282 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -120,9 +120,11 @@ PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri d
120PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 120PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
121PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" 121PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto"
122PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" 122PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
123PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto libxshmfence" 123# DRI3 requires xshmfence to also be enabled
124PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
124PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" 125PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11"
125PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" 126PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
127PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
126 128
127do_install_append () { 129do_install_append () {
128 # Its assumed base-files creates this for us 130 # Its assumed base-files creates this for us
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch
new file mode 100644
index 0000000000..55e09134ce
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xshmfence-option.patch
@@ -0,0 +1,55 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4commit 1affe20d5c82befc3b1626e557409dab5343c47b
5Author: Ross Burton <ross.burton@intel.com>
6Date: Mon Jul 7 12:53:35 2014 +0100
7
8 configure.ac: add option for xshmfence
9
10 xshmfence is usable outside of DRI3, and is currently autodetected which isn't
11 good for distributions where deterministic builds are aspired to.
12
13 Signed-off-by: Ross Burton <ross.burton@intel.com>
14
15diff --git a/configure.ac b/configure.ac
16index 2daa6be..fd1cf3f 100644
17--- a/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
20 AC_ARG_ENABLE(kdrive-mouse, AS_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto])
21 AC_ARG_ENABLE(kdrive-evdev, AS_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto])
22 AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"])
23+AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [WANT_XSHMFENCE="$enableval"], [WANT_XSHMFENCE="auto"])
24
25
26 dnl chown/chmod to be setuid root as part of build
27@@ -1235,18 +1236,19 @@ esac
28
29 AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes)
30
31-PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE,
32- [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no])
33+HAVE_XSHMFENCE=no
34+if test "x$WANT_XSHMFENCE" != "xno"; then
35+ PKG_CHECK_MODULES([XSHMFENCE], $XSHMFENCE,
36+ [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no])
37
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
44 AM_CONDITIONAL(XSHMFENCE, test "x$HAVE_XSHMFENCE" = xyes)
45
46-case x"$HAVE_XSHMFENCE" in
47- xyes)
48- AC_DEFINE(HAVE_XSHMFENCE, 1, [Have X Shared Memory Fence library])
49- REQUIRED_LIBS="$REQUIRED_LIBS xshmfence"
50- ;;
51-esac
52-
53
54 case "$DRI3,$HAVE_XSHMFENCE" in
55 yes,yes | auto,yes)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb
index 6a4168e3e6..22ac604433 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://crosscompile.patch \
6 file://mips64-compiler.patch \ 6 file://mips64-compiler.patch \
7 file://aarch64.patch \ 7 file://aarch64.patch \
8 file://xorg-CVE-2013-6424.patch \ 8 file://xorg-CVE-2013-6424.patch \
9 file://xshmfence-option.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" 12SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227"