diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-30 23:11:47 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-30 23:11:47 +0000 |
| commit | 64e72407414ce0badfb541782125cd8e3a25c12e (patch) | |
| tree | b77ce06374d43b1653bc517ebdbd10e1d0f2b328 /extra/blender | |
| parent | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (diff) | |
Thu Jun 30 23:11:47 UTC 2011
Diffstat (limited to 'extra/blender')
| -rw-r--r-- | extra/blender/PKGBUILD | 24 | ||||
| -rw-r--r-- | extra/blender/blender-ffmpeg.diff | 13 | ||||
| -rw-r--r-- | extra/blender/blender.install | 10 |
3 files changed, 27 insertions, 20 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 |