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 | |
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/libva')
-rw-r--r-- | meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch | 26 | ||||
-rw-r--r-- | meta-emenlow/packages/libva/libva_0.31.0.bb | 47 |
2 files changed, 50 insertions, 23 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 0000000000..795ba62522 --- /dev/null +++ b/meta-emenlow/packages/libva/libva-0.31.0/libdrm-poulsbo.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | # Make the libva 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: libva-0.31.0/configure.ac | ||
6 | =================================================================== | ||
7 | --- libva-0.31.0.orig/configure.ac | ||
8 | +++ libva-0.31.0/configure.ac | ||
9 | @@ -99,14 +99,14 @@ AC_SYS_LARGEFILE | ||
10 | PKG_CHECK_MODULES([X11], [x11]) | ||
11 | PKG_CHECK_MODULES([XEXT],[xext]) | ||
12 | PKG_CHECK_MODULES([XFIXES], [xfixes]) | ||
13 | -PKG_CHECK_MODULES([DRM], [libdrm]) | ||
14 | +PKG_CHECK_MODULES([DRM], [libdrm-poulsbo]) | ||
15 | |||
16 | PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no]) | ||
17 | AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) | ||
18 | |||
19 | # Check for libdrm >= 2.4 (needed for i965_drv_video.so) | ||
20 | -if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then | ||
21 | - AC_MSG_WARN([libdrm < 2.4 found, disabling build of i965 video driver]) | ||
22 | +if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm-poulsbo; then | ||
23 | + AC_MSG_WARN([libdrm-poulsbo < 2.4 found, disabling build of i965 video driver]) | ||
24 | enable_i965_driver=no | ||
25 | fi | ||
26 | AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes) | ||
diff --git a/meta-emenlow/packages/libva/libva_0.31.0.bb b/meta-emenlow/packages/libva/libva_0.31.0.bb index bd9f758b00..0bc782f9d6 100644 --- a/meta-emenlow/packages/libva/libva_0.31.0.bb +++ b/meta-emenlow/packages/libva/libva_0.31.0.bb | |||
@@ -1,32 +1,33 @@ | |||
1 | DESCRIPTION = "Video Acceleration (VA) API for Linux" | 1 | DESCRIPTION = "Video Acceleration (VA) API for Linux" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=efc13a0998e678466e556756613c582e" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=efc13a0998e678466e556756613c582e" |
4 | PR = "r0" | 4 | PR = "r1" |
5 | 5 | ||
6 | inherit autotools | 6 | inherit autotools |
7 | 7 | ||
8 | SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libva_0.31.0-1+sds9.1ubuntu1.tar.gz \ | 8 | SRC_URI = "https://launchpad.net/~gma500/+archive/ppa/+files/libva_0.31.0-1+sds9.1ubuntu1.tar.gz \ |
9 | file://033_g45_add_rgba_subpic.patch;patch=1 \ | 9 | file://033_g45_add_rgba_subpic.patch \ |
10 | file://034_g45_fix_return_for_unimpl.patch;patch=1 \ | 10 | file://034_g45_fix_return_for_unimpl.patch \ |
11 | file://035_g45_add_yv12_image_format.patch;patch=1 \ | 11 | file://035_g45_add_yv12_image_format.patch \ |
12 | file://036_g45_add_vaGetImage.patch;patch=1 \ | 12 | file://036_g45_add_vaGetImage.patch \ |
13 | file://037_g45_add_vaPutImage.patch;patch=1 \ | 13 | file://037_g45_add_vaPutImage.patch \ |
14 | file://038_g45_vaPutSurface_cliprects.patch;patch=1 \ | 14 | file://038_g45_vaPutSurface_cliprects.patch \ |
15 | file://102_attribute_visibility.patch;patch=1 \ | 15 | file://102_attribute_visibility.patch \ |
16 | file://103_fix_vainfo_deps.patch;patch=1 \ | 16 | file://103_fix_vainfo_deps.patch \ |
17 | file://104_fix_libva_pkgconfig_deps.patch;patch=1 \ | 17 | file://104_fix_libva_pkgconfig_deps.patch \ |
18 | file://105_dont_search_LIBGL_DRIVERS_PATH.patch;patch=1 \ | 18 | file://105_dont_search_LIBGL_DRIVERS_PATH.patch \ |
19 | file://108_drivers_path.patch;patch=1 \ | 19 | file://108_drivers_path.patch \ |
20 | file://203_fix_fglrx_detection.patch;patch=1 \ | 20 | file://203_fix_fglrx_detection.patch \ |
21 | file://204_check_ATIFGLEXTENSION.patch;patch=1 \ | 21 | file://204_check_ATIFGLEXTENSION.patch \ |
22 | file://300_sds_version.patch;patch=1 \ | 22 | file://300_sds_version.patch \ |
23 | file://301_vdpau_mpeg4.patch;patch=1 \ | 23 | file://301_vdpau_mpeg4.patch \ |
24 | file://320_move_vaPutSurface_flags_def.patch;patch=1 \ | 24 | file://320_move_vaPutSurface_flags_def.patch \ |
25 | file://321_libva_glx.base.patch;patch=1 \ | 25 | file://321_libva_glx.base.patch \ |
26 | file://322_libva_glx.patch;patch=1 \ | 26 | file://322_libva_glx.patch \ |
27 | file://390_compat.base.patch;patch=1 \ | 27 | file://390_compat.base.patch \ |
28 | file://391_compat.patch;patch=1 \ | 28 | file://391_compat.patch \ |
29 | file://392_compat.dso.patch;patch=1" | 29 | file://392_compat.dso.patch \ |
30 | file://libdrm-poulsbo.patch" | ||
30 | 31 | ||
31 | export LDFLAGS="-Wl,-z,defs" | 32 | export LDFLAGS="-Wl,-z,defs" |
32 | 33 | ||
@@ -34,5 +35,5 @@ EXTRA_OECONF = "--disable-i965-driver" | |||
34 | 35 | ||
35 | FILES_${PN} += "${libdir}/va/drivers/*" | 36 | FILES_${PN} += "${libdir}/va/drivers/*" |
36 | 37 | ||
37 | COMAPTIBLE_MACHINE = "emenlow" | 38 | COMPATIBLE_MACHINE = "emenlow" |
38 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 39 | PACKAGE_ARCH = "${MACHINE_ARCH}" |