Sat Jun 18 23:03:19 UTC 2011

7 files changed, 299 insertions, 20 deletions

diff --git a/multilib/lib32-llvm/PKGBUILD b/multilib/lib32-llvm/PKGBUILD
new file mode 100644
index 000000000..ff7f4f050
--- /dev/null
+++ b/multilib/lib32-llvm/PKGBUILD
@@ -0,0 +1,153 @@
+# $Id: PKGBUILD 47129 2011-05-17 14:00:02Z lcarlier $
+# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Sebastian Nowicki <sebnow@gmail.com>
+# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
+# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+
+pkgname=('lib32-llvm')
+pkgver=2.9
+_gcc_ver=4.6.0
+pkgrel=1
+arch=('x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('gcc-libs-multilib' 'lib32-libffi' 'python2' "gcc-multilib=$_gcc_ver")
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tgz
+        http://llvm.org/releases/$pkgver/clang-$pkgver.tgz
+        ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz
+        clang-plugin-loader-registry.patch
+        cindexer-clang-path.patch
+        clang-toolchains-gcc-versions.patch
+        clang-pure64.patch
+        enable-lto.patch)
+md5sums=('793138412d2af2c7c7f54615f8943771'
+         '634de18d04b7a4ded19ec4c17d23cfca'
+         '70e23a3dc2b38ecb2bb4d2c48f47295d'
+         '02c23b4aaca3445b8bf39fddb2f9906e'
+         '87a7162dbe99e9ffce6c40bd09f5f4f0'
+         '8da236120a9a287a977b575b8b905c93'
+         '225ee6b531f8327f34f344a18cb4ec81'
+         '8f7582d7440e4a8342c3aea9ec714fb4')
+
+build() {
+  cd "$srcdir/llvm-$pkgver"
+
+  export CC="gcc -m32"
+  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:' \
+         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+    Makefile.config.in
+
+  # 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"
+
+  # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
+  #patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
+
+  # Add GCC 4.6.0 to GccVersions (FS#23631)
+  #patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
+
+  # Adjust lib paths
+  #patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
+
+  # Make -flto work
+  # Use gold instead of default linker, and always use the plugin
+  #patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
+
+  # Apply strip option to configure
+  _optimized_switch="enable"
+  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
+
+  # Include location of libffi headers in CPPFLAGS
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
+
+  # TODO: Uncomment when clang works with GCC 4.6+
+  #_cxx_headers="/usr/include/c++/$_gcc_ver"
+  #if [[ ! -d $_cxx_headers ]]; then
+  #  error "Couldn't find the C++ headers, PKGBUILD needs fixing!"
+  #  return 1
+  #fi
+  _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 \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-libffi \
+    --enable-targets=all \
+    --disable-expensive-checks \
+    --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
+}
+
+package() {
+  pkgdesc="Low Level Virtual Machine (32 bits version)"
+  depends=('perl' 'lib32-libffi' 'llvm')
+
+  cd "$srcdir/llvm-$pkgver"
+
+  # We move the clang directory out of the tree so it won't get installed and
+  # then we bring it back in for the clang package
+  # mv tools/clang "$srcdir"
+  # -j1 is due to race conditions during the installation of the OCaml bindings
+  make -j1 DESTDIR="$pkgdir" install
+  # mv "$srcdir/clang" tools
+
+  # OCaml bindings go to a separate package
+  # rm -rf "$srcdir"/{ocaml,ocamldoc}
+  # mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
+
+  # Remove duplicate files installed by the OCaml bindings
+  # rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
+
+  # Fix permissions of static libs
+  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"
+  # Get rid of example Hello transformation
+  rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.*
+
+  # Symlink the gold plugin where clang expects it
+  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so"
+
+  # Add ld.so.conf.d entry
+  install -d "$pkgdir/etc/ld.so.conf.d"
+  echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}}
+}
diff --git a/multilib/lib32-llvm/cindexer-clang-path.patch b/multilib/lib32-llvm/cindexer-clang-path.patch
new file mode 100644
index 000000000..ddaab690e
--- /dev/null
+++ b/multilib/lib32-llvm/cindexer-clang-path.patch
@@ -0,0 +1,10 @@
+--- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
++++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
+@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
+   
+   // We now have the CIndex directory, locate clang relative to it.
+   LibClangPath.eraseComponent();
++  LibClangPath.eraseComponent();
+ #endif
+   
+   LibClangPath.appendComponent("clang");
diff --git a/multilib/lib32-llvm/clang-plugin-loader-registry.patch b/multilib/lib32-llvm/clang-plugin-loader-registry.patch
new file mode 100644
index 000000000..f46eb9fce
--- /dev/null
+++ b/multilib/lib32-llvm/clang-plugin-loader-registry.patch
@@ -0,0 +1,11 @@
+diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
+--- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
++++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
+@@ -2,6 +2,7 @@
+ 	global: main;
+ 		__progname;
+ 		environ;
++		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
+ 
+ 	local: *;
+ };
diff --git a/multilib/lib32-llvm/clang-pure64.patch b/multilib/lib32-llvm/clang-pure64.patch
new file mode 100644
index 000000000..da6178519
--- /dev/null
+++ b/multilib/lib32-llvm/clang-pure64.patch
@@ -0,0 +1,38 @@
+Index: lib/Driver/Tools.cpp
+===================================================================
+--- lib/Driver/Tools.cpp	(revision 123373)
++++ lib/Driver/Tools.cpp	(working copy)
+@@ -3306,7 +3306,7 @@
+     else if (ToolChain.getArch() == llvm::Triple::arm)
+       CmdArgs.push_back("/lib/ld-linux.so.3");
+     else
+-      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
++      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
+   }
+ 
+   CmdArgs.push_back("-o");
+Index: lib/Driver/ToolChains.cpp
+===================================================================
+--- lib/Driver/ToolChains.cpp	(revision 123373)
++++ lib/Driver/ToolChains.cpp	(working copy)
+@@ -1317,18 +1317,10 @@
+   if (Arch == llvm::Triple::x86)
+     Suffix64 = "/64";
+ 
+-  std::string Lib32 = "lib";
+-
+-  bool Exists;
+-  if (!llvm::sys::fs::exists("/lib32", Exists) && Exists)
+-    Lib32 = "lib32";
+-
++  std::string Lib32 = "lib32";
+   std::string Lib64 = "lib";
+-  bool Symlink;
+-  if (!llvm::sys::fs::exists("/lib64", Exists) && Exists &&
+-      (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink))
+-    Lib64 = "lib64";
+ 
++  bool Exists;
+   std::string GccTriple = "";
+   if (Arch == llvm::Triple::arm) {
+     if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) &&
diff --git a/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch b/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
new file mode 100644
index 000000000..2e527300d
--- /dev/null
+++ b/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
@@ -0,0 +1,12 @@
+diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
+--- clang-2.9.orig/lib/Driver/ToolChains.cpp	2011-03-21 23:29:27.000000000 +0200
++++ clang-2.9/lib/Driver/ToolChains.cpp	2011-04-08 00:03:34.000000000 +0300
+@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
+       GccTriple = "i586-suse-linux";
+   }
+ 
+-  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
++  const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
+                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
+                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
+                                "4.2"};
diff --git a/multilib/lib32-llvm/enable-lto.patch b/multilib/lib32-llvm/enable-lto.patch
new file mode 100644
index 000000000..40d93104a
--- /dev/null
+++ b/multilib/lib32-llvm/enable-lto.patch
@@ -0,0 +1,36 @@
+Index: lib/Driver/ToolChains.cpp
+===================================================================
+--- lib/Driver/ToolChains.cpp	(revision 123373)
++++ lib/Driver/ToolChains.cpp	(working copy)
+@@ -1398,11 +1398,11 @@
+     Lib = Lib64;
+   }
+ 
+-  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
++  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold");
+   if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
+     Linker = LinkerPath.str();
+   else
+-    Linker = GetProgramPath("ld");
++    Linker = GetProgramPath("ld.gold");
+ 
+   LinuxDistro Distro = DetectLinuxDistro(Arch);
+ 
+Index: lib/Driver/Tools.cpp
+===================================================================
+--- lib/Driver/Tools.cpp	(revision 123373)
++++ lib/Driver/Tools.cpp	(working copy)
+@@ -3412,11 +3412,11 @@
+     }
+   }
+ 
+-  if (Args.hasArg(options::OPT_use_gold_plugin)) {
++  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
+     CmdArgs.push_back("-plugin");
+     std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
+     CmdArgs.push_back(Args.MakeArgString(Plugin));
+-  }
++  // }
+ 
+   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
+ }
diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
index 489fd3703..b787a2a8b 100644
--- a/multilib/lib32-mesa/PKGBUILD
+++ b/multilib/lib32-mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $
+# $Id: PKGBUILD 49474 2011-06-17 12:06:33Z lcarlier $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
@@ -10,24 +10,24 @@ pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dr
 _git=false
 
 if [ "${_git}" = "true" ]; then
-    pkgver=7.10.0.git20110215
+    pkgver=7.10.99.git20110616
   else
-    pkgver=7.10.2
+    pkgver=7.10.3
 fi
 
-pkgrel=2
+pkgrel=1
 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')
+makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' '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.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') #  'lib32-llvm'
 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')
+  # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe
+  source=('ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2')
+  md5sums=('f9cf11f9fd8f5d2092536fc48fad922f')
 else
-  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch)
-  md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4')
+  source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch)
+  md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4')
 fi
 
 build() {
@@ -37,31 +37,43 @@ build() {
 
   if [ "${_git}" = "true" ]; then
     cd ${srcdir}/mesa-*   
+    # for our llvm-config for 32 bit :(
+    export PATH="/usr/lib32/llvm:$PATH"
+    # fix linking with llvmpipe driver
+    sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile
     autoreconf -vfi
   else
     cd "${srcdir}/Mesa-${pkgver}" 
   fi
 
-  patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
+  if [ "${_git}" != "true" ]; then
+    patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
+  fi
 
   if [ "${_git}" = "true" ]; then
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --enable-gallium-radeon \
+    --enable-gallium-r300 \
     --enable-gallium-r600 \
     --enable-gallium-nouveau \
+    --enable-gallium-llvm \
+    --enable-gallium-egl \
     --enable-gallium-swrast \
     --enable-glx-tls \
     --with-driver=dri \
     --enable-xcb \
-    --with-state-trackers=dri,glx \
+    --with-state-trackers=dri,glx,egl \
     --disable-glut \
     --enable-gles1 \
     --enable-gles2 \
     --enable-egl \
-    --disable-gallium-egl \
+    --enable-texture-float \
+    --enable-shared-dricore \
     --enable-32-bit \
     --libdir=/usr/lib32
+    #  --enable-gallium-svga \
+    #  --enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled]  http://bugs.gentoo.org/show_bug.cgi?id=357177
+    #  --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no]
   else
     ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
@@ -86,7 +98,7 @@ build() {
 }
 
 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')
+  depends=('lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' '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
@@ -99,6 +111,10 @@ package_lib32-libgl() {
   install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
 
   bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
+  if [ "${_git}" = "true" ]; then
+    bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/"
+    bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/"
+  fi
 
   if [ "${_git}" = "true" ]; then
     make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
@@ -139,15 +155,18 @@ package_lib32-libegl() {
 
   if [ "${_git}" = "true" ]; then
     cd ${srcdir}/mesa-*   
+    make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install
   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/"
+  if [ "${_git}" != "true" ]; then
+    install -m755 -d "${pkgdir}/usr/lib32/egl"
+    bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
+  fi
   bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
@@ -155,7 +174,7 @@ package_lib32-libegl() {
 }
 
 package_lib32-mesa() {
-  depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'mesa')
+  depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.25' 'lib32-gcc-libs>=4.5' 'mesa')
   pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
 
   if [ "${_git}" = "true" ]; then
@@ -180,7 +199,7 @@ package_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)"
+  pkgdesc="Mesa DRI radeon/r200 + 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