From: Victor Martinez <pitillo@ono.com>
Date: Tue, 12 Feb 2013 09:39:21 +0000 (+0100)
Subject: mesa3d: updated to 9.0.2
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=1c15fb1856e8bd5aae405fabb7825c104fa1f807;p=ports%2Fxorg-arm.git

mesa3d: updated to 9.0.2
---

diff --git a/mesa3d/.footprint b/mesa3d/.footprint
index d307002..3f1f7ab 100644
--- a/mesa3d/.footprint
+++ b/mesa3d/.footprint
@@ -50,10 +50,17 @@ lrwxrwxrwx	root/root	usr/lib/libGLESv1_CM.so.1 -> libGLESv1_CM.so.1.1.0
 lrwxrwxrwx	root/root	usr/lib/libGLESv2.so -> libGLESv2.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0
 -rwxr-xr-x	root/root	usr/lib/libGLESv2.so.2.0.0
+<<<<<<< HEAD
 -rwxr-xr-x	root/root	usr/lib/libdricore9.0.1.la
 lrwxrwxrwx	root/root	usr/lib/libdricore9.0.1.so -> libdricore9.0.1.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libdricore9.0.1.so.1 -> libdricore9.0.1.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libdricore9.0.1.so.1.0.0
+=======
+-rwxr-xr-x	root/root	usr/lib/libdricore9.0.2.la
+lrwxrwxrwx	root/root	usr/lib/libdricore9.0.2.so -> libdricore9.0.2.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libdricore9.0.2.so.1 -> libdricore9.0.2.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libdricore9.0.2.so.1.0.0
+>>>>>>> af48ac0... mesa3d: updated to 9.0.2
 -rwxr-xr-x	root/root	usr/lib/libglapi.la
 lrwxrwxrwx	root/root	usr/lib/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index ce5e182..1fc420b 100644
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1 +1,5 @@
+<<<<<<< HEAD
 97d6554c05ea7449398afe3a0ede7018  MesaLib-9.0.1.tar.bz2
+=======
+dc45d1192203e418163e0017640e1cfc  MesaLib-9.0.2.tar.bz2
+>>>>>>> af48ac0... mesa3d: updated to 9.0.2
diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index b8038b0..322587b 100644
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-xf86vidmodeproto, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, xorg-libpciaccess, expat, talloc, libxml2-python
 
 name=mesa3d
-version=9.0.1
+version=9.0.2
 release=1
 source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2)