From 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Mar 2012 00:01:30 +0000 Subject: Wed Mar 14 00:01:29 UTC 2012 --- multilib/lib32-libpciaccess/PKGBUILD | 11 ++- multilib/lib32-libx11/PKGBUILD | 6 +- multilib/lib32-libxcb/PKGBUILD | 12 +-- .../lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch | 9 +-- multilib/lib32-libxi/PKGBUILD | 6 +- multilib/lib32-llvm/PKGBUILD | 37 +++------ multilib/lib32-mesa/PKGBUILD | 94 +++------------------- 7 files changed, 45 insertions(+), 130 deletions(-) (limited to 'multilib') diff --git a/multilib/lib32-libpciaccess/PKGBUILD b/multilib/lib32-libpciaccess/PKGBUILD index be80aab83..43a3145c0 100644 --- a/multilib/lib32-libpciaccess/PKGBUILD +++ b/multilib/lib32-libpciaccess/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58044 2011-11-05 19:35:56Z lcarlier $ +# $Id: PKGBUILD 67498 2012-03-12 21:10:17Z lcarlier $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck _pkgbasename=libpciaccess pkgname=lib32-${_pkgbasename} -pkgver=0.12.1 -pkgrel=3 +pkgver=0.13 +pkgrel=1 pkgdesc="X11 PCI access library (32-bit" arch=(i686 x86_64) license=('custom') @@ -14,7 +14,7 @@ depends=('lib32-glibc' ${_pkgbasename}) makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2) -sha1sums=('4933bda545df37395e57ff6b4bd61e17a5431770') +sha1sums=('7ddd8e1de27326f6f4a3ac6b4d2241fe77ef5353') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" @@ -26,7 +26,10 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --libdir=/usr/lib32 make +} +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/include diff --git a/multilib/lib32-libx11/PKGBUILD b/multilib/lib32-libx11/PKGBUILD index f5392d36d..0a2692ee1 100644 --- a/multilib/lib32-libx11/PKGBUILD +++ b/multilib/lib32-libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55180 2011-09-05 08:14:08Z bluewind $ +# $Id: PKGBUILD 67505 2012-03-12 21:21:46Z lcarlier $ # Maintainer: Jan de Groot _pkgbasename=libx11 pkgname=lib32-$_pkgbasename -pkgver=1.4.4 +pkgver=1.4.99.1 pkgrel=1 pkgdesc="X11 client-side library (32-bit)" arch=(x86_64) @@ -13,7 +13,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib' options=('!libtool') license=('custom:XFREE86') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha1sums=('2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90') +sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d') build() { export CC="gcc -m32" diff --git a/multilib/lib32-libxcb/PKGBUILD b/multilib/lib32-libxcb/PKGBUILD index 8e68f1911..00b8598d7 100644 --- a/multilib/lib32-libxcb/PKGBUILD +++ b/multilib/lib32-libxcb/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 62579 2012-01-21 16:17:25Z ibiru $ +# $Id: PKGBUILD 67504 2012-03-12 21:20:30Z lcarlier $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot _pkgbasename=libxcb pkgname=lib32-$_pkgbasename -pkgver=1.7 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="X11 client-side library (32-bit)" arch=(x86_64) url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.6' 'lib32-libxdmcp' 'lib32-libxau' +depends=('xcb-proto>=1.7' 'lib32-libxdmcp' 'lib32-libxau' $_pkgbasename) makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib' 'autoconf') @@ -16,8 +16,8 @@ options=('!libtool') license=('custom') source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8' - '3455e84642283bc91c8313af319002a20bbcbdf4') +sha1sums=('98199b6054750a06cddd4e77baa4354af547ce6f' + 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch index f17de1b1d..8e8162f0a 100644 --- a/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch +++ b/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -1,10 +1,9 @@ -diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac ---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 -+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 -@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) +--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 ++++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 +@@ -35,7 +35,7 @@ # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) -NEEDED="pthread-stubs xau >= 0.99.2" +NEEDED="xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) diff --git a/multilib/lib32-libxi/PKGBUILD b/multilib/lib32-libxi/PKGBUILD index c4ad68595..f950e30ba 100644 --- a/multilib/lib32-libxi/PKGBUILD +++ b/multilib/lib32-libxi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61219 2011-12-24 18:33:43Z bluewind $ +# $Id: PKGBUILD 67501 2012-03-12 21:14:16Z lcarlier $ # Maintainer: Jan de Groot _pkgbasename=libxi pkgname=lib32-$_pkgbasename -pkgver=1.4.5 +pkgver=1.6.0 pkgrel=1 pkgdesc="X11 Input extension library (32-bit)" arch=('x86_64') @@ -13,7 +13,7 @@ makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib) options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737') +sha1sums=('b7edf48f93e8abd13ca688fa7f597452c4b74346') build() { export CC="gcc -m32" diff --git a/multilib/lib32-llvm/PKGBUILD b/multilib/lib32-llvm/PKGBUILD index e7ff5c5ef..993c29020 100644 --- a/multilib/lib32-llvm/PKGBUILD +++ b/multilib/lib32-llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60966 2011-12-19 19:56:09Z lcarlier $ +# $Id: PKGBUILD 67497 2012-03-12 21:08:23Z lcarlier $ # Maintainer: Evangelos Foutras # Contributor: Jan "heftig" Steffens # Contributor: Sebastian Nowicki @@ -11,17 +11,13 @@ pkgname=('lib32-llvm') pkgver=3.0 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('lib32-libffi' 'python2' 'gcc-multilib') -source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz - clang-plugin-loader-registry.patch) -sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477' - 'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d' - 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c') +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz) +sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477') build() { cd "$srcdir/llvm-$pkgver.src" @@ -30,9 +26,6 @@ build() { export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - # Fix installation directories, ./configure doesn't seem to set them right sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \ @@ -42,10 +35,6 @@ build() { # Fix insecure rpath (http://bugs.archlinux.org/task/14017) sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - # Get the correct list of symbols to export - # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html - patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" - # Apply strip option to configure _optimized_switch="enable" [[ $(check_option strip) == n ]] && _optimized_switch="disable" @@ -53,14 +42,6 @@ build() { # Include location of libffi headers in CPPFLAGS export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - _cxx_headers="/usr/include/c++/clang-$pkgver" - - _32bit_headers="" - if [[ $CARCH == x86_64 ]]; then - # Important for multilib - _32bit_headers="32" - fi - ./configure \ --prefix=/usr \ --libdir=/usr/lib32/llvm \ @@ -72,9 +53,7 @@ build() { --disable-debug-runtime \ --disable-assertions \ --with-binutils-include=/usr/include \ - --with-cxx-include-root=$_cxx_headers \ --with-cxx-include-arch=$CHOST \ - --with-cxx-include-32bit-dir=$_32bit_headers \ --$_optimized_switch-optimized make REQUIRES_RTTI=1 @@ -96,9 +75,9 @@ package() { chmod -x "$pkgdir"/usr/lib32/llvm/*.a # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - #sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/llvm:' "$pkgdir/usr/bin/llvm-config" - mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm/llvm-config" + sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config" + mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config" + # Get rid of example Hello transformation rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.* @@ -112,4 +91,6 @@ package() { install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} + mkdir "$pkgdir"/usr/bin + mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32" } diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index 81395d897..a1169ae23 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,12 +1,9 @@ -# $Id: PKGBUILD 64038 2012-02-08 20:14:24Z lcarlier $ +# $Id: PKGBUILD 67496 2012-03-12 21:07:25Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke pkgbase=lib32-mesa -pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' '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') -# prepare 7.12/8.0 -# pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri') +pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri') #_git=true _gitdate=20111031 @@ -16,12 +13,12 @@ if [ "${_git}" = "true" ]; then #pkgver=7.10.99.git20110709 pkgver=7.11 else - pkgver=7.11.2 + pkgver=8.0.1 fi -pkgrel=3 +pkgrel=1 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' +makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap') url="http://mesa3d.sourceforge.net" license=('custom') @@ -31,9 +28,9 @@ if [ "${_git}" = "true" ]; then source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd') else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" fix-build-with-llvm-3.0.patch) + source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2") - md5sums=('0837c52698fe3252369c3fdb5195afcc' '73501728793dc895bfc80dfb3253d39e') + md5sums=('24eeebf66971809d8f40775a379b36c9') fi build() { @@ -41,15 +38,10 @@ build() { export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" # for our llvm-config for 32 bit - export LLVM_CONFIG=/usr/lib32/llvm/llvm-config + export LLVM_CONFIG=/usr/bin/llvm-config32 cd ${srcdir}/?esa-* - if [ "${_git}" = "false" ]; then - # fix building of mesa-7.11.2 with llvm-3.0 - patch -Np1 -i ../fix-build-with-llvm-3.0.patch - fi - autoreconf -vfi if [ "${_git}" = "true" ]; then @@ -60,9 +52,7 @@ build() { --disable-gallium-egl --enable-shared-glapi \ --enable-shared-glapi \ --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --disable-glut \ + --enable-dri \ --enable-gles1 \ --enable-gles2 \ --disable-egl \ @@ -79,8 +69,6 @@ build() { --disable-gallium-egl --enable-shared-glapi \ --enable-glx-tls \ --with-driver=dri \ - --enable-xcb \ - --disable-glut \ --enable-gles1 \ --enable-gles2 \ --disable-egl \ @@ -94,8 +82,9 @@ 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' 'lib32-libglapi' 'libgl') + depends=('lib32-libdrm>=2.4.31' '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)" + replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri') cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/lib32" @@ -106,8 +95,7 @@ package_lib32-libgl() { bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" 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" + 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" @@ -160,7 +148,7 @@ package_lib32-libgles() { #} package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa') + depends=('lib32-libgl' 'lib32-libx11>=1.4.99.1' '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-* @@ -196,66 +184,10 @@ package_lib32-intel-dri() { depends=("lib32-libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel (32-bit)" - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12 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)" - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/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') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/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') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/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') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/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') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/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') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/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') - - 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)" -- cgit v1.2.3-54-g00ecf