Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Feb 2020 19:09:46 +0000 (UTC)
From:      =?UTF-8?Q?Alexandre_C=2e_Guimar=c3=a3es?= <rigoletto@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r527184 - in head/graphics/openshadinglanguage: . files
Message-ID:  <202002261909.01QJ9k38046726@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rigoletto
Date: Wed Feb 26 19:09:46 2020
New Revision: 527184
URL: https://svnweb.freebsd.org/changeset/ports/527184

Log:
  graphics/openshadinglanguage: Update to 1.10.9
  
  PR:		244189
  Submitted by:	Shane <FreeBSD@ShaneWare.Biz> (maintainer)
  Approved by:	tcberner (mentor, implicit)

Deleted:
  head/graphics/openshadinglanguage/files/patch-src_cmake_modules_FindLLVM.cmake
Modified:
  head/graphics/openshadinglanguage/Makefile
  head/graphics/openshadinglanguage/distinfo
  head/graphics/openshadinglanguage/pkg-plist

Modified: head/graphics/openshadinglanguage/Makefile
==============================================================================
--- head/graphics/openshadinglanguage/Makefile	Wed Feb 26 19:05:57 2020	(r527183)
+++ head/graphics/openshadinglanguage/Makefile	Wed Feb 26 19:09:46 2020	(r527184)
@@ -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,widget
 
 CXXFLAGS+=	-I${STAGEDIR}/include
 
-PLIST_SUB+=	LIBVERS=${PORTVERSION}
+PLIST_SUB+=	LIBVERS=${DISTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,bash,sh,' \

Modified: head/graphics/openshadinglanguage/distinfo
==============================================================================
--- head/graphics/openshadinglanguage/distinfo	Wed Feb 26 19:05:57 2020	(r527183)
+++ head/graphics/openshadinglanguage/distinfo	Wed Feb 26 19:09:46 2020	(r527184)
@@ -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

Modified: head/graphics/openshadinglanguage/pkg-plist
==============================================================================
--- head/graphics/openshadinglanguage/pkg-plist	Wed Feb 26 19:05:57 2020	(r527183)
+++ head/graphics/openshadinglanguage/pkg-plist	Wed Feb 26 19:09:46 2020	(r527184)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002261909.01QJ9k38046726>