diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-20 20:17:40 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-05-20 20:17:50 +0000 |
| commit | c57650d938f96a544b5d9182c46f698ca0b6950f (patch) | |
| tree | e55a5f6dfe73285c28f595aba41b18a111d91d3c | |
| parent | 15463c312a92067180bb07bdf4448fd221d56d87 (diff) | |
| download | aports-c57650d938f96a544b5d9182c46f698ca0b6950f.tar.bz2 aports-c57650d938f96a544b5d9182c46f698ca0b6950f.tar.xz | |
main/mesa: upgrade to 8.0.3
| -rw-r--r-- | main/mesa/APKBUILD | 10 | ||||
| -rw-r--r-- | main/mesa/imports-uclibc.patch | 4 | ||||
| -rw-r--r-- | main/mesa/mesa-7.10-uclibc-glsl.patch | 11 | ||||
| -rw-r--r-- | main/mesa/mesa-8.0.3-uclibc-strtod.patch | 11 |
4 files changed, 18 insertions, 18 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 9eff64ed74..00276f10ca 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=8.0.2 +pkgver=8.0.3 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" @@ -22,7 +22,7 @@ makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend talloc-dev py-libxml2 flex bison llvm-dev autoconf automake" source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 - mesa-7.10-uclibc-glsl.patch + mesa-8.0.3-uclibc-strtod.patch mesa-7.10-uclibc-gallium.patch imports-uclibc.patch glx_ro_text_segm.patch @@ -131,8 +131,8 @@ nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri; } swrast() { _mv_dri swrast_dri; } vmwgfx() { _mv_dri vmwgfx_dri; } -md5sums="a368104e5700707048dc3e8691a9a7a1 MesaLib-8.0.2.tar.bz2 -03e9685b0d714e915c35fd0fb5fde810 mesa-7.10-uclibc-glsl.patch +md5sums="cc5ee15e306b8c15da6a478923797171 MesaLib-8.0.3.tar.bz2 +13cc91257dac1311013f681705bcf3aa mesa-8.0.3-uclibc-strtod.patch 90a2ea438ff328443a0436a91a74d518 mesa-7.10-uclibc-gallium.patch -9dc5080bb4d9d436b476bfeb878ca224 imports-uclibc.patch +bc2d3e144f7577be016b44b514d0b923 imports-uclibc.patch a1a766b4c6a96d67cad9bd7ad5c578e8 glx_ro_text_segm.patch" diff --git a/main/mesa/imports-uclibc.patch b/main/mesa/imports-uclibc.patch index d27d5af4d3..19e7e32d72 100644 --- a/main/mesa/imports-uclibc.patch +++ b/main/mesa/imports-uclibc.patch @@ -4,8 +4,8 @@ _mesa_strtof( const char *s, char **end ) { #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ -- !defined(ANDROID) -+ !defined(ANDROID) && !defined(__UCLIBC__) +- !defined(ANDROID) && !defined(__HAIKU__) ++ !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) static locale_t loc = NULL; if (!loc) { loc = newlocale(LC_CTYPE_MASK, "C", NULL); diff --git a/main/mesa/mesa-7.10-uclibc-glsl.patch b/main/mesa/mesa-7.10-uclibc-glsl.patch deleted file mode 100644 index df7ee1b3b3..0000000000 --- a/main/mesa/mesa-7.10-uclibc-glsl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-7.10.orig/src/glsl/strtod.c -+++ Mesa-7.10/src/glsl/strtod.c -@@ -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/main/mesa/mesa-8.0.3-uclibc-strtod.patch b/main/mesa/mesa-8.0.3-uclibc-strtod.patch new file mode 100644 index 0000000000..53f4bd3f77 --- /dev/null +++ b/main/mesa/mesa-8.0.3-uclibc-strtod.patch @@ -0,0 +1,11 @@ +--- ./src/glsl/strtod.c.orig ++++ ./src/glsl/strtod.c +@@ -45,7 +45,7 @@ + glsl_strtod(const char *s, char **end) + { + #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ +- !defined(__HAIKU__) ++ !defined(__HAIKU__) && !defined(__UCLIBC__) + static locale_t loc = NULL; + if (!loc) { + loc = newlocale(LC_CTYPE_MASK, "C", NULL); |