[arch-commits] Commit in mesa/trunk (PKGBUILD)
Jan de Groot
jgc at archlinux.org
Sun Apr 4 14:43:20 UTC 2010
Date: Sunday, April 4, 2010 @ 10:43:19
Author: jgc
Revision: 75839
upgpkg: mesa 7.8-1
Update to 7.8
- Disable EGL
- Remove intel vbl patch, upstream should have fixed the real reason for this patch by now
- Disable libdricore for now, Fedora disables it too and it does not apply
Modified:
mesa/trunk/PKGBUILD
----------+
PKGBUILD | 66 +++++++++++--------------------------------------------------
1 file changed, 12 insertions(+), 54 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-04-04 13:31:59 UTC (rev 75838)
+++ PKGBUILD 2010-04-04 14:43:19 UTC (rev 75839)
@@ -1,26 +1,23 @@
- # $Id$
+# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgbase="mesa"
-pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') # 'nouveau-dri')
-pkgver=7.7.1
+pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
+pkgver=7.8
pkgrel=1
arch=(i686 x86_64)
-makedepends=('glproto>=1.4.11' 'pkgconfig' 'libdrm>=2.4.19' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1' 'libx11>=1.3.3' 'libxt>=1.0.7'
-'gcc-libs>=4.4.3' 'dri2proto=2.1' 'python')
+makedepends=('glproto>=1.4.11' 'pkgconfig' 'libdrm>=2.4.20' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1' 'libx11>=1.3.3' 'libxt>=1.0.8' 'gcc-libs>=4.4.3' 'dri2proto=2.3' 'python')
url="http://mesa3d.sourceforge.net"
license=('custom')
options=(!makeflags)
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
- #ftp://ftp.freedesktop.org/pub/mesa/${pkgver/.0.902//}RC/MesaLib-${pkgver/0.902/1-rc2}.tar.bz2
ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaDemos-${pkgver}.tar.bz2
- #ftp://ftp.freedesktop.org/pub/mesa/${pkgver/.0.902//}RC/MesaDemos-${pkgver/0.902/1-rc2}.tar.bz2
ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
mesa-7.1-link-shared.patch
intel-revert-vbl.patch
LICENSE)
-md5sums=('46664d99e03f1e3ac078a7fea02af115'
- 'aeb39645d80d656e0adebaa09e5bcd03'
+md5sums=('85cb891eecb89aae4fdd3499cccd934b'
+ '9fe8ec184c7f78691e43c4c0a7f97d56'
'6ae05158e678f4594343f32c2ca50515'
'8420bed348e7016ef03cac6545d68389'
'a111f4dc82e894f8801bc3fa129af7af'
@@ -28,33 +25,17 @@
build() {
cd "${srcdir}/Mesa-${pkgver}"
- #cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}"
- patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
- patch -Np1 -i "${srcdir}/intel-revert-vbl.patch" || return 1
+ #patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
+ #patch -Np1 -i "${srcdir}/intel-revert-vbl.patch" || return 1
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
--with-dri-drivers=swrast,radeon,r200,r300,r600,i810,i915,i965,unichrome,mach64,mga,r128,savage,sis,tdfx \
+ --disable-egl \
--disable-gallium-intel \
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
--disable-glut --disable-gallium || return 1
-
-# --with-state-trackers=dri,egl \
-# --enable-gallium-nouveau \
-
-# --with-state-trackers=yes \ # gentoo: glx,dri,egl
-# --disable-gallium build gallium [default=enabled]
-# --disable-gallium-intel build gallium intel [default=enabled]
-# --enable-gallium-radeon build gallium radeon [default=disabled]
-# --enable-gallium-nouveau build gallium nouveau [default=disabled]
-
-#ls src/Mesa-7.6/src/mesa/drivers/dri/
-#common dri.pc.in fb ffb gamma glcore i810 i915 i965 intel mach64 mga r128 r200 r300 r600 radeon s3v savage sis swrast tdfx trident unichrome
-#ls src/Mesa-7.6/src/gallium/drivers/
-#cell failover i915simple i965simple identity llvmpipe nouveau nv04 nv10 nv20 nv30 nv40 nv50 r300 softpipe trace
-
-
make || return 1
cd "${srcdir}/gl-manpages-1.0.1"
@@ -63,11 +44,10 @@
}
package_libgl() {
- depends=('libdrm>=2.4.17-2' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1')
+ depends=('libdrm>=2.4.20' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.2' 'expat>=2.0.1')
pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
cd "${srcdir}/Mesa-${pkgver}" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}" || return 1
install -m755 -d "${pkgdir}/usr/lib" || return 1
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
@@ -75,7 +55,7 @@
cd src/mesa/drivers/dri
make -C swrast DESTDIR="${pkgdir}" install || return 1
- install -m755 libdricore.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
+ #install -m755 libdricore.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" || return 1
install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
@@ -83,11 +63,10 @@
}
package_mesa() {
- depends=('libgl' 'libx11>=1.3.2' 'libxt>=1.0.7' 'gcc-libs>=4.4.2' 'dri2proto=2.1' 'libdrm>=2.4.17-2')
+ depends=('libgl' 'libx11>=1.3.3' 'libxt>=1.0.8' 'gcc-libs>=4.4.3' 'dri2proto=2.3' 'libdrm>=2.4.20')
pkgdesc="Mesa 3-D graphics libraries and include files"
cd "${srcdir}/Mesa-${pkgver}" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}" || return 1
make DESTDIR="${pkgdir}" install || return 1
install -m755 -d "${pkgdir}/usr/bin"
install -m755 progs/xdemos/glx{gears,info} "${pkgdir}/usr/bin/" || return 1
@@ -111,7 +90,6 @@
conflicts=('xf86-video-ati<6.9.0-6')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C radeon DESTDIR="${pkgdir}" install || return 1
make -C r200 DESTDIR="${pkgdir}" install || return 1
make -C r300 DESTDIR="${pkgdir}" install || return 1
@@ -123,14 +101,9 @@
pkgdesc="Mesa DRI drivers for Intel"
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C i810 DESTDIR="${pkgdir}" install || return 1
make -C i915 DESTDIR="${pkgdir}" install || return 1
make -C i965 DESTDIR="${pkgdir}" install || return 1
-
-# cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/intel/egl"
-# cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/intel"
-# make DESTDIR="${pkgdir}" install || return 1
}
package_unichrome-dri() {
@@ -138,7 +111,6 @@
pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C unichrome DESTDIR="${pkgdir}" install || return 1
}
@@ -148,7 +120,6 @@
conflicts=('xf86-video-mach64<6.8.2')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C mach64 DESTDIR="${pkgdir}" install || return 1
}
@@ -158,7 +129,6 @@
conflicts=('xf86-video-mga<1.4.11')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C mga DESTDIR="${pkgdir}" install || return 1
}
@@ -168,7 +138,6 @@
conflicts=('xf86-video-r128<6.8.1')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C r128 DESTDIR="${pkgdir}" install || return 1
}
@@ -178,7 +147,6 @@
conflicts=('xf86-video-savage<2.3.1')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C savage DESTDIR="${pkgdir}" install || return 1
}
@@ -188,7 +156,6 @@
conflicts=('xf86-video-sis<0.10.2')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C sis DESTDIR="${pkgdir}" install || return 1
}
@@ -198,14 +165,5 @@
conflicts=('xf86-video-tdfx<1.4.3')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" || return 1
-# cd "${srcdir}/Mesa-${pkgver/0.902/1-rc2}/src/mesa/drivers/dri" || return 1
make -C tdfx DESTDIR="${pkgdir}" install || return 1
}
-
-#package_nouveau-dri() {
-# depends=("libgl=${pkgver}")
-# pkgdesc="Mesa Gallium3D DRI drivers for Nouveau"
-
-# cd "${srcdir}/Mesa-${pkgver}/src/gallium/winsys/drm/nouveau/dri"
-# make DESTDIR="${pkgdir}" install || return 1
-#}
More information about the arch-commits
mailing list