summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-24 22:44:49 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-24 22:44:49 -0300
commit32f16d6f464b30b5c1ad82b6e514105f1fe0fa0a (patch)
tree1737da0da6b2210cfde713e83a29d72f75bf2683 /libre
parent980300e78b7e71bc0f8163611c34ad1657bde98c (diff)
parentde0bdddfd6891cbea374fa26675618f7247a22c5 (diff)
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Conflicts: libre/lirc-parabola/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r--libre/lirc-parabola/PKGBUILD4
-rw-r--r--libre/luxrender-parabola/PKGBUILD15
2 files changed, 10 insertions, 9 deletions
diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD
index 156e48fb3..68ba148d6 100644
--- a/libre/lirc-parabola/PKGBUILD
+++ b/libre/lirc-parabola/PKGBUILD
@@ -37,7 +37,7 @@ md5sums=('1f1fac162ed309dd50f307e96a292957'
'febf25c154a7d36f01159e84f26c2d9a')
# Package info
-pkgrel=3.1
+pkgrel=3.2
epoch=1
arch=('i686' 'x86_64' 'mips64el')
options=('!makeflags' '!strip')
@@ -99,7 +99,7 @@ _package_lirc() {
# Set the correct extramodules directory for install
cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
true && install=${install}.pkg
- sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}"
+ sed -i "s/_extramodules=.*/_extramodules=${_extramodules}/" "${startdir}/${install}"
make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install
gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko
diff --git a/libre/luxrender-parabola/PKGBUILD b/libre/luxrender-parabola/PKGBUILD
index a59a58c35..e9f32284c 100644
--- a/libre/luxrender-parabola/PKGBUILD
+++ b/libre/luxrender-parabola/PKGBUILD
@@ -11,12 +11,13 @@ pkgdesc='Rendering system for physically correct, unbiased image synthesis, with
arch=('i686' 'x86_64' 'mips64el')
url="http://www.$_pkgname.net/"
license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libcl' 'libgl' 'fftw')
+#depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libcl' 'libgl' 'fftw')
+depends=('boost-libs' 'freeimage' 'openexr' 'libpng' 'libgl' 'fftw')
optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI'
'python: pylux Python interface')
# luxrender is constantly broken to various GCC bugs, the latest one being FS#40596
-#makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python')
+#makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' 'clang')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'clang')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname" "$_pkgname-libre")
replaces=("$_pkgname" "$_pkgname-libre")
@@ -28,6 +29,9 @@ md5sums=('cbe749f56a1e1976745f5458100efa8a'
prepare() {
cd $srcdir/$_pkgname-lux-$_pkgver
+ # fix library path on 64bit
+ sed -i '\|SET[(]LIB_SUFFIX 64[)]|d' CMakeLists.txt
+
patch -Np1 < $srcdir/force_python3.diff || true
# workaround QTBUG-22829
find . -type f -exec sed -i 's|^#include .*boost/.*|#ifndef Q_MOC_RUN\n&\n#endif|' '{}' ';'
@@ -40,7 +44,7 @@ build() {
export CXX=clang++
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
- -DLUXRAYS_DISABLE_OPENCL=OFF \
+ -DLUXRAYS_DISABLE_OPENCL=ON \
-DPYTHON_CUSTOM=ON \
-DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \
-DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \
@@ -52,9 +56,6 @@ package() {
cd $srcdir/$_pkgname-lux-$_pkgver
make DESTDIR=$pkgdir install
- # fix library path on 64bit
- [[ $CARCH == x86_64 ]] && mv $pkgdir/usr/lib64 $pkgdir/usr/lib
-
#install pylux
install -D -m644 pylux.so $pkgdir/usr/lib/python3.4/pylux.so
}