diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-13 10:28:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 13:18:10 +0100 |
commit | 8a46f88e3fdd950d0dd73ad4c7a4d7d777d537f2 (patch) | |
tree | b2e4c41d1b95003df4039ac0394e2679deb21e9b /meta/recipes-graphics/mesa/mesa-dri_git.bb | |
parent | f7a51d75e34119551ffa1c02c475cc456a656ce1 (diff) | |
download | poky-8a46f88e3fdd950d0dd73ad4c7a4d7d777d537f2.tar.gz |
mesa-dri: move shared options to mesa-dri.inc
(From OE-Core rev: 184957c784d6dc93ab1b2f0c1ebc1cd0c807fde4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-dri_git.bb')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri_git.bb | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb index 10ebd1c7ad..aaa3073ee0 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb | |||
@@ -1,4 +1,5 @@ | |||
1 | include mesa-common.inc | 1 | include mesa-common.inc |
2 | include mesa-dri.inc | ||
2 | 3 | ||
3 | SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ | 4 | SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ |
4 | file://cross2.patch \ | 5 | file://cross2.patch \ |
@@ -6,26 +7,16 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ | |||
6 | # file://mesa-DRI2Swapbuffer.patch " | 7 | # file://mesa-DRI2Swapbuffer.patch " |
7 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
8 | 9 | ||
9 | PROTO_DEPS += "dri2proto" | ||
10 | LIB_DEPS += "libdrm expat" | ||
11 | |||
12 | SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" | 10 | SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" |
13 | PV = "7.7+git${SRCPV}" | 11 | PV = "7.7+git${SRCPV}" |
14 | PR = "${INC_PR}.0" | 12 | PR = "${INC_PR}.0" |
15 | 13 | ||
16 | # most of our targets do not have DRI so will use mesa-xlib | ||
17 | DEFAULT_PREFERENCE = "-1" | ||
18 | |||
19 | PACKAGES =+ "${PN}-xprogs" | 14 | PACKAGES =+ "${PN}-xprogs" |
20 | PACKAGES_DYNAMIC = "mesa-dri-driver-*" | ||
21 | 15 | ||
22 | FILES_${PN}-dbg += "${libdir}/dri/.debug/*" | ||
23 | FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" | 16 | FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" |
24 | 17 | ||
25 | LEAD_SONAME = "libGL.so.1" | 18 | LEAD_SONAME = "libGL.so.1" |
26 | 19 | ||
27 | EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" | ||
28 | |||
29 | do_configure_prepend () { | 20 | do_configure_prepend () { |
30 | cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86 | 21 | cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86 |
31 | touch ${S}/src/mesa/x86/matypes.h | 22 | touch ${S}/src/mesa/x86/matypes.h |
@@ -44,12 +35,4 @@ do_install_append () { | |||
44 | install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ | 35 | install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ |
45 | } | 36 | } |
46 | 37 | ||
47 | python populate_packages_prepend() { | ||
48 | import os.path | ||
49 | |||
50 | dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") | ||
51 | |||
52 | do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') | ||
53 | } | ||
54 | |||
55 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 38 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |