summaryrefslogtreecommitdiffstats
path: root/meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2010-12-27 16:32:21 -0600
committerTom Zanussi <tom.zanussi@intel.com>2010-12-27 16:32:21 -0600
commitaf40e14ce335fa689d1a989feba3c02a8c71b7a7 (patch)
tree90ce1d53eb63627d90ec7f081b680a66c92e8705 /meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch
parentba8b8a99fd1598d0ce2cbaa69e9d16358d1ff5db (diff)
downloadmeta-intel-af40e14ce335fa689d1a989feba3c02a8c71b7a7.tar.gz
meta-emenlow: move to meta-intel repo from poky repo
This is the meta-emenlow layer, moved from the poky repo in order to keep all the meta-intel BSPs together. This version builds against laverne (0.90) - detailed build instruction can be found in the README file. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch')
-rw-r--r--meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch b/meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch
new file mode 100644
index 00000000..b604cab7
--- /dev/null
+++ b/meta-emenlow/recipes-graphics/xorg-xserver/files/libdrm-poulsbo.patch
@@ -0,0 +1,26 @@
1# Make the server depend on libdrm-poulsbo instead of libdrm so that the
2# emenlow libdrm can coexist with the normal libdrm.
3# jdike@linux.intel.com
4
5Index: xorg-server-1.7.99.2/configure.ac
6===================================================================
7--- xorg-server-1.7.99.2.orig/configure.ac
8+++ xorg-server-1.7.99.2/configure.ac
9@@ -763,7 +763,7 @@ dnl List of libraries that require a spe
10 LIBAPPLEWM="applewm >= 1.4"
11 LIBDMX="dmx >= 1.0.99.1"
12 LIBDRI="dri >= 7.1.0"
13-LIBDRM="libdrm >= 2.3.0"
14+LIBDRM="libdrm_poulsbo >= 2.3.0"
15 LIBGL="gl >= 7.1.0"
16 LIBXEXT="xext >= 1.0.99.4"
17 LIBXI="xi >= 1.2.99.1"
18@@ -2002,7 +2002,7 @@ if test "$KDRIVE" = yes; then
19 XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
20 fi
21 if test "x$DRI" = xyes && test "x$GLX" = xyes; then
22- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
23+ XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm_poulsbo"
24 fi
25
26 PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])