From 76c26b027d797f3671bf0b6c6618eda2496cf88d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 15 Jul 2011 23:12:20 +0000 Subject: Fri Jul 15 23:12:20 UTC 2011 --- multilib-testing/lib32-mesa/PKGBUILD | 70 ++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 34 deletions(-) (limited to 'multilib-testing/lib32-mesa/PKGBUILD') diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index 5e6212119..e06a2caa9 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51582 2011-07-11 18:59:50Z lcarlier $ +# $Id: PKGBUILD 51770 2011-07-14 11:51:51Z 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') +pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' '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 @@ -16,7 +16,7 @@ if [ "${_git}" = "true" ]; then pkgver=7.11rc1 fi -pkgrel=2 +pkgrel=3 arch=(x86_64) 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') @@ -25,8 +25,8 @@ 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') - source=(git_fixes.patch "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-b033f050fd5179b051181a0a4b6d94110624d25c.tar.bz2") - md5sums=('62b7e9591737846ff0e98f970ffc8b78' '2246d97eb0cfb1f6d2bf8a54b533d07f') + source=(linking_fix.patch "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") + md5sums=('887be83c01d126c2a4cb372af7d3b067' '817a63bb60b81f4f817ffc9ed0a3dddd') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip") md5sums=('2246d97eb0cfb1f6d2bf8a54b533d07f') @@ -46,7 +46,7 @@ build() { autoreconf -vfi if [ "${_git}" = "true" ]; then - patch -Np1 -i ${srcdir}/git_fixes.patch + patch -Np1 -i ${srcdir}/linking_fix.patch ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ --with-gallium-drivers=r300,r600,nouveau,swrast \ @@ -64,7 +64,6 @@ build() { --enable-32-bit \ --libdir=/usr/lib32 # --enable-gallium-svga \ - # --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ @@ -88,7 +87,7 @@ build() { } package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'libgl') + depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" cd ${srcdir}/?esa-* @@ -108,8 +107,20 @@ package_lib32-libgl() { ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" } +package_lib32-libglapi() { + depends=('lib32-glibc' 'libglapi') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib32" + bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/" + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" +} + package_lib32-libgles() { - depends=('libgles') + depends=('lib32-libglapi' 'libgles') pkgdesc="Mesa GLES libraries (32-bit)" cd ${srcdir}/?esa-* @@ -124,7 +135,7 @@ package_lib32-libgles() { } package_lib32-libegl() { - depends=('lib32-udev' 'libegl') + depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl') pkgdesc="Mesa libEGL libraries (32-bit)" cd ${srcdir}/?esa-* @@ -142,13 +153,14 @@ package_lib32-libegl() { } package_lib32-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') + depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa') pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" cd ${srcdir}/?esa-* make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/lib32/libGL.so"* + rm -f "${pkgdir}/usr/lib32/libglapi.so"* rm -f "${pkgdir}/usr/lib32/libGLESv"* rm -f "${pkgdir}/usr/lib32/libEGL"* rm -rf "${pkgdir}/usr/lib32/egl" @@ -165,10 +177,9 @@ package_lib32-ati-dri() { conflicts=('xf86-video-ati<6.9.0-6') cd ${srcdir}/?esa-*/src/mesa/drivers/dri + # classic mesa drivers for radeon,r200 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 make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install @@ -178,18 +189,16 @@ package_lib32-intel-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel (32-bit)" - 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 + 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_lib32-unichrome-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)" - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C unichrome DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } package_lib32-mach64-dri() { @@ -197,8 +206,7 @@ package_lib32-mach64-dri() { pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)" conflicts=('xf86-video-mach64<6.8.2') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C mach64 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install } package_lib32-mga-dri() { @@ -206,8 +214,7 @@ package_lib32-mga-dri() { pkgdesc="Mesa DRI drivers for Matrox (32-bit)" conflicts=('xf86-video-mga<1.4.11') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C mga DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install } package_lib32-r128-dri() { @@ -215,8 +222,7 @@ package_lib32-r128-dri() { pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)" conflicts=('xf86-video-r128<6.8.1') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C r128 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install } package_lib32-savage-dri() { @@ -224,8 +230,7 @@ package_lib32-savage-dri() { pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)" conflicts=('xf86-video-savage<2.3.1') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C savage DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install } package_lib32-sis-dri() { @@ -233,8 +238,7 @@ package_lib32-sis-dri() { pkgdesc="Mesa DRI drivers for SiS (32-bit)" conflicts=('xf86-video-sis<0.10.2') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C sis DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install } package_lib32-tdfx-dri() { @@ -242,17 +246,15 @@ package_lib32-tdfx-dri() { pkgdesc="Mesa DRI drivers for 3dfx (32-bit)" conflicts=('xf86-video-tdfx<1.4.3') - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - make -C tdfx DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install } package_lib32-nouveau-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" - cd ${srcdir}/?esa-*/src/mesa/drivers/dri # 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 make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install } -- cgit v1.2.3-54-g00ecf