Mon Jan 13 03:38:11 UTC 2014

8 files changed, 107 insertions, 89 deletions

diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index c51b0b185..29ff4a14e 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 201370 2013-12-09 18:57:47Z giovanni $
+# $Id: PKGBUILD 203515 2014-01-12 11:15:34Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.17.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
 url="http://gparted.sourceforge.net"
@@ -21,7 +21,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'reiserfsprogs: for reiser partitions'
             'xfsprogs: for xfs partitions'
             'nilfs-utils: for nilfs2 support'
-            'polkit-gnome: to run gparted directly from menu'
+            'polkit: to run gparted directly from menu'
             'gpart: for recovering corrupt partition tables'
             'mtools: utilities to access MS-DOS disks')
 install=gparted.install
@@ -32,10 +32,15 @@ md5sums=('ecd66491bb2061c6aa6077cc24823b9e'
          '122ed3120c846376bead22b25f6a3b19'
          '0b68a4e2bc6bc15440730ebe2d7bf9f6')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   ./configure --prefix=/usr \
               --sbindir=/usr/bin
   make
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 1cc75c60f..23d8b5d75 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203492 2014-01-11 20:07:08Z eric $
+# $Id: PKGBUILD 203508 2014-01-12 01:30:04Z eric $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=hugin
 pkgver=2013.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
@@ -15,11 +15,17 @@ optdepends=('python2: bindings and plugins')
 makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig')
 depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13'
          'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" hugin-build.patch)
+sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d'
+          '45a8d8f5ee9b3c013cbc1ae3cfad14a2705c0dd4')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../hugin-build.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	cmake . \
diff --git a/extra/hugin/hugin-build.patch b/extra/hugin/hugin-build.patch
new file mode 100644
index 000000000..42d765927
--- /dev/null
+++ b/extra/hugin/hugin-build.patch
@@ -0,0 +1,11 @@
+--- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp
++++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp
+@@ -150,7 +150,7 @@
+         { wxCMD_LINE_SWITCH, "v", "verbose",  "show verbose output when processing projects" },
+         { wxCMD_LINE_SWITCH, "a", "assistant", "run the assistant on the given projects" },
+         {
+-            wxCMD_LINE_PARAM,  NULL, NULL, _("stitch_project.pto [output prefix]|assistant_project.pto"),
++            wxCMD_LINE_PARAM,  NULL, NULL, "stitch_project.pto [output prefix]|assistant_project.pto",
+             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE
+         },
+         { wxCMD_LINE_NONE }
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 899d29785..b28c023cd 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197048 2013-10-21 14:52:40Z foutrelis $
+# $Id: PKGBUILD 203529 2014-01-12 20:24:07Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -9,8 +9,9 @@
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
-pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=3.3
+pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
+         'clang-tools-extra')
+pkgver=3.4
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
@@ -18,40 +19,41 @@ license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
 options=('staticlibs')
 source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
-        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz
         http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
         clang-3.3-use-gold-linker.patch
         llvm-Config-config.h
         llvm-Config-llvm-config.h)
-sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578'
-            'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996'
-            '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423'
+sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628'
+            '22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b'
+            'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4'
+            'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c'
             '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
 
 prepare() {
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   # At the present, clang must reside inside the LLVM source code tree to build
   # See http://llvm.org/bugs/show_bug.cgi?id=4840
-  mv "$srcdir/cfe-$pkgver.src" tools/clang
+  mv "$srcdir/clang-$pkgver" tools/clang
 
-  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+  mv "$srcdir/clang-tools-extra-$pkgver" tools/clang/tools/extra
+
+  mv "$srcdir/compiler-rt-$pkgver" projects/compiler-rt
 
   # Fix docs installation directory
   sed -i '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
-
   # Make -flto work; use ld.gold instead of the default linker
   patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
 }
 
 build() {
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   # Apply strip option to configure
   _optimized_switch="enable"
@@ -68,7 +70,6 @@ build() {
     --enable-shared \
     --enable-libffi \
     --enable-targets=all \
-    --enable-experimental-targets=R600 \
     --disable-expensive-checks \
     --disable-debug-runtime \
     --disable-assertions \
@@ -86,7 +87,7 @@ package_llvm() {
   pkgdesc="Low Level Virtual Machine"
   depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
 
-  cd "$srcdir/llvm-$pkgver.src"
+  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
@@ -140,11 +141,11 @@ package_llvm() {
 
 package_llvm-libs() {
   pkgdesc="Low Level Virtual Machine (runtime library)"
-  depends=('gcc-libs' 'zlib' 'libffi')
+  depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
 
   install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so"
 
-  install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
+  install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -152,7 +153,7 @@ package_llvm-ocaml() {
   pkgdesc="OCaml bindings for LLVM"
   depends=("llvm=$pkgver-$pkgrel" 'ocaml')
 
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "$srcdir/llvm-$pkgver"
 
   install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
   cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
@@ -161,7 +162,7 @@ package_llvm-ocaml() {
   # Remove execute bit from static libraries
   chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_clang() {
@@ -171,23 +172,35 @@ package_clang() {
 
   # Fix installation path for clang docs
   sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
-    "$srcdir/llvm-$pkgver.src/Makefile.config"
+    "$srcdir/llvm-$pkgver/Makefile.config"
+
+  cd "$srcdir/llvm-$pkgver/tools/clang"
+
+  # We move the extra tools directory out of the tree so it won't get
+  # installed and then we bring it back in for the clang-tools-extra package
+  mv tools/extra "$srcdir"
 
-  cd "$srcdir/llvm-$pkgver.src/tools/clang"
   make DESTDIR="$pkgdir" install
+  mv "$srcdir/extra" tools/
 
   # Fix permissions of static libs
   chmod -x "$pkgdir"/usr/lib/*.a
 
   # Revert the path change in case we want to do a repackage later
   sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
-    "$srcdir/llvm-$pkgver.src/Makefile.config"
+    "$srcdir/llvm-$pkgver/Makefile.config"
 
   # Install html docs
   cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/"
   rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
+  # Install Python bindings
+  install -d "$pkgdir/usr/lib/python2.7/site-packages"
+  cp -r bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/"
+  python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang"
+  python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_clang-analyzer() {
@@ -195,7 +208,7 @@ package_clang-analyzer() {
   url="http://clang-analyzer.llvm.org/"
   depends=("clang=$pkgver-$pkgrel" 'python2')
 
-  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+  cd "$srcdir/llvm-$pkgver/tools/clang"
 
   install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
   for _tool in scan-{build,view}; do
@@ -222,7 +235,22 @@ package_clang-analyzer() {
   python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
   python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang-tools-extra() {
+  pkgdesc="Extra tools built using Clang's tooling APIs"
+  url="http://clang.llvm.org/"
+  depends=("clang=$pkgver-$pkgrel")
+
+  cd "$srcdir/llvm-$pkgver/tools/clang/tools/extra"
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 12b858267..5c6f44a14 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,29 +1,20 @@
-# $Id: PKGBUILD 203236 2014-01-06 07:56:25Z lcarlier $
+# $Id: PKGBUILD 203530 2014-01-12 20:24:08Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.0.1
-pkgrel=2
+pkgver=10.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-        LICENSE
-	revert.remove.GLXContextID.typedef.patch)
-md5sums=('0a72ca5b36046a658bf6038326ff32ed'
-         '5c65a0fe315dd347e09b1f2826a1df5a'
-         '6e49b4dd4ceb7873610f608f74efbaaf')
-
-prepare() {
-  cd ${srcdir}/?esa-*
-
-  # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
-  patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
-}
+        LICENSE)
+md5sums=('8544c0ab3e438a08b5103421ea15b6d2'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
   cd ${srcdir}/?esa-*
diff --git a/extra/mesa/revert.remove.GLXContextID.typedef.patch b/extra/mesa/revert.remove.GLXContextID.typedef.patch
deleted file mode 100644
index 92232dd2d..000000000
--- a/extra/mesa/revert.remove.GLXContextID.typedef.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
-From: Kenneth Graunke <kenneth@whitecape.org>
-Date: Mon, 30 Dec 2013 07:19:36 +0000
-Subject: Revert "mesa: Remove GLXContextID typedef from glx.h."
-
-This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1.
-
-According to belak51 on IRC, this commit broke Allegro, which would no
-longer compile.  Applications apparently expect the GLXContextID typedef
-to exist in glx.h; removing it breaks them.  A bit of searching around
-the internet revealed other complaints since upgrading to Mesa 10.
-
-Cc: "10.0" <mesa-stable@lists.freedesktop.org>
-(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
----
-diff --git a/include/GL/glx.h b/include/GL/glx.h
-index 62d0ede..234abc0 100644
---- a/include/GL/glx.h
-+++ b/include/GL/glx.h
-@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
- /* GLX 1.3 and later */
- typedef struct __GLXFBConfigRec *GLXFBConfig;
- typedef XID GLXFBConfigID;
-+typedef XID GLXContextID;
- typedef XID GLXWindow;
- typedef XID GLXPbuffer;
- 
---
-cgit v0.9.0.2-2-gbebe
-
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 60851eb7b..e7338e4e0 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 203493 2014-01-11 20:07:09Z eric $
+# $Id: PKGBUILD 203527 2014-01-12 13:16:58Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=6.7.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
@@ -14,7 +14,7 @@ makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
 md5sums=('27bb6b0a10b3bb2fcf1c3e520c300207')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Disable automagic curl dep used for online update checking
@@ -24,18 +24,25 @@ build() {
   export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
   export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
 
-  autoreconf
+  # Sets number of threads for a parallel build
+  export DRAKETHREADS=4
+
+  autoreconf -vfi
+}
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib \
               --disable-gui
-  rake
+  ./drake
 
   mv src/mkvinfo{,-cli}
 
   ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib
-  rake
+  ./drake
 }
 
 package_mkvtoolnix-cli() {
@@ -47,7 +54,7 @@ package_mkvtoolnix-cli() {
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  rake DESTDIR="${pkgdir}" install
+  ./drake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/bin/mkvinfo
   install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
 
@@ -70,7 +77,7 @@ package_mkvtoolnix-gtk() {
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  rake DESTDIR="${pkgdir}" install
+  ./drake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/bin/mkv*
   install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
   sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index c15f815e1..941a4feab 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 203500 2014-01-11 20:07:15Z eric $
+# $Id: PKGBUILD 203510 2014-01-12 02:18:23Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxpython
 pkgver=3.0.0.0
 _editraver=0.7.20
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI toolkit for Python"
 arch=('i686' 'x86_64')
 license=('custom:wxWindows')