From d1993fab7ccac5683ce218fe8ec86b42a7f691ac Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Wed, 7 Jul 2010 17:28:11 +0800 Subject: mesa: upgrade to 7.8.2 upgrade from 7.4 to 7.8.2 the mesa-dri 7.5 & 7.7 is still kept since it is used by moblin distro. Signed-off-by: Yu Ke --- .../distro/include/preferred-xorg-versions.inc | 2 +- meta/packages/mesa/mesa-common.inc | 9 ++-- meta/packages/mesa/mesa-dri_7.4.bb | 37 ----------------- meta/packages/mesa/mesa-dri_7.8.2.bb | 48 ++++++++++++++++++++++ meta/packages/mesa/mesa-xlib_7.4.bb | 20 --------- meta/packages/mesa/mesa-xlib_7.8.2.bb | 22 ++++++++++ 6 files changed, 76 insertions(+), 62 deletions(-) delete mode 100644 meta/packages/mesa/mesa-dri_7.4.bb create mode 100644 meta/packages/mesa/mesa-dri_7.8.2.bb delete mode 100644 meta/packages/mesa/mesa-xlib_7.4.bb create mode 100644 meta/packages/mesa/mesa-xlib_7.8.2.bb (limited to 'meta') diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index fe3e21cca..f8cb2a1c0 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -136,7 +136,7 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.5" PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5" PREFERRED_VERSION_xvinfo ?= "1.0.2" PREFERRED_VERSION_xwininfo ?= "1.0.5" -PREFERRED_VERSION_mesa-dri ?= "7.7" +PREFERRED_VERSION_mesa-dri ?= "7.8.2" PREFERRED_VERSION_libdrm ?= "2.4.21" PREFERRED_VERSION_xcb-proto ?= "1.6" PREFERRED_VERSION_libxcb ?= "1.6" diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc index 26ea671ed..240f956b8 100644 --- a/meta/packages/mesa/mesa-common.inc +++ b/meta/packages/mesa/mesa-common.inc @@ -1,11 +1,12 @@ -SECTION = "x11" - DESCRIPTION = "An open source implementation of the OpenGL spec" HOMEPAGE = "http://mesa3d.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11" LICENSE = "MIT" -SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ - ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ + ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2 " + S = "${WORKDIR}/Mesa-${PV}" PROVIDES = "virtual/libgl" diff --git a/meta/packages/mesa/mesa-dri_7.4.bb b/meta/packages/mesa/mesa-dri_7.4.bb deleted file mode 100644 index 43e4cb552..000000000 --- a/meta/packages/mesa/mesa-dri_7.4.bb +++ /dev/null @@ -1,37 +0,0 @@ -include mesa-common.inc - -PROTO_DEPS = "xf86driproto glproto dri2proto" -LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" - -PR = "r6" - -# most of our targets do not have DRI so will use mesa-xlib -DEFAULT_PREFERENCE = "-1" - -# Netbooks have DRI support so use mesa-dri by default -DEFAULT_PREFERENCE_netbook = "1" - -PACKAGES =+ "${PN}-xprogs" -PACKAGES_DYNAMIC = "mesa-dri-driver-*" - -FILES_${PN}-dbg += "${libdir}/dri/.debug/*" -FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" - -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_7.8.2.bb b/meta/packages/mesa/mesa-dri_7.8.2.bb new file mode 100644 index 000000000..2ea649af3 --- /dev/null +++ b/meta/packages/mesa/mesa-dri_7.8.2.bb @@ -0,0 +1,48 @@ +include mesa-common.inc + +LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" + +PROTO_DEPS = "xf86driproto glproto dri2proto" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PR = "r0" + +SRC_URI += "file://crossfix.patch" + +# most of our targets do not have DRI so will use mesa-xlib +DEFAULT_PREFERENCE = "-1" + +# Netbooks have DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_netbook = "1" + +LEAD_SONAME = "libGL.so.1" + +EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium" + +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)' + +PACKAGES =+ "${PN}-xprogs" +PACKAGES_DYNAMIC = "mesa-dri-driver-*" + +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +# +# Header generated by i586-poky-linux-gcc gen_matypes.c -o gen_matypes -I ../../../include/GL -I ../../../include -I .. -I ../main/ -I ../math -I ../glapi/ -I ../tnl +# then run gen_matypes > matypes.h on device +# diff --git a/meta/packages/mesa/mesa-xlib_7.4.bb b/meta/packages/mesa/mesa-xlib_7.4.bb deleted file mode 100644 index 069446904..000000000 --- a/meta/packages/mesa/mesa-xlib_7.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -include mesa-common.inc - -PROTO_DEPS = "xf86driproto glproto" -LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" - -PE = "1" -PR = "r3" - -EXTRA_OECONF += "--with-driver=xlib" - -PACKAGES =+ "${PN}-xprogs" - -FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" - -do_install_append () { - install -d ${D}/${bindir} - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} -} diff --git a/meta/packages/mesa/mesa-xlib_7.8.2.bb b/meta/packages/mesa/mesa-xlib_7.8.2.bb new file mode 100644 index 000000000..093ad6ed7 --- /dev/null +++ b/meta/packages/mesa/mesa-xlib_7.8.2.bb @@ -0,0 +1,22 @@ +include mesa-common.inc + +LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" + +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PE = "1" +PR = "r0" + +EXTRA_OECONF += "--with-driver=xlib" + +do_install_append () { + install -d ${D}/${bindir} + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} +} + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" -- cgit v1.2.3