diff options
author | Jeff Dike <jdike@x86_64.user-mode-linux.org> | 2010-07-22 17:30:49 -0400 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-22 23:18:26 +0100 |
commit | 833390e533ee997600f37ec87192f05e49e26db3 (patch) | |
tree | 670a6ff928f75bfc5e74a753e45acb64d97f72f7 /meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch | |
parent | b18f1216b0d3654f7b6fb3752eda1dd82a294f3d (diff) | |
download | poky-833390e533ee997600f37ec87192f05e49e26db3.tar.gz |
libdrm-poulsbo: Provide libdrm-poulsbo instead of libdrm
In order to allow this package to be build alongside the regular
libdrm, it was made to export libdrm-poulsbo and its users make to use
libdrm-poulsbo instead of libdrm. libva and xserver-psb were make to
build against libdrm-poulsbo. While I was in there, I changed a couple
of misspellings of COMPATIBLE and removed a bunch of ';patch=1'.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Diffstat (limited to 'meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch')
-rw-r--r-- | meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch b/meta-emenlow/packages/xorg-xserver/files/libdrm-poulsbo.patch new file mode 100644 index 0000000000..2f036f1baa --- /dev/null +++ b/meta-emenlow/packages/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 | |||
5 | Index: 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"]) | ||