From a9ed4f570a9d234298f2295b841893d3d65f5fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Wed, 12 Sep 2012 17:16:11 -0300 Subject: mesa-git: updating package --- pcr/mesa-git/PKGBUILD | 71 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 17 deletions(-) (limited to 'pcr') diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD index 8b8a5c7dd..0a63f43d8 100644 --- a/pcr/mesa-git/PKGBUILD +++ b/pcr/mesa-git/PKGBUILD @@ -4,7 +4,7 @@ _d3d1x=false _openvg=true _va=false _vdpau=true -_wayland=false +_wayland=true _xorg=true _xvmc=true pkgbase=mesa-git @@ -24,6 +24,7 @@ true && pkgname=( intel-gallium-dri-git intel-dri-git nouveau-dri-git + svga-dri-git mesa-git ) if [ $_openvg = true ]; then @@ -67,9 +68,10 @@ if [ $_xvmc = true ]; then soft-xvmc-git ) fi -true && pkgver=9.0.0.git20120908 +true && pkgver=9.0.0.git$(LC_ALL=C date -u +%Y%m%d) true && pkgrel=1 _mesaver=9.0 +_dricore=9.1 arch=( i686 x86_64 @@ -205,7 +207,7 @@ build() { --with-clang-libdir=/usr/lib \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \ - --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,swrast + --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast make V=0 } @@ -275,11 +277,12 @@ package_libegl-wayland-git() { fi conflicts=( libegl + libegl-git libegl-wayland ) provides=( libegl=$_mesaver - libegl-git=$_mesaver + libegl-git libegl-wayland=$_mesaver ) pkgdesc='Mesa EGL libraries and headers, with wayland Support' @@ -322,11 +325,12 @@ package_libegl-git() { conflicts=( libegl libegl-wayland + libegl-wayland-git ) provides=( libegl=$_mesaver - libegl-git=$_mesaver libegl-wayland=$_mesaver + libegl-wayland-git ) pkgdesc='Mesa EGL libraries and headers' @@ -397,11 +401,12 @@ package_libgl-gallium-git() { ) conflicts=( libgl + libgl-git libgl-gallium ) provides=( libgl=$_mesaver - libgl-git=$_mesaver + libgl-git libgl-gallium=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer' @@ -415,12 +420,12 @@ package_libgl-gallium-git() { install -m755 -d $pkgdir/usr/lib/xorg/modules/extensions install -m755 -d $pkgdir/usr/share/doc/libgl install -m755 -d $pkgdir/usr/share/licenses/libgl - #ln -s libdricore$_mesaver.so.1.0.0 $pkgdir/usr/lib/libdricore.so + #ln -s libdricore$_dricore.so.1.0.0 $pkgdir/usr/lib/libdricore.so ln -s libglx.xorg $pkgdir/usr/lib/xorg/modules/extensions/libglx.so #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib #install -Dm644 lib/libGL.so* $pkgdir/usr/lib - #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib - #install -Dm644 lib/libdricore$_mesaver.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore$_dricore.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore$_dricore.so* $pkgdir/usr/lib #install -Dm644 lib/gallium/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgl @@ -439,11 +444,12 @@ package_libgl-git() { conflicts=( libgl libgl-gallium + libgl-gallium-git ) provides=( libgl=$_mesaver libgl-gallium=$_mesaver - libgl-gallium-git=$_mesaver + libgl-gallium-git ) pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer' @@ -460,8 +466,8 @@ package_libgl-git() { ln -s libglx.xorg $pkgdir/usr/lib/xorg/modules/extensions/libglx.so #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib #install -Dm644 lib/libGL.so* $pkgdir/usr/lib - #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib - #install -Dm644 lib/libdricore$_mesaver.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore$_dricore.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore$_dricore.so* $pkgdir/usr/lib #install -Dm644 src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri #install -Dm644 lib/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl @@ -625,11 +631,12 @@ package_intel-gallium-dri-git() { ) conflicts=( intel-dri + intel-dri-git intel-gallium-dri ) provides=( intel-dri=$_mesaver - intel-dri-git=$_mesaver + intel-dri-git intel-gallium-dri=$_mesaver ) pkgdesc='Mesa DRI drivers for Intel, with i915 Gallium Driver )' @@ -654,6 +661,7 @@ package_intel-dri-git() { conflicts=( intel-dri intel-gallium-dri + intel-gallium-dri-git ) provides=( intel-dri=$_mesaver @@ -703,6 +711,36 @@ package_nouveau-dri-git() { install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-dri } +package_svga-dri-git() { + depends=( + libgl-git + ) + conflicts=( + svga-dri + ) + provides=( + svga-dri=$_mesaver + ) + pkgdesc='Free Gallium3D VMware guest GL driver' + + make -C $srcdir/build/src/gallium/targets/dri-vmwgfx DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xa-vmwgfx DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/include + #install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + install -m755 -d $pkgdir/usr/share/licenses/svga-dri + #install -Dm644 lib/gallium/libxatracker.so* $pkgdir/usr/lib + #install -Dm644 src/gallium/state_trackers/xa/xa_composite.h $pkgdir/usr/lib/include + #install -Dm644 src/gallium/state_trackers/xa/xa_context.h $pkgdir/usr/lib/include + #install -Dm644 src/gallium/state_trackers/xa/xa_tracker.h $pkgdir/usr/lib/include + #install -Dm644 src/gallium/targets/xa-vmwgfx/xatracker.pc $pkgdir/usr/lib/pkgconfig + #install -Dm644 lib/gallium/vmwgfx_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/svga-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/svga-dri +} + package_ati-va-git() { depends=( glibc @@ -974,7 +1012,6 @@ package_mesa-git() { depends=( dri2proto glproto-git - libgl-git libglu-git ) optdepends=( @@ -992,10 +1029,10 @@ package_mesa-git() { cd $srcdir/build make DESTDIR=$pkgdir install - rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h} + rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h,xa_*.h} rm -fvr $pkgdir/usr/lib/{egl,gbm,opencl,vdpau,xorg} - rm -fv $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*} - rm -fv $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc} + rm -fv $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*,libxatracker.so*} + rm -fv $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc,xatracker.pc} install -m755 -d $pkgdir/usr/share/licenses/mesa install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/mesa install -Dm644 docs/license.html $pkgdir/usr/share/licenses/mesa -- cgit v1.2.3-2-g168b