summaryrefslogtreecommitdiff
path: root/extra/mesa
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-08-04 00:20:47 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-08-04 00:20:47 -0300
commit97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (patch)
tree614d5483fcdab0aa6adecc7041c4b872ffb5a293 /extra/mesa
parente8eefc5a3834440246552e54c169abfa0703672e (diff)
parent8c2359e2541f9d1b11443b49d8ea502b3ffea39c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/unifdef/PKGBUILD extra/gtk2/PKGBUILD extra/libmpeg2/PKGBUILD extra/mesa/PKGBUILD multilib/lib32-libdrm/PKGBUILD multilib/lib32-libdrm/no-pthread-stubs.patch multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'extra/mesa')
-rw-r--r--extra/mesa/PKGBUILD234
1 files changed, 70 insertions, 164 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 431a69083..0e5fa22f6 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,50 +1,39 @@
-# $Id: PKGBUILD 127561 2011-06-16 15:23:47Z andyrtr $
+# $Id: PKGBUILD 134098 2011-08-01 12:57:59Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
-pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri')
+pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
[[ "$CARCH" = "mips64el" ]] && pkgname=('mesa' 'libgl' 'libgles' 'libegl')
#_git=true
_git=false
if [ "${_git}" = "true" ]; then
- pkgver=7.10.99.git20110612
+ #pkgver=7.10.99.git20110709
+ pkgver=7.11
else
- pkgver=7.10.3
+ pkgver=7.11
fi
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
-makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1'
- 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1'
- 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake')
-[[ "$CARCH" = "mips64el" ]] || makedepends+=('dri2proto=2.3' 'llvm')
+makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1'
+ 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev')
+[[ "$CARCH" = "mips64el" ]] || makedepends+=('dri2proto=2.6' 'llvm')
url="http://mesa3d.sourceforge.net"
license=('custom')
-source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch mesa-7.5-mips-wmb.patch mesa-loongson.patch)
+source=(LICENSE)
if [ "${_git}" = "true" ]; then
- # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87
- source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2')
+ # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
+ #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
+ source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
else
- source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip"
+ source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
)
fi
build() {
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- autoreconf -vfi
- else
- cd "${srcdir}/Mesa-${pkgver}"
-fi
-
-if [ "${_git}" != "true" ]; then
-#backport from master to fix gnome-shell shader
-#https://bugs.freedesktop.org/show_bug.cgi?id=35714
-patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch"
-patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
-fi
+ cd ${srcdir}/?esa-*
# WMB for MIPS patch from Fedora and Gentoo
patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch
@@ -63,46 +52,40 @@ if [ "$CARCH" = "mips64el" ]; then
--disable-gallium-egl
else
if [ "${_git}" = "true" ]; then
+ autoreconf -vfi
./autogen.sh --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --enable-gallium-r300 \
- --enable-gallium-r600 \
- --enable-gallium-nouveau \
+ --with-gallium-drivers=r300,r600,nouveau,swrast \
--enable-gallium-llvm \
- --enable-gallium-egl \
- --enable-gallium-swrast \
+ --enable-gallium-egl --enable-shared-glapi\
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
- --with-state-trackers=dri,glx,egl \
--disable-glut \
--enable-gles1 \
--enable-gles2 \
--enable-egl \
- --enable-texture-float
+ --enable-texture-float \
+ --enable-shared-dricore
+
# --enable-gallium-svga \
-
- # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg
- #The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply.
-
- #--enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177
else
+ autoreconf -vfi
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib/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-shared-glapi\
--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
fi
fi
@@ -110,19 +93,17 @@ fi
}
package_libgl() {
- depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1')
+ depends=('libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
[[ "$CARCH" = "mips64el" ]] && pkgdesc="Mesa 3-D graphics library (Xlib)"
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- else
- cd "${srcdir}/Mesa-${pkgver}"
-fi
+ cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/lib"
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
+ bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
+ bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
if [ "$CARCH" != "mips64el" ]; then
@@ -131,7 +112,7 @@ fi
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
+ make -C ${srcdir}/Mesa-${pkgver/rc/-rc}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
fi
ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
@@ -142,15 +123,23 @@ fi
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
}
+package_libglapi() {
+ depends=('glibc')
+ pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
+
+ cd ${srcdir}/?esa-*
+ install -m755 -d "${pkgdir}/usr/lib"
+ bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
+}
+
package_libgles() {
- depends=('libgl')
+ depends=('libglapi')
pkgdesc="Mesa GLES libraries and headers"
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- else
- cd "${srcdir}/Mesa-${pkgver}"
-fi
+ cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/lib"
install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
install -m755 -d "${pkgdir}/usr/include"
@@ -168,15 +157,11 @@ fi
}
package_libegl() {
- depends=('libgl')
- pkgdesc="Mesa libEGL libraries and headers"
+ depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev')
+ pkgdesc="Mesa EGL libraries and headers"
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- make -C src/gallium/targets/egl 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/lib"
install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
install -m755 -d "${pkgdir}/usr/include"
@@ -187,10 +172,8 @@ fi
install -m755 -d "${pkgdir}/usr/share/doc"
install -m755 -d "${pkgdir}/usr/share/doc/libegl"
bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
-if [ "${_git}" != "true" ]; then
install -m755 -d "${pkgdir}/usr/lib/egl"
bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
-fi
bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
@@ -201,18 +184,15 @@ fi
}
package_mesa() {
- depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12')
+ depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6') # 'dri2proto>=2.6' 'glproto>=1.4.14')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
pkgdesc="Mesa 3-D graphics libraries and include files"
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*
- else
- cd "${srcdir}/Mesa-${pkgver}"
-fi
+ cd ${srcdir}/?esa-*
make DESTDIR="${pkgdir}" install
rm -f "${pkgdir}/usr/lib/libGL.so"*
+ rm -f "${pkgdir}/usr/lib/libglapi.so"*
rm -f "${pkgdir}/usr/lib/libGLESv"*
rm -f "${pkgdir}/usr/lib/libEGL"*
rm -rf "${pkgdir}/usr/lib/egl"
@@ -233,50 +213,28 @@ package_ati-dri() {
pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
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
- make -C radeon DESTDIR="${pkgdir}" install
- make -C r200 DESTDIR="${pkgdir}" install
- # classic mesa driver for R300 r300_dri.so
- #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated
- # gallium3D driver for R300 r300_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 r600 DESTDIR="${pkgdir}" install
+ # classic mesa drivers for radeon,r200
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
+ # gallium3D driver for r300,r600
+ 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_intel-dri() {
depends=("libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for Intel"
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C i810 DESTDIR="${pkgdir}" install
- make -C i915 DESTDIR="${pkgdir}" install
- make -C i965 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
}
package_unichrome-dri() {
depends=("libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
- make -C unichrome DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
}
package_mach64-dri() {
@@ -284,12 +242,7 @@ package_mach64-dri() {
pkgdesc="Mesa DRI drivers for ATI Mach64"
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
- make -C mach64 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
}
package_mga-dri() {
@@ -297,12 +250,7 @@ package_mga-dri() {
pkgdesc="Mesa DRI drivers for Matrox"
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
- make -C mga DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
}
package_r128-dri() {
@@ -310,12 +258,7 @@ package_r128-dri() {
pkgdesc="Mesa DRI drivers for ATI Rage128"
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
- make -C r128 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
}
package_savage-dri() {
@@ -323,12 +266,7 @@ package_savage-dri() {
pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
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
- make -C savage DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
}
package_sis-dri() {
@@ -336,12 +274,7 @@ package_sis-dri() {
pkgdesc="Mesa DRI drivers for SiS"
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
- make -C sis DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
}
package_tdfx-dri() {
@@ -349,33 +282,17 @@ package_tdfx-dri() {
pkgdesc="Mesa DRI drivers for 3dfx"
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
- make -C tdfx DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
}
package_nouveau-dri() {
depends=("libgl=${pkgver}")
pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-if [ "${_git}" = "true" ]; then
- cd ${srcdir}/mesa-*/src/mesa/drivers/dri
- else
- cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
-fi
-
# classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C nouveau DESTDIR="${pkgdir}" install
-
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/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
}
#package_llvm-dri() {
@@ -396,14 +313,3 @@ fi
# make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
#fi
#}
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- '3ec78f340f9387abd7a37b195e764cbf'
- '67c87b77cc2236b52a3b47dad3fbb5d4'
- 'c7788f2495060bf133771aef6ad25929'
- '614d063ecd170940d9ae7b355d365d59')
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- '3ec78f340f9387abd7a37b195e764cbf'
- '67c87b77cc2236b52a3b47dad3fbb5d4'
- 'c7788f2495060bf133771aef6ad25929'
- '598c24dccfcdcc99c07d883f7c09f36a'
- '614d063ecd170940d9ae7b355d365d59')