aboutsummaryrefslogtreecommitdiffstats
path: root/main/mesa
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-03-05 11:51:53 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-03-05 11:51:53 +0000
commitf7a0497570263fcaa0417615b63a8256858efbb9 (patch)
tree2a030b73d4a2bdda1cc73950fdef2784ce75851b /main/mesa
parent3342f40e78b1781939ee8ea41078265f5c7a31dd (diff)
downloadaports-f7a0497570263fcaa0417615b63a8256858efbb9.tar.bz2
aports-f7a0497570263fcaa0417615b63a8256858efbb9.tar.xz
main/mesa: upgrade to 9.1
Diffstat (limited to 'main/mesa')
-rw-r--r--main/mesa/APKBUILD41
-rw-r--r--main/mesa/ccache.patch11
2 files changed, 24 insertions, 28 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index bfbabe4e12..573f54bd69 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
-pkgver=9.0.3
-pkgrel=1
+pkgver=9.1
+pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
url="http://www.mesa3d.org"
arch="all"
@@ -21,15 +21,13 @@ depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev
libxdamage-dev libxfixes-dev libxcb-dev glproto"
makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend
talloc-dev py-libxml2 flex bison llvm-dev udev-dev libvdpau-dev
- libxvmc-dev
+ libxvmc-dev gettext
autoconf automake libtool"
source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
glx_ro_text_segm.patch
- ccache.patch
uclibc-debug.patch
"
-
_dri_driverdir=/usr/lib/xorg/modules/dri
_builddir="$srcdir/Mesa-$pkgver"
@@ -65,8 +63,8 @@ build() {
--disable-asm \
--enable-pic \
--enable-glx-rts \
- --with-gallium-drivers=r300,r600,svga,swrast,nouveau \
- --with-dri-drivers=i915,i965,r200,radeon,swrast,nouveau \
+ --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
--enable-gallium-llvm \
--enable-gallium-egl \
--with-egl-platforms=x11,drm \
@@ -181,22 +179,31 @@ _mv_vdpau() {
done
}
+_mv_gpipe() {
+ local i
+ install -d "$subpkgdir"/usr/lib/gallium-pipe
+ for i in "$@"; do
+ mv "$pkgdir"/usr/lib/gallium-pipe/pipe_$i.* \
+ "$subpkgdir"/usr/lib/gallium-pipe/ || return 1
+ done
+}
+
ati() { _mv_dri radeon_dri r200_dri r300_dri r600_dri \
- && _mv_vdpau r300 r600 softpipe; }
+ && _mv_vdpau r300 r600 softpipe \
+ && _mv_gpipe r300 r600; }
intel() { _mv_dri i915_dri i965_dri; }
-nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri && _mv_vdpau nouveau; }
-swrast() { _mv_dri swrast_dri; }
-vmwgfx() { _mv_dri vmwgfx_dri; }
+nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri \
+ && _mv_vdpau nouveau \
+ && _mv_gpipe nouveau; }
+swrast() { _mv_dri swrast_dri && _mv_gpipe swrast; }
+vmwgfx() { _mv_dri vmwgfx_dri && _mv_gpipe vmwgfx; }
-md5sums="d7515cc5116c72ac63d735655bd63689 MesaLib-9.0.3.tar.bz2
+md5sums="d3891e02215422e120271d976ff1947e MesaLib-9.1.tar.bz2
a1a766b4c6a96d67cad9bd7ad5c578e8 glx_ro_text_segm.patch
-1f30bf8340114b455f005cc9b134c414 ccache.patch
cff511b3d459189751c841b8f99e7112 uclibc-debug.patch"
-sha256sums="ea940005b2c379f83527b5ba6d7fb69c533c2c17b561dc3b8469237ac75606a5 MesaLib-9.0.3.tar.bz2
+sha256sums="af484cbfe7fe26e62fb1ddb1204d608c4270e74364c44e7207508cd736a0707b MesaLib-9.1.tar.bz2
004f52adefaeccfd4553e0b1d09ad769891d69d05880094c7a45d19623e674a6 glx_ro_text_segm.patch
-aa756ba2da1a27829f784ac86e0c95a90aa139b232e0e59b5a981070cdf14a63 ccache.patch
8caa309f38190005e37fa833dba34463ee03b775210742004888db1d2b19184d uclibc-debug.patch"
-sha512sums="2685706670356ca82c36a9fc30bfdabe9429e37ba670ece4a44634222430f828dfd5f15b116d78e3a9a6c432cf6ee3cf3a44bd132f896b81cc0bf1e1076dfdc5 MesaLib-9.0.3.tar.bz2
+sha512sums="9475361e3e3ce0e8ad632003b6e41944d3750de3d5a1a774a2e9cb1f04fd0df8f27e6f47e31f08808c3f4506f683cbda53570617f1db1dd0657b07e4bac36a19 MesaLib-9.1.tar.bz2
c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch
-3d7e1152d033873fb953fe09b7cab0980f355924ac17e2f857b070907142489709bc55af63361d8036bf8e84526a589f05a0a29af2c72760b6f99ba957ac6c7f ccache.patch
72da0c43a5ae8c9fcd4a14df6c565d015a5f2f6422688e4b9b63c9b7e438e37219b94172952fc5664dd72a862e47e1893967df5820835b1f37547808087affb7 uclibc-debug.patch"
diff --git a/main/mesa/ccache.patch b/main/mesa/ccache.patch
deleted file mode 100644
index c75d659fa2..0000000000
--- a/main/mesa/ccache.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/gallium/targets/xa-vmwgfx/Makefile.orig
-+++ ./src/gallium/targets/xa-vmwgfx/Makefile
-@@ -59,7 +59,7 @@
- # Make the library
- $(TOP)/$(LIB_DIR)/gallium/$(XA_LIB_NAME): depend $(OBJECTS) $(XA_LIB_DEPS) \
- xa_symbols
-- $(MKLIB) -o $(XA_LIB) -linker $(LD) -ldflags '$(LDFLAGS)' \
-+ $(MKLIB) -o $(XA_LIB) -linker '$(LD)' -ldflags '$(LDFLAGS)' \
- -major $(XA_MAJOR) -minor $(XA_MINOR) -patch $(XA_TINY) \
- $(MKLIB_OPTIONS) \
- -exports xa_symbols \