Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 45 insertions, 7 deletions

diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 541372a2e..9638a6135 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -10,7 +10,7 @@ _srcver=ad6536b0dda8
 
 pkgname=$_bldname-addon-$_srcname
 pkgver=$_pkgver.v$_bldver
-pkgrel=1
+pkgrel=2
 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
 arch=any
 url=http://www.$_srcname.net/
@@ -26,6 +26,12 @@ replaces=$_pkgname
 source=http://src.$_srcname.net/$_pkgname/archive/$_srcver.tar.bz2
 sha512sums=7bfd64abde07d9ad90d5e80a95f6fe5478ff65a8ff6965bd3a6c9671907a9a940affa5fb1a593884dc9eb6a5c967eaa1386a3225edc9cbbbb4c20c5d26198aa1
 
+prepare() {
+  sed -i "\|def find_luxrender_path[(][)]|,+9 d
+          s|find_luxrender_path[(][)]|'/usr/bin'|
+         " $srcdir/$_pkgname-$_srcver/src/$_srcname/__init__.py
+}
+
 package() {
   a=$srcdir/$_pkgname-$_srcver/src/$_srcname
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index f01210a1e..fffb0926b 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=blender
 epoch=10
 _pkgver=2.69
-pkgrel=2
+pkgrel=3
 _jpgver=1.5
 _pyver=3.3
 
@@ -46,6 +46,11 @@ depends=(
 optdepends=(
   'bullet: for Rigid Bodies and Physics Simulation'
   'xcftools: for import GIMP images to scene (pcr repo)'
+  'povray-libre: for optional renderer with POV-Ray'
+  'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
+  'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
+  'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
+  'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)'
 )
 makedepends=(
   boost
@@ -87,6 +92,11 @@ prepare() {
           s|open-source and free|free|
          ' release/text/readme.html
 
+  msg 'fixing povray-libre path and desc'
+  sed -i "s|FILE_PATH',|FILE_PATH',\n                default='/usr/bin/povray',|
+          s|both POV-Ray 3[.]7 and this script are beta|this script is beta|
+         " release/scripts/addons/render_povray/__init__.py  
+
   mkdir -v build
 }
 
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 5d31f1386..86f9c296c 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=luxrender
 pkgname=$_pkgname-libre
 pkgver=1.3.1
 _pkgver=d0b0e20c47cc
-pkgrel=1
+pkgrel=3
 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.$_pkgname.net/"
@@ -15,17 +15,27 @@ license=('GPL')
 depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw')
 optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \
             'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
-makedepends+=('libtool-lts')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' \
+             'clang')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
-source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2)
-md5sums=('cbe749f56a1e1976745f5458100efa8a')
+source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 \
+        force_python3.diff)
+md5sums=('cbe749f56a1e1976745f5458100efa8a'
+         '42692e65eabc5828693e2682e94b7c64')
+
+prepare() {
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
+
+  patch -Np1 < "$srcdir/force_python3.diff" || true
+}
 
 build() {
   cd "$srcdir"/$_pkgname-lux-$_pkgver
 
+  export CC=clang
+  export CXX=clang++
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
diff --git a/libre/luxrender-libre/force_python3.diff b/libre/luxrender-libre/force_python3.diff
new file mode 100644
index 000000000..1ee61e872
--- /dev/null
+++ b/libre/luxrender-libre/force_python3.diff
@@ -0,0 +1,12 @@
+diff -rup luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake
+--- luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake	2013-11-04 22:25:45.000000000 +0100
++++ luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake	2013-12-05 19:43:23.414625854 +0100
+@@ -156,7 +156,7 @@ IF(MSVC AND BOOST_python_LIBRARYDIR)
+ 	SET(BOOST_LIBRARYDIR "${BOOST_python_LIBRARYDIR}")
+ ENDIF(MSVC AND BOOST_python_LIBRARYDIR)
+ 
+-FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python REQUIRED)
++FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python3 REQUIRED)
+ 
+ IF(MSVC AND BOOST_python_LIBRARYDIR)
+ 	SET(BOOST_LIBRARYDIR "${_boost_libdir}")