diff options
Diffstat (limited to 'main/mesa')
| -rw-r--r-- | main/mesa/APKBUILD | 44 | ||||
| -rw-r--r-- | main/mesa/mesa-7.10-uclibc.patch | 13 |
2 files changed, 14 insertions, 43 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 41d4518acf..6ba55652e5 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=7.11.2 +pkgver=8.0.1 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" @@ -10,13 +10,7 @@ depends= subpackages="$pkgname-dev $pkgname-dri-ati:ati $pkgname-dri-intel:intel - $pkgname-dri-mach64:mach64 - $pkgname-dri-mga:mga - $pkgname-dri-r128:r128 - $pkgname-dri-savage:savage $pkgname-dri-swrast:swrast - $pkgname-dri-tdfx:tdfx - $pkgname-dri-unichrome:unichrome $pkgname-dri-nouveau:nouveau $pkgname-dri-vmwgfx:vmwgfx $pkgname-egl $pkgname-glu $pkgname-gl $pkgname-gles @@ -27,11 +21,10 @@ depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend talloc-dev py-libxml2 flex bison llvm-dev" source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 - mesa-7.10-uclibc.patch mesa-7.10-uclibc-glsl.patch mesa-7.10-uclibc-gallium.patch + imports-uclibc.patch " -# Mesa-7.10.1-nouveau-compile.patch _dri_driverdir=/usr/lib/xorg/modules/dri @@ -43,16 +36,16 @@ x86_64-*) _intel_dri="i915_dri i965_dri" ;; i[3456789]86-*) - _intel_dri="i810_dri i915_dri i965_dri" - subpackages="$subpackages $pkgname-dri-sis:sis" + _intel_dri="i915_dri i965_dri" ;; esac prepare() { cd "$_builddir" - for i in ../*.patch; do - msg "Applying $i..." - patch -p1 -i $i || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done } @@ -69,13 +62,11 @@ build() { --disable-asm \ --disable-glx-tls \ --with-driver=dri \ - --enable-xcb \ --enable-egl \ --enable-gles2 \ - --with-gallium-drivers=i915,i965,nouveau,r300,r600,svga,swrast \ + --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast \ --disable-gallium-egl \ - --disable-glut \ - --disable-glw || return 1 + || return 1 make || return 1 @@ -131,19 +122,12 @@ _mv_dri() { } ati() { _mv_dri radeon_dri r200_dri r300_dri r600_dri; } -intel() { _mv_dri $_intel_dri; } -mach64() { _mv_dri mach64_dri; } -mga() { _mv_dri mga_dri; } -r128() { _mv_dri r128_dri; } -savage() { _mv_dri savage_dri; } -sis() { _mv_dri sis_dri; } -tdfx() { _mv_dri tdfx_dri; } -unichrome() { _mv_dri unichrome_dri; } +intel() { _mv_dri i915_dri i965_dri; } nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri; } -swrast() { _mv_dri swrast_dri swrastg_dri; } +swrast() { _mv_dri swrast_dri; } vmwgfx() { _mv_dri vmwgfx_dri; } -md5sums="0837c52698fe3252369c3fdb5195afcc MesaLib-7.11.2.tar.bz2 -9c8c161f954f0d08895cd9d45e63f498 mesa-7.10-uclibc.patch +md5sums="24eeebf66971809d8f40775a379b36c9 MesaLib-8.0.1.tar.bz2 03e9685b0d714e915c35fd0fb5fde810 mesa-7.10-uclibc-glsl.patch -90a2ea438ff328443a0436a91a74d518 mesa-7.10-uclibc-gallium.patch" +90a2ea438ff328443a0436a91a74d518 mesa-7.10-uclibc-gallium.patch +9dc5080bb4d9d436b476bfeb878ca224 imports-uclibc.patch" diff --git a/main/mesa/mesa-7.10-uclibc.patch b/main/mesa/mesa-7.10-uclibc.patch deleted file mode 100644 index 54d7d8c833..0000000000 --- a/main/mesa/mesa-7.10-uclibc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Mesa-7.10/src/mesa/main/imports.c -+++ Mesa-7.10.mod/src/mesa/main/imports.c -@@ -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); -Only in Mesa-7.10.mod: src/mesa/main/imports.c.orig -Only in Mesa-7.10.mod: src/mesa/main/imports.c.rej |