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/libva/libva-0.31.0/libdrm-poulsbo.patch | |
| parent | b18f1216b0d3654f7b6fb3752eda1dd82a294f3d (diff) | |
| download | openembedded-core-833390e533ee997600f37ec87192f05e49e26db3.tar.gz openembedded-core-833390e533ee997600f37ec87192f05e49e26db3.tar.bz2 openembedded-core-833390e533ee997600f37ec87192f05e49e26db3.tar.xz openembedded-core-833390e533ee997600f37ec87192f05e49e26db3.zip | |
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/libva/libva-0.31.0/libdrm-poulsbo.patch')
| -rw-r--r-- | meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch b/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch new file mode 100644 index 000000000..795ba6252 --- /dev/null +++ b/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch @@ -0,0 +1,26 @@ +# Make the libva depend on libdrm-poulsbo instead of libdrm so that the +# emenlow libdrm can coexist with the normal libdrm. +# jdike@linux.intel.com + +Index: libva-0.31.0/configure.ac +=================================================================== +--- libva-0.31.0.orig/configure.ac ++++ libva-0.31.0/configure.ac +@@ -99,14 +99,14 @@ AC_SYS_LARGEFILE + PKG_CHECK_MODULES([X11], [x11]) + PKG_CHECK_MODULES([XEXT],[xext]) + PKG_CHECK_MODULES([XFIXES], [xfixes]) +-PKG_CHECK_MODULES([DRM], [libdrm]) ++PKG_CHECK_MODULES([DRM], [libdrm-poulsbo]) + + PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no]) + AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) + + # Check for libdrm >= 2.4 (needed for i965_drv_video.so) +-if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then +- AC_MSG_WARN([libdrm < 2.4 found, disabling build of i965 video driver]) ++if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm-poulsbo; then ++ AC_MSG_WARN([libdrm-poulsbo < 2.4 found, disabling build of i965 video driver]) + enable_i965_driver=no + fi + AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes) |