aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2017-09-10 03:40:10 +0800
committerjbeich <jbeich@FreeBSD.org>2017-09-10 03:40:10 +0800
commit67dd80185b4746069be87da7284142808b7c26f5 (patch)
treebce0f449de507caa7a6f14f4cf64036509743183 /graphics
parentbfe7216292bc23c8c2ea3cd0515266e0914a193f (diff)
downloadfreebsd-ports-gnome-67dd80185b4746069be87da7284142808b7c26f5.tar.gz
freebsd-ports-gnome-67dd80185b4746069be87da7284142808b7c26f5.tar.zst
freebsd-ports-gnome-67dd80185b4746069be87da7284142808b7c26f5.zip
graphics/openshadinglanguage: update to 1.8.10
- graphics/appleseed isn't compatible yet, so disable OSL by default Changes: https://github.com/imageworks/OpenShadingLanguage/blob/Release-1.8.10/CHANGES.md PR: 220784 222131 Submitted by: Shane Ambler <FreeBSD@ShaneWare.Biz> (maintainer)
Diffstat (limited to 'graphics')
-rw-r--r--graphics/appleseed/Makefile6
-rw-r--r--graphics/blender/Makefile2
-rw-r--r--graphics/openshadinglanguage/Makefile14
-rw-r--r--graphics/openshadinglanguage/distinfo6
-rw-r--r--graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt19
-rw-r--r--graphics/openshadinglanguage/pkg-plist18
6 files changed, 41 insertions, 24 deletions
diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
index ed442483f333..dc1caa9ec60c 100644
--- a/graphics/appleseed/Makefile
+++ b/graphics/appleseed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= appleseed
DISTVERSION= 1.5.2-beta
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MAINTAINER= danfe@FreeBSD.org
@@ -43,7 +43,7 @@ SUB_FILES= pkg-message
SUB_LIST:= ${PLIST_SUB}
OPTIONS_DEFINE= EXAMPLES OSL DISNEY
-OPTIONS_DEFAULT= OSL DISNEY
+OPTIONS_DEFAULT= DISNEY
OPTIONS_SUB= yes
OSL_DESC= Open Shading Language support
@@ -53,6 +53,8 @@ EXAMPLES_CMAKE_OFF= -DWITH_SAMPLES:BOOL=OFF
OSL_CMAKE_ON= -DWITH_OSL:BOOL=ON
OSL_LIB_DEPENDS= liboslexec.so:graphics/openshadinglanguage
+# src/appleseed/libappleseed.so: undefined reference to `typeinfo for OSL::RendererServices'
+OSL_BROKEN= fails to build against openshadinglanguage-1.8.10
DISNEY_CMAKE_ON= -DWITH_DISNEY_MATERIAL:BOOL=ON
DISNEY_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 3673e0f9fc07..40648d2d0efa 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -3,7 +3,7 @@
PORTNAME= blender
PORTVERSION= 2.78c
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 62d139ed289d..c9eaab307421 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= openshadinglanguage
-PORTVERSION= 1.7.5
+PORTVERSION= 1.8.10
DISTVERSIONPREFIX= Release-
-PORTREVISION= 3
CATEGORIES= graphics devel
MAINTAINER= FreeBSD@Shaneware.biz
@@ -12,21 +11,20 @@ COMMENT= Advanced shading language for production GI renderers
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= llvm-config34:devel/llvm34 \
- clang34>=3.4_1:lang/clang34
+BUILD_DEPENDS= llvm-config40:devel/llvm40
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libIlmImf.so:graphics/OpenEXR \
libImath.so:graphics/ilmbase \
libOpenImageIO.so:graphics/openimageio
-RUN_DEPENDS= llvm-config34:devel/llvm34
+RUN_DEPENDS= llvm-config40:devel/llvm40
-USES= bison cmake:outsource compiler:c++11-lib ncurses
+USES= bison cmake:outsource compiler:c++11-lang ncurses
USE_GITHUB= yes
GH_ACCOUNT= imageworks
GH_PROJECT= OpenShadingLanguage
-CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34" \
- -DENABLERTTI:BOOL=ON
+CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config40" \
+ -DENABLERTTI:BOOL=OFF -DUSE_BOOST_WAVE:BOOL=OFF
USE_LDCONFIG= yes
post-patch:
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index cd713a89871a..a15fbfcbb141 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478806482
-SHA256 (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 46226af0592297172e856635eac50327255f1a307244162c1feb47581e72a109
-SIZE (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 13739852
+TIMESTAMP = 1503300284
+SHA256 (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 5b9ad6814fd55e68f4ac50e4214120629ab9175142dc93aac350d0f54bea745a
+SIZE (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 14572479
diff --git a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
index f8c0de05658e..2838db711e47 100644
--- a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
+++ b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
@@ -1,16 +1,21 @@
---- src/doc/CMakeLists.txt.orig 2015-03-10 21:57:05 UTC
+--- src/doc/CMakeLists.txt.orig 2017-07-01 03:52:54 UTC
+++ src/doc/CMakeLists.txt
-@@ -1,11 +1,11 @@
- set (public_docs osl-languagespec.pdf)
- # Some day: CLA-INDIVIDUAL CLA-CORPORATE
+@@ -3,15 +3,15 @@ set (public_docs osl-languagespec.pdf
+ markdeep.min.js
+ )
-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
+install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage COMPONENT documentation)
install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
- "${PROJECT_SOURCE_DIR}/INSTALL"
- "${PROJECT_SOURCE_DIR}/CHANGES"
+ "${PROJECT_SOURCE_DIR}/INSTALL.md"
+ "${PROJECT_SOURCE_DIR}/CHANGES.md"
"${PROJECT_SOURCE_DIR}/README.md"
-- DESTINATION . )
+- DESTINATION doc )
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )
+
+ file (GLOB testshade_figures "Figures/testshade/*.jpg")
+ install (FILES ${testshade_figures}
+- DESTINATION doc/Figures/testshade )
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage/Figures/testshade )
diff --git a/graphics/openshadinglanguage/pkg-plist b/graphics/openshadinglanguage/pkg-plist
index abeddf8d70f2..8c0ce53e1e70 100644
--- a/graphics/openshadinglanguage/pkg-plist
+++ b/graphics/openshadinglanguage/pkg-plist
@@ -16,20 +16,31 @@ include/OSL/oslclosure.h
include/OSL/oslcomp.h
include/OSL/oslconfig.h
include/OSL/oslexec.h
+include/OSL/oslnoise.h
include/OSL/oslquery.h
include/OSL/oslversion.h
include/OSL/rendererservices.h
include/OSL/shaderglobals.h
lib/liboslcomp.so
lib/liboslexec.so
+lib/liboslnoise.so
lib/liboslquery.so
lib/libtestshade.so
lib/osl.imageio.so
-%%DATADIR%%/CHANGES
-%%DATADIR%%/INSTALL
+%%DATADIR%%/CHANGES.md
+%%DATADIR%%/Figures/testshade/fBm_default.jpg
+%%DATADIR%%/Figures/testshade/fBm_freq.jpg
+%%DATADIR%%/Figures/testshade/fBm_gain.jpg
+%%DATADIR%%/Figures/testshade/fBm_lac.jpg
+%%DATADIR%%/Figures/testshade/fBm_octaves.jpg
+%%DATADIR%%/Figures/testshade/makenoise.jpg
+%%DATADIR%%/Figures/testshade/noisetex.jpg
+%%DATADIR%%/Figures/testshade/show_uv.jpg
+%%DATADIR%%/INSTALL.md
%%DATADIR%%/LICENSE
-%%DATADIR%%/README.md
+%%DATADIR%%/markdeep.min.js
%%DATADIR%%/osl-languagespec.pdf
+%%DATADIR%%/README.md
%%DATADIR%%/shaders/emitter.osl
%%DATADIR%%/shaders/emitter.oso
%%DATADIR%%/shaders/glass.osl
@@ -44,3 +55,4 @@ lib/osl.imageio.so
%%DATADIR%%/shaders/stdosl.h
%%DATADIR%%/shaders/ubersurface.osl
%%DATADIR%%/shaders/ubersurface.oso
+%%DATADIR%%/testshade.md.html