Commit f2bc4234 authored by Natanael Copa's avatar Natanael Copa

x11/mesa: upgrade to 7.6.1

parent 16a19005
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
pkgver=7.6
pkgrel=1
pkgver=7.6.1
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
url="http://www.mesa3d.org"
license="LGPL"
......@@ -19,7 +19,9 @@ makedepends="pkgconfig libdrm-dev libxxf86vm-dev libxdamage-dev expat-dev
source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
mesa-7.1-link-shared.patch
intel-revert-vbl.patch
mesa-7.4-parallel.patch"
mesa-7.4-parallel.patch
mesa-7.6.1-ldflags.patch
mesa-7.6.1-uclibc.patch"
depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
libxdamage-dev libxfixes-dev libxcb-dev"
......@@ -48,6 +50,9 @@ build() {
--disable-glw || return 1
make || return 1
# check so we dont have any bind NOW
scanelf -Rb . | grep NOW && return 1
return 0
}
package() {
......@@ -80,7 +85,9 @@ tdfx() { _mv_dri tdfx_dri; }
trident() { _mv_dri trident_dri; }
unichrome() { _mv_dri unichrome_dri; }
md5sums="8c75f90cd0303cfac9e4b6d54f6759ca MesaLib-7.6.tar.bz2
md5sums="7db4617e9e10ad3aca1b64339fd71b7d MesaLib-7.6.1.tar.bz2
6e2bd02a8035fb165cf9d861fcf19e79 mesa-7.1-link-shared.patch
a111f4dc82e894f8801bc3fa129af7af intel-revert-vbl.patch
75e1bb69f384e9d60544fa03c15cc0ec mesa-7.4-parallel.patch"
75e1bb69f384e9d60544fa03c15cc0ec mesa-7.4-parallel.patch
eb6bb53bb1643782aa572edc40d28629 mesa-7.6.1-ldflags.patch
8d98e15310e0f2e1520beb9e6cb6ab41 mesa-7.6.1-uclibc.patch"
diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
index 9635c3c..88e02c0 100644
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/winsys/drm/Makefile.template
@@ -83,6 +83,7 @@ default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
$(MKLIB) -noprefix -o $@ \
+ -ldflags "$(LDFLAGS)" \
$(OBJECTS) $(PIPE_DRIVERS) \
-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
$(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
@@ -90,6 +91,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)
$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
$(MKLIB) -o $(LIBNAME_EGL) \
-linker "$(CC)" \
+ -ldflags "$(LDFLAGS)" \
-noprefix \
$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 46ffb92..6192fe6 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -915,7 +915,7 @@ _mesa_atoi(const char *s)
double
_mesa_strtod( const char *s, char **end )
{
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) && ! defined(__UCLIBC__)
static locale_t loc = NULL;
if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment