Thu Jun 30 23:11:47 UTC 2011

9 files changed, 58 insertions, 45 deletions

diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 68688bc51..48cc575e0 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 121081 2011-04-29 00:16:23Z eric $
+# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -8,25 +8,25 @@
 # look for release numbers only we make a messy PKGBUILD that can checkout svn
 # release if necessary.
 
-_svn=true
-#_svn=false
+#_svn=true
+_svn=false
 
 pkgname=blender
-pkgver=2.57b
-pkgrel=2
+pkgver=2.58
+pkgrel=1
 epoch=1
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.blender.org"
-depends=('libjpeg' 'libpng' 'openjpeg' 'libtiff' 'openexr' 'sdl' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gettext' 'libxi' 'libxmu' 'mesa' \
-         'freetype2' 'openal' 'libsndfile' 'libsamplerate' 'ffmpeg')
+depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
+         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
+         'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
 makedepends=('cmake') # 'subversion'
 install=blender.install
 if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('e6cb5523323a71c070051e6fe6efe497')
+  source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff)
+  md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('59e344d4ec48750a86e4ef079c3acbfc')
@@ -47,6 +47,7 @@ mksource() {
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p0 -i ../blender-ffmpeg.diff
   mkdir build
   cd build
 
@@ -60,6 +61,9 @@ build() {
     -DWITH_OPENCOLLADA:BOOL=OFF \
     -DWITH_GAMEENGINE:BOOL=ON \
     -DWITH_PLAYER:BOOL=ON \
+    -DWITH_BUILTIN_GLEW:BOOL=OFF \
+    -DWITH_CODEC_FFMPEG:BOOL=ON \
+    -DWITH_CODEC_SNDFILE:BOOL=ON \
     -DPYTHON_VERSION:STRING=3.2 \
     -DPYTHON_LIBPATH:STRING=/usr/lib \
     -DPYTHON_LIBRARY:STRING=python3.2mu \
diff --git a/extra/blender/blender-ffmpeg.diff b/extra/blender/blender-ffmpeg.diff
new file mode 100644
index 000000000..ffef489e2
--- /dev/null
+++ b/extra/blender/blender-ffmpeg.diff
@@ -0,0 +1,13 @@
+Index: intern/ffmpeg/ffmpeg_compat.h
+===================================================================
+--- intern/ffmpeg/ffmpeg_compat.h	(revision 37744)
++++ intern/ffmpeg/ffmpeg_compat.h	(revision 37745)
+@@ -40,7 +40,7 @@
+ #define FFMPEG_HAVE_AVIO 1
+ #endif
+ 
+-#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1))
++#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122))
+ #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
+ #endif
+ 
diff --git a/extra/blender/blender.install b/extra/blender/blender.install
index 2fcf98022..f4d7cc443 100644
--- a/extra/blender/blender.install
+++ b/extra/blender/blender.install
@@ -1,14 +1,4 @@
 post_install() {
-  cat << EOF
-
-NOTE
-----
-
-We also ship the plugins, but most of these features can be accessed only
-from the users home directory. Therefore, you want to copy everything from
-/usr/share/blender/2.57 to ~/.blender (some are hidden files!). 
-
-EOF
   update-desktop-database -q
   update-mime-database usr/share/mime &> /dev/null
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 234b009b6..3aeb30afa 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123080 2011-05-08 02:35:16Z foutrelis $
+# $Id: PKGBUILD 129537 2011-06-28 18:36:08Z foutrelis $
 # Maintainer: Evangelos Foutras <foutrelis@gmail.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,8 +11,8 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=2.9
-_gcc_ver=4.6.0
-pkgrel=5
+_gcc_ver=4.6.1
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -31,7 +31,7 @@ md5sums=('793138412d2af2c7c7f54615f8943771'
          '70e23a3dc2b38ecb2bb4d2c48f47295d'
          '02c23b4aaca3445b8bf39fddb2f9906e'
          '87a7162dbe99e9ffce6c40bd09f5f4f0'
-         '8da236120a9a287a977b575b8b905c93'
+         '016d70145d52255c9a46fedde51634e2'
          '225ee6b531f8327f34f344a18cb4ec81'
          '8f7582d7440e4a8342c3aea9ec714fb4'
          '047cac563a557463d7ec6bd87d953f5e')
@@ -63,7 +63,7 @@ build() {
   # 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)
+  # Add GCC 4.6.1 to GccVersions (FS#23631)
   patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
 
   if [[ $CARCH == x86_64 ]]; then
diff --git a/extra/llvm/clang-toolchains-gcc-versions.patch b/extra/llvm/clang-toolchains-gcc-versions.patch
index 2e527300d..7e0083791 100644
--- a/extra/llvm/clang-toolchains-gcc-versions.patch
+++ b/extra/llvm/clang-toolchains-gcc-versions.patch
@@ -6,7 +6,7 @@ diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChai
    }
  
 -  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",
++  const char* GccVersions[] = {"4.6.1", "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/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 7f4416ccd..8c95ca2d4 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 104670 2011-01-04 18:37:53Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 127048 2011-06-10 06:18:26Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64')
 url="http://www.rrdtool.org"
@@ -21,16 +21,17 @@ sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl -Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE |' \
+    bindings/perl-shared/Makefile.PL
   ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
     --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install --enable-tcl 
+    --enable-lua --enable-lua-site-install --enable-tcl
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index a72fa7c11..789246858 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124538 2011-05-22 21:23:30Z angvp $
+# $Id: PKGBUILD 129923 2011-06-29 23:05:47Z stephane $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.11
-pkgrel=4
+pkgver=9.12
+pkgrel=1
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=('i686' 'x86_64')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
@@ -15,9 +15,9 @@ optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed')
 changelog=ChangeLog
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
         ${pkgname}.desktop)
-md5sums=('1bed5bfeed026e0bfafa0e9e4f62aa37'
+md5sums=('945af37d661c8c45a7cac292160e7c70'
          '3de6c13126a45bc3bc9f6bba077a1311')
-sha1sums=('21d0fad9a6032dbcf2c43a85f288543c6bd5ab3d'
+sha1sums=('4cbf0516b8304dfb041b9f3e5aaba662fee4b979'
           '962aebc88982dbeb62a7c4a051ff567e015f61a0')
 
 build() {
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index f1656671a..bd6d48600 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 127582 2011-06-16 17:17:05Z ibiru $
+# $Id: PKGBUILD 129881 2011-06-29 11:16:17Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
-pkgver=0.12.2
+pkgver=0.12.3
 pkgrel=1
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
 options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
 install=telepathy-gabble.install
-md5sums=('1fb19cef6cb407adbf6d3c44e8a183a2')
+md5sums=('07d927f1299dbb6bb7ca91ee9dce5d1c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/tree/PKGBUILD b/extra/tree/PKGBUILD
index d221616d1..5c4567cae 100644
--- a/extra/tree/PKGBUILD
+++ b/extra/tree/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 64859 2010-01-22 13:47:51Z giovanni $
+# $Id: PKGBUILD 129903 2011-06-29 17:46:59Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=tree
-pkgver=1.5.3
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="A directory listing program displaying a depth indented list of files"
 arch=('i686' 'x86_64')
 url="http://mama.indstate.edu/users/ice/tree/"
 license=('GPL')
 depends=('glibc')
-source=(ftp://mama.indstate.edu/linux/tree/${pkgname}-${pkgver}.tgz)
-md5sums=('c07ce9065667a23f27aca4de8ecccb10')
+source=("http://mama.indstate.edu/users/ice/${pkgname}/src/${pkgname}-${pkgver}.tgz")
+md5sums=('04e967a3f4108d50cde3b4b0e89e970a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make || return 1
-  make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
 }