diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
| commit | f5e137fdf748b757bacfc50577e5d48a693d31c4 (patch) | |
| tree | c75bdfef17b69eff3b8bb20b285c880d7f9183c0 /community/luxrender | |
| parent | 300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff) | |
| parent | dd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chntpw/PKGBUILD
community/hardinfo/PKGBUILD
community/obconf/obconf.install
community/xplc/PKGBUILD
community/zziplib/PKGBUILD
core/rp-pppoe/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/icon-naming-utils/PKGBUILD
extra/lxmenu-data/PKGBUILD
extra/openbox/PKGBUILD
extra/phonon-xine/PKGBUILD
extra/qt/PKGBUILD
extra/zope-interface/PKGBUILD
libre/pacman/PKGBUILD
libre/pacman/pacman.conf.mips64el
libre/pacman/rePKGBUILD
testing/coreutils/PKGBUILD
testing/net-tools/PKGBUILD
Diffstat (limited to 'community/luxrender')
| -rw-r--r-- | community/luxrender/PKGBUILD | 26 | ||||
| -rw-r--r-- | community/luxrender/libpng.patch | 21 |
2 files changed, 15 insertions, 32 deletions
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index c7c7ee4a9..8b3ab0e1a 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 49014 2011-06-09 17:05:59Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -6,28 +7,31 @@ pkgver=0.8 _pkgver=45d3e13eb94c _luxblend=9cb3fcee0be8 _blender=2.57 -pkgrel=1 +pkgrel=2 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" license=('GPL') -depends=('boost-libs' 'luxrays' 'openexr') +depends=('boost-libs' 'freeimage' 'openexr') optdepends=('blender: Blender exporter' 'qt: Qt GUI') -makedepends=('cmake' 'boost' 'qt' 'opencl-headers') -source=(http://src.luxrender.net/lux/archive/$_pkgver.tar.bz2 - http://src.luxrender.net/luxblend25/archive/$_luxblend.tar.bz2) -md5sums=('ad8d2ede00aa244cad884d9696ff5fbb' - '29c34f97791db3af1b827d9e9a1b3d79') +makedepends=('cmake' 'boost' 'qt' 'luxrays') +source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ + https://bitbucket.org/luxrender/luxblend25/get/$_luxblend.tar.bz2) +md5sums=('0f2d856385db72131f51e44a7ee527fa' + '0c3c8d9efba76133f8c687b5dd2bca8a') build() { - cd "$srcdir"/lux-$_pkgver + cd "$srcdir"/luxrender-lux-$_pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr . + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + . make } package() { - cd "$srcdir"/lux-$_pkgver + cd "$srcdir"/luxrender-lux-$_pkgver make DESTDIR="$pkgdir" install # fix library path on x86_64 @@ -35,7 +39,7 @@ package() { # install blender exporter install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxblend25-$_luxblend/src/luxrender \ + cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \ "$pkgdir"/usr/share/blender/$_blender/scripts/addons } diff --git a/community/luxrender/libpng.patch b/community/luxrender/libpng.patch deleted file mode 100644 index 71700a7d2..000000000 --- a/community/luxrender/libpng.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN lux-36533b0843bd/core/cimg.h lux-fixed/core/cimg.h ---- lux-36533b0843bd/core/external/cimg.h 2009-12-19 10:39:59.000000000 +0100 -+++ lux-fixed/core/external/cimg.h 2010-01-22 11:38:06.651814854 +0100 -@@ -25679,7 +25679,7 @@ namespace cimg_library { - png_read_info(png_ptr,info_ptr); - png_uint_32 W, H; - int bit_depth, color_type, interlace_type; -- png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,int_p_NULL,int_p_NULL); -+ png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,(int *) NULL,(int *) NULL); - int new_bit_depth = bit_depth; - int new_color_type = color_type; - -@@ -25690,7 +25690,7 @@ namespace cimg_library { - new_bit_depth = 8; - } - if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){ -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - new_bit_depth = 8; - } - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) |