summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-03-25 11:00:10 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-03-25 11:00:10 -0300
commit6fcad08341d06f036afee5f2de74c8796f82f606 (patch)
tree62e2dcce40db1a23a04fb1a3bd3aab35b2f6d801
parentf10aef59a689c4df62b002185d5a4ca7a4ab97ec (diff)
downloadabslibre-6fcad08341d06f036afee5f2de74c8796f82f606.tar.gz
abslibre-6fcad08341d06f036afee5f2de74c8796f82f606.tar.bz2
abslibre-6fcad08341d06f036afee5f2de74c8796f82f606.zip
update libre/openshadinglanguage package
-rw-r--r--libre/openshadinglanguage/PKGBUILD14
-rw-r--r--libre/openshadinglanguage/llvm-133.patch (renamed from libre/openshadinglanguage/llvm.patch)0
-rw-r--r--libre/openshadinglanguage/llvm-141.patch333
3 files changed, 340 insertions, 7 deletions
diff --git a/libre/openshadinglanguage/PKGBUILD b/libre/openshadinglanguage/PKGBUILD
index f5d2a43b8..1ba120173 100644
--- a/libre/openshadinglanguage/PKGBUILD
+++ b/libre/openshadinglanguage/PKGBUILD
@@ -2,7 +2,7 @@
# based of Arch pkg
pkgname=openshadinglanguage
-pkgver=1.3.3
+pkgver=1.4.1
pkgrel=1
pkgdesc="Advanced shading language for production GI renderers (built for the blender-libre package)"
arch=(
@@ -29,11 +29,11 @@ makedepends=(
)
source=(
https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
- llvm.patch
+ llvm-141.patch
)
-md5sums=(
- 77e2261b6b4e0aabdc13b3bb58caeae1a603dbd6a674048631284e150795ecdc4c0d6fd50e7898bda835024bcfeba3da5d89dea8b1ceb3f8fd893087001cc756
- 8d62aa04426cb93c9239845a6eb685081a8760a1731cffb9f075cc294ab8b426c369347ae90a473b0dfbcf4d04a2be44e786792c8ce79fe82c11dc81acf6b3a2
+sha512sums=(
+ 1c9d25e5a87d2e9578eb6b2b83e12da5ea81ae9586bf11b61e092e520f75d746a33465fd9529ea2c58090826bb74ddb2a14b1cb6f170440e9bb5d50984c74081
+ 597cd4a8d59e03e7cbe0eb9c2f988d81317d9bb0a65c1dc5f5db2fbb3be927b4c9e5342decd1409757787b9354dfdf3aa56fdeadcb8c25308aa5653dc9775ea1
)
prepare() {
@@ -56,7 +56,7 @@ prepare() {
# LLVM 3.4 build fix
# based of "https://github.com/imageworks/OpenShadingLanguage/pull/320.patch"
- patch -Np1 < $srcdir/llvm.patch
+ patch -Np1 < $srcdir/llvm-141.patch
# fix include paths
sed -i 's|oslconfig.h|../include/oslconfig.h|
@@ -77,7 +77,7 @@ prepare() {
build() {
cd OpenShadingLanguage-Release-$pkgver/src/build
- cmake .. \
+ cmake ../.. \
-DCMAKE_BUILD_TYPE=Release\
-DCMAKE_INSTALL_PREFIX=/usr\
-DLLVM_STATIC=OFF
diff --git a/libre/openshadinglanguage/llvm.patch b/libre/openshadinglanguage/llvm-133.patch
index a63b91e0d..a63b91e0d 100644
--- a/libre/openshadinglanguage/llvm.patch
+++ b/libre/openshadinglanguage/llvm-133.patch
diff --git a/libre/openshadinglanguage/llvm-141.patch b/libre/openshadinglanguage/llvm-141.patch
new file mode 100644
index 000000000..eeb82935e
--- /dev/null
+++ b/libre/openshadinglanguage/llvm-141.patch
@@ -0,0 +1,333 @@
+diff -Nur OpenShadingLanguage-Release-1.4.1.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.4.1/src/cmake/externalpackages.cmake
+--- OpenShadingLanguage-Release-1.4.1.orig/src/cmake/externalpackages.cmake 2013-12-19 17:59:26.000000000 -0200
++++ OpenShadingLanguage-Release-1.4.1/src/cmake/externalpackages.cmake 2014-03-25 10:06:24.092921746 -0300
+@@ -174,9 +174,9 @@
+ find_library ( LLVM_LIBRARY
+ NAMES LLVM-${LLVM_VERSION}
+ PATHS ${LLVM_LIB_DIR})
++message (STATUS "LLVM version = ${LLVM_VERSION}")
++message (STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ if (VERBOSE)
+- message (STATUS "LLVM version = ${LLVM_VERSION}")
+- message (STATUS "LLVM dir = ${LLVM_DIRECTORY}")
+ message (STATUS "LLVM includes = ${LLVM_INCLUDES}")
+ message (STATUS "LLVM library = ${LLVM_LIBRARY}")
+ message (STATUS "LLVM lib dir = ${LLVM_LIB_DIR}")
+diff -Nur OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/CMakeLists.txt OpenShadingLanguage-Release-1.4.1/src/liboslexec/CMakeLists.txt
+--- OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/CMakeLists.txt 2013-12-19 17:59:26.000000000 -0200
++++ OpenShadingLanguage-Release-1.4.1/src/liboslexec/CMakeLists.txt 2014-03-25 10:15:14.011130861 -0300
+@@ -52,51 +52,64 @@
+ MESSAGE (STATUS "LLVM_COMPILE cpp=${llvm_bc_cpp}")
+ endif ()
+ SET ( ${srclist} ${${srclist}} ${llvm_bc_cpp} )
+- EXEC_PROGRAM ( "${LLVM_DIRECTORY}/bin/llvm-config" ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS )
+- set (LLVM_COMPILE_FLAGS "${LLVM_COMPILE_FLAGS} -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -O3 --combine")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-I${ILMBASE_INCLUDE_DIR}")
+ if (OSL_NAMESPACE)
+- LIST (APPEND LLVM_COMPILE_FLAGS "-DOSL_NAMESPACE=${OSL_NAMESPACE}")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-DOSL_NAMESPACE=${OSL_NAMESPACE}")
+ endif ()
+ if (OPENIMAGEIO_NAMESPACE)
+- LIST (APPEND LLVM_COMPILE_FLAGS "-DOPENIMAGEIO_NAMESPACE=${OPENIMAGEIO_NAMESPACE}")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-DOPENIMAGEIO_NAMESPACE=${OPENIMAGEIO_NAMESPACE}")
+ endif ()
+ get_property (CURRENT_DEFINITIONS DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+ if (VERBOSE)
+ message (STATUS "Current #defines are ${CURRENT_DEFINITIONS}")
+ endif ()
+ foreach (def ${CURRENT_DEFINITIONS})
+- LIST (APPEND LLVM_COMPILE_FLAGS "-D${def}")
++ SET (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-D${def}")
+ endforeach()
+
+- # First try looking in their build (clang++ first, then llvm-g++)
+- FIND_PROGRAM(LLVM_BC_GENERATOR NAMES "clang++" "llvm-g++" PATHS "${LLVM_DIRECTORY}/bin" NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH)
++ # Figure out what program we will use to make the bitcode.
++ if (NOT LLVM_BC_GENERATOR)
++ FIND_PROGRAM(LLVM_BC_GENERATOR NAMES "clang++" PATHS "${LLVM_DIRECTORY}/bin" NO_DEFAULT_PATH NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH)
++ endif ()
++ # If that didn't work, look anywhere
++ if (NOT LLVM_BC_GENERATOR)
++ # Wasn't in their build, look anywhere
++ FIND_PROGRAM(LLVM_BC_GENERATOR NAMES clang++ llvm-g++)
++ endif ()
+
+- if(NOT LLVM_BC_GENERATOR)
+- # Wasn't in their build, look anywhere
+- FIND_PROGRAM(LLVM_BC_GENERATOR NAMES clang++ llvm-g++)
+- endif()
++ if (NOT LLVM_BC_GENERATOR)
++ message (FATAL_ERROR "You must have a valid llvm bitcode generator (clang++) somewhere.")
++ endif ()
++ if (VERBOSE)
++ message (STATUS "Using ${LLVM_BC_GENERATOR} to generate bitcode.")
++ endif ()
+
+- if(NOT LLVM_BC_GENERATOR)
+- message (FATAL_ERROR "You must have a valid llvm bitcode generator (either llvm-g++ or clang++) somewhere.")
+- else()
+- if (VERBOSE)
+- message (STATUS "Using ${LLVM_BC_GENERATOR} to generate bitcode.")
+- endif ()
+- endif()
++ # Fix specific problem I had on new Apple systems (e.g. Mavericks) with
++ # LLVM/libc++ installed -- for some reason, LLVM 3.4 wasn't finding it,
++ # so in that specific case, append another -I to point it in the right
++ # direction.
++ if (APPLE AND ${LLVM_BC_GENERATOR} MATCHES ".*clang.*")
++ EXEC_PROGRAM ( "${LLVM_BC_GENERATOR}" ARGS --version OUTPUT_VARIABLE MY_CLANG_VERSION )
++ string (REGEX REPLACE "clang version ([0-9][.][0-9]+).*" "\\1" MY_CLANG_VERSION "${MY_CLANG_VERSION}")
++ if ((${MY_CLANG_VERSION} VERSION_GREATER "3.3")
++ AND (EXISTS "/usr/lib/libc++.dylib")
++ AND (EXISTS "/Library/Developer/CommandLineTools/usr/lib/c++/v1"))
++ set (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-I/Library/Developer/CommandLineTools/usr/lib/c++/v1")
++ endif ()
++ endif ()
+
+ # Command to turn the .cpp file into LLVM assembly language .s, into
+ # LLVM bitcode .bc, then back into a C++ file with the bc embedded!
+ ADD_CUSTOM_COMMAND ( OUTPUT ${llvm_bc_cpp}
+ COMMAND ${LLVM_BC_GENERATOR}
+- "-I${CMAKE_CURRENT_SOURCE_DIR}"
+- "-I${CMAKE_SOURCE_DIR}/src/include"
+- "-I${CMAKE_BINARY_DIR}/include"
+- "-I${OPENIMAGEIO_INCLUDES}"
+- "-I${ILMBASE_INCLUDE_DIR}"
+- "-I${Boost_INCLUDE_DIRS}"
+- ${LLVM_COMPILE_FLAGS}
+- -O3 -S -emit-llvm -o ${llvm_asm} ${llvm_src}
+-
++ ${LLVM_COMPILE_FLAGS}
++ "-I${CMAKE_CURRENT_SOURCE_DIR}"
++ "-I${CMAKE_SOURCE_DIR}/src/include"
++ "-I${CMAKE_BINARY_DIR}/include"
++ "-I${OPENIMAGEIO_INCLUDES}"
++ "-I${ILMBASE_INCLUDE_DIR}"
++ "-I${Boost_INCLUDE_DIRS}"
++ -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}
+ MAIN_DEPENDENCY ${llvm_src}
+diff -Nur OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/llvm_headers.h OpenShadingLanguage-Release-1.4.1/src/liboslexec/llvm_headers.h
+--- OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/llvm_headers.h 2013-12-19 17:59:26.000000000 -0200
++++ OpenShadingLanguage-Release-1.4.1/src/liboslexec/llvm_headers.h 2014-03-25 10:28:30.679823090 -0300
+@@ -33,7 +33,27 @@
+ namespace llvm = LLVM_NAMESPACE;
+ #endif
+
+-#if OSL_LLVM_VERSION >= 33
++#if OSL_LLVM_VERSION >= 34
++
++# include <llvm/IR/Constants.h>
++# include <llvm/IR/DerivedTypes.h>
++# include <llvm/IR/Instructions.h>
++# include <llvm/IR/Intrinsics.h>
++# include <llvm/IR/Module.h>
++# include <llvm/IR/LLVMContext.h>
++# include <llvm/IR/IRBuilder.h>
++# include <llvm/IR/DataLayout.h>
++# include <llvm/Bitcode/ReaderWriter.h>
++# include <llvm/ExecutionEngine/GenericValue.h>
++# include <llvm/ExecutionEngine/JIT.h>
++# include <llvm/ExecutionEngine/JITMemoryManager.h>
++# include <llvm/Linker.h>
++# include <llvm/IR/LegacyPassManager.h>
++# include <llvm/Support/ManagedStatic.h>
++# include <llvm/Support/MemoryBuffer.h>
++# include <llvm/Support/raw_ostream.h>
++
++#elif OSL_LLVM_VERSION >= 33
+
+ # include <llvm/IR/Constants.h>
+ # include <llvm/IR/DerivedTypes.h>
+diff -Nur OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/llvm_instance.cpp OpenShadingLanguage-Release-1.4.1/src/liboslexec/llvm_instance.cpp
+--- OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/llvm_instance.cpp 2013-12-19 17:59:26.000000000 -0200
++++ OpenShadingLanguage-Release-1.4.1/src/liboslexec/llvm_instance.cpp 2014-03-25 10:23:48.454056987 -0300
+@@ -1119,6 +1119,7 @@
+ virtual void deallocateFunctionBody(void *Body) {
+ // DON'T DEALLOCATE mm->deallocateFunctionBody (Body);
+ }
++#if OSL_LLVM_VERSION <= 33
+ virtual uint8_t* startExceptionTable(const llvm::Function* F,
+ uintptr_t &ActualSize) {
+ return mm->startExceptionTable (F, ActualSize);
+@@ -1130,6 +1131,7 @@
+ virtual void deallocateExceptionTable(void *ET) {
+ // DON'T DEALLOCATE mm->deallocateExceptionTable(ET);
+ }
++#endif
+ virtual bool CheckInvariants(std::string &s) {
+ return mm->CheckInvariants(s);
+ }
+@@ -1145,7 +1147,41 @@
+ virtual unsigned GetNumCodeSlabs() { return mm->GetNumCodeSlabs(); }
+ virtual unsigned GetNumDataSlabs() { return mm->GetNumDataSlabs(); }
+ virtual unsigned GetNumStubSlabs() { return mm->GetNumStubSlabs(); }
+-#if OSL_LLVM_VERSION >= 31
++
++#if OSL_LLVM_VERSION >= 34
++
++ virtual void *getPointerToNamedFunction(const std::string &Name,
++ bool AbortOnFailure = true) {
++ return mm->getPointerToNamedFunction (Name, AbortOnFailure);
++ }
++ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
++ unsigned SectionID, llvm::StringRef SectionName) {
++ return mm->allocateCodeSection(Size, Alignment, SectionID, SectionName);
++ }
++ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
++ unsigned SectionID, llvm::StringRef SectionName,
++ bool IsReadOnly) {
++ return mm->allocateDataSection(Size, Alignment, SectionID,
++ SectionName, IsReadOnly);
++ }
++ virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
++ mm->registerEHFrames (Addr, LoadAddr, Size);
++ }
++ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
++ mm->deregisterEHFrames(Addr, LoadAddr, Size);
++ }
++ virtual uint64_t getSymbolAddress(const std::string &Name) {
++ return mm->getSymbolAddress (Name);
++ }
++ virtual void notifyObjectLoaded(llvm::ExecutionEngine *EE, const llvm::ObjectImage *oi) {
++ mm->notifyObjectLoaded (EE, oi);
++ }
++ virtual bool finalizeMemory(std::string *ErrMsg = 0) {
++ return mm->finalizeMemory (ErrMsg);
++ }
++
++#elif OSL_LLVM_VERSION == 33
++
+ virtual void *getPointerToNamedFunction(const std::string &Name,
+ bool AbortOnFailure = true) {
+ return mm->getPointerToNamedFunction (Name, AbortOnFailure);
+@@ -1154,7 +1190,6 @@
+ unsigned SectionID) {
+ return mm->allocateCodeSection(Size, Alignment, SectionID);
+ }
+-#if OSL_LLVM_VERSION >= 33
+ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
+ unsigned SectionID, bool IsReadOnly) {
+ return mm->allocateDataSection(Size, Alignment, SectionID, IsReadOnly);
+@@ -1162,12 +1197,22 @@
+ virtual bool applyPermissions(std::string *ErrMsg = 0) {
+ return mm->applyPermissions(ErrMsg);
+ }
+-#else
++
++#elif OSL_LLVM_VERSION == 32 || OSL_LLVM_VERSION == 31
++
++ virtual void *getPointerToNamedFunction(const std::string &Name,
++ bool AbortOnFailure = true) {
++ return mm->getPointerToNamedFunction (Name, AbortOnFailure);
++ }
++ virtual uint8_t *allocateCodeSection(uintptr_t Size, unsigned Alignment,
++ unsigned SectionID) {
++ return mm->allocateCodeSection(Size, Alignment, SectionID);
++ }
+ virtual uint8_t *allocateDataSection(uintptr_t Size, unsigned Alignment,
+ unsigned SectionID) {
+ return mm->allocateDataSection(Size, Alignment, SectionID);
+ }
+-#endif
++
+ #endif
+ };
+
+@@ -1282,7 +1327,7 @@
+ m_shadingsys.m_stat_empty_groups += 1;
+ m_shadingsys.m_stat_empty_instances += 1; // the one layer is empty
+ } else {
+- m_llvm_passes->run (*llvm_module());
++ m_llvm_module_passes->run (*llvm_module());
+ }
+
+ m_stat_llvm_opt_time += timer.lap();
+@@ -1417,7 +1462,12 @@
+ // Some global LLVM initialization for the first thread that
+ // gets here.
+ info ("Setting up LLVM");
++
++#if OSL_LLVM_VERSION <= 33
++ // Starting with LLVM 3.4, the pretty stack trace was opt-in rather
++ // than opt-out, and the following variable was removed.
+ llvm::DisablePrettyStackTrace = true;
++#endif
+ llvm::llvm_start_multithreaded (); // enable it to be thread-safe
+ llvm::InitializeNativeTarget();
+ done = true;
+@@ -1428,12 +1478,17 @@
+ void
+ RuntimeOptimizer::llvm_setup_optimization_passes ()
+ {
+- ASSERT (m_llvm_passes == NULL && m_llvm_func_passes == NULL);
++ ASSERT (m_llvm_module_passes == NULL && m_llvm_func_passes == NULL);
+
+ // Specify per-function passes
+ //
++#if OSL_LLVM_VERSION >= 34
++ m_llvm_func_passes = new llvm::legacy::FunctionPassManager(llvm_module());
++ llvm::legacy::FunctionPassManager &fpm (*m_llvm_func_passes);
++#else
+ m_llvm_func_passes = new llvm::FunctionPassManager(llvm_module());
+ llvm::FunctionPassManager &fpm (*m_llvm_func_passes);
++#endif
+ #if OSL_LLVM_VERSION >= 32
+ fpm.add (new llvm::DataLayout(llvm_module()));
+ #else
+@@ -1442,8 +1497,13 @@
+
+ // Specify module-wide (interprocedural optimization) passes
+ //
+- m_llvm_passes = new llvm::PassManager;
+- llvm::PassManager &passes (*m_llvm_passes);
++#if OSL_LLVM_VERSION >= 34
++ m_llvm_module_passes = new llvm::legacy::PassManager;
++ llvm::legacy::PassManager &passes (*m_llvm_module_passes);
++#else
++ m_llvm_module_passes = new llvm::PassManager;
++ llvm::PassManager &passes (*m_llvm_module_passes);
++#endif
+ #if OSL_LLVM_VERSION >= 32
+ passes.add (new llvm::DataLayout(llvm_module()));
+ #else
+diff -Nur OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/runtimeoptimize.cpp OpenShadingLanguage-Release-1.4.1/src/liboslexec/runtimeoptimize.cpp
+--- OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/runtimeoptimize.cpp 2013-12-19 17:59:26.000000000 -0200
++++ OpenShadingLanguage-Release-1.4.1/src/liboslexec/runtimeoptimize.cpp 2014-03-25 10:24:53.282903590 -0300
+@@ -109,7 +109,7 @@
+ m_stat_llvm_jit_time(0),
+ m_llvm_context(NULL), m_llvm_module(NULL),
+ m_llvm_exec(NULL), m_builder(NULL),
+- m_llvm_passes(NULL), m_llvm_func_passes(NULL)
++ m_llvm_module_passes(NULL), m_llvm_func_passes(NULL)
+ {
+ set_debug ();
+ memset (&m_shaderglobals, 0, sizeof(ShaderGlobals));
+@@ -121,7 +121,7 @@
+ RuntimeOptimizer::~RuntimeOptimizer ()
+ {
+ delete m_builder;
+- delete m_llvm_passes;
++ delete m_llvm_module_passes;
+ delete m_llvm_func_passes;
+ }
+
+diff -Nur OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/runtimeoptimize.h OpenShadingLanguage-Release-1.4.1/src/liboslexec/runtimeoptimize.h
+--- OpenShadingLanguage-Release-1.4.1.orig/src/liboslexec/runtimeoptimize.h 2013-12-19 17:59:26.000000000 -0200
++++ OpenShadingLanguage-Release-1.4.1/src/liboslexec/runtimeoptimize.h 2014-03-25 10:26:38.102685835 -0300
+@@ -968,8 +968,13 @@
+ llvm::Type *m_llvm_type_closure_component_attr; // LLVM type for ClosureMeta::Attr
+ llvm::PointerType *m_llvm_type_prepare_closure_func;
+ llvm::PointerType *m_llvm_type_setup_closure_func;
+- llvm::PassManager *m_llvm_passes;
++#if OSL_LLVM_VERSION >= 34
++ llvm::legacy::PassManager *m_llvm_module_passes;
++ llvm::legacy::FunctionPassManager *m_llvm_func_passes;
++#else
++ llvm::PassManager *m_llvm_module_passes;
+ llvm::FunctionPassManager *m_llvm_func_passes;
++#endif
+ int m_llvm_local_mem; // Amount of memory we use for locals
+
+ // Persistant data shared between layers