From 7c32f1ed6b2d31beda7c7e01f0862343236f3966 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 2 Sep 2014 23:39:58 -0300 Subject: openimageio: fix desc --- libre/openimageio/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/openimageio/PKGBUILD b/libre/openimageio/PKGBUILD index 84ec3570b..345880f0c 100644 --- a/libre/openimageio/PKGBUILD +++ b/libre/openimageio/PKGBUILD @@ -4,8 +4,8 @@ pkgname=openimageio pkgver=1.4.12 -pkgrel=3.2 -pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender-parabola package)' +pkgrel=3.3 +pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender package)' arch=('i686' 'x86_64' 'mips64el') url="http://www.$pkgname.org/" license=('custom') -- cgit v1.2.3 From 578a5cd92fbb5cf1cdc745a8f8a3c0622795e27c Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 02:46:29 -0300 Subject: opencolorio: change version --- libre/opencolorio/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/opencolorio/PKGBUILD b/libre/opencolorio/PKGBUILD index 7a3e4fd98..3ce13113a 100644 --- a/libre/opencolorio/PKGBUILD +++ b/libre/opencolorio/PKGBUILD @@ -4,7 +4,7 @@ pkgname=opencolorio pkgver=1.0.9 -pkgrel=2.6 +pkgrel=2.parabola1 pkgdesc='A color management framework for visual effects and animation (built for the blender package)' arch=('i686' 'x86_64' 'mips64el') url="http://$pkgname.org" -- cgit v1.2.3 From daa81ad158c86a249c422cf3951b22f2d7ab9cfb Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 02:47:18 -0300 Subject: openimageio: change version --- libre/openimageio/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/openimageio/PKGBUILD b/libre/openimageio/PKGBUILD index 345880f0c..f60f498cb 100644 --- a/libre/openimageio/PKGBUILD +++ b/libre/openimageio/PKGBUILD @@ -4,7 +4,7 @@ pkgname=openimageio pkgver=1.4.12 -pkgrel=3.3 +pkgrel=3.parabola1 pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender package)' arch=('i686' 'x86_64' 'mips64el') url="http://www.$pkgname.org/" -- cgit v1.2.3 From 70ef399eaf19029e6896add5baf8501d53a9852f Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 02:54:12 -0300 Subject: rename to opencollada --- libre/opencollada-parabola/PKGBUILD | 49 ------------------------------------- libre/opencollada/PKGBUILD | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 49 deletions(-) delete mode 100644 libre/opencollada-parabola/PKGBUILD create mode 100644 libre/opencollada/PKGBUILD (limited to 'libre') diff --git a/libre/opencollada-parabola/PKGBUILD b/libre/opencollada-parabola/PKGBUILD deleted file mode 100644 index c22bf3a3e..000000000 --- a/libre/opencollada-parabola/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer (Arch): Sven-Hendrik Haase -# Maintainer: Márcio Silva - -_pkgname=opencollada -pkgname=$_pkgname-parabola -pkgver=20140214 -pkgrel=1.1 -pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-parabola package)" -arch=('i686' 'x86_64' 'mips64el') -url='https://github.com/KhronosGroup/OpenCOLLADA' -license=('GPL') -depends=('libxml2' 'pcre') -makedepends=('git' 'cmake') -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") -source=('git://github.com/KhronosGroup/OpenCOLLADA.git') -md5sums=('SKIP') - -prepare() { - cd $srcdir/OpenCOLLADA - - # adapt source to last blender release - git reset --hard 8dc9e4e5b73caa1fcfe19508f381a087e036d886 # Fri Feb 14 14:32:18 2014 -0800 -} - -build() { - cd "$srcdir"/OpenCOLLADA - - [[ -d build ]] && rm -r build - mkdir build && cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_SHARED=ON \ - -DUSE_STATIC=OFF - make -} - -package() { - cd $srcdir/OpenCOLLADA/build - - make DESTDIR=$pkgdir install - - install -d $pkgdir/etc/ld.so.conf.d - echo /usr/lib/$_pkgname > $pkgdir/etc/ld.so.conf.d/$_pkgname.conf -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/opencollada/PKGBUILD b/libre/opencollada/PKGBUILD new file mode 100644 index 000000000..5b6733645 --- /dev/null +++ b/libre/opencollada/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer (Arch): Sven-Hendrik Haase +# Maintainer: Márcio Silva + +pkgname=opencollada +pkgver=20140214 +pkgrel=1.parabola1 +pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender package)" +arch=('i686' 'x86_64' 'mips64el') +url='https://github.com/KhronosGroup/OpenCOLLADA' +license=('GPL') +depends=('libxml2' 'pcre') +makedepends=('git' 'cmake') +conflicts=("$pkgname-parabola") +replaces=("$pkgname-parabola") +source=('git://github.com/KhronosGroup/OpenCOLLADA.git') +md5sums=('SKIP') + +prepare() { + cd $srcdir/OpenCOLLADA + + # adapt source to last blender release + git reset --hard 8dc9e4e5b73caa1fcfe19508f381a087e036d886 # Fri Feb 14 14:32:18 2014 -0800 +} + +build() { + cd "$srcdir"/OpenCOLLADA + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_SHARED=ON \ + -DUSE_STATIC=OFF + make +} + +package() { + cd $srcdir/OpenCOLLADA/build + + make DESTDIR=$pkgdir install + + install -d $pkgdir/etc/ld.so.conf.d + echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3 From 8f4b533d3d0cc11cf70c9f66d44280ebc2e88dfc Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 03:11:28 -0300 Subject: rename openshadinglanguage --- libre/openshadinglanguage-parabola/PKGBUILD | 97 ------- libre/openshadinglanguage-parabola/llvm-133.patch | 331 --------------------- libre/openshadinglanguage-parabola/llvm-141.patch | 333 ---------------------- libre/openshadinglanguage/PKGBUILD | 95 ++++++ libre/openshadinglanguage/llvm-133.patch | 331 +++++++++++++++++++++ libre/openshadinglanguage/llvm-141.patch | 333 ++++++++++++++++++++++ 6 files changed, 759 insertions(+), 761 deletions(-) delete mode 100644 libre/openshadinglanguage-parabola/PKGBUILD delete mode 100644 libre/openshadinglanguage-parabola/llvm-133.patch delete mode 100644 libre/openshadinglanguage-parabola/llvm-141.patch create mode 100644 libre/openshadinglanguage/PKGBUILD create mode 100644 libre/openshadinglanguage/llvm-133.patch create mode 100644 libre/openshadinglanguage/llvm-141.patch (limited to 'libre') diff --git a/libre/openshadinglanguage-parabola/PKGBUILD b/libre/openshadinglanguage-parabola/PKGBUILD deleted file mode 100644 index ce04f74c1..000000000 --- a/libre/openshadinglanguage-parabola/PKGBUILD +++ /dev/null @@ -1,97 +0,0 @@ -# Maintainer (Arch): Sven-Hendrik Haase -# Maintainer: Márcio Silva - -_pkgname=openshadinglanguage -pkgname=$_pkgname-parabola -pkgver=1.4.2 # 1.5.10 for blender 2.72 -pkgrel=1 -pkgdesc='Advanced shading language for production GI renderers (built for the blender-parabola package)' -arch=('i686' 'x86_64' 'mips64el') -url='https://github.com/imageworks/OpenShadingLanguage' -license=('custom') -depends=('boost-libs' 'freetype2' 'libpng' 'libtiff' 'llvm-libs' 'openexr' 'openimageio') -makedepends=('boost' 'clang' 'cmake') -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") -source=("https://github.com/imageworks/OpenShadingLanguage/archive/Release-$pkgver.tar.gz" - 'llvm-141.patch') -md5sums=('5aeb3c9502aedf62d0120b3523957e92' - 'b948e5df8710366b65027d1d8450f340') - -prepare() { - cd OpenShadingLanguage-Release-$pkgver - - msg 'renaming wrong OS name' - _OS=$(uname -o) - [[ $_OS == GNU ]] &&\ - sed -i 's|linux|GNU|i; - ' src/{cmake/platform.cmake,make/detectplatform.mk} - [[ $_OS == GNU/Linux ]] &&\ - sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/Linux|;\|platform| s|linux|GNU/Linux|i - ' src/{cmake/platform.cmake,make/detectplatform.mk} - [[ $_OS == GNU/kFreeBSD ]] &&\ - sed -i '\|STREQUAL| s|FreeBSD|kFreeBSD|;\|platform| s|freebsd|GNU/kFreeBSD|i - ' src/cmake/platform.cmake - sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i - ' src/make/detectplatform.mk - - if [[ ${pkgver::3} == 1.4 ]]; then - # renaming wrong OS name - sed -i 's|Linux/OSX|GNU/BSD|' src/include/export.h - - # LLVM 3.4 build fix - # based of "https://github.com/imageworks/OpenShadingLanguage/pull/320.patch" - patch -Np1 < $srcdir/llvm-141.patch - - # fix include paths - sed -i 's|oslconfig.h|../include/oslconfig.h| - s|dual.h|../include/dual.h| - s|dual_vec.h|../include/dual_vec.h| - ' src/liboslexec/llvm_ops.cpp - sed -i 's|oslexec.h|../include/oslexec.h| - s|oslclosure.h|../include/oslclosure.h| - s|osl_pvt.h|../include/osl_pvt.h| - ' src/liboslexec/oslexec_pvt.h - else - # renaming wrong OS name - sed -i 's|Linux/OSX|GNU/BSD|' src/include/OSL/export.h - fi -} - -build() { - cd OpenShadingLanguage-Release-$pkgver - - if [[ ${pkgver::3} == 1.5 ]]; then - # Fails building this file on i686 - if [[ $CARCH == i686 ]]; then - sed -i "/src\/testshade/d" CMakeLists.txt - fi - fi - - cd src - - [[ -d build ]] && rm -r build - mkdir build && cd build - - cmake ../.. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_STATIC=OFF - make -} - -package() { - cd OpenShadingLanguage-Release-$pkgver/src/build - - make DESTDIR=$pkgdir install - - mkdir -p $pkgdir/usr/share/OSL/ - mkdir -p $pkgdir/usr/share/licenses/$_pkgname - mv $pkgdir/usr/{CHANGES,README.md,INSTALL} $pkgdir/usr/share/OSL - mv $pkgdir/usr/doc $pkgdir/usr/share/OSL/doc - mv $pkgdir/usr/shaders $pkgdir/usr/share/OSL/shaders - mv $pkgdir/usr/LICENSE $pkgdir/usr/share/licenses/$_pkgname -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/openshadinglanguage-parabola/llvm-133.patch b/libre/openshadinglanguage-parabola/llvm-133.patch deleted file mode 100644 index a63b91e0d..000000000 --- a/libre/openshadinglanguage-parabola/llvm-133.patch +++ /dev/null @@ -1,331 +0,0 @@ -diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.3.3/src/cmake/externalpackages.cmake ---- OpenShadingLanguage-Release-1.3.3.orig/src/cmake/externalpackages.cmake 2013-07-11 20:01:18.000000000 -0300 -+++ OpenShadingLanguage-Release-1.3.3/src/cmake/externalpackages.cmake 2014-02-04 18:09:20.236025178 -0200 -@@ -185,9 +185,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.3.3.orig/src/liboslexec/CMakeLists.txt OpenShadingLanguage-Release-1.3.3/src/liboslexec/CMakeLists.txt ---- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/CMakeLists.txt 2013-07-11 20:01:18.000000000 -0300 -+++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/CMakeLists.txt 2014-02-04 18:07:21.960947198 -0200 -@@ -51,49 +51,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") -- LIST (APPEND LLVM_COMPILE_FLAGS "-I${ILMBASE_INCLUDE_DIR}") -+ 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++) -+ 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} ${LLVM_COMPILE_FLAGS} -- -I${CMAKE_CURRENT_SOURCE_DIR} -- -I${CMAKE_SOURCE_DIR}/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_BC_GENERATOR} -+ ${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.3.3.orig/src/liboslexec/llvm_headers.h OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_headers.h ---- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_headers.h 2013-07-11 20:01:18.000000000 -0300 -+++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_headers.h 2014-02-04 19:28:31.349811104 -0200 -@@ -33,7 +33,27 @@ - namespace llvm = LLVM_NAMESPACE; - #endif - --#if OSL_LLVM_VERSION >= 33 -+#if OSL_LLVM_VERSION >= 34 -+ -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+ -+#elif OSL_LLVM_VERSION >= 33 - - # include - # include -diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_instance.cpp OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_instance.cpp ---- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_instance.cpp 2013-07-11 20:01:18.000000000 -0300 -+++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_instance.cpp 2014-02-04 20:08:23.574948459 -0200 -@@ -992,6 +992,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); -@@ -1003,6 +1004,7 @@ - virtual void deallocateExceptionTable(void *ET) { - // DON'T DEALLOCATE mm->deallocateExceptionTable(ET); - } -+#endif - virtual bool CheckInvariants(std::string &s) { - return mm->CheckInvariants(s); - } -@@ -1018,7 +1020,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); -@@ -1027,7 +1063,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); -@@ -1035,12 +1070,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 - }; - -@@ -1155,7 +1200,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(); -@@ -1290,7 +1335,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; -@@ -1301,12 +1351,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 -@@ -1315,8 +1370,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.3.3.orig/src/liboslexec/runtimeoptimize.cpp OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.cpp ---- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.cpp 2013-07-11 20:01:18.000000000 -0300 -+++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.cpp 2014-02-04 19:37:02.660353625 -0200 -@@ -107,7 +107,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)); -@@ -119,7 +119,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.3.3.orig/src/liboslexec/runtimeoptimize.h OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.h ---- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.h 2013-07-11 20:01:18.000000000 -0300 -+++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.h 2014-02-04 19:52:30.207956999 -0200 -@@ -934,8 +934,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 diff --git a/libre/openshadinglanguage-parabola/llvm-141.patch b/libre/openshadinglanguage-parabola/llvm-141.patch deleted file mode 100644 index eeb82935e..000000000 --- a/libre/openshadinglanguage-parabola/llvm-141.patch +++ /dev/null @@ -1,333 +0,0 @@ -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 -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+# include -+ -+#elif OSL_LLVM_VERSION >= 33 - - # include - # include -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 diff --git a/libre/openshadinglanguage/PKGBUILD b/libre/openshadinglanguage/PKGBUILD new file mode 100644 index 000000000..ec2e732be --- /dev/null +++ b/libre/openshadinglanguage/PKGBUILD @@ -0,0 +1,95 @@ +# Maintainer (Arch): Sven-Hendrik Haase +# Maintainer: Márcio Silva + +pkgname=openshadinglanguage +pkgver=1.4.2 # 1.5.10 for blender 2.72 +pkgrel=1.parabola1 +pkgdesc='Advanced shading language for production GI renderers (built for the blender package)' +arch=('i686' 'x86_64' 'mips64el') +url='https://github.com/imageworks/OpenShadingLanguage' +license=('custom') +depends=('boost-libs' 'freetype2' 'libpng' 'libtiff' 'llvm-libs' 'openexr' 'openimageio') +makedepends=('boost' 'clang' 'cmake') +conflicts=("$pkgname-parabola") +replaces=("$pkgname-parabola") +source=("https://github.com/imageworks/OpenShadingLanguage/archive/Release-$pkgver.tar.gz" + 'llvm-141.patch') +md5sums=('5aeb3c9502aedf62d0120b3523957e92' + 'b948e5df8710366b65027d1d8450f340') + +prepare() { + cd OpenShadingLanguage-Release-$pkgver + + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] &&\ + sed -i 's|linux|GNU|i; + ' src/{cmake/platform.cmake,make/detectplatform.mk} + [[ $_OS == GNU/Linux ]] &&\ + sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/Linux|;\|platform| s|linux|GNU/Linux|i + ' src/{cmake/platform.cmake,make/detectplatform.mk} + [[ $_OS == GNU/kFreeBSD ]] &&\ + sed -i '\|STREQUAL| s|FreeBSD|kFreeBSD|;\|platform| s|freebsd|GNU/kFreeBSD|i + ' src/cmake/platform.cmake + sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i + ' src/make/detectplatform.mk + + if [[ ${pkgver::3} == 1.4 ]]; then + # renaming wrong OS name + sed -i 's|Linux/OSX|GNU/BSD|' src/include/export.h + + # LLVM 3.4 build fix + # based of "https://github.com/imageworks/OpenShadingLanguage/pull/320.patch" + patch -Np1 < $srcdir/llvm-141.patch + + # fix include paths + sed -i 's|oslconfig.h|../include/oslconfig.h| + s|dual.h|../include/dual.h| + s|dual_vec.h|../include/dual_vec.h| + ' src/liboslexec/llvm_ops.cpp + sed -i 's|oslexec.h|../include/oslexec.h| + s|oslclosure.h|../include/oslclosure.h| + s|osl_pvt.h|../include/osl_pvt.h| + ' src/liboslexec/oslexec_pvt.h + else + # renaming wrong OS name + sed -i 's|Linux/OSX|GNU/BSD|' src/include/OSL/export.h + fi +} + +build() { + cd OpenShadingLanguage-Release-$pkgver + + if [[ ${pkgver::3} == 1.5 ]]; then + # Fails building this file on i686 + if [[ $CARCH == i686 ]]; then + sed -i "/src\/testshade/d" CMakeLists.txt + fi + fi + + cd src + + [[ -d build ]] && rm -r build + mkdir build && cd build + + cmake ../.. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_STATIC=OFF + make +} + +package() { + cd OpenShadingLanguage-Release-$pkgver/src/build + + make DESTDIR=$pkgdir install + + mkdir -p $pkgdir/usr/share/OSL/ + mkdir -p $pkgdir/usr/share/licenses/$pkgname + mv $pkgdir/usr/{CHANGES,README.md,INSTALL} $pkgdir/usr/share/OSL + mv $pkgdir/usr/doc $pkgdir/usr/share/OSL/doc + mv $pkgdir/usr/shaders $pkgdir/usr/share/OSL/shaders + mv $pkgdir/usr/LICENSE $pkgdir/usr/share/licenses/$pkgname +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/openshadinglanguage/llvm-133.patch b/libre/openshadinglanguage/llvm-133.patch new file mode 100644 index 000000000..a63b91e0d --- /dev/null +++ b/libre/openshadinglanguage/llvm-133.patch @@ -0,0 +1,331 @@ +diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.3.3/src/cmake/externalpackages.cmake +--- OpenShadingLanguage-Release-1.3.3.orig/src/cmake/externalpackages.cmake 2013-07-11 20:01:18.000000000 -0300 ++++ OpenShadingLanguage-Release-1.3.3/src/cmake/externalpackages.cmake 2014-02-04 18:09:20.236025178 -0200 +@@ -185,9 +185,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.3.3.orig/src/liboslexec/CMakeLists.txt OpenShadingLanguage-Release-1.3.3/src/liboslexec/CMakeLists.txt +--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/CMakeLists.txt 2013-07-11 20:01:18.000000000 -0300 ++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/CMakeLists.txt 2014-02-04 18:07:21.960947198 -0200 +@@ -51,49 +51,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") +- LIST (APPEND LLVM_COMPILE_FLAGS "-I${ILMBASE_INCLUDE_DIR}") ++ 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++) ++ 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} ${LLVM_COMPILE_FLAGS} +- -I${CMAKE_CURRENT_SOURCE_DIR} +- -I${CMAKE_SOURCE_DIR}/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_BC_GENERATOR} ++ ${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.3.3.orig/src/liboslexec/llvm_headers.h OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_headers.h +--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_headers.h 2013-07-11 20:01:18.000000000 -0300 ++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_headers.h 2014-02-04 19:28:31.349811104 -0200 +@@ -33,7 +33,27 @@ + namespace llvm = LLVM_NAMESPACE; + #endif + +-#if OSL_LLVM_VERSION >= 33 ++#if OSL_LLVM_VERSION >= 34 ++ ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++ ++#elif OSL_LLVM_VERSION >= 33 + + # include + # include +diff -Nur OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_instance.cpp OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_instance.cpp +--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/llvm_instance.cpp 2013-07-11 20:01:18.000000000 -0300 ++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/llvm_instance.cpp 2014-02-04 20:08:23.574948459 -0200 +@@ -992,6 +992,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); +@@ -1003,6 +1004,7 @@ + virtual void deallocateExceptionTable(void *ET) { + // DON'T DEALLOCATE mm->deallocateExceptionTable(ET); + } ++#endif + virtual bool CheckInvariants(std::string &s) { + return mm->CheckInvariants(s); + } +@@ -1018,7 +1020,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); +@@ -1027,7 +1063,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); +@@ -1035,12 +1070,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 + }; + +@@ -1155,7 +1200,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(); +@@ -1290,7 +1335,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; +@@ -1301,12 +1351,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 +@@ -1315,8 +1370,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.3.3.orig/src/liboslexec/runtimeoptimize.cpp OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.cpp +--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.cpp 2013-07-11 20:01:18.000000000 -0300 ++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.cpp 2014-02-04 19:37:02.660353625 -0200 +@@ -107,7 +107,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)); +@@ -119,7 +119,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.3.3.orig/src/liboslexec/runtimeoptimize.h OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.h +--- OpenShadingLanguage-Release-1.3.3.orig/src/liboslexec/runtimeoptimize.h 2013-07-11 20:01:18.000000000 -0300 ++++ OpenShadingLanguage-Release-1.3.3/src/liboslexec/runtimeoptimize.h 2014-02-04 19:52:30.207956999 -0200 +@@ -934,8 +934,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 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 ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++# include ++ ++#elif OSL_LLVM_VERSION >= 33 + + # include + # include +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 -- cgit v1.2.3 From aa1429f598bc3b1017d3875a6daf671519f31c97 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 03:15:38 -0300 Subject: rename to openexr --- libre/openexr-libre/PKGBUILD | 69 ----------------------------------------- libre/openexr-libre/gcc43.patch | 11 ------- libre/openexr/PKGBUILD | 67 +++++++++++++++++++++++++++++++++++++++ libre/openexr/gcc43.patch | 11 +++++++ 4 files changed, 78 insertions(+), 80 deletions(-) delete mode 100644 libre/openexr-libre/PKGBUILD delete mode 100644 libre/openexr-libre/gcc43.patch create mode 100644 libre/openexr/PKGBUILD create mode 100644 libre/openexr/gcc43.patch (limited to 'libre') diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD deleted file mode 100644 index 5423862e3..000000000 --- a/libre/openexr-libre/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 212797 2014-05-15 10:44:29Z tpowa $ -# Maintainer (Arch): Tobias Powalowski -# Maintainer: André Silva - -_pkgname=openexr -pkgname=openexr-libre -pkgver=2.1.0 -pkgrel=1 -pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" -url="http://www.openexr.com/" -arch=('i686' 'x86_64' 'mips64el') -license=('BSD') -depends=('zlib' 'ilmbase') -[ "$CARCH" != "mips64el" ] && makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -mksource=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" - "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx" - "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt" - "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt" - "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt" - "https://github.com/${_pkgname}/${_pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt") -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) - -mksource() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - # remove documentation with embedded nonfree fonts - rm -rv "doc/"{InterpretingDeepPixels,MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction,TheoryDeepPixels}.pdf - - # add source documentation - install -m644 -v "${srcdir}/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} doc - - # convert source documentation to pdf format and clean source code - if [ "$CARCH" != "mips64el" ]; then - cd doc - libreoffice --headless --invisible --convert-to pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} - rm -rv "${srcdir}/"{_rels,Configurations2,customXml,docProps,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails,word} - fi -} - -prepare() { - # remove TheoryDeepPixels.pdf reference - sed -i '\|TheoryDeepPixels[.]pdf|d - \|InterpretingDeepPixels[.]pdf| s| [\]|| - ' "${srcdir}/${_pkgname}-${pkgver}/doc/Makefile."{am,in} -} - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" - install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" -} -mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43' - 'a59a8516d9dbb76755cb258d18cf4e72' - '0b0b41269d6a3ee1a7090067cc89895f' - '6889a150ab9f2f35fbc9835373dd3c34' - 'ef6912faf2ab7516678bd0fa56b832f8' - '232a6be90fd36ce49e213492a60d335d') -md5sums=('97613563c17dc3a1aa3359e05b7b37da') diff --git a/libre/openexr-libre/gcc43.patch b/libre/openexr-libre/gcc43.patch deleted file mode 100644 index ab99eb9a1..000000000 --- a/libre/openexr-libre/gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- exrenvmap/blurImage.cpp -+++ exrenvmap/blurImage.cpp -@@ -39,6 +39,8 @@ - // - //----------------------------------------------------------------------------- - -+#include -+ - #include - - #include diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD new file mode 100644 index 000000000..e38132fcf --- /dev/null +++ b/libre/openexr/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 212797 2014-05-15 10:44:29Z tpowa $ +# Maintainer (Arch): Tobias Powalowski +# Maintainer: André Silva + +pkgname=openexr +pkgver=2.1.0 +pkgrel=1 +pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" +url="http://www.$pkgname.com/" +arch=('i686' 'x86_64' 'mips64el') +license=('BSD') +depends=('zlib' 'ilmbase') +makedepends=('jre7-openjdk-headless' 'libcups' 'libreoffice-writer' 'libxinerama') +replaces=("$pkgname-libre") +conflicts=("$pkgname-libre") +mksource=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/InterpretingDeepPixels.docx" + "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/MultiViewOpenEXR.odt" + "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/OpenEXRFileLayout.odt" + "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/ReadingAndWritingImageFiles.odt" + "https://github.com/${pkgname}/${pkgname}/raw/master/OpenEXR/doc/TechnicalIntroduction.odt") +source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") +noextract=(InterpretingDeepPixels.docx MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) + +mksource() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # remove documentation with embedded nonfree fonts + rm -rv "doc/"{InterpretingDeepPixels,MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction,TheoryDeepPixels}.pdf + + # add source documentation + install -m644 -v "${srcdir}/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} doc + + # convert source documentation to pdf format and clean source code + if [ "$CARCH" != "mips64el" ]; then + cd doc + libreoffice --headless --invisible --convert-to pdf {InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} + rm -rv "${srcdir}/"{_rels,Configurations2,customXml,docProps,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails,word} + fi +} + +prepare() { + # remove TheoryDeepPixels.pdf reference + sed -i '\|TheoryDeepPixels[.]pdf|d + \|InterpretingDeepPixels[.]pdf| s| [\]|| + ' "${srcdir}/${pkgname}-${pkgver}/doc/Makefile."{am,in} +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -m644 "doc/"{InterpretingDeepPixels.docx,{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt} "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" +} +mkmd5sums=('33735d37d2ee01c6d8fbd0df94fb8b43' + 'a59a8516d9dbb76755cb258d18cf4e72' + '0b0b41269d6a3ee1a7090067cc89895f' + '6889a150ab9f2f35fbc9835373dd3c34' + 'ef6912faf2ab7516678bd0fa56b832f8' + '232a6be90fd36ce49e213492a60d335d') +md5sums=('97613563c17dc3a1aa3359e05b7b37da') diff --git a/libre/openexr/gcc43.patch b/libre/openexr/gcc43.patch new file mode 100644 index 000000000..ab99eb9a1 --- /dev/null +++ b/libre/openexr/gcc43.patch @@ -0,0 +1,11 @@ +--- exrenvmap/blurImage.cpp ++++ exrenvmap/blurImage.cpp +@@ -39,6 +39,8 @@ + // + //----------------------------------------------------------------------------- + ++#include ++ + #include + + #include -- cgit v1.2.3 From 99fa9da4b77d6c41f3d49f089247554e44e4b11f Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 06:56:19 -0300 Subject: remane to blender --- libre/blender-parabola/PKGBUILD | 173 --------------------------------- libre/blender-parabola/blender.install | 13 --- libre/blender/PKGBUILD | 173 +++++++++++++++++++++++++++++++++ libre/blender/blender.install | 13 +++ 4 files changed, 186 insertions(+), 186 deletions(-) delete mode 100644 libre/blender-parabola/PKGBUILD delete mode 100644 libre/blender-parabola/blender.install create mode 100644 libre/blender/PKGBUILD create mode 100644 libre/blender/blender.install (limited to 'libre') diff --git a/libre/blender-parabola/PKGBUILD b/libre/blender-parabola/PKGBUILD deleted file mode 100644 index 7d665ec9f..000000000 --- a/libre/blender-parabola/PKGBUILD +++ /dev/null @@ -1,173 +0,0 @@ -# Contributor (Arch): John Sowiak -# Contributor (Arch): tobias -# Maintainer (Arch): Sven-Hendrik Haase -# Maintainer: Márcio Silva - -pkgbase=blender -pkgname=("$pkgbase-parabola" "$pkgbase-addon-gimp" "$pkgbase-addon-povray" "$pkgbase-addons-contrib") -pkgver=2.71 -pkgrel=2 -epoch=14 -_jpgver=1.5 -_pyver=3.4 -pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.$pkgbase.org" -depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freetype2' 'glew' - 'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libtiff' 'openal' - 'opencolorio' 'opencollada=20140214' 'openexr' 'openimageio' - 'openshadinglanguage=1.4.2' 'python' 'shared-mime-info' 'xdg-utils') -makedepends=('boost' 'cmake' 'git') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n) -optdepends=('bullet: for Rigid Bodies and Physics Simulation' - #'mesa-libcl: for rendering with optional Mesa OpenCL' - 'povray: for optional renderer with POV-Ray' - 'xcftools: for import GIMP images to scene (pcr repo)' - 'blender-addon-luxrender: for optional renderer and exporter with LuxRender' - 'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)' - 'blender-addon-ogre: for export to Ogre3D formats (pcr repo)' - 'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)') -provides=("$pkgbase") -conflicts=("$pkgbase" "$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") -replaces=("$pkgbase" "$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") -options=('!strip') -install="$pkgbase.install" -source=("http://download.$pkgbase.org/source/$pkgbase-$pkgver.tar.gz") -md5sums=('fc1112adb493ea62e9587ca0e86d6b0d') - -#source=("git://git.$pkgbase.org/$pkgbase.git#tag=$pkgver" -# "git://git.$pkgbase.org/$pkgbase-translations.git#tag=$pkgver" -# "git://git.$pkgbase.org/$pkgbase-addons.git#tag=$pkgver" -# "git://git.$pkgbase.org/$pkgbase-addons-contrib.git#tag=$pkgver" -#md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP') - -prepare() { - cd $srcdir/$pkgbase-v$pkgver - - msg 'renaming wrong OS name' - _OS=$(uname -o) - [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c - [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c - [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c - sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD| - s|Linux, FreeBSD|GNU and BSD| - s|Unpack the archive, Then run the Blender executable.|Install from Parabola repo (pacman -S '"$pkgname"'), Then run blender.| - \|Windows|d;\|Mac OS X|d - s|The downloaded Blender package includes|The '"${pkgname^}"' package includes| - ' release/text/readme.html - sed -i 's|Linux|GNU| - ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py - sed -i 's| (.so under Linux, .dll under windows...)| (.so under GNU or BSD, .dll under Wine or ReactOS...)| - ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py - - msg 'removing Open Source term' - sed -i 's|free, open source|free| - s|free and open-source|free| - s|open-source and free|free| - ' release/text/readme.html - - msg 'fixing povray-libre path and desc' - sed -i "s|FILE_PATH',|FILE_PATH',\n default='/usr/bin/povray',| - s|both POV-Ray 3[.]7 and this script are beta|this script is beta| - " release/scripts/addons/render_povray/__init__.py - - mkdir -v build -} - -build() { - cd $srcdir/$pkgbase-v$pkgver/build - - [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" \ - -DCMAKE_CXX_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCYCLES_OSL=/usr \ - -DLLVM_STATIC=OFF \ - -DLLVM_VERSION=3.4 \ - -DOPENIMAGEIO_ROOT_DIR=/usr \ - -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver \ - -DOSL_INCLUDES=/usr/include/OSL \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m \ - -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python${_pyver}m \ - -DPYTHON_VERSION=$_pyver \ - -DSUPPORT_SSE_BUILD=$_SSE \ - -DSUPPORT_SSE2_BUILD=$_SSE2 \ - -DWITH_AUDASPACE=ON \ - -DWITH_BLENDER=ON \ - -DWITH_BOOST=ON \ - -DWITH_BOOST_ICU=OFF \ - -DWITH_BUILDINFO=ON \ - -DWITH_BULLET=ON \ - -DWITH_CODEC_AVI=ON \ - -DWITH_CODEC_FFMPEG=ON \ - -DWITH_CODEC_SNDFILE=ON \ - -DWITH_COMPOSITOR=ON \ - -DWITH_CYCLES=ON \ - -DWITH_CYCLES_CUDA_BINARIES=OFF \ - -DWITH_CYCLES_OSL=OFF \ - -DWITH_CYCLES_STANDALONE=ON \ - -DWITH_CYCLES_STANDALONE_GUI=ON \ - -DWITH_FFTW3=ON \ - -DWITH_FREESTYLE=ON \ - -DWITH_GAMEENGINE=ON \ - -DWITH_GHOST_XDND=ON \ - -DWITH_IK_ITASC=ON \ - -DWITH_IK_SOLVER=ON \ - -DWITH_IMAGE_CINEON=ON \ - -DWITH_IMAGE_DDS=ON \ - -DWITH_IMAGE_FRAMESERVER=ON \ - -DWITH_IMAGE_HDR=ON \ - -DWITH_IMAGE_OPENEXR=ON \ - -DWITH_IMAGE_OPENJPEG=ON \ - -DWITH_IMAGE_REDCODE=ON \ - -DWITH_IMAGE_TIFF=ON \ - -DWITH_INPUT_NDOF=OFF \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_INTERNATIONAL=ON \ - -DWITH_JACK=ON \ - -DWITH_JACK_DYNLOAD=ON \ - -DWITH_LIBMV=OFF \ - -DWITH_LLVM=ON \ - -DWITH_LZMA=ON \ - -DWITH_LZO=ON \ - -DWITH_MEM_JEMALLOC=OFF \ - -DWITH_MEM_VALGRIND=OFF \ - -DWITH_MOD_BOOLEAN=ON \ - -DWITH_MOD_FLUID=ON \ - -DWITH_MOD_OCEANSIM=ON \ - -DWITH_MOD_REMESH=ON \ - -DWITH_MOD_SMOKE=ON \ - -DWITH_OPENAL=ON \ - -DWITH_OPENIMAGEIO=ON \ - -DWITH_OPENCOLLADA=ON \ - -DWITH_OPENCOLORIO=ON \ - -DWITH_OPENMP=ON \ - -DWITH_PLAYER=ON \ - -DWITH_PYTHON=ON \ - -DWITH_PYTHON_INSTALL=OFF \ - -DWITH_PYTHON_INSTALL_NUMPY=OFF \ - -DWITH_PYTHON_INSTALL_REQUESTS=ON \ - -DWITH_PYTHON_MODULE=OFF \ - -DWITH_PYTHON_SAFETY=OFF \ - -DWITH_PYTHON_SECURITY=ON \ - -DWITH_RAYOPTIMIZATION=ON \ - -DWITH_SDL=ON \ - -DWITH_STATIC_LIBS=OFF \ - -DWITH_SYSTEM_GLEW=ON \ - -DWITH_SYSTEM_OPENJPEG=ON \ - -DWITH_X11_XF86VMODE=ON \ - -DWITH_X11_XINPUT=ON - #-DWITH_MOD_CLOTH_ELTOPO=ON\ - #-DWITH_SYSTEM_BULLET=ON\ - make -} - -package() { - cd $srcdir/$pkgbase-v$pkgver/build - - make DESTDIR=$pkgdir install - python -m compileall $pkgdir/usr/share/$pkgbase -} diff --git a/libre/blender-parabola/blender.install b/libre/blender-parabola/blender.install deleted file mode 100644 index 724bfce00..000000000 --- a/libre/blender-parabola/blender.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD new file mode 100644 index 000000000..7d665ec9f --- /dev/null +++ b/libre/blender/PKGBUILD @@ -0,0 +1,173 @@ +# Contributor (Arch): John Sowiak +# Contributor (Arch): tobias +# Maintainer (Arch): Sven-Hendrik Haase +# Maintainer: Márcio Silva + +pkgbase=blender +pkgname=("$pkgbase-parabola" "$pkgbase-addon-gimp" "$pkgbase-addon-povray" "$pkgbase-addons-contrib") +pkgver=2.71 +pkgrel=2 +epoch=14 +_jpgver=1.5 +_pyver=3.4 +pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support' +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://www.$pkgbase.org" +depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freetype2' 'glew' + 'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libtiff' 'openal' + 'opencolorio' 'opencollada=20140214' 'openexr' 'openimageio' + 'openshadinglanguage=1.4.2' 'python' 'shared-mime-info' 'xdg-utils') +makedepends=('boost' 'cmake' 'git') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n) +optdepends=('bullet: for Rigid Bodies and Physics Simulation' + #'mesa-libcl: for rendering with optional Mesa OpenCL' + 'povray: for optional renderer with POV-Ray' + 'xcftools: for import GIMP images to scene (pcr repo)' + 'blender-addon-luxrender: for optional renderer and exporter with LuxRender' + 'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)' + 'blender-addon-ogre: for export to Ogre3D formats (pcr repo)' + 'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)') +provides=("$pkgbase") +conflicts=("$pkgbase" "$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") +replaces=("$pkgbase" "$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") +options=('!strip') +install="$pkgbase.install" +source=("http://download.$pkgbase.org/source/$pkgbase-$pkgver.tar.gz") +md5sums=('fc1112adb493ea62e9587ca0e86d6b0d') + +#source=("git://git.$pkgbase.org/$pkgbase.git#tag=$pkgver" +# "git://git.$pkgbase.org/$pkgbase-translations.git#tag=$pkgver" +# "git://git.$pkgbase.org/$pkgbase-addons.git#tag=$pkgver" +# "git://git.$pkgbase.org/$pkgbase-addons-contrib.git#tag=$pkgver" +#md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP') + +prepare() { + cd $srcdir/$pkgbase-v$pkgver + + msg 'renaming wrong OS name' + _OS=$(uname -o) + [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c + [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c + [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c + sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD| + s|Linux, FreeBSD|GNU and BSD| + s|Unpack the archive, Then run the Blender executable.|Install from Parabola repo (pacman -S '"$pkgname"'), Then run blender.| + \|Windows|d;\|Mac OS X|d + s|The downloaded Blender package includes|The '"${pkgname^}"' package includes| + ' release/text/readme.html + sed -i 's|Linux|GNU| + ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py + sed -i 's| (.so under Linux, .dll under windows...)| (.so under GNU or BSD, .dll under Wine or ReactOS...)| + ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py + + msg 'removing Open Source term' + sed -i 's|free, open source|free| + s|free and open-source|free| + s|open-source and free|free| + ' release/text/readme.html + + msg 'fixing povray-libre path and desc' + sed -i "s|FILE_PATH',|FILE_PATH',\n default='/usr/bin/povray',| + s|both POV-Ray 3[.]7 and this script are beta|this script is beta| + " release/scripts/addons/render_povray/__init__.py + + mkdir -v build +} + +build() { + cd $srcdir/$pkgbase-v$pkgver/build + + [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" \ + -DCMAKE_CXX_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCYCLES_OSL=/usr \ + -DLLVM_STATIC=OFF \ + -DLLVM_VERSION=3.4 \ + -DOPENIMAGEIO_ROOT_DIR=/usr \ + -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver \ + -DOSL_INCLUDES=/usr/include/OSL \ + -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m \ + -DPYTHON_LIBPATH=/usr/lib \ + -DPYTHON_LIBRARY=python${_pyver}m \ + -DPYTHON_VERSION=$_pyver \ + -DSUPPORT_SSE_BUILD=$_SSE \ + -DSUPPORT_SSE2_BUILD=$_SSE2 \ + -DWITH_AUDASPACE=ON \ + -DWITH_BLENDER=ON \ + -DWITH_BOOST=ON \ + -DWITH_BOOST_ICU=OFF \ + -DWITH_BUILDINFO=ON \ + -DWITH_BULLET=ON \ + -DWITH_CODEC_AVI=ON \ + -DWITH_CODEC_FFMPEG=ON \ + -DWITH_CODEC_SNDFILE=ON \ + -DWITH_COMPOSITOR=ON \ + -DWITH_CYCLES=ON \ + -DWITH_CYCLES_CUDA_BINARIES=OFF \ + -DWITH_CYCLES_OSL=OFF \ + -DWITH_CYCLES_STANDALONE=ON \ + -DWITH_CYCLES_STANDALONE_GUI=ON \ + -DWITH_FFTW3=ON \ + -DWITH_FREESTYLE=ON \ + -DWITH_GAMEENGINE=ON \ + -DWITH_GHOST_XDND=ON \ + -DWITH_IK_ITASC=ON \ + -DWITH_IK_SOLVER=ON \ + -DWITH_IMAGE_CINEON=ON \ + -DWITH_IMAGE_DDS=ON \ + -DWITH_IMAGE_FRAMESERVER=ON \ + -DWITH_IMAGE_HDR=ON \ + -DWITH_IMAGE_OPENEXR=ON \ + -DWITH_IMAGE_OPENJPEG=ON \ + -DWITH_IMAGE_REDCODE=ON \ + -DWITH_IMAGE_TIFF=ON \ + -DWITH_INPUT_NDOF=OFF \ + -DWITH_INSTALL_PORTABLE=OFF \ + -DWITH_INTERNATIONAL=ON \ + -DWITH_JACK=ON \ + -DWITH_JACK_DYNLOAD=ON \ + -DWITH_LIBMV=OFF \ + -DWITH_LLVM=ON \ + -DWITH_LZMA=ON \ + -DWITH_LZO=ON \ + -DWITH_MEM_JEMALLOC=OFF \ + -DWITH_MEM_VALGRIND=OFF \ + -DWITH_MOD_BOOLEAN=ON \ + -DWITH_MOD_FLUID=ON \ + -DWITH_MOD_OCEANSIM=ON \ + -DWITH_MOD_REMESH=ON \ + -DWITH_MOD_SMOKE=ON \ + -DWITH_OPENAL=ON \ + -DWITH_OPENIMAGEIO=ON \ + -DWITH_OPENCOLLADA=ON \ + -DWITH_OPENCOLORIO=ON \ + -DWITH_OPENMP=ON \ + -DWITH_PLAYER=ON \ + -DWITH_PYTHON=ON \ + -DWITH_PYTHON_INSTALL=OFF \ + -DWITH_PYTHON_INSTALL_NUMPY=OFF \ + -DWITH_PYTHON_INSTALL_REQUESTS=ON \ + -DWITH_PYTHON_MODULE=OFF \ + -DWITH_PYTHON_SAFETY=OFF \ + -DWITH_PYTHON_SECURITY=ON \ + -DWITH_RAYOPTIMIZATION=ON \ + -DWITH_SDL=ON \ + -DWITH_STATIC_LIBS=OFF \ + -DWITH_SYSTEM_GLEW=ON \ + -DWITH_SYSTEM_OPENJPEG=ON \ + -DWITH_X11_XF86VMODE=ON \ + -DWITH_X11_XINPUT=ON + #-DWITH_MOD_CLOTH_ELTOPO=ON\ + #-DWITH_SYSTEM_BULLET=ON\ + make +} + +package() { + cd $srcdir/$pkgbase-v$pkgver/build + + make DESTDIR=$pkgdir install + python -m compileall $pkgdir/usr/share/$pkgbase +} diff --git a/libre/blender/blender.install b/libre/blender/blender.install new file mode 100644 index 000000000..724bfce00 --- /dev/null +++ b/libre/blender/blender.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3 From deff77ebe2b2c552e3b8b4e2d156697d1c92bb74 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Wed, 3 Sep 2014 06:59:39 -0300 Subject: openexr: add parabola1 on release --- libre/openexr/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/openexr/PKGBUILD b/libre/openexr/PKGBUILD index e38132fcf..a2a2ba472 100644 --- a/libre/openexr/PKGBUILD +++ b/libre/openexr/PKGBUILD @@ -4,7 +4,7 @@ pkgname=openexr pkgver=2.1.0 -pkgrel=1 +pkgrel=1.parabola1 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" url="http://www.$pkgname.com/" arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3