ports/176242: [maintainer update] for graphics/openshadinglanguage

[Shane Ambler]

>Number:         176242
>Category:       ports
>Synopsis:       [maintainer update] for graphics/openshadinglanguage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 18 14:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Shane Ambler
>Release:        9.1-RELEASE
>Organization:
>Environment:
FreeBSD leader.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r246600: Sun Feb 10 16:13:27 CST 2013     shane at leader.local:/usr/obj/usr/src/sys/dtracekern  amd64

>Description:
Update to official 1.3.0 release
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nru openshadinglanguage.orig/Makefile openshadinglanguage/Makefile
--- openshadinglanguage.orig/Makefile	2013-02-19 00:29:52.163610849 +1030
+++ openshadinglanguage/Makefile	2013-02-17 07:05:11.685610127 +1030
@@ -2,8 +2,8 @@
 # $FreeBSD: head/graphics/openshadinglanguage/Makefile 311310 2013-01-31 13:38:42Z bapt $
 
 PORTNAME=	openshadinglanguage
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 
 MAINTAINER=	FreeBSD at Shaneware.biz
@@ -19,12 +19,12 @@
 RUN_DEPENDS=	llvm>=3.1:${PORTSDIR}/devel/llvm
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	sambler
+GH_ACCOUNT=	imageworks
 GH_PROJECT=	OpenShadingLanguage
-GH_TAGNAME=	osl-20130106
-GH_COMMIT=	3c69652
+GH_TAGNAME=	Release-${PORTVERSION}
+GH_COMMIT=	d722707
 
-WRKSRC+=	${WRKDIR}/sambler-OpenShadingLanguage-${GH_COMMIT}/src
+WRKSRC=		${WRKDIR}/imageworks-OpenShadingLanguage-${GH_COMMIT}/src
 
 USE_CMAKE=	yes
 CMAKE_VERBOSE=	yes
diff -Nru openshadinglanguage.orig/distinfo openshadinglanguage/distinfo
--- openshadinglanguage.orig/distinfo	2013-02-19 00:29:52.163610849 +1030
+++ openshadinglanguage/distinfo	2013-02-18 23:34:40.954610595 +1030
@@ -1,2 +1,2 @@
-SHA256 (openshadinglanguage-1.3.0.tar.gz) = 3c19c3b0ac6d8e7d260d1fe0c738b8d6a9014dd5ee186aba74db3f1197e16a81
-SIZE (openshadinglanguage-1.3.0.tar.gz) = 10310632
+SHA256 (openshadinglanguage-1.3.0.tar.gz) = a84e97535e9fa15aa02b68a7894046b36cad0964de21e9f1a8709852a8aa0d89
+SIZE (openshadinglanguage-1.3.0.tar.gz) = 10315983
diff -Nru openshadinglanguage.orig/files/patch-doc__CMakeLists.txt openshadinglanguage/files/patch-doc__CMakeLists.txt
--- openshadinglanguage.orig/files/patch-doc__CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
+++ openshadinglanguage/files/patch-doc__CMakeLists.txt	2013-02-17 07:13:51.312989047 +1030
@@ -0,0 +1,16 @@
+--- ./doc/CMakeLists.txt.orig	2013-02-15 11:22:42.000000000 +1030
++++ ./doc/CMakeLists.txt	2013-02-17 07:11:28.270631151 +1030
+@@ -1,11 +1,11 @@
+ set (public_docs osl-languagespec.pdf)
+ # Some day: CLA-INDIVIDUAL CLA-CORPORATE
+ 
+-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}/../README.md
+-          DESTINATION . )
++          DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )
+ 
diff -Nru openshadinglanguage.orig/files/patch-liboslexec__CMakeLists.txt openshadinglanguage/files/patch-liboslexec__CMakeLists.txt
--- openshadinglanguage.orig/files/patch-liboslexec__CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
+++ openshadinglanguage/files/patch-liboslexec__CMakeLists.txt	2013-02-17 07:13:51.346611558 +1030
@@ -0,0 +1,11 @@
+--- ./liboslexec/CMakeLists.txt.orig	2013-02-15 11:22:42.000000000 +1030
++++ ./liboslexec/CMakeLists.txt	2013-02-17 07:11:28.388647893 +1030
+@@ -95,7 +95,7 @@
+       -I${Boost_INCLUDE_DIRS} -I${TBB_INCLUDES} -O3 -S -emit-llvm -o ${llvm_asm} ${llvm_src}
+ 
+       COMMAND ${LLVM_DIRECTORY}/bin/llvm-as -f -o ${llvm_bc} ${llvm_asm}
+-      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash ${llvm_bc} ${llvm_bc_cpp}
++      COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash ${llvm_bc} ${llvm_bc_cpp}
+       MAIN_DEPENDENCY ${llvm_src}
+       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/serialize-bc.bash
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
diff -Nru openshadinglanguage.orig/files/patch-liboslexec__llvm_ops.cpp openshadinglanguage/files/patch-liboslexec__llvm_ops.cpp
--- openshadinglanguage.orig/files/patch-liboslexec__llvm_ops.cpp	1970-01-01 09:30:00.000000000 +0930
+++ openshadinglanguage/files/patch-liboslexec__llvm_ops.cpp	2013-02-17 07:13:51.371612581 +1030
@@ -0,0 +1,13 @@
+--- ./liboslexec/llvm_ops.cpp.orig	2013-02-17 07:12:22.136610427 +1030
++++ ./liboslexec/llvm_ops.cpp	2013-02-17 07:13:26.175610292 +1030
+@@ -127,8 +127,8 @@
+ 
+ #if defined(__FreeBSD__)
+ #include <sys/param.h>
+-#if __FreeBSD_version < 803000
+-// freebsd before 8.3 doesn't have log2f - use OIIO lib replacement
++#if __FreeBSD_version < 802502
++// freebsd before 8.2-STABLE doesn't have log2f - use OIIO lib replacement
+ using OIIO::log2f;
+ #endif
+ #endif
diff -Nru openshadinglanguage.orig/files/patch-shaders__CMakeLists.txt openshadinglanguage/files/patch-shaders__CMakeLists.txt
--- openshadinglanguage.orig/files/patch-shaders__CMakeLists.txt	1970-01-01 09:30:00.000000000 +0930
+++ openshadinglanguage/files/patch-shaders__CMakeLists.txt	2013-02-17 07:13:51.376611731 +1030
@@ -0,0 +1,9 @@
+--- ./shaders/CMakeLists.txt.orig	2013-02-15 11:22:42.000000000 +1030
++++ ./shaders/CMakeLists.txt	2013-02-17 07:11:28.389609929 +1030
+@@ -42,5 +42,5 @@
+                    SOURCES ${shader_source} ${shader_headers})
+ 
+ install (FILES ${shader_headers} ${shader_source} ${shader_objs}
+-         DESTINATION shaders)
++         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage/shaders)
+ 


>Release-Note:
>Audit-Trail:
>Unformatted: