All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 2/2] mesa: add new 7.10 version, with D_P -1 and without glamo.patch for now
Date: Wed, 12 Jan 2011 08:23:35 +0100	[thread overview]
Message-ID: <1294817015-16540-2-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <1294817015-16540-1-git-send-email-Martin.Jansa@gmail.com>

* someone please test uclibc build if old uclibc.patch is enough
* Tartarus reported issues with 7.9.1 (probably missing -ldl), I'll try
  to reproduce it here, but someone with populated ppc build is welcome
  to confirm it in 7.10 sooner
* I'll rebase glamo.patch and add it later

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/mesa/mesa-7.10.inc          |   18 ++++++++++++++++++
 recipes/mesa/mesa-7.10/uclibc.patch |   26 ++++++++++++++++++++++++++
 recipes/mesa/mesa-dri_7.10.bb       |    4 ++++
 recipes/mesa/mesa-xlib_7.10.bb      |    4 ++++
 recipes/mesa/mesa_7.10.bb           |    6 ++++++
 5 files changed, 58 insertions(+), 0 deletions(-)
 create mode 100644 recipes/mesa/mesa-7.10.inc
 create mode 100644 recipes/mesa/mesa-7.10/uclibc.patch
 create mode 100644 recipes/mesa/mesa-dri_7.10.bb
 create mode 100644 recipes/mesa/mesa-xlib_7.10.bb
 create mode 100644 recipes/mesa/mesa_7.10.bb

diff --git a/recipes/mesa/mesa-7.10.inc b/recipes/mesa/mesa-7.10.inc
new file mode 100644
index 0000000..5b26943
--- /dev/null
+++ b/recipes/mesa/mesa-7.10.inc
@@ -0,0 +1,18 @@
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
+           file://uclibc.patch \
+          "
+
+DEPENDS += "talloc"
+
+SRC_URI[archive.md5sum] = "33fb94eccc02cbb4d8d1365615e38e46"
+SRC_URI[archive.sha256sum] = "bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df6e0aca"
+
+EXTRA_OECONF += " --disable-gallium"
+
+#needs more testing and updated glamo.patch before making default
+DEFAULT_PREFERENCE = "-2"
+
+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
+}
diff --git a/recipes/mesa/mesa-7.10/uclibc.patch b/recipes/mesa/mesa-7.10/uclibc.patch
new file mode 100644
index 0000000..0508112
--- /dev/null
+++ b/recipes/mesa/mesa-7.10/uclibc.patch
@@ -0,0 +1,26 @@
+Index: Mesa-7.9.1/src/mesa/main/imports.c
+===================================================================
+--- Mesa-7.9.1.orig/src/mesa/main/imports.c	2010-12-15 13:50:00.000000000 -0800
++++ Mesa-7.9.1/src/mesa/main/imports.c	2011-01-10 12:23:48.848656001 -0800
+@@ -757,7 +757,7 @@
+ 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);
+Index: Mesa-7.9.1/src/glsl/strtod.c
+===================================================================
+--- Mesa-7.9.1.orig/src/glsl/strtod.c	2011-01-10 20:08:01.568656001 -0800
++++ Mesa-7.9.1/src/glsl/strtod.c	2011-01-10 20:08:39.898656001 -0800
+@@ -44,7 +44,7 @@
+ double
+ glsl_strtod(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);
diff --git a/recipes/mesa/mesa-dri_7.10.bb b/recipes/mesa/mesa-dri_7.10.bb
new file mode 100644
index 0000000..bd62c98
--- /dev/null
+++ b/recipes/mesa/mesa-dri_7.10.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-dri.inc
+PR = "${INC_PR}.1"
diff --git a/recipes/mesa/mesa-xlib_7.10.bb b/recipes/mesa/mesa-xlib_7.10.bb
new file mode 100644
index 0000000..93bb8cd
--- /dev/null
+++ b/recipes/mesa/mesa-xlib_7.10.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-xlib.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/mesa/mesa_7.10.bb b/recipes/mesa/mesa_7.10.bb
new file mode 100644
index 0000000..f5c9a17
--- /dev/null
+++ b/recipes/mesa/mesa_7.10.bb
@@ -0,0 +1,6 @@
+# This is a dummy package so OE can use the poky mesa files
+require mesa-dri_${PV}.bb
+
+PR = "${INC_PR}.1"
+
+EXTRA_OECONF += "--disable-egl"
-- 
1.7.4.rc1




  reply	other threads:[~2011-01-12  7:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-12  7:23 [PATCH 1/2] xorg: new versions 2011-01-12 Martin Jansa
2011-01-12  7:23 ` Martin Jansa [this message]
2011-01-12  8:42   ` [PATCH v2 2/2] mesa: add new 7.10 version, with D_P -2 Martin Jansa
2011-01-12  8:57     ` Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1294817015-16540-2-git-send-email-Martin.Jansa@gmail.com \
    --to=martin.jansa@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.