Date: Mon, 9 Dec 2013 16:09:45 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336001 - in head/graphics/openshadinglanguage: . files Message-ID: <201312091609.rB9G9jYg076567@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Mon Dec 9 16:09:44 2013 New Revision: 336001 URL: http://svnweb.freebsd.org/changeset/ports/336001 Log: - Update from 1.3.3 to 1.4.0 PR: ports/184611 Submitted by: Shane Ambler <FreeBSD@Shaneware.biz> (maintainer) Deleted: head/graphics/openshadinglanguage/files/patch-liboslcomp__CMakeLists.txt head/graphics/openshadinglanguage/files/patch-liboslcomp__oslcomp.cpp head/graphics/openshadinglanguage/files/patch-liboslexec__constfold.cpp head/graphics/openshadinglanguage/files/patch-liboslexec__dictionary.cpp head/graphics/openshadinglanguage/files/patch-liboslexec__llvm_gen.cpp head/graphics/openshadinglanguage/files/patch-liboslexec__llvm_instance.cpp head/graphics/openshadinglanguage/files/patch-liboslexec__runtimeoptimize.h Modified: head/graphics/openshadinglanguage/Makefile head/graphics/openshadinglanguage/distinfo head/graphics/openshadinglanguage/files/patch-CMakeLists.txt head/graphics/openshadinglanguage/files/patch-doc__CMakeLists.txt head/graphics/openshadinglanguage/files/patch-shaders__CMakeLists.txt Modified: head/graphics/openshadinglanguage/Makefile ============================================================================== --- head/graphics/openshadinglanguage/Makefile Mon Dec 9 16:07:32 2013 (r336000) +++ head/graphics/openshadinglanguage/Makefile Mon Dec 9 16:09:44 2013 (r336001) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openshadinglanguage -PORTVERSION= 1.3.3 -PORTREVISION= 3 +PORTVERSION= 1.4.0 CATEGORIES= graphics devel MAINTAINER= FreeBSD@Shaneware.biz @@ -22,9 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= imageworks GH_PROJECT= OpenShadingLanguage GH_TAGNAME= Release-${PORTVERSION} -GH_COMMIT= 18671dc - -WRKSRC= ${WRKDIR}/imageworks-OpenShadingLanguage-${GH_COMMIT}/src +GH_COMMIT= fb85664 CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config33" USE_LDCONFIG= yes @@ -32,10 +29,6 @@ USES= bison cmake:outsource .include <bsd.port.options.mk> -.if ${ARCH} == i386 && ! ${MACHINE_CPU:Mi586} -IGNORE= CPUTYPE must be i586 or higher in /etc/make.conf -.endif - .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=2.5.37:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex @@ -44,7 +37,7 @@ CXXFLAGS+= -I${LOCALBASE}/include/flex post-patch: @${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' \ - ${WRKSRC}/liboslexec/serialize-bc.bash + ${WRKSRC}/src/liboslexec/serialize-bc.bash post-install: .for LNAME in oslcomp oslexec oslquery testshade Modified: head/graphics/openshadinglanguage/distinfo ============================================================================== --- head/graphics/openshadinglanguage/distinfo Mon Dec 9 16:07:32 2013 (r336000) +++ head/graphics/openshadinglanguage/distinfo Mon Dec 9 16:09:44 2013 (r336001) @@ -1,2 +1,2 @@ -SHA256 (openshadinglanguage-1.3.3.tar.gz) = 55c62a3eeedbf7dea5a672e0bdd73cc0fbf9c60e89d72d77bff5eb9cccca7578 -SIZE (openshadinglanguage-1.3.3.tar.gz) = 10316937 +SHA256 (openshadinglanguage-1.4.0.tar.gz) = 866bddfcaed7938a5ca61a7477e60ce7ae899b33d207a5faa7fd46cc72055f69 +SIZE (openshadinglanguage-1.4.0.tar.gz) = 11513652 Modified: head/graphics/openshadinglanguage/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/openshadinglanguage/files/patch-CMakeLists.txt Mon Dec 9 16:07:32 2013 (r336000) +++ head/graphics/openshadinglanguage/files/patch-CMakeLists.txt Mon Dec 9 16:09:44 2013 (r336001) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-07-12 01:01:18.000000000 +0200 -+++ CMakeLists.txt 2013-11-05 21:12:26.000000000 +0100 -@@ -9,10 +9,8 @@ +--- ./CMakeLists.txt.orig 2013-11-26 05:11:29.000000000 +1030 ++++ ./CMakeLists.txt 2013-11-28 23:52:39.202491493 +1030 +@@ -10,10 +10,8 @@ set (OSO_FILE_VERSION_MAJOR 1) set (OSO_FILE_VERSION_MINOR 0) @@ -13,7 +13,7 @@ set (CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) message (STATUS "Project source dir = ${PROJECT_SOURCE_DIR}") message (STATUS "Project build dir = ${CMAKE_BINARY_DIR}") -@@ -21,6 +19,8 @@ +@@ -22,6 +20,8 @@ message (FATAL_ERROR "Not allowed to run in-source build!") endif () @@ -22,57 +22,46 @@ if (NOT CMAKE_BUILD_TYPE) set (CMAKE_BUILD_TYPE "Release") endif () -@@ -42,12 +42,11 @@ - OUTPUT_STRIP_TRAILING_WHITESPACE) - message (STATUS "Using gcc ${GCC_VERSION} as the compiler") - endif () --if (NOT CMAKE_COMPILER_IS_CLANG) -- string (REGEX MATCH clang CMAKE_COMPILER_IS_CLANG ${CMAKE_CXX_COMPILER}) -- if (CMAKE_COMPILER_IS_CLANG) -- set (CMAKE_COMPILER_IS_CLANG 1) -- message (STATUS "Using clang as the compiler") -- endif () -+ -+message (STATUS "CMAKE_CXX_COMPILER_ID is ${CMAKE_CXX_COMPILER_ID}") -+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -+ set (CMAKE_COMPILER_IS_CLANG 1) -+ message (STATUS "Using clang as the compiler") - endif () - - ## turn on more detailed warnings and consider warnings as errors -@@ -121,6 +120,10 @@ +@@ -124,12 +124,11 @@ endif () endif () +-# Try to detect if this is an OSX distro new enough that the system library +-# is libc++, in which case we should force use of Boost Wave (because that +-# avoids a nonstandard g++ extension in the other code path). +-if (EXISTS "/usr/lib/libc++.dylib" OR OSL_USE_LIBCPP) +- set (OSL_SYSTEM_HAS_LIBCPP ON) +-endif () +# Try to detect libc++, in which case we should force use of Boost +# Wave (because that avoids a nonstandard g++ extension in the other +# code path). +check_cxx_symbol_exists(_LIBCPP_VERSION string OSL_SYSTEM_HAS_LIBCPP) ++ set (VERBOSE OFF CACHE BOOL "Print lots of messages while compiling") set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared") -@@ -129,12 +132,16 @@ - "Use an externally built shared library version of the pugixml library") - set (PUGIXML_HOME "" CACHE STRING "Hint about where to find external PugiXML library") - if (WIN32) -- set (USE_BOOST_WAVE ON CACHE BOOL "Use Boost Wave as preprocessor") - set (USE_LLVM_BITCODE OFF CACHE BOOL "Generate embedded LLVM bitcode") - else () -- set (USE_BOOST_WAVE OFF CACHE BOOL "Use Boost Wave as preprocessor") - set (USE_LLVM_BITCODE ON CACHE BOOL "Generated embedded LLVM bitcode") +@@ -167,7 +166,6 @@ + + if (CMAKE_COMPILER_IS_CLANG AND OSL_USE_LIBCPP) + message (STATUS "Using libc++") +- add_definitions ("-stdlib=libc++") endif () -+if (WIN32 OR OSL_SYSTEM_HAS_LIBCPP) -+ set (USE_BOOST_WAVE ON CACHE BOOL "Use Boost Wave as preprocessor") -+else () -+ set (USE_BOOST_WAVE OFF CACHE BOOL "Use Boost Wave as preprocessor") -+endif () -+ - set (USE_PARTIO ON CACHE BOOL "Use Partio if found") - if (LLVM_NAMESPACE) -@@ -149,6 +156,13 @@ - add_definitions ("${EXTRA_CPP_DEFINITIONS}") - endif() + set (CMAKE_MODULE_PATH +@@ -202,6 +200,10 @@ + + message (STATUS "CMAKE_INSTALL_RPATH = ${CMAKE_INSTALL_RPATH}") + ++# Try to detect libc++, in which case we should force use of Boost ++# Wave (because that avoids a nonstandard g++ extension in the other ++# code path). ++check_cxx_symbol_exists(_LIBCPP_VERSION string OSL_SYSTEM_HAS_LIBCPP) + + ########################################################################### + if (MSVC) +@@ -232,6 +234,13 @@ + add_subdirectory (src/include) + add_subdirectory (src/doc) +if (USE_BOOST_WAVE) + add_definitions ("-DUSE_BOOST_WAVE") @@ -82,5 +71,5 @@ + message (STATUS "Using libc++") +endif () - set (CMAKE_MODULE_PATH - "${PROJECT_SOURCE_DIR}/cmake/modules" + + ######################################################################### Modified: head/graphics/openshadinglanguage/files/patch-doc__CMakeLists.txt ============================================================================== --- head/graphics/openshadinglanguage/files/patch-doc__CMakeLists.txt Mon Dec 9 16:07:32 2013 (r336000) +++ head/graphics/openshadinglanguage/files/patch-doc__CMakeLists.txt Mon Dec 9 16:09:44 2013 (r336001) @@ -1,5 +1,5 @@ ---- ./doc/CMakeLists.txt.orig 2013-02-15 11:22:42.000000000 +1030 -+++ ./doc/CMakeLists.txt 2013-02-17 07:11:28.270631151 +1030 +--- ./src/doc/CMakeLists.txt.orig 2013-11-26 05:11:29.000000000 +1030 ++++ ./src/doc/CMakeLists.txt 2013-11-28 23:57:11.961491397 +1030 @@ -1,11 +1,11 @@ set (public_docs osl-languagespec.pdf) # Some day: CLA-INDIVIDUAL CLA-CORPORATE @@ -7,10 +7,10 @@ -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 + 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 ) Modified: head/graphics/openshadinglanguage/files/patch-shaders__CMakeLists.txt ============================================================================== --- head/graphics/openshadinglanguage/files/patch-shaders__CMakeLists.txt Mon Dec 9 16:07:32 2013 (r336000) +++ head/graphics/openshadinglanguage/files/patch-shaders__CMakeLists.txt Mon Dec 9 16:09:44 2013 (r336001) @@ -1,5 +1,5 @@ ---- ./shaders/CMakeLists.txt.orig 2013-02-15 11:22:42.000000000 +1030 -+++ ./shaders/CMakeLists.txt 2013-02-17 07:11:28.389609929 +1030 +--- ./src/shaders/CMakeLists.txt.orig 2013-02-15 11:22:42.000000000 +1030 ++++ ./src/shaders/CMakeLists.txt 2013-02-17 07:11:28.389609929 +1030 @@ -42,5 +42,5 @@ SOURCES ${shader_source} ${shader_headers})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312091609.rB9G9jYg076567>