Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=76130b434eecc3d7adf1b9486254337060e72831
commit 76130b434eecc3d7adf1b9486254337060e72831 Author: Michel Hermier <herm...@frugalware.org> Date: Mon Jun 6 08:52:17 2011 +0200 mesa-7.10.2-3-i686 * Enable dri driver by name(not auto guessed) * Enable nouveau-vieu dri driver. diff --git a/source/x11/mesa/1d24e6ec1d13c2b88b858997900aa8b69de92b13.patch b/source/x11/mesa/1d24e6ec1d13c2b88b858997900aa8b69de92b13.patch new file mode 100644 index 0000000..ade379a --- /dev/null +++ b/source/x11/mesa/1d24e6ec1d13c2b88b858997900aa8b69de92b13.patch @@ -0,0 +1,22 @@ +From 1d24e6ec1d13c2b88b858997900aa8b69de92b13 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <bske...@redhat.com> +Date: Mon, 06 Jun 2011 00:17:59 +0000 +Subject: dri/nouveau: fix gnome-shell segfault + +Signed-off-by: Ben Skeggs <bske...@redhat.com> +--- +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c +index 71dde41..22b9957 100644 +--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c ++++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c +@@ -261,7 +261,7 @@ nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw) + assert(!ret); + } + +- _mesa_resize_framebuffer(NULL, fb, draw->w, draw->h); ++ _mesa_resize_framebuffer(ctx, fb, draw->w, draw->h); + } + + static void +-- +cgit v0.8.3-6-g21f6 diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index e53c60d..4a68725 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -9,7 +9,7 @@ pkgname=mesa origname=Mesa _F_archive_name="MesaLib" pkgver=7.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/"; @@ -31,9 +31,11 @@ if Fuse $USE_DEVEL; then Finclude scm else source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2"; \ - "5c102dd94f435e97507213fbd128e50dd15f5f54.patch") + "5c102dd94f435e97507213fbd128e50dd15f5f54.patch" \ + "1d24e6ec1d13c2b88b858997900aa8b69de92b13.patch") sha1sums=('71bbb2686230f6334aa625a951b58b4b2d5d6aa0' \ - '08d16a0f0f1f655b443c6c7630d16f47c2d44837') + '08d16a0f0f1f655b443c6c7630d16f47c2d44837' \ + '42dd2b7783d1f3f379086ff94cb6e8cabf92b8c2') fi source=("${source[@]}" \ @@ -118,10 +120,19 @@ build() { Fcd $origname-$pkgver Fpatchall + DRI_DRIVERS="swrast" + DRI_DRIVERS="$DRI_DRIVERS,i810,i915,i965" + DRI_DRIVERS="$DRI_DRIVERS,mach64" + DRI_DRIVERS="$DRI_DRIVERS,mga" + DRI_DRIVERS="$DRI_DRIVERS,nouveau" + DRI_DRIVERS="$DRI_DRIVERS,r128,r200,r300,r600,radeon" + DRI_DRIVERS="$DRI_DRIVERS,savage" if [ "$CARCH" == "arm" ]; then #disable sis support - Fsed "savage sis tdfx" "savage tdfx" configure* + DRI_DRIVERS="$DRI_DRIVERS,sis" fi + DRI_DRIVERS="$DRI_DRIVERS,tdfx" + DRI_DRIVERS="$DRI_DRIVERS,unichrome" if Fuse $USE_GALLIUM; then Fconfopts="$Fconfopts --disable-gallium-llvm --enable-gallium-nouveau --enable-gallium-radeon \ @@ -132,7 +143,7 @@ build() { Fconf --with-driver=dri \ --with-dri-driverdir=/usr/lib/dri \ - --with-dri-drivers=yes \ + --with-dri-drivers=$DRI_DRIVERS \ --with-egl-platforms=drm,x11 \ --disable-glut \ --enable-egl \ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
