From cbcb8120e17b8c95a5c77ea2b8aeebe6d5c733f3 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Mon, 11 Nov 2013 10:15:31 -0500 Subject: [PATCH 1/2] updated PKGBUILD file for collada-dom --- data/linux/arch/collada-dom/PKGBUILD | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/data/linux/arch/collada-dom/PKGBUILD b/data/linux/arch/collada-dom/PKGBUILD index 9ab6bd93..dff318fa 100644 --- a/data/linux/arch/collada-dom/PKGBUILD +++ b/data/linux/arch/collada-dom/PKGBUILD @@ -2,20 +2,28 @@ # Contributer: Wenzel Jakob pkgname="collada-dom" -pkgver=2.3.1 +pkgver=2.4.0 pkgrel=1 pkgdesc="An API that provides a C++ object representation of a COLLADA XML instance document." url="http://collada-dom.sourceforge.net/" license=("MIT") arch=("i686" "x86_64") -depends=("libxml2" "boost" "pcre") #"libminizip" +depends=("libxml2" "boost" "pcre") # makedepends=() -source=("http://downloads.sourceforge.net/${pkgname}/collada_dom-${pkgver}-src.tgz") -md5sums=("a74d19c1187806a713cec90c2f0f692c") +source=("http://downloads.sourceforge.net/${pkgname}/collada-dom-${pkgver}.tgz") +md5sums=("20399de4206eab850c32e65c04e907cb") build() { cd ${pkgname}-${pkgver}/dom - make project=dom + sed -i.bak "s/domMinorVersion := 2/domMinorVersion := 4/g" Makefile + cd external-libs + rm -Rf minizip + mv minizip-1.1 minizip + ln -s . minizip/src + ln -s . minizip/include + cd .. + make project=minizip libOpts="-Wl,-soname -Wl,libminizip.so.1.2.3" ccFlags="-fPIC" + make project=dom libOpts="-Wl,-soname -Wl,libcollada14dom.so.2.4" ccFlags="-DCOLLADA_DOM_SUPPORT141 -fPIC" } package() { From 881acb3cd17d5a411f51393c1ea26d976b179e7a Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Mon, 11 Nov 2013 10:56:15 -0500 Subject: [PATCH 2/2] updated mitsuba pkgbuild file --- data/linux/arch/mitsuba/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/linux/arch/mitsuba/PKGBUILD b/data/linux/arch/mitsuba/PKGBUILD index a2f78820..41ddbae0 100644 --- a/data/linux/arch/mitsuba/PKGBUILD +++ b/data/linux/arch/mitsuba/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="Mitsuba physically based renderer" url="http://mitsuba-renderer.org/" license=("GPL3") arch=("i686" "x86_64") -depends=("xerces-c" "glew" "openexr" "boost" "libpng" "libjpeg" "qt4" "collada-dom", "fftw") +depends=("xerces-c" "glew" "openexr" "boost" "libpng" "libjpeg" "qt4" "collada-dom" "fftw") makedepends=("mercurial" "scons") provides=("mitsuba") @@ -33,6 +33,7 @@ package() { ${pkgdir}/usr/share/applications \ ${pkgdir}/usr/share/pixmaps \ ${pkgdir}/usr/include/mitsuba/{core,hw,render,bidir} \ + ${pkgdir}/usr/lib/python2.7/lib-dynload \ ${pkgdir}/usr/lib/python3.3/lib-dynload cd ${_hgrepo} @@ -46,6 +47,7 @@ package() { install -m644 dist/data/schema/* ${pkgdir}/usr/share/mitsuba/data/schema install -m644 dist/data/ior/* ${pkgdir}/usr/share/mitsuba/data/ior install -m644 dist/data/microfacet/* ${pkgdir}/usr/share/mitsuba/data/microfacet + install -m644 dist/python/2.7/mitsuba.so ${pkgdir}/usr/lib/python2.7/lib-dynload install -m644 dist/python/3.3/mitsuba.so ${pkgdir}/usr/lib/python3.3/lib-dynload install -m644 data/linux/mitsuba.desktop ${pkgdir}/usr/share/applications install -m644 src/mtsgui/resources/mitsuba48.png ${pkgdir}/usr/share/pixmaps