mesa: upgrade 7.9 to bugfix release 7.9.1
PATCH 1/6 mesa: upgrade 7.9 to bugfix release 7.9.1
--- recipes/mesa/mesa-7.9.1.inc | 11 + recipes/mesa/mesa-7.9.1/glamo.patch | 2394 ++++++++++++++++++++++++++++++++++ recipes/mesa/mesa-7.9.1/uclibc.patch | 13 + recipes/mesa/mesa-7.9.inc | 11 - recipes/mesa/mesa-7.9/glamo.patch | 2394 ---------------------------------- recipes/mesa/mesa-7.9/uclibc.patch | 13 - recipes/mesa/mesa-dri_7.9.1.bb | 4 + recipes/mesa/mesa-dri_7.9.bb | 4 - recipes/mesa/mesa-xlib_7.9.1.bb | 4 + recipes/mesa/mesa-xlib_7.9.bb | 4 - recipes/mesa/mesa_7.9.1.bb | 6 + recipes/mesa/mesa_7.9.bb | 6 - 12 files changed, 2432 insertions(+), 2432 deletions(-) create mode 100644 recipes/mesa/mesa-7.9.1.inc create mode 100644 recipes/mesa/mesa-7.9.1/glamo.patch create mode 100644 recipes/mesa/mesa-7.9.1/uclibc.patch delete mode 100644 recipes/mesa/mesa-7.9.inc delete mode 100644 recipes/mesa/mesa-7.9/glamo.patch delete mode 100644 recipes/mesa/mesa-7.9/uclibc.patch create mode 100644 recipes/mesa/mesa-dri_7.9.1.bb delete mode 100644 recipes/mesa/mesa-dri_7.9.bb create mode 100644 recipes/mesa/mesa-xlib_7.9.1.bb delete mode 100644 recipes/mesa/mesa-xlib_7.9.bb create mode 100644 recipes/mesa/mesa_7.9.1.bb delete mode 100644 recipes/mesa/mesa_7.9.bb
recipes/mesa/mesa-7.9.1.inc new file +11 -0
@@ -0,0 +1,11 @@ +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \ + file://glamo.patch \ + file://uclibc.patch \ + " + +DEPENDS += "talloc" + +SRC_URI[archive.md5sum] = "07dc6cfb5928840b8b9df5bd1b3ae434" +SRC_URI[archive.sha256sum] = "403986cd83d957db17957f11c320c9562cc8675273efbaa402e88bf4e6586721" + +EXTRA_OECONF += " --disable-gallium"
recipes/mesa/mesa-7.9.1/glamo.patch new file +2394 -0
2,394 lines not on this page · raw message
recipes/mesa/mesa-7.9.1/uclibc.patch new file +13 -0
@@ -0,0 +1,13 @@ +Index: Mesa-7.9/src/mesa/main/imports.c +=================================================================== +--- Mesa-7.9.orig/src/mesa/main/imports.c ++++ Mesa-7.9/src/mesa/main/imports.c +@@ -756,7 +756,7 @@ _mesa_strdup( const char *s ) + float + _mesa_strtof( const char *s, char **end ) + { +-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) ++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__) + static locale_t loc = NULL; + if (!loc) { + loc = newlocale(LC_CTYPE_MASK, "C", NULL);
recipes/mesa/mesa-7.9.inc deleted +0 -11
@@ -1,11 +0,0 @@ -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \ - file://glamo.patch \ - file://uclibc.patch \ - " - -DEPENDS += "talloc" - -SRC_URI[archive.md5sum] = "82c740c49d572baa6da2b1a1eee90bca" -SRC_URI[archive.sha256sum] = "e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3" - -EXTRA_OECONF += " --disable-gallium"
recipes/mesa/mesa-7.9/glamo.patch deleted +0 -2394
571 lines not on this page · raw message
recipes/mesa/mesa-7.9/uclibc.patch deleted +0 -13
Lines of this file are not shown. View the raw message.
recipes/mesa/mesa-dri_7.9.1.bb new file +4 -0
Lines of this file are not shown. View the raw message.
recipes/mesa/mesa-xlib_7.9.1.bb new file +4 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.4.rc1
Part of the diff is not shown here. View the raw message.
PATCH 2/6 mesa-7.9.1: change configure.ac to check for python not python2 as python-native does not stage python2
* should we fix it in python recipes instead? maybe more projects are looking for python2 and finds is on host not sysroot
--- recipes/mesa/mesa-7.9.1.inc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
recipes/mesa/mesa-7.9.1.inc +5 -0
@@ -9,3 +9,8 @@ SRC_URI[archive.md5sum] = "07dc6cfb5928840b8b9df5bd1b3ae434" SRC_URI[archive.sha256sum] = "403986cd83d957db17957f11c320c9562cc8675273efbaa402e88bf4e6586721" EXTRA_OECONF += " --disable-gallium" + +do_configure_prepend() { + #check for python not python2, because python-native does not stage python2 binary/link + sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac +}
Signature · 1 line
1.7.4.rc1
PATCH 3/6 angstrom-2010: prefer newer mesa 7.9.1
In reply to Martin Jansa--- .../include/angstrom-2010-preferred-versions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/angstrom-2010-preferred-versions.inc +1 -1
@@ -1,4 +1,4 @@ -ANGSTROM_MESA_VERSION = "7.8.2" +ANGSTROM_MESA_VERSION = "7.9.1" ANGSTROM_QT_VERSION ?= "4.7.1" ANGSTROM_LIBTOOL_VERSION = "2.4" # Use new sysroot feature
Signature · 1 line
1.7.4.rc1
Re: [PATCH 3/6] angstrom-2010: prefer newer mesa 7.9.1
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 1 line · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>
Quoted 9 lines
--- .../include/angstrom-2010-preferred-versions.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)conf/distro/include/angstrom-2010-preferred-versions.inc +0
-0
conf/distro/include/angstrom-2010-preferred-versions.inc line 4
Quoted 5 lines
conf/distro/include/angstrom-2010-preferred-versions.inc +1
-1@@ -1,4 +1,4 @@ -ANGSTROM_MESA_VERSION = "7.8.2" +ANGSTROM_MESA_VERSION = "7.9.1" ANGSTROM_QT_VERSION ?= "4.7.1" ANGSTROM_LIBTOOL_VERSION = "2.4" # Use new sysroot feature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNKw+BMkyGM64RGpERAnx6AJ4m+zfiB3WNOMiuMQEurqzMNELd4gCdH8MN NU9OS/wz2ycDfj2MfuyHuuQ=
=HEp/
-----END PGP SIGNATURE-----
PATCH 4/6 mesa: drop 7.8.2 version
In reply to Martin Jansa--- recipes/mesa/mesa-7.8.2.inc | 22 - recipes/mesa/mesa-7.8.2/glamo.patch | 2386 ---------------------------- recipes/mesa/mesa-dri-glsl-native_7.8.2.bb | 19 - recipes/mesa/mesa-dri_7.8.2.bb | 11 - recipes/mesa/mesa-xlib_7.8.2.bb | 4 - recipes/mesa/mesa_7.8.2.bb | 8 - 6 files changed, 0 insertions(+), 2450 deletions(-) delete mode 100644 recipes/mesa/mesa-7.8.2.inc delete mode 100644 recipes/mesa/mesa-7.8.2/glamo.patch delete mode 100644 recipes/mesa/mesa-dri-glsl-native_7.8.2.bb delete mode 100644 recipes/mesa/mesa-dri_7.8.2.bb delete mode 100644 recipes/mesa/mesa-xlib_7.8.2.bb delete mode 100644 recipes/mesa/mesa_7.8.2.bb
recipes/mesa/mesa-7.8.2.inc deleted +0 -22
@@ -1,22 +0,0 @@ -SRC_URI += " \ - ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=demos \ - file://fix-progs-makefile.patch \ - file://glamo.patch \ - " - -SRC_URI[archive.md5sum] = "6be2d343a0089bfd395ce02aaf8adb57" -SRC_URI[archive.sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d" -SRC_URI[demos.md5sum] = "757d9e2e06f48b1a52848be9b0307ced" -SRC_URI[demos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c" - -PACKAGES =+ "${PN}-xprogs" -FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" - -EXTRA_OECONF += " --disable-gallium" - -do_install_append () { - install -d ${D}/${bindir} - for i in glxdemo glxgears glxheads glxinfo; do - install -m 0755 ${S}/progs/xdemos/${i} ${D}/${bindir} - done -}
recipes/mesa/mesa-7.8.2/glamo.patch deleted +0 -2386
2,386 lines not on this page · raw message
recipes/mesa/mesa-dri-glsl-native_7.8.2.bb deleted +0 -19
@@ -1,19 +0,0 @@ -inherit native - -DEPENDS = "makedepend-native" - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive" -SRC_URI[archive.md5sum] = "6be2d343a0089bfd395ce02aaf8adb57" -SRC_URI[archive.sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d" - -S = "${WORKDIR}/Mesa-7.8.2/src/glsl/" - -do_configure_prepend() { - ln -s ${S}/../../configs/default ${S}/../../configs/current -} - -NATIVE_INSTALL_WORKS = "1" -do_install() { - install -d ${bindir} - install -m 755 ${S}/apps/compile ${bindir}/glsl-compile -}
recipes/mesa/mesa-dri_7.8.2.bb deleted +0 -11
@@ -1,11 +0,0 @@ -require mesa-common.inc -require mesa-${PV}.inc -require mesa-dri.inc -PR = "${INC_PR}.0" - -DEPENDS += "mesa-dri-glsl-native" - -# We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" -do_configure_prepend() { - sed -i "s#^GLSL_CL = .*\$#GLSL_CL = ${STAGING_BINDIR_NATIVE}/glsl-compile#g" ${S}/src/mesa/shader/slang/library/Makefile -}
recipes/mesa/mesa-xlib_7.8.2.bb deleted +0 -4
@@ -1,4 +0,0 @@ -require mesa-common.inc -require mesa-${PV}.inc -require mesa-xlib.inc -PR = "${INC_PR}.0"
recipes/mesa/mesa_7.8.2.bb deleted +0 -8
@@ -1,8 +0,0 @@ -# This is a dummy package so OE can use the poky mesa files -require mesa-dri_${PV}.bb - -FILESPATHPKG =. "mesa-dri-${PV}:" - -PR = "${INC_PR}.1" - -EXTRA_OECONF += "--disable-egl"
Signature · 1 line
1.7.4.rc1
PATCH 5/6 libglew: import 1.5.7 from poky
In reply to Martin Jansa--- recipes/glew/files/autotools.patch | 146 ---------------------------- recipes/glew/libglew-1.5.1/autotools.patch | 146 ++++++++++++++++++++++++++++ recipes/glew/libglew-1.5.7/autotools.patch | 146 ++++++++++++++++++++++++++++ recipes/glew/libglew_1.5.7.bb | 18 ++++ 4 files changed, 310 insertions(+), 146 deletions(-) delete mode 100644 recipes/glew/files/autotools.patch create mode 100644 recipes/glew/libglew-1.5.1/autotools.patch create mode 100644 recipes/glew/libglew-1.5.7/autotools.patch create mode 100644 recipes/glew/libglew_1.5.7.bb
recipes/glew/files/autotools.patch deleted +0 -146
@@ -1,146 +0,0 @@ -Index: glew/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/Makefile.am 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,5 @@ -+ -+ACLOCAL_AMFLAGS = -I m4 --install -+ -+SUBDIRS = include src -+ -Index: glew/configure.ac -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/configure.ac 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,67 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.62]) -+AC_INIT([glew], [1.5.1], [BUG-REPORT-ADDRESS]) -+AC_CONFIG_SRCDIR([src/glew.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AC_CONFIG_MACRO_DIR([m4]) -+ -+LT_INIT -+ -+# Checks for programs. -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_TYPE_INT32_T -+AC_TYPE_INT64_T -+AC_TYPE_UINT64_T -+AC_CHECK_TYPES([ptrdiff_t]) -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_CHECK_FUNCS([strtol]) -+ -+# Check for pkgconfig libs -+ -+PKG_CHECK_MODULES([X11], [x11]) -+AC_SUBST([X11_LIBS]) -+AC_SUBST([X11_CFLAGS]) -+ -+PKG_CHECK_MODULES([XMU], [xmu]) -+AC_SUBST([XMU_LIBS]) -+AC_SUBST([XMU_CFLAGS]) -+ -+PKG_CHECK_MODULES([XI], [xi]) -+AC_SUBST([XI_LIBS]) -+AC_SUBST([XI_CFLAGS]) -+ -+PKG_CHECK_MODULES([XEXT], [xext]) -+AC_SUBST([XEXT_LIBS]) -+AC_SUBST([XEXT_CFLAGS]) -+ -+# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS -+PKG_CHECK_MODULES([GLU], [glu]) -+AC_SUBST([GLU_LIBS]) -+AC_SUBST([GLU_CFLAGS]) -+ -+# ENABLE option for Multiple Rendering Contexts support -+AC_CHECK_ENABLE_GLEWMX -+ -+# for now we use the same version as the package, but that should be avoided -+# in the future -+ -+AC_SUBST([LIBGLEW_SO_VERSION], [1:5:1]) -+ -+AC_CONFIG_FILES([Makefile -+ include/Makefile -+ src/Makefile]) -+AC_OUTPUT -Index: glew/src/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/src/Makefile.am 2009-12-02 00:33:48.690786110 +0100 -@@ -0,0 +1,35 @@ -+ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ -+if ENABLE_GLEWMX -+AM_CPPFLAGS += -DGLEW_MX -+endif -+ -+AM_CFLAGS = @X11_CFLAGS@ \ -+ @XMU_CFLAGS@ \ -+ @XI_CFLAGS@ \ -+ @XEXT_CFLAGS@ \ -+ @GLU_CFLAGS@ -+ -+lib_LTLIBRARIES = libGLEW.la -+ -+libGLEW_la_SOURCES = glew.c -+ -+libGLEW_la_LIBADD = @X11_LIBS@ \ -+ @XMU_LIBS@ \ -+ @XI_LIBS@ \ -+ @XEXT_LIBS@ \ -+ @GLU_LIBS@ -+ -+libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@ -+ -+bin_PROGRAMS = glewinfo visualinfo -+ -+glewinfo_SOURCES = glewinfo.c -+ -+glewinfo_LDADD = libGLEW.la -+ -+visualinfo_SOURCES = visualinfo.c -+ -+visualinfo_LDADD = libGLEW.la -+ -Index: glew/m4/glewmx.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/m4/glewmx.m4 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,11 @@ -+ -+AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[ -+AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support]) -+AC_ARG_ENABLE([glewmx], -+ [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])], -+ [ENABLE_GLEWMX="$enableval"], -+ [ENABLE_GLEWMX="no"]) -+AC_MSG_RESULT([${ENABLE_GLEWMX}]) -+AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"]) -+]) -+ -Index: glew/include/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/include/Makefile.am 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,3 @@ -+ -+nobase_include_HEADERS = GL/glew.h GL/glxew.h GL/wglew.h -+
recipes/glew/libglew-1.5.1/autotools.patch new file +146 -0
146 lines not on this page · raw message
recipes/glew/libglew-1.5.7/autotools.patch new file +146 -0
146 lines not on this page · raw message
recipes/glew/libglew_1.5.7.bb new file +18 -0
@@ -0,0 +1,18 @@ +DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." +HOMEPAGE = "http://glew.sourceforge.net/" +SECTION = "x11" +LICENSE = "MIT" + +DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ + file://autotools.patch \ + " +SRC_URI[md5sum] = "f913ce9dbde4cd250b932731b3534ded" +SRC_URI[sha256sum] = "86bd36a163640d6027ec6be5fdd8a6e3b90f02dcf55f95c3c2429ebb58be3107" + +S = "${WORKDIR}/glew-${PV}" + +inherit autotools lib_package
Signature · 1 line
1.7.4.rc1
PATCH 6/6 mesa-demos: import recipe from poky
In reply to Martin Jansa--- recipes/mesa/mesa-demos_8.0.1.bb | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 recipes/mesa/mesa-demos_8.0.1.bb
recipes/mesa/mesa-demos_8.0.1.bb new file +16 -0
@@ -0,0 +1,16 @@ +DESCRIPTION = "mesa demo applications" +HOMEPAGE = "http://mesa3d.org" +SECTION = "x11" + +LICENSE = "MIT & PD" + +DEPENDS = "virtual/libx11 virtual/libgl libglew" + +PR = "r0" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +SRC_URI[md5sum] = "320c2a4b6edc6faba35d9cb1e2a30bf4" +SRC_URI[sha256sum] = "4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1"
Signature · 1 line
1.7.4.rc1