From 06c7c4c5ef2c808f288b2a8cd63548a322d66754 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 11 Apr 2011 04:43:21 +0000 Subject: Mon Apr 11 04:43:21 UTC 2011 --- multilib-testing/lib32-mesa/PKGBUILD | 337 +++++++++++++++++++++ .../lib32-mesa/nouveau-fix-header.patch | 86 ++++++ 2 files changed, 423 insertions(+) create mode 100644 multilib-testing/lib32-mesa/PKGBUILD create mode 100644 multilib-testing/lib32-mesa/nouveau-fix-header.patch (limited to 'multilib-testing/lib32-mesa') diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD new file mode 100644 index 000000000..489fd3703 --- /dev/null +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -0,0 +1,337 @@ +# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $ +# Contributor: Jan de Groot +# Contributor: Andreas Radke + +pkgbase=lib32-mesa +pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' +'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') + +#_git=true +_git=false + +if [ "${_git}" = "true" ]; then + pkgver=7.10.0.git20110215 + else + pkgver=7.10.2 +fi + +pkgrel=2 +arch=(x86_64) +makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' +'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') +url="http://mesa3d.sourceforge.net" +license=('custom') +if [ "${_git}" = "true" ]; then + # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866 + source=('ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2') + md5sums=('f0d9daab4aaaacfd3b756dcb23b268af') +else + source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) + md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') +fi + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + if [ "${_git}" = "true" ]; then + cd ${srcdir}/mesa-* + autoreconf -vfi + else + cd "${srcdir}/Mesa-${pkgver}" + fi + + patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" + + if [ "${_git}" = "true" ]; then + ./autogen.sh --prefix=/usr \ + --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ + --enable-gallium-radeon \ + --enable-gallium-r600 \ + --enable-gallium-nouveau \ + --enable-gallium-swrast \ + --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-32-bit \ + --libdir=/usr/lib32 + else + ./configure --prefix=/usr \ + --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ + --enable-gallium-radeon \ + --enable-gallium-r600 \ + --enable-gallium-nouveau \ + --enable-gallium-swrast \ + --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-32-bit \ + --libdir=/usr/lib32 + fi + + make +} + +package_lib32-libgl() { + depends=('lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' '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 + + 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 + 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 + 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" + + rm -rf "${pkgdir}"/usr/{include,share,bin} + install -m755 -d "${pkgdir}/usr/share/licenses/libgl" + ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" +} + +package_lib32-libgles() { + depends=('libgles') + pkgdesc="Mesa GLES libraries (32-bit)" + + if [ "${_git}" = "true" ]; then + cd ${srcdir}/mesa-* + else + cd "${srcdir}/Mesa-${pkgver}" + fi + + install -m755 -d "${pkgdir}/usr/lib32" + install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" + bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/" + bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/" + bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libgles" + ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" +} + +package_lib32-libegl() { + depends=('lib32-udev' 'libegl') + pkgdesc="Mesa libEGL libraries (32-bit)" + + if [ "${_git}" = "true" ]; then + cd ${srcdir}/mesa-* + else + cd "${srcdir}/Mesa-${pkgver}" + fi + + install -m755 -d "${pkgdir}/usr/lib32" + install -m755 -d "${pkgdir}/usr/lib32/egl" + install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" + bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" + 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" + ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl" +} + +package_lib32-mesa() { + depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' '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 + + make DESTDIR="${pkgdir}" install + + + rm -f "${pkgdir}/usr/lib32/libGL.so"* + rm -f "${pkgdir}/usr/lib32/libGLESv"* + rm -f "${pkgdir}/usr/lib32/libEGL"* + rm -rf "${pkgdir}/usr/lib32/egl" + rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} + rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg} + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" +} + +package_lib32-ati-dri() { + depends=("lib32-libgl=${pkgver}") + pkgdesc="Mesa DRI + 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 + + 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 +} + +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 + + make -C i810 DESTDIR="${pkgdir}" install + make -C i915 DESTDIR="${pkgdir}" install + make -C i965 DESTDIR="${pkgdir}" install +} + +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 + + make -C unichrome DESTDIR="${pkgdir}" install +} + +package_lib32-mach64-dri() { + depends=("lib32-libgl=${pkgver}") + 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 + + make -C mach64 DESTDIR="${pkgdir}" install +} + +package_lib32-mga-dri() { + depends=("lib32-libgl=${pkgver}") + 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 + + make -C mga DESTDIR="${pkgdir}" install +} + +package_lib32-r128-dri() { + depends=("lib32-libgl=${pkgver}") + 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 + + make -C r128 DESTDIR="${pkgdir}" install +} + +package_lib32-savage-dri() { + depends=("lib32-libgl=${pkgver}") + 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 + + make -C savage DESTDIR="${pkgdir}" install +} + +package_lib32-sis-dri() { + depends=("lib32-libgl=${pkgver}") + 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 + + make -C sis DESTDIR="${pkgdir}" install +} + +package_lib32-tdfx-dri() { + depends=("lib32-libgl=${pkgver}") + 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 + + make -C tdfx DESTDIR="${pkgdir}" install +} + +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 + + # 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 +} + diff --git a/multilib-testing/lib32-mesa/nouveau-fix-header.patch b/multilib-testing/lib32-mesa/nouveau-fix-header.patch new file mode 100644 index 000000000..38aa996f1 --- /dev/null +++ b/multilib-testing/lib32-mesa/nouveau-fix-header.patch @@ -0,0 +1,86 @@ +From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs +Date: Mon, 20 Dec 2010 03:39:36 +0000 +Subject: nouveau: fix includes for latest libdrm + +Signed-off-by: Ben Skeggs +--- +diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h +index ab480ca..747b084 100644 +--- a/src/gallium/drivers/nouveau/nouveau_winsys.h ++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h +@@ -10,7 +10,7 @@ + #include "nouveau/nouveau_grobj.h" + #include "nouveau/nouveau_notifier.h" + #include "nouveau/nouveau_resource.h" +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + + #ifndef NV04_PFIFO_MAX_PACKET_LEN + #define NV04_PFIFO_MAX_PACKET_LEN 2047 +diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c +index ce48022..a99df76 100644 +--- a/src/gallium/drivers/nv50/nv50_surface.c ++++ b/src/gallium/drivers/nv50/nv50_surface.c +@@ -22,7 +22,7 @@ + + #define __NOUVEAU_PUSH_H__ + #include +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + #include "nv50_context.h" + #include "nv50_resource.h" + #include "pipe/p_defines.h" +diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c +index e0e65e7..e2fadd3 100644 +--- a/src/gallium/drivers/nvfx/nv04_2d.c ++++ b/src/gallium/drivers/nvfx/nv04_2d.c +@@ -34,11 +34,11 @@ + #include + #include + #include +-#include + #include + #include + #include + #include ++#include + #include "nv04_2d.h" + + #include "nouveau/nv_object.xml.h" +diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c +index 597664e..339b317 100644 +--- a/src/gallium/drivers/nvfx/nvfx_vbo.c ++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c +@@ -9,8 +9,7 @@ + #include "nvfx_resource.h" + + #include "nouveau/nouveau_channel.h" +- +-#include "nouveau/nouveau_pushbuf.h" ++#include "nouveau/nv04_pushbuf.h" + + static inline unsigned + util_guess_unique_indices_count(unsigned mode, unsigned indices) +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h +index 8036b18..c5ac128 100644 +--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h ++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h +@@ -38,7 +38,6 @@ + #include + + #include "nouveau_device.h" +-#include "nouveau_pushbuf.h" + #include "nouveau_grobj.h" + #include "nouveau_channel.h" + #include "nouveau_bo.h" +@@ -46,6 +45,7 @@ + #include "nouveau_screen.h" + #include "nouveau_state.h" + #include "nouveau_surface.h" ++#include "nv04_pushbuf.h" + + #define DRIVER_DATE "20091015" + #define DRIVER_AUTHOR "Nouveau" +-- +cgit v0.8.3-6-g21f6 -- cgit v1.2.3-54-g00ecf