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

[Sven-Hendrik Haase]

    Date: Thursday, April 18, 2013 @ 10:03:14
  Author: svenstaro
Revision: 88457

upgpkg: blender 7:2.66a-1

Restructure PKGBUILD

Modified:
  blender/trunk/PKGBUILD

----------+
 PKGBUILD |   47 +++++++++++++++++++----------------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-18 07:44:43 UTC (rev 88456)
+++ PKGBUILD	2013-04-18 08:03:14 UTC (rev 88457)
@@ -6,11 +6,11 @@
 # Sometimes blender.org takes some time to release patch releases and because Arch users
 # are impatient, we sometimes need to build from svn directly.
 
-_svn=false
+_svn=true
 
 pkgname=blender
-true && pkgver=2.66a # Hack for svn
-true && pkgrel=2
+pkgver=2.66a
+pkgrel=1
 epoch=7
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
@@ -24,38 +24,28 @@
 optdepends=('cuda: cycles renderer cuda support')
 options=(!strip)
 install=blender.install
-if [[ $_svn = false ]]; then
+if $_svn; then
+  source=("${pkgname}::svn+https://svn.blender.org/svnroot/bf-blender/trunk/blender")
+  md5sums=(SKIP)
+else
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
   md5sums=('dde8211818e35b00a1c01a11efef4533')
-else
-  source=()
-  md5sums=()
 fi
 
-_svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-_svnmod="blender"
+if $_svn; then
+pkgver() {
+  cd "${SRCDEST}"/${pkgname}
+  echo "${pkgver}.$(svnversion)"
+}
+fi
 
 build() {
-if [[ $_svn = true ]]; then
-  cd "$srcdir"
-  msg "Connecting to SVN server...."
-
-  if [[ -d "$_svnmod/.svn" ]]; then
-    (cd "$_svnmod" && svn up )
+  if $_svn == true; then
+    cd "$srcdir"/$pkgname
   else
-    svn co "$_svntrunk" --config-dir ./ "$_svnmod"
+    cd "$srcdir/$pkgname-$pkgver"
   fi
 
-  msg "SVN checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_svnmod-build"
-  cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
-  cd "$srcdir/$_svnmod-build"
-else
-  cd "$srcdir/$pkgname-$pkgver"
-fi
-
   mkdir build
   cd build
 
@@ -92,11 +82,12 @@
 }
 
 package() {
-  if [[ $_svn = true ]]; then
-    cd "$srcdir/$_svnmod-build/build"
+  if $_svn; then
+    cd "$srcdir/$pkgname/build"
   else
     cd "$srcdir/$pkgname-$pkgver/build"
   fi
+
   make DESTDIR="${pkgdir}" install
   python -m compileall "${pkgdir}/usr/share/blender"
 }