Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=3f14352fbf884e10e596d2422f8da7ef71ff2e9e

commit 3f14352fbf884e10e596d2422f8da7ef71ff2e9e
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sat Apr 16 18:12:47 2011 +0200

mesa-7.10.2-1-i686

* Bump version.

diff --git a/source/x11/mesa/5c102dd94f435e97507213fbd128e50dd15f5f54.patch 
b/source/x11/mesa/5c102dd94f435e97507213fbd128e50dd15f5f54.patch
new file mode 100644
index 0000000..7f57e69
--- /dev/null
+++ b/source/x11/mesa/5c102dd94f435e97507213fbd128e50dd15f5f54.patch
@@ -0,0 +1,85 @@
+commit 5c102dd94f435e97507213fbd128e50dd15f5f54
+Author: Ben Skeggs <bske...@redhat.com>
+Date:   Mon Dec 20 13:39:36 2010 +1000
+
+    nouveau: fix includes for latest libdrm
+
+    Signed-off-by: Ben Skeggs <bske...@redhat.com>
+
+diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h 
b/src/gallium/drivers/nouveau/nouveau_winsys.h
+index ab480ca..747b084 100644
+--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
+@@ -10,7 +10,7 @@
+ #include "nouveau/nouveau_grobj.h"
+ #include "nouveau/nouveau_notifier.h"
+ #include "nouveau/nouveau_resource.h"
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ #ifndef NV04_PFIFO_MAX_PACKET_LEN
+ #define NV04_PFIFO_MAX_PACKET_LEN 2047
+diff --git a/src/gallium/drivers/nv50/nv50_surface.c 
b/src/gallium/drivers/nv50/nv50_surface.c
+index ce48022..a99df76 100644
+--- a/src/gallium/drivers/nv50/nv50_surface.c
++++ b/src/gallium/drivers/nv50/nv50_surface.c
+@@ -22,7 +22,7 @@
+
+ #define __NOUVEAU_PUSH_H__
+ #include <stdint.h>
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ #include "pipe/p_defines.h"
+diff --git a/src/gallium/drivers/nvfx/nv04_2d.c 
b/src/gallium/drivers/nvfx/nv04_2d.c
+index e0e65e7..e2fadd3 100644
+--- a/src/gallium/drivers/nvfx/nv04_2d.c
++++ b/src/gallium/drivers/nvfx/nv04_2d.c
+@@ -34,11 +34,11 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <nouveau/nouveau_device.h>
+-#include <nouveau/nouveau_pushbuf.h>
+ #include <nouveau/nouveau_channel.h>
+ #include <nouveau/nouveau_bo.h>
+ #include <nouveau/nouveau_notifier.h>
+ #include <nouveau/nouveau_grobj.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv04_2d.h"
+
+ #include "nouveau/nv_object.xml.h"
+diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c 
b/src/gallium/drivers/nvfx/nvfx_vbo.c
+index 597664e..339b317 100644
+--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
+@@ -9,8 +9,7 @@
+ #include "nvfx_resource.h"
+
+ #include "nouveau/nouveau_channel.h"
+-
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ static inline unsigned
+ util_guess_unique_indices_count(unsigned mode, unsigned indices)
+diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h 
b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+index 8036b18..c5ac128 100644
+--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+@@ -38,7 +38,6 @@
+ #include <assert.h>
+
+ #include "nouveau_device.h"
+-#include "nouveau_pushbuf.h"
+ #include "nouveau_grobj.h"
+ #include "nouveau_channel.h"
+ #include "nouveau_bo.h"
+@@ -46,6 +45,7 @@
+ #include "nouveau_screen.h"
+ #include "nouveau_state.h"
+ #include "nouveau_surface.h"
++#include "nv04_pushbuf.h"
+
+ #define DRIVER_DATE   "20091015"
+ #define DRIVER_AUTHOR "Nouveau"
diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild
index e79a24e..1cf06c3 100644
--- a/source/x11/mesa/FrugalBuild
+++ b/source/x11/mesa/FrugalBuild
@@ -8,8 +8,8 @@ USE_GALLIUM=${USE_GALLIUM:-"y"}
pkgname=mesa
origname=Mesa
_F_archive_name="MesaLib"
-pkgver=7.10
-pkgrel=3
+pkgver=7.10.2
+pkgrel=1
pkgdesc="Mesa is a 3D graphics library"
url="http://mesa3d.sourceforge.net/";
up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/";
@@ -30,8 +30,10 @@ if Fuse $USE_DEVEL; then
_F_scm_url="git://anongit.freedesktop.org/mesa/mesa"
Finclude scm
else
-       
source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2";)
-       sha1sums=('3cc8a077a3668041eb7296a94afcd807a3b90379')
+       
source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2"; \
+               "5c102dd94f435e97507213fbd128e50dd15f5f54.patch")
+       sha1sums=('71bbb2686230f6334aa625a951b58b4b2d5d6aa0' \
+               '08d16a0f0f1f655b443c6c7630d16f47c2d44837')
fi

source=("${source[@]}" \
@@ -125,7 +127,7 @@ build() {
Fconf   --with-driver=dri \
--with-dri-driverdir=/usr/lib/dri \
--with-dri-drivers=yes \
-               --with-egl-platforms=x11,drm \
+               --with-egl-platforms=drm,x11 \
--with-state-trackers=dri,egl,glx,vega \
--disable-glut \
--enable-egl \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to