rebuild against new llvm

lib32-alsa-plugins/PKGBUILD

@@ -4,9 +4,9 @@
 _pkgbasename=alsa-plugins
 pkgname=lib32-$_pkgbasename
 pkgver=1.0.27
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra alsa plugins (32-bit)"
-arch=(x86_64)
+arch=('x86_64')
 url="http://www.alsa-project.org"
 license=(GPL)
 depends=(lib32-alsa-lib $_pkgbasename=$pkgver)

lib32-llvm/PKGBUILD

@@ -6,29 +6,33 @@
 # adjusted for Chakra
 
 pkgname=('lib32-llvm' 'lib32-llvm-libs')
-pkgver=3.3
-_gcc_ver=4.8.0
-pkgrel=3
+pkgver=3.4.1
+_base_ver=3.4
+_gcc_ver=4.9.0
+pkgrel=1
 arch=('x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('lib32-libffi' 'lib32-zlib' 'python2' "gcc-multilib=${_gcc_ver}")
 
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
-        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz)
-sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578'
-            '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423')
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz{,.sig}
+        http://llvm.org/releases/$_base_ver/compiler-rt-$_base_ver.src.tar.gz{,.sig})
+sha256sums=('7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a'
+            SKIP
+            'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c'
+            SKIP)
 
-build() {
+prepare() {
+  # Change directory names to release names so we don't need to change the
+  # whole PKGBUILD
+  mv llvm-$pkgver{.src,}
 
-  # preparation
-
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   rm -rf tools/clang
   
   rm -rf projects/compiler-rt
-  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+  mv "$srcdir/compiler-rt-$_base_ver" projects/compiler-rt
 
   # Fix installation directories, ./configure doesn't seem to set them right
   sed -i -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32:' \
@@ -39,11 +43,13 @@ build() {
   sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib32":' \
     autoconf/configure.ac \
     configure
-
+  
   # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
   sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+}
 
-  cd "$srcdir/llvm-$pkgver.src"
+build() {
+  cd "$srcdir/llvm-$pkgver"
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -81,14 +87,15 @@ build() {
 
 package_lib32-llvm() {
   pkgdesc="Low Level Virtual Machine (32-bit)"
-  depends=('lib32-llvm-libs' 'llvm')
+  depends=('lib32-llvm-libs' "llvm=${pkgver}")
 
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
   # The runtime library goes into lib32-llvm-libs
-  mv "$pkgdir/usr/lib32/libLLVM-3.3.so" "$srcdir"
+  mv "$pkgdir/usr/lib32/libLLVM-$pkgver.so" "$srcdir"
+  rm "$pkgdir/usr/lib32/libLLVM-$_base_ver.so"
 
   # Fix permissions of static libs
   chmod -x "$pkgdir"/usr/lib32/*.a
@@ -117,14 +124,15 @@ package_lib32-llvm() {
 }
 
 package_lib32-llvm-libs() {
-  pkgdesc="Low Level Virtual Machine (runtime library)(32-bit) "
+  pkgdesc="Low Level Virtual Machine (runtime library)(32-bit)"
   depends=('lib32-libffi' 'lib32-zlib' 'lib32-gcc-libs')
 
   cd "$srcdir"
 
-  install -D libLLVM-3.3.so "$pkgdir/usr/lib32/libLLVM-3.3.so"
+  install -D libLLVM-$pkgver.so "$pkgdir/usr/lib32/libLLVM-$pkgver.so"
+  ln -s libLLVM-$pkgver.so "$pkgdir/usr/lib32/libLLVM-$_base_ver.so"
 
-  install -Dm644 llvm-$pkgver.src/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 llvm-$pkgver/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:

lib32-mesa/PKGBUILD

@@ -4,7 +4,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi')
 pkgver=10.0.5
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.38' '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.7' 'lib32-llvm>=3.2' 'lib32-systemd' 'lib32-elfutils'
@@ -12,8 +12,9 @@ makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.38' 'lib32-libxxf86vm>=1.1.1'
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-md5sums=('e6009ccd8898d7104bb325b6af9ec354')
+source=(${source[@]} 
+"ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/${pkgver}/MesaLib-${pkgver}.tar.gz" )
+md5sums=('db606aadd0fe321f3664099677d159bc')
 
 build() {
   export CFLAGS="-m32"
@@ -23,7 +24,7 @@ build() {
   # for our llvm-config for 32 bit
   export LLVM_CONFIG=/usr/bin/llvm-config32
 
-  cd "${srcdir}/Mesa-${pkgver}" 
+  cd ${srcdir}/?esa-*
 
   autoreconf -vfi
 
@@ -59,7 +60,7 @@ package_lib32-libgl() {
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (ELF32)"
   replaces=('lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri')
 
-  cd "${srcdir}/Mesa-${pkgver}" 
+  cd ${srcdir}/?esa-* 
 
   install -m755 -d "${pkgdir}/usr/lib32"
   install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
@@ -95,7 +96,7 @@ package_lib32-mesa() {
   conflicts=('lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-svga-dri' 'lib32-nouveau-dri' 'lib32-udev')
   replaces=('lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri')
 
-  cd "${srcdir}/Mesa-${pkgver}" 
+  cd ${srcdir}/?esa-*
 
   make DESTDIR="${pkgdir}" install