Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=0703ead510f6973640f5555363e28952f0a1762f
commit 0703ead510f6973640f5555363e28952f0a1762f
Author: bouleetbil <bouleet...@frogdev.info>
Date: Tue Jul 12 13:16:39 2011 +0200
mesa-7.10.2-5-x86_64
*revers bump to latest mesa
*the 7.10.3 and 7.11-rc1 break intel support
*after this downgrade will search why
diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild
index 307b1c1..154c5cd 100644
--- a/source/x11/mesa/FrugalBuild
+++ b/source/x11/mesa/FrugalBuild
@@ -4,14 +4,12 @@
USE_DEVEL=${USE_DEVEL:-"n"}
USE_GALLIUM=${USE_GALLIUM:-"y"}
-USE_SNAPSHOT=${USE_SNAPSHOT:-"y"}
pkgname=mesa
origname=Mesa
_F_archive_name="MesaLib"
-pkgver=7.11
-subpkgver=rc1
-pkgrel=1
+pkgver=7.10.2
+pkgrel=5
pkgdesc="Mesa is a 3D graphics library"
url="http://mesa3d.sourceforge.net/";
up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/";
@@ -24,6 +22,8 @@ makedepends=('libxi>=1.2.1' 'libxmu>=1.0.4-2' 'makedepend'
'xf86vidmodeproto' 'l
rodepends=('libgl' 'libglu' 'libglw')
archs=('i686' 'x86_64' 'ppc' 'arm')
groups=('x11' 'xorg-core' 'xorg-libs')
+options=('force')
+
if Fuse $USE_DEVEL; then
unset source sha1sums
pkgver=$pkgver.1.g6e00627
@@ -31,18 +31,15 @@ if Fuse $USE_DEVEL; then
_F_scm_type="git"
_F_scm_url="git://anongit.freedesktop.org/mesa/mesa"
Finclude scm
-elif Fuse $USE_SNAPSHOT; then
-
source=("http://cgit.freedesktop.org/mesa/mesa/snapshot/${pkgname}-${pkgver}-${subpkgver}.tar.bz2";)
- sha1sums=('3dc05039e4e5ececb5989ad9b9782127c11da4d4')
else
source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2"; \
"5c102dd94f435e97507213fbd128e50dd15f5f54.patch" \
"1d24e6ec1d13c2b88b858997900aa8b69de92b13.patch" \
"gnome-shell.diff")
- sha1sums=('e1fe8bad90bb24cc4b25a42932c277a0e0d7a2ac' \
- '08d16a0f0f1f655b443c6c7630d16f47c2d44837' \
- '42dd2b7783d1f3f379086ff94cb6e8cabf92b8c2' \
- '0da49e00bf7263ec6a34b74976bbb6960331ade0')
+ sha1sums=('71bbb2686230f6334aa625a951b58b4b2d5d6aa0' \
+ '08d16a0f0f1f655b443c6c7630d16f47c2d44837' \
+ '42dd2b7783d1f3f379086ff94cb6e8cabf92b8c2' \
+ '0da49e00bf7263ec6a34b74976bbb6960331ade0')
fi
source=("${source[@]}" \
@@ -62,6 +59,7 @@ subdepends=('libdrm>=2.4.20 libxcb>=1.3 libxdamage>=1.1.1-3
libxi libxmu libxxf8
subrodepends=("libdri libgl-headers-mesa>=$pkgver-$pkgrel libglx" '')
subgroups=('x11' 'x11')
subarchs=('i686 x86_64 ppc arm' 'i686 x86_64 ppc arm')
+suboptions=('force' 'force')
subpkgs=("${subpkgs[@]}" 'libegl')
subdescs=("${subdescs[@]}" 'Mesa OpenEGL library.')
@@ -72,6 +70,7 @@ subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" 'libgl')
subgroups=("${subgroups[@]}" 'x11')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+suboptions=("${suboptions[@]}" 'force')
subpkgs=("${subpkgs[@]}" 'libgles')
subdescs=("${subdescs[@]}" 'Mesa OpenGL ES1/ES2 libraries.')
@@ -82,6 +81,7 @@ subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" '')
subgroups=("${subgroups[@]}" 'x11')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+suboptions=("${suboptions[@]}" 'force')
subpkgs=("${subpkgs[@]}" 'libglu')
subdescs=("${subdescs[@]}" 'Mesa OpenGL Utility library.')
@@ -92,6 +92,7 @@ subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" 'libgl')
subgroups=("${subgroups[@]}" 'x11')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+suboptions=("${suboptions[@]}" 'force')
subpkgs=("${subpkgs[@]}" 'libvg')
subdescs=("${subdescs[@]}" 'Mesa OpenVG library.')
@@ -102,6 +103,7 @@ subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" 'libgl')
subgroups=("${subgroups[@]}" 'x11')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+suboptions=("${suboptions[@]}" 'force')
subpkgs=("${subpkgs[@]}" 'libglw')
subdescs=("${subdescs[@]}" 'Mesa Xt/Motif OpenGL drawing area widget library.')
@@ -112,6 +114,7 @@ subdepends=("${subdepends[@]}" '')
subrodepends=("${subrodepends[@]}" 'libgl')
subgroups=("${subgroups[@]}" 'x11')
subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm')
+suboptions=("${suboptions[@]}" 'force')
# NOTE: If you bump version (major or minor) you need to review the symlinking
at the end of this
# file !!!! On minor bump last number will be changed.
@@ -123,16 +126,8 @@ build() {
Funpack_scm
./autogen.sh
fi
- if Fuse $USE_SNAPSHOT; then
- Fcd $pkgname-$pkgver-$subpkgver
- ./autogen.sh
- else
- Fcd $origname-$pkgver
- fi
- # recommended by upstream
- export CFLAGS="$CFLAGS -ffast-math"
- export CXXFLAGS="$CXXFLAGS -ffast-math"
+ Fcd $origname-$pkgver
Fpatchall
DRI_DRIVERS="swrast"
@@ -142,19 +137,21 @@ build() {
DRI_DRIVERS="$DRI_DRIVERS,nouveau"
DRI_DRIVERS="$DRI_DRIVERS,r128,r200,r300,r600,radeon"
DRI_DRIVERS="$DRI_DRIVERS,savage"
- if [ "$CARCH" != "arm" -a "$CARCH" != "ppc" ]; then
+ if [ "$CARCH" != "arm" ]; then
+ #disable sis support
DRI_DRIVERS="$DRI_DRIVERS,sis"
fi
DRI_DRIVERS="$DRI_DRIVERS,tdfx"
DRI_DRIVERS="$DRI_DRIVERS,unichrome"
if Fuse $USE_GALLIUM; then
- #LLVM is required to build Gallium R300
- Fconfopts="$Fconfopts --enable-gallium-llvm"
- Fconfopts="$Fconfopts --enable-openvg"
- Fconfopts="$Fconfopts --enable-shared-glapi"
- Fconfopts="$Fconfopts --enable-gallium-egl"
- Fconfopts="$Fconfopts
--with-gallium-drivers=i915,i965,nouveau,r300,r600,svga,swrast"
+ Fconfopts="$Fconfopts --disable-gallium-llvm"
+ Fconfopts="$Fconfopts --enable-gallium-swrast"
+ Fconfopts="$Fconfopts --enable-gallium-i915
--enable-gallium-i965"
+ Fconfopts="$Fconfopts --enable-gallium-nouveau"
+ Fconfopts="$Fconfopts --enable-gallium-r300
--enable-gallium-r600"
+ Fconfopts="$Fconfopts --enable-gallium-svga"
+ Fconfopts="$Fconfopts --enable-openvg
--with-state-trackers=dri,egl,glx,vega"
else
Fconfopts="$Fconfopts --disable-gallium --disable-openvg"
fi
@@ -186,7 +183,7 @@ build() {
# Install our .la files with r-xr-xr-x rights
Finstall 0555 lib{GL,GLU}.la /usr/lib/
- Fln libGLU.so.1.3.071100 /usr/lib/libGLU.so.1.3
+ Fln libGLU.so.1.3.071000 /usr/lib/libGLU.so.1.3
Fln libGLw.so.1.0.0 /usr/lib/libGLw.so.1.0
# Remove glut.h because it conflicts with freeglut :P
@@ -237,3 +234,4 @@ build() {
}
# optimization OK
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
