diff options
| author | rigoletto <rigoletto@FreeBSD.org> | 2020-02-27 03:09:46 +0800 |
|---|---|---|
| committer | rigoletto <rigoletto@FreeBSD.org> | 2020-02-27 03:09:46 +0800 |
| commit | b9e1c181860c5d416709901680d857dfdbaba669 (patch) | |
| tree | 8af7ff395799e08a05acb7d1d3c9c6b7758405ad | |
| parent | fa0a93ae7309feb643786aa1c91cb1beacea48eb (diff) | |
| download | freebsd-ports-gnome-b9e1c181860c5d416709901680d857dfdbaba669.tar.gz freebsd-ports-gnome-b9e1c181860c5d416709901680d857dfdbaba669.tar.zst freebsd-ports-gnome-b9e1c181860c5d416709901680d857dfdbaba669.zip | |
graphics/openshadinglanguage: Update to 1.10.9
PR: 244189
Submitted by: Shane <FreeBSD@ShaneWare.Biz> (maintainer)
Approved by: tcberner (mentor, implicit)
| -rw-r--r-- | graphics/openshadinglanguage/Makefile | 19 | ||||
| -rw-r--r-- | graphics/openshadinglanguage/distinfo | 6 | ||||
| -rw-r--r-- | graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake | 16 | ||||
| -rw-r--r-- | graphics/openshadinglanguage/pkg-plist | 2 |
4 files changed, 15 insertions, 28 deletions
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index 46062220392e..256c1534452c 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -3,8 +3,7 @@ PORTNAME= openshadinglanguage DISTVERSIONPREFIX= Release- -DISTVERSION= 1.10.7 -PORTREVISION= 3 +DISTVERSION= 1.10.9 CATEGORIES= graphics devel MAINTAINER= FreeBSD@Shaneware.biz @@ -27,12 +26,18 @@ USE_GITHUB= yes GH_ACCOUNT= imageworks GH_PROJECT= OpenShadingLanguage -LLVM_VER= 80 +# Use LLVM linker where available +.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) +LDFLAGS+= -fuse-ld=lld +.endif + +LLVM_VER= 90 CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS CMAKE_OFF= USE_BOOST_WAVE -CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ - -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} \ - -DUSE_CPP:STRING=11 +CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ + -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} +# This flag fixes linking with clang 9.0 ?? +CXXFLAGS+= -DNDEBUG OPTIONS_DEFINE= OSLTOY OPTIONS_SUB= yes @@ -43,7 +48,7 @@ OSLTOY_USE= QT=buildtools,core,gui,qmake_build,widgets CXXFLAGS+= -I${STAGEDIR}/include -PLIST_SUB+= LIBVERS=${PORTVERSION} +PLIST_SUB+= LIBVERS=${DISTVERSION} post-patch: @${REINPLACE_CMD} -e 's,bash,sh,' \ diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo index 58cf3418b53a..4ce65598b546 100644 --- a/graphics/openshadinglanguage/distinfo +++ b/graphics/openshadinglanguage/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1570088164 -SHA256 (imageworks-OpenShadingLanguage-Release-1.10.7_GH0.tar.gz) = 0c4cce505e2803baa55db11744adb72fad854c2a4cc4f02592f79324ac5bfda1 -SIZE (imageworks-OpenShadingLanguage-Release-1.10.7_GH0.tar.gz) = 13542717 +TIMESTAMP = 1581909751 +SHA256 (imageworks-OpenShadingLanguage-Release-1.10.9_GH0.tar.gz) = 3f061831e3541068ce080fa96fa682df3ee93aa2505bad00dc34522b11af20f9 +SIZE (imageworks-OpenShadingLanguage-Release-1.10.9_GH0.tar.gz) = 13547288 diff --git a/graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake b/graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake deleted file mode 100644 index ca3b4523d254..000000000000 --- a/graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake +++ /dev/null @@ -1,16 +0,0 @@ ---- src/cmake/modules/FindLLVM.cmake.orig 2018-03-28 12:34:16 UTC -+++ src/cmake/modules/FindLLVM.cmake -@@ -94,11 +94,12 @@ if ((LLVM_LIBRARY OR LLVM_LIBRARIES OR L - # if static LLVM libraries were requested, use llvm-config to generate - # the list of what libraries we need, and substitute that in the right - # way for LLVM_LIBRARY. -- execute_process (COMMAND ${LLVM_CONFIG} --libfiles -+ execute_process (COMMAND ${LLVM_CONFIG} --libfiles --link-static - OUTPUT_VARIABLE LLVM_LIBRARIES - OUTPUT_STRIP_TRAILING_WHITESPACE) - string (REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES}") - set (LLVM_LIBRARY "") -+ set(LLVM_SYSTEM_LIBRARIES "-lz -lexecinfo -lncurses") - else () - set (LLVM_LIBRARIES "${LLVM_LIBRARY}") - endif () diff --git a/graphics/openshadinglanguage/pkg-plist b/graphics/openshadinglanguage/pkg-plist index 1a4525aeb06d..a89207572411 100644 --- a/graphics/openshadinglanguage/pkg-plist +++ b/graphics/openshadinglanguage/pkg-plist @@ -42,8 +42,6 @@ lib/libtestshade.so lib/libtestshade.so.1.10 lib/libtestshade.so.%%LIBVERS%% lib/osl.imageio.so -lib/osl.imageio.so.1.10 -lib/osl.imageio.so.%%LIBVERS%% %%DATADIR%%/shaders/MaterialX/mx_absval_color.osl %%DATADIR%%/shaders/MaterialX/mx_absval_color.oso %%DATADIR%%/shaders/MaterialX/mx_absval_color2.osl |