summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-13 10:28:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:10 +0100
commit8a46f88e3fdd950d0dd73ad4c7a4d7d777d537f2 (patch)
treeb2e4c41d1b95003df4039ac0394e2679deb21e9b /meta
parentf7a51d75e34119551ffa1c02c475cc456a656ce1 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri.inc20
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.11.bb22
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb19
3 files changed, 23 insertions, 38 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
new file mode 100644
index 0000000000..603438ef0b
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -0,0 +1,20 @@
1PROTO_DEPS += "dri2proto"
2LIB_DEPS += "libdrm expat"
3
4# most of our targets do not have DRI so will use mesa-xlib
5DEFAULT_PREFERENCE = "-1"
6
7EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
8
9python populate_packages_prepend() {
10 import os.path
11
12 dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
13
14 do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
15}
16
17PACKAGES_DYNAMIC = "mesa-dri-driver-*"
18
19FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
20
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 8ab1941a36..2cb2e055b3 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -1,28 +1,10 @@
1include mesa-common.inc 1include mesa-common.inc
2include mesa-${PV}.inc 2include mesa-${PV}.inc
3 3include mesa-dri.inc
4PROTO_DEPS += "dri2proto"
5LIB_DEPS += "libdrm expat"
6
7PR = "${INC_PR}.0" 4PR = "${INC_PR}.0"
8 5
9# most of our targets do not have DRI so will use mesa-xlib
10DEFAULT_PREFERENCE = "-1"
11
12LEAD_SONAME = "libGL.so.1" 6LEAD_SONAME = "libGL.so.1"
13 7
14EXTRA_OECONF += "--with-driver=dri --disable-egl -with-dri-drivers=swrast,i915,i965 --without-gallium-drivers" 8EXTRA_OECONF += "--with-dri-drivers=swrast,i915,i965"
15
16python populate_packages_prepend() {
17 import os.path
18
19 dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
20
21 do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
22}
23 9
24COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' 10COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
25
26PACKAGES_DYNAMIC = "mesa-dri-driver-*"
27
28FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
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 @@
1include mesa-common.inc 1include mesa-common.inc
2include mesa-dri.inc
2 3
3SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \ 4SRC_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 "
7S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"
8 9
9PROTO_DEPS += "dri2proto"
10LIB_DEPS += "libdrm expat"
11
12SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca" 10SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
13PV = "7.7+git${SRCPV}" 11PV = "7.7+git${SRCPV}"
14PR = "${INC_PR}.0" 12PR = "${INC_PR}.0"
15 13
16# most of our targets do not have DRI so will use mesa-xlib
17DEFAULT_PREFERENCE = "-1"
18
19PACKAGES =+ "${PN}-xprogs" 14PACKAGES =+ "${PN}-xprogs"
20PACKAGES_DYNAMIC = "mesa-dri-driver-*"
21 15
22FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
23FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" 16FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
24 17
25LEAD_SONAME = "libGL.so.1" 18LEAD_SONAME = "libGL.so.1"
26 19
27EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
28
29do_configure_prepend () { 20do_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
47python 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
55COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 38COMPATIBLE_HOST = '(i.86|x86_64).*-linux'