summaryrefslogtreecommitdiff
path: root/multilib-testing
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-07-11 23:12:58 +0000
committerroot <root@rshg047.dnsready.net>2011-07-11 23:12:58 +0000
commite03f4b9bc9da3327de94bc58aa92ecb836c1580d (patch)
treeafaa891d69789d31246d52c3d9c47c236929d3c2 /multilib-testing
parent1a1b748f1738b1989a834d75b1623be21bf9bab5 (diff)
Mon Jul 11 23:12:58 UTC 2011
Diffstat (limited to 'multilib-testing')
-rw-r--r--multilib-testing/lib32-mesa/PKGBUILD185
1 files changed, 44 insertions, 141 deletions
diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD
index 32667675a..d616def9e 100644
--- a/multilib-testing/lib32-mesa/PKGBUILD
+++ b/multilib-testing/lib32-mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51304 2011-07-06 17:52:30Z lcarlier $
+# $Id: PKGBUILD 51484 2011-07-10 09:40:09Z lcarlier $
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -10,45 +10,36 @@ _git=true
#_git=false
if [ "${_git}" = "true" ]; then
- pkgver=7.10.99.git20110706
+ #pkgver=7.10.99.git20110709
+ pkgver=7.11rc1
else
- pkgver=7.10.3
+ pkgver=7.11rc1
fi
pkgrel=1
arch=(x86_64)
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1'
-'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm')
+makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1'
+'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm')
url="http://mesa3d.sourceforge.net"
license=('custom')
if [ "${_git}" = "true" ]; then
# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
- source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
- md5sums=('6d655a2573037838844019275dce66af')
+ #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
+ source=("MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-b033f050fd5179b051181a0a4b6d94110624d25c.tar.bz2")
else
- source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch)
- md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4')
+ source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip")
fi
+md5sums=('2246d97eb0cfb1f6d2bf8a54b533d07f')
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ # for our llvm-config for 32 bit :(
+ export PATH="/usr/lib32/llvm:$PATH"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- # for our llvm-config for 32 bit :(
- export PATH="/usr/lib32/llvm:$PATH"
- # fix linking with llvmpipe driver
- sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile
- autoreconf -vfi
- else
- cd "${srcdir}/Mesa-${pkgver}"
- fi
-
- if [ "${_git}" != "true" ]; then
- patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
- fi
+ cd ${srcdir}/?esa-*
+ autoreconf -vfi
if [ "${_git}" = "true" ]; then
./autogen.sh --prefix=/usr \
@@ -72,19 +63,18 @@ build() {
else
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib32/xorg/modules/dri \
- --enable-gallium-radeon \
- --enable-gallium-r600 \
- --enable-gallium-nouveau \
- --enable-gallium-swrast \
+ --with-gallium-drivers=r300,r600,nouveau,swrast \
+ --enable-gallium-llvm \
+ --enable-gallium-egl \
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
- --with-state-trackers=dri,glx \
--disable-glut \
--enable-gles1 \
--enable-gles2 \
--enable-egl \
- --disable-gallium-egl \
+ --enable-texture-float \
+ --enable-shared-dricore \
--enable-32-bit \
--libdir=/usr/lib32
fi
@@ -93,29 +83,18 @@ build() {
}
package_lib32-libgl() {
- depends=('lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl')
+ depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'libgl')
pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- else
- cd "${srcdir}/Mesa-${pkgver}"
- fi
-
+ cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/lib32"
install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
- if [ "${_git}" = "true" ]; then
- bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
- bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
- fi
+ bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
+ bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
- if [ "${_git}" = "true" ]; then
- make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
- else
- make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
- fi
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so"
ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
@@ -128,12 +107,7 @@ package_lib32-libgles() {
depends=('libgles')
pkgdesc="Mesa GLES libraries (32-bit)"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- else
- cd "${srcdir}/Mesa-${pkgver}"
- fi
-
+ cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/lib32"
install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
@@ -148,20 +122,14 @@ package_lib32-libegl() {
depends=('lib32-udev' 'libegl')
pkgdesc="Mesa libEGL libraries (32-bit)"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
- else
- cd "${srcdir}/Mesa-${pkgver}"
- fi
+ cd ${srcdir}/?esa-*
+ make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/lib32"
install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
+ install -m755 -d "${pkgdir}/usr/lib32/egl"
bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
- if [ "${_git}" != "true" ]; then
- install -m755 -d "${pkgdir}/usr/lib32/egl"
- bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
- fi
+ bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
@@ -169,18 +137,12 @@ package_lib32-libegl() {
}
package_lib32-mesa() {
- depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.25' 'lib32-gcc-libs>=4.5' 'mesa')
+ depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.26' 'lib32-gcc-libs>=4.6.1' 'mesa')
pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- else
- cd "${srcdir}/Mesa-${pkgver}"
- fi
-
+ cd ${srcdir}/?esa-*
make DESTDIR="${pkgdir}" install
-
rm -f "${pkgdir}/usr/lib32/libGL.so"*
rm -f "${pkgdir}/usr/lib32/libGLESv"*
rm -f "${pkgdir}/usr/lib32/libEGL"*
@@ -197,36 +159,21 @@ package_lib32-ati-dri() {
pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
conflicts=('xf86-video-ati<6.9.0-6')
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C radeon DESTDIR="${pkgdir}" install
make -C r200 DESTDIR="${pkgdir}" install
# DRI drivers for r300 and r600 are removed
# gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
- if [ "${_git}" = "true" ]; then
- make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
- else
- make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
- fi
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
}
package_lib32-intel-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for Intel (32-bit)"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C i810 DESTDIR="${pkgdir}" install
make -C i915 DESTDIR="${pkgdir}" install
make -C i965 DESTDIR="${pkgdir}" install
@@ -236,12 +183,7 @@ package_lib32-unichrome-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C unichrome DESTDIR="${pkgdir}" install
}
@@ -250,12 +192,7 @@ package_lib32-mach64-dri() {
pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)"
conflicts=('xf86-video-mach64<6.8.2')
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C mach64 DESTDIR="${pkgdir}" install
}
@@ -264,12 +201,7 @@ package_lib32-mga-dri() {
pkgdesc="Mesa DRI drivers for Matrox (32-bit)"
conflicts=('xf86-video-mga<1.4.11')
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C mga DESTDIR="${pkgdir}" install
}
@@ -278,12 +210,7 @@ package_lib32-r128-dri() {
pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)"
conflicts=('xf86-video-r128<6.8.1')
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C r128 DESTDIR="${pkgdir}" install
}
@@ -292,12 +219,7 @@ package_lib32-savage-dri() {
pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)"
conflicts=('xf86-video-savage<2.3.1')
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C savage DESTDIR="${pkgdir}" install
}
@@ -306,12 +228,7 @@ package_lib32-sis-dri() {
pkgdesc="Mesa DRI drivers for SiS (32-bit)"
conflicts=('xf86-video-sis<0.10.2')
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C sis DESTDIR="${pkgdir}" install
}
@@ -320,12 +237,7 @@ package_lib32-tdfx-dri() {
pkgdesc="Mesa DRI drivers for 3dfx (32-bit)"
conflicts=('xf86-video-tdfx<1.4.3')
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C tdfx DESTDIR="${pkgdir}" install
}
@@ -333,19 +245,10 @@ package_lib32-nouveau-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
- if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
- fi
-
+ cd ${srcdir}/?esa-*/src/mesa/drivers/dri
# classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
make -C nouveau DESTDIR="${pkgdir}" install
# gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
- if [ "${_git}" = "true" ]; then
- make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
- else
- make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
- fi
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
}