diff options
| -rw-r--r-- | libre/luxrays/PKGBUILD | 59 | ||||
| -rw-r--r-- | libre/luxrays/force_python3.diff | 12 | ||||
| -rw-r--r-- | libre/luxrender/PKGBUILD | 61 | ||||
| -rw-r--r-- | libre/luxrender/force_python3.diff | 12 | ||||
| -rw-r--r-- | libre/luxrender/luxrender-gcc7.patch | 13 |
5 files changed, 0 insertions, 157 deletions
diff --git a/libre/luxrays/PKGBUILD b/libre/luxrays/PKGBUILD deleted file mode 100644 index 1445909d4..000000000 --- a/libre/luxrays/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 207920 2017-01-18 20:08:01Z stativ $ -# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -pkgname='luxrays' -pkgver=1.6 -_pkgver=61352e6aae3f -pkgrel=10.parabola1 -pkgdesc="Accelerate the ray intersection process by using GPUs, with opencl-mesa recommendation" -arch=('x86_64') -url="http://www.luxrender.net/" -license=('GPL') -depends=('embree' 'opencl-icd-loader' 'libgl' 'openimageio') -makedepends=('boost' 'cmake' 'freetype2' 'gtk3' 'libpng' 'mesa' 'opencl-headers' 'glew' 'freeglut') -optdepends=('opencl-mesa: OpenCL support for AMD GPUs' \ - 'glew: demos (SmallLuxGPU etc.)' \ - 'gtk3: luxcoreui' - 'freeglut: demos (SmallLuxGPU etc.)' \ - 'boost-libs: demos (SmallLuxGPU etc.)') -options=('staticlibs') -source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/luxrender_v$pkgver.tar.bz2 \ - force_python3.diff) -sha256sums=('eb38489e4bcb1336027efc8fa991f506bf78e8cb9edc7b73794e0cdcf998b15a' - 'e49978fefd61461301acd6054d41aeb625ed11873f85d810fb7cc1f60f94b5bf') - -prepare() { - cd "$srcdir"/luxrender-luxrays-$_pkgver - - # force python3 for boost - patch -Np1 < "$srcdir/force_python3.diff" || true -} - -build() { - cd "$srcdir/luxrender-luxrays-$_pkgver" - - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=OFF - # this sucks, but luxrays doesn't seem to honor CMAKE_*_LINKER_FLAGS - # thanks bartus from AUR for the fix - for file in `grep lboost_python -l -R ` ;do sed -i 's/$/ -lpython3/' $file ; done - make -} - -package() { - cd "$srcdir/luxrender-luxrays-$_pkgver" - - install -d -m755 "$pkgdir"/usr/{bin,include,lib} - install -m755 bin/* "$pkgdir"/usr/bin - install -m644 lib/* "$pkgdir"/usr/lib - cp -a include "$pkgdir"/usr - - # install pyluxcore to the Python search path - install -d -m755 "$pkgdir"/usr/lib/python3.6/ - mv "$pkgdir"/usr/lib/pyluxcore.so "$pkgdir"/usr/lib/python3.6/ -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/luxrays/force_python3.diff b/libre/luxrays/force_python3.diff deleted file mode 100644 index 9dc09b42f..000000000 --- a/libre/luxrays/force_python3.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup luxrender-luxrays-61352e6aae3f.orig/cmake/Dependencies.cmake luxrender-luxrays-61352e6aae3f/cmake/Dependencies.cmake ---- luxrender-luxrays-61352e6aae3f.orig/cmake/Dependencies.cmake 2016-05-09 22:17:57.000000000 +0200 -+++ luxrender-luxrays-61352e6aae3f/cmake/Dependencies.cmake 2016-05-29 09:04:30.913648230 +0200 -@@ -58,7 +58,7 @@ set(Boost_MINIMUM_VERSION "1.44.0" - - set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0") - --set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python chrono) -+set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python3 chrono) - find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS}) - if (NOT Boost_FOUND) - # Try again with the other type of libs diff --git a/libre/luxrender/PKGBUILD b/libre/luxrender/PKGBUILD deleted file mode 100644 index 54cf36ac3..000000000 --- a/libre/luxrender/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 207916 2017-01-18 20:07:35Z stativ $ -# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Arch): flixie <69one@gmx.net> -# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -pkgname=luxrender -pkgver=1.6 -_pkgver=b3f85cf7742f -pkgrel=8.parabola1 -pkgdesc="Rendering system for physically correct, unbiased image synthesis, with opencl-mesa recommendation" -arch=('x86_64') -url="http://www.luxrender.net/" -license=('GPL') -depends=('boost-libs' 'embree' 'freeimage' 'openexr' 'openimageio' 'libpng' 'opencl-icd-loader' 'libgl' 'fftw') -optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' \ - 'python: pylux Python interface' - 'opencl-mesa: OpenCL support for AMD GPUs') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') -conflicts=("$pkgname-libre" "$pkgname-parabola") -replaces=("$pkgname-libre" "$pkgname-parabola") -source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/lux/get/v${pkgver/./}.tar.bz2 \ - force_python3.diff luxrender-gcc7.patch) -sha256sums=('29144f657087644086928a66421df5d25fc4dccd05970200932f5693650ddecf' - '916a45aec1326e6990c1ff9f141080c17a33ed793c44d1af9a2dacb9b21c19d2' - 'e51e33ac85c247696a0cab7751b5e91a23df5dac45af05b9ee68299e4a37dc6d') - -prepare() { - cd "$srcdir"/luxrender-lux-$_pkgver - - patch -Np1 < "$srcdir/force_python3.diff" - # fix build with GCC 7 (Fedora) - patch -p1 -i ../luxrender-gcc7.patch -} - -build() { - cd "$srcdir"/luxrender-lux-$_pkgver - - - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.6m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.6m/ \ - -DCMAKE_EXE_LINKER_FLAGS=-lpthread - make -} - -package() { - cd "$srcdir"/luxrender-lux-$_pkgver - make DESTDIR="$pkgdir" install - - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - - # install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.6/pylux.so -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/luxrender/force_python3.diff b/libre/luxrender/force_python3.diff deleted file mode 100644 index 1ee61e872..000000000 --- a/libre/luxrender/force_python3.diff +++ /dev/null @@ -1,12 +0,0 @@ -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}") diff --git a/libre/luxrender/luxrender-gcc7.patch b/libre/luxrender/luxrender-gcc7.patch deleted file mode 100644 index 62dd64428..000000000 --- a/libre/luxrender/luxrender-gcc7.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- luxrender-lux-b3f85cf7742f/qtgui/mainwindow.hxx.debug 2016-05-10 06:21:17.000000000 +0900 -+++ luxrender-lux-b3f85cf7742f/qtgui/mainwindow.hxx 2017-03-24 19:42:42.005564560 +0900 -@@ -134,8 +134,8 @@ - public: - QMRUListModel() : QAbstractListModel(), maxCount(0) { } - QMRUListModel(int count, QObject *parent = 0) : QAbstractListModel(parent), maxCount(count) { } -- QMRUListModel(const QMRUListModel<T> &other) -- : maxCount(other.maxCount), mruList(other.mruList), QAbstractListModel(other.parent()) { } -+ //QMRUListModel(const QMRUListModel<T> &other) -+ //: maxCount(other.maxCount), mruList(other.mruList), QAbstractListModel(other.parent()) { } - - int count() const { - return maxCount; |