diff options
| -rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
| -rw-r--r-- | meta/packages/mesa/mesa-common.inc | 3 | ||||
| -rw-r--r-- | meta/packages/mesa/mesa-dri_7.2.bb (renamed from meta/packages/mesa/mesa-dri_7.1.bb) | 9 | ||||
| -rw-r--r-- | meta/packages/mesa/mesa-dri_git.bb | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 259f098b5a..143b4e5585 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -135,7 +135,7 @@ PREFERRED_VERSION_xtrans-native = "1.0.4" PREFERRED_VERSION_xtrans-sdk = "1.0.4" PREFERRED_VERSION_xvinfo = "1.0.2" PREFERRED_VERSION_xwininfo = "1.0.3" -PREFERRED_VERSION_mesa-dri = "7.1" +PREFERRED_VERSION_mesa-dri = "7.2" PREFERRED_VERSION_libdrm = "2.3.1" PREFERRED_VERSION_xcb-proto = "1.0" PREFERRED_VERSION_libxcb = "1.0" diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc index b28d5b43e5..ebfb920b87 100644 --- a/meta/packages/mesa/mesa-common.inc +++ b/meta/packages/mesa/mesa-common.inc @@ -4,7 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec" HOMEPAGE = "http://mesa3d.org" LICENSE = "MIT" -SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " S = "${WORKDIR}/Mesa-${PV}" PROVIDES = "virtual/libgl" diff --git a/meta/packages/mesa/mesa-dri_7.1.bb b/meta/packages/mesa/mesa-dri_7.2.bb index 2514eb97f0..d753f33a8e 100644 --- a/meta/packages/mesa/mesa-dri_7.1.bb +++ b/meta/packages/mesa/mesa-dri_7.2.bb @@ -6,10 +6,17 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PE = "1" -PR = "r1" +PR = "r2" + +PACKAGES += "${PN}-xprogs" 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}" +do_install_append () { + install -d ${D}/usr/bin + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ +} diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb index 59b845e6ba..d9e61d8a5c 100644 --- a/meta/packages/mesa/mesa-dri_git.bb +++ b/meta/packages/mesa/mesa-dri_git.bb @@ -5,7 +5,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" -PV = "7.1+git${SRCREV}" +PV = "7.2+git${SRCREV}" PR = "r1" DEFAULT_PREFERENCE = "-1" |