Attachment 211714 Details for Bug 244189 – maintainer update for graphics/openshadinglanguage

[patch] maintainer update for graphics/openshadinglanguage

openshadinglanguage.patch (text/plain), 4.07 KB, created by Shane on 2020-02-17 11:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane

Created: 2020-02-17 11:15:56 UTC

Size: 4.07 KB

patch

obsolete

>diff -Nru graphics/openshadinglanguage.orig/Makefile graphics/openshadinglanguage/Makefile
>--- graphics/openshadinglanguage.orig/Makefile	2020-02-17 21:10:00.371373000 +1030
>+++ graphics/openshadinglanguage/Makefile	2020-02-17 21:09:33.660022000 +1030
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	openshadinglanguage
> DISTVERSIONPREFIX=	Release-
>-DISTVERSION=	1.10.7
>-PORTREVISION=	2
>+DISTVERSION=	1.10.9
> CATEGORIES=	graphics devel
> 
> MAINTAINER=	FreeBSD@Shaneware.biz
>@@ -14,7 +13,6 @@
> 
> BUILD_DEPENDS=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
> LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
>-		libtinfo.so:devel/ncurses \
> 		libImath.so:graphics/ilmbase \
> 		libIlmImf.so:graphics/openexr \
> 		libOpenImageIO.so:graphics/openimageio \
>@@ -28,12 +26,18 @@
> 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
>@@ -44,7 +48,7 @@
> 
> CXXFLAGS+=	-I${STAGEDIR}/include
> 
>-PLIST_SUB+=	LIBVERS=${PORTVERSION}
>+PLIST_SUB+=	LIBVERS=${DISTVERSION}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's,bash,sh,' \
>diff -Nru graphics/openshadinglanguage.orig/distinfo graphics/openshadinglanguage/distinfo
>--- graphics/openshadinglanguage.orig/distinfo	2020-02-17 21:10:00.371315000 +1030
>+++ graphics/openshadinglanguage/distinfo	2020-02-17 13:52:31.978628000 +1030
>@@ -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 -Nru graphics/openshadinglanguage.orig/files/patch-src_cmake_modules_FindLLVM.cmake graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake
>--- graphics/openshadinglanguage.orig/files/patch-src_cmake_modules_FindLLVM.cmake	2020-02-17 21:10:00.371116000 +1030
>+++ graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake	1970-01-01 09:30:00.000000000 +0930
>@@ -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 -Nru graphics/openshadinglanguage.orig/pkg-plist graphics/openshadinglanguage/pkg-plist
>--- graphics/openshadinglanguage.orig/pkg-plist	2020-02-17 21:10:00.371192000 +1030
>+++ graphics/openshadinglanguage/pkg-plist	2020-02-06 20:13:47.210790000 +1030
>@@ -42,8 +42,6 @@
> 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

Flags:

FreeBSD: maintainer-approval+

Actions: View | Diff

Attachments on bug 244189: 211714 | 211949