[arch-commits] Commit in blender/trunk (PKGBUILD blender-ffmpeg.diff)

[Eric Bélanger]

    Date: Friday, July 8, 2011 @ 04:34:11
  Author: eric
Revision: 130835

upgpkg: blender 2.58a-1
Upstream update, Removed old patch

Modified:
  blender/trunk/PKGBUILD
Deleted:
  blender/trunk/blender-ffmpeg.diff

---------------------+
 PKGBUILD            |   17 ++++++++---------
 blender-ffmpeg.diff |   13 -------------
 2 files changed, 8 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-07-08 08:19:43 UTC (rev 130834)
+++ PKGBUILD    2011-07-08 08:34:11 UTC (rev 130835)
@@ -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')
 license=('GPL')
@@ -25,16 +25,16 @@
 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 @@
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 -i ../blender-ffmpeg.diff
   mkdir build
   cd build
 

Deleted: blender-ffmpeg.diff
===================================================================
--- blender-ffmpeg.diff 2011-07-08 08:19:43 UTC (rev 130834)
+++ blender-ffmpeg.diff 2011-07-08 08:34:11 UTC (rev 130835)
@@ -1,13 +0,0 @@
-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
-