summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/mesa/mesa-dri_7.2.bb14
-rw-r--r--meta/packages/mesa/mesa-dri_git.bb24
2 files changed, 30 insertions, 8 deletions
diff --git a/meta/packages/mesa/mesa-dri_7.2.bb b/meta/packages/mesa/mesa-dri_7.2.bb
index 77b68c4558..43e4cb5527 100644
--- a/meta/packages/mesa/mesa-dri_7.2.bb
+++ b/meta/packages/mesa/mesa-dri_7.2.bb
@@ -5,7 +5,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
5 5
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 7
8PR = "r5" 8PR = "r6"
9 9
10# most of our targets do not have DRI so will use mesa-xlib 10# most of our targets do not have DRI so will use mesa-xlib
11DEFAULT_PREFERENCE = "-1" 11DEFAULT_PREFERENCE = "-1"
@@ -14,16 +14,24 @@ DEFAULT_PREFERENCE = "-1"
14DEFAULT_PREFERENCE_netbook = "1" 14DEFAULT_PREFERENCE_netbook = "1"
15 15
16PACKAGES =+ "${PN}-xprogs" 16PACKAGES =+ "${PN}-xprogs"
17PACKAGES_DYNAMIC = "mesa-dri-driver-*"
17 18
18FILES_${PN} += "${libdir}/dri/*.so"
19FILES_${PN}-dbg += "${libdir}/dri/.debug/*" 19FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
20FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" 20FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
21 21
22EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" 22EXTRA_OECONF += "--with-driver=dri"
23 23
24do_install_append () { 24do_install_append () {
25 install -d ${D}/usr/bin 25 install -d ${D}/usr/bin
26 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ 26 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
27} 27}
28 28
29python populate_packages_prepend() {
30 import os.path
31
32 dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
33
34 do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
35}
36
29COMPATIBLE_HOST = '(i.86.*-linux)' 37COMPATIBLE_HOST = '(i.86.*-linux)'
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
index 25eaa5a766..e565ac5367 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -6,22 +6,36 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 7
8PV = "7.3.0+git${SRCREV}" 8PV = "7.3.0+git${SRCREV}"
9PR = "r1" 9PR = "r3"
10 10
11# most of our targets do not have DRI so will use mesa-xlib 11# most of our targets do not have DRI so will use mesa-xlib
12DEFAULT_PREFERENCE = "-1" 12DEFAULT_PREFERENCE = "-1"
13 13
14# Netbooks have has DRI support so use mesa-dri by default 14# Netbooks have DRI support so use mesa-dri by default
15DEFAULT_PREFERENCE_netbook = "1" 15DEFAULT_PREFERENCE_netbook = "1"
16 16
17SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" 17SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=intel-2008-q3 "
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
20PACKAGES =+ "${PN}-xprogs" 20PACKAGES =+ "${PN}-xprogs"
21PACKAGES_DYNAMIC = "mesa-dri-driver-*"
21 22
22FILES_${PN} += "${libdir}/dri/*.so"
23FILES_${PN}-dbg += "${libdir}/dri/.debug/*" 23FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
24FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
24 25
25EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" 26EXTRA_OECONF += "--with-driver=dri"
27
28do_install_append () {
29 install -d ${D}/usr/bin
30 install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
31}
32
33python populate_packages_prepend() {
34 import os.path
35
36 dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
37
38 do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
39}
26 40
27COMPATIBLE_HOST = '(i.86.*-linux)' 41COMPATIBLE_HOST = '(i.86.*-linux)'