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

[Alexander Rødseth]

    Date: Wednesday, November 27, 2013 @ 14:37:50
  Author: arodseth
Revision: 101545

Applied patches (UberPOV) to fix FS#37689 while waiting for a new release.

Modified:
  povray/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-27 11:45:16 UTC (rev 101544)
+++ PKGBUILD	2013-11-27 13:37:50 UTC (rev 101545)
@@ -7,7 +7,7 @@
 
 pkgname=povray
 pkgver=3.7
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Script based raytracer for creating 3D graphics'
 arch=('x86_64' 'i686')
@@ -14,32 +14,45 @@
 license=('AGPL3')
 url='http://povray.org/'
 depends=('libtiff' 'libpng' 'boost-libs')
-makedepends=('boost')
+makedepends=('boost' 'git')
 backup=("etc/povray/$pkgver/povray.conf"
         "etc/povray/$pkgver/povray.ini")
 source=("https://github.com/POV-Ray/$pkgname/archive/$pkgver-stable.zip"
-        'povray3.7.0_rc3-user-conf.patch')
+        'povray3.7.0_rc3-user-conf.patch'
+        'git://github.com/UberPOV/UberPOV.git')
 sha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb'
-            '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
+            '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0'
+            'SKIP')
 
 prepare() {
-  cd "$pkgname-$pkgver-stable"
+  # Fix FS#37689, can be removed for next povray release
+  cp -ruv UberPOV/* "$pkgname-$pkgver-stable"
 
-  cd unix
+  cd "$pkgname-$pkgver-stable/unix"
+
+  # configure the script that configures configure
   sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
   sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac
+
+  # configure configure
   ./prebuild.sh
   cd ..
   ./bootstrap
-  patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch"
+
+  patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch" ||  true
 }
 
 build() {
   cd "$pkgname-$pkgver-stable"
 
+  # just configure
   ./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Arch Linux' \
     --prefix=/usr --sysconfdir=/etc
+
+  # compile
   make CXXFLAGS+="-w -lboost_system -lboost_thread"
+
+  # compress the man page
   gzip -f povray.1
 }
 
@@ -48,7 +61,8 @@
 
   install -d "$pkgdir/usr/share/$pkgname-$pkgver"
   install -d "$pkgdir/usr/share/doc/$pkgname-$pkgver"
-  cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-$pkgver"
+  cp -r icons include ini scenes "$pkgdir/usr/share/$pkgname-$pkgver"
+  cp -r scripts "$pkgdir/usr/share/$pkgname-$pkgver" || true
   cp -r doc "$pkgdir/usr/share/doc/$pkgname-$pkgver"
   install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
   install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf"