diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-09 20:52:21 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-09 20:52:21 -0300 |
| commit | aabab2c530c33c1beb40ac3dacb95e19ab99eac3 (patch) | |
| tree | 1417c10b601a05725676a727a25901a32e7fd94c /extra/blender | |
| parent | 3357db80ffa8a795fb5cdad0fc726470887706b0 (diff) | |
| parent | d1e588afc2779754c0abd1122ecf4f8e3c863d7a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/cinepaint/PKGBUILD
extra/cmake/PKGBUILD
extra/fltk/PKGBUILD
extra/foomatic/PKGBUILD
extra/kdegraphics/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/libxi/PKGBUILD
extra/monica/PKGBUILD
extra/rasqal/PKGBUILD
extra/soprano/PKGBUILD
multilib/wine/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/blender')
| -rw-r--r-- | extra/blender/PKGBUILD | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index fca057768..4959644e2 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $ +# $Id: PKGBUILD 130835 2011-07-08 08:34:11Z eric $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -8,13 +8,13 @@ # 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.58 +pkgver=2.58a pkgrel=1 -epoch=1 +epoch=2 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,16 +25,16 @@ depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ makedepends=('cmake') # 'subversion' install=blender.install if [ $_svn = false ]; then - source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff) - md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f') + source=(http://download.blender.org/source/$pkgname-$pkgver.tgz) + md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67') else source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) - md5sums=('59e344d4ec48750a86e4ef079c3acbfc') + md5sums=('7579d1139d0d6025df8afcfca64a65c4') fi # source PKGBUILD && mksource mksource() { - _svnver=36339 + _svnver=38016 _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" _svnmod="$pkgname-$pkgver" mkdir ${pkgname}-$pkgver @@ -47,7 +47,6 @@ mksource() { build() { cd "$srcdir/$pkgname-$pkgver" - patch -p0 -i ../blender-ffmpeg.diff mkdir build cd build |