diff options
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | PKGBUILD | 44 | ||||
-rw-r--r-- | patch | 38 |
3 files changed, 103 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..91e8bded3ed1 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,21 @@ +# Generated by mksrcinfo v8 +# Thu Aug 11 00:16:12 UTC 2016 +pkgbase = ospray + pkgdesc = A Ray Tracing Based Rendering Engine for High-Fidelity Visualization + pkgver = 1.0.0 + pkgrel = 1 + url = http://www.ospray.org/ + arch = i686 + arch = x86_64 + license = Apache + makedepends = cmake + depends = qt4>=4.6 + depends = ispc + depends = intel-tbb + source = https://github.com/ospray/OSPRay/archive/v1.0.0.tar.gz + source = patch + md5sums = faf022e6448f4bc750055d2c28847fb7 + md5sums = a14f2a7da967fe078cf1b6aeb7beb961 + +pkgname = ospray + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..ccceff805c06 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: <gucong@gc-desktop> +pkgname=ospray +pkgver=1.0.0 +pkgrel=1 +pkgdesc="A Ray Tracing Based Rendering Engine for High-Fidelity Visualization" +arch=('i686' 'x86_64') +url="http://www.ospray.org/" +license=('Apache') +depends=('qt4>=4.6' 'ispc' 'intel-tbb') +makedepends=('cmake') +source=(https://github.com/ospray/OSPRay/archive/v$pkgver.tar.gz + patch) +md5sums=('faf022e6448f4bc750055d2c28847fb7' + 'a14f2a7da967fe078cf1b6aeb7beb961') + +prepare() { + cd "$srcdir" + + patch -p0 -N < patch + + [[ -d ${pkgname}-build ]] && rm -r ${pkgname}-build + mkdir ${pkgname}-build +} + +build() { + cd "$srcdir/${pkgname}-build" + + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + ../OSPRay-$pkgver + make +} + +package() { + cd "$srcdir/${pkgname}-build" + + make DESTDIR="$pkgdir" install + + mv $pkgdir/usr/lib{64,} + + rm $pkgdir/usr/lib/libtbb.so.2 + rm $pkgdir/usr/lib/libtbbmalloc.so.2 +} + +# vim:set ts=2 sw=2 et: diff --git a/patch b/patch new file mode 100644 index 000000000000..ce0856821a61 --- /dev/null +++ b/patch @@ -0,0 +1,38 @@ +diff -ru OSPRay-1.0.0/apps/qtViewer/widgets/affineSpaceManipulator/QAffineSpaceManipulator.cpp src/OSPRay-1.0.0/apps/qtViewer/widgets/affineSpaceManipulator/QAffineSpaceManipulator.cpp +--- OSPRay-1.0.0/apps/qtViewer/widgets/affineSpaceManipulator/QAffineSpaceManipulator.cpp 2016-07-20 13:30:36.000000000 -0500 ++++ OSPRay-1.0.0/apps/qtViewer/widgets/affineSpaceManipulator/QAffineSpaceManipulator.cpp 2016-08-10 18:26:30.577820791 -0500 +@@ -375,7 +375,7 @@ + for (int y=0;y<Ny;y++) { + const float t = (y+0.f)/Ny*2.f*M_PI; + const float f = (x+0.f)/Nx*2.f*M_PI; +- vtx[x][y] = vec3f(cos(t)*sin(f),sin(t)*sin(f),cos(f)); ++ vtx[x][y] = vec3f(ospcommon::cos(t)*ospcommon::sin(f),ospcommon::sin(t)*ospcommon::sin(f),ospcommon::cos(f)); + txt[x][y] = vec2f(x/float(Nx),y/float(Ny)); + vec3f c = (((x/4)+(y/4))%2) ? color_bright : color_dark; + col[x][y] = vec3f(c); +diff -ru OSPRay-1.0.0/ospray/lights/DirectionalLight.cpp src/OSPRay-1.0.0/ospray/lights/DirectionalLight.cpp +--- OSPRay-1.0.0/ospray/lights/DirectionalLight.cpp 2016-07-20 13:30:36.000000000 -0500 ++++ OSPRay-1.0.0/ospray/lights/DirectionalLight.cpp 2016-08-10 18:01:57.408643851 -0500 +@@ -38,7 +38,7 @@ + direction = -normalize(direction); // the ispc::DirLight expects direction towards light source + + angularDiameter = clamp(angularDiameter, 0.f, 180.f); +- const float cosAngle = cos(deg2rad(0.5f*angularDiameter)); ++ const float cosAngle = ospcommon::cos(deg2rad(0.5f*angularDiameter)); + + ispc::DirectionalLight_set(getIE(), (ispc::vec3f&)direction, (ispc::vec3f&)radiance, cosAngle); + } +diff -ru OSPRay-1.0.0/ospray/lights/SpotLight.cpp src/OSPRay-1.0.0/ospray/lights/SpotLight.cpp +--- OSPRay-1.0.0/ospray/lights/SpotLight.cpp 2016-07-20 13:30:36.000000000 -0500 ++++ OSPRay-1.0.0/ospray/lights/SpotLight.cpp 2016-08-10 18:03:40.671063737 -0500 +@@ -52,8 +52,8 @@ + direction = normalize(direction); + openingAngle = clamp(openingAngle, 0.f, 180.f); + penumbraAngle = clamp(penumbraAngle, 0.f, 0.5f*openingAngle); +- const float cosAngleMax = cos(deg2rad(0.5f*openingAngle)); +- const float cosAngleMin = cos(deg2rad(0.5f*openingAngle - penumbraAngle)); ++ const float cosAngleMax = ospcommon::cos(deg2rad(0.5f*openingAngle)); ++ const float cosAngleMin = ospcommon::cos(deg2rad(0.5f*openingAngle - penumbraAngle)); + const float cosAngleScale = 1.0f/(cosAngleMin - cosAngleMax); + + ispc::SpotLight_set(getIE(), |