diff options
| -rw-r--r-- | meta/packages/mesa/mesa-dri_7.2.bb | 14 | ||||
| -rw-r--r-- | meta/packages/mesa/mesa-dri_git.bb | 24 |
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 77b68c455..43e4cb552 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" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PR = "r5" +PR = "r6" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -14,16 +14,24 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_netbook = "1" PACKAGES =+ "${PN}-xprogs" +PACKAGES_DYNAMIC = "mesa-dri-driver-*" -FILES_${PN} += "${libdir}/dri/*.so" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" -EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" +EXTRA_OECONF += "--with-driver=dri" do_install_append () { install -d ${D}/usr/bin install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ } +python populate_packages_prepend() { + import os.path + + dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") + + do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') +} + COMPATIBLE_HOST = '(i.86.*-linux)' diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb index 25eaa5a76..e565ac536 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" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PV = "7.3.0+git${SRCREV}" -PR = "r1" +PR = "r3" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" -# Netbooks have has DRI support so use mesa-dri by default +# Netbooks have DRI support so use mesa-dri by default DEFAULT_PREFERENCE_netbook = "1" -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git;branch=intel-2008-q3 " S = "${WORKDIR}/git" PACKAGES =+ "${PN}-xprogs" +PACKAGES_DYNAMIC = "mesa-dri-driver-*" -FILES_${PN} += "${libdir}/dri/*.so" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" -EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" +EXTRA_OECONF += "--with-driver=dri" + +do_install_append () { + install -d ${D}/usr/bin + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ +} + +python populate_packages_prepend() { + import os.path + + dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri") + + do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') +} COMPATIBLE_HOST = '(i.86.*-linux)' |