diff options
author | Treeve Jelbert | 2012-01-31 21:18:07 +0100 |
---|---|---|
committer | Treeve Jelbert | 2012-01-31 21:18:07 +0100 |
commit | ec760a77dd97bbe7530c5064150e2c0fd88593c3 (patch) | |
tree | 7319352123c0423e3f9eb214eb003207ac93850c | |
parent | c3691fcd8f77bd3a96d8c9f19f7c283dca7cf00e (diff) |
opengtl-0.9.16
-rwxr-xr-x | graphics-libs/opengtl/DEPENDS | 5 | ||||
-rwxr-xr-x | graphics-libs/opengtl/DETAILS | 6 | ||||
-rw-r--r-- | graphics-libs/opengtl/HISTORY | 6 | ||||
-rwxr-xr-x | graphics-libs/opengtl/PRE_BUILD | 4 | ||||
-rw-r--r-- | graphics-libs/opengtl/llvm-3.0.diff | 42 |
5 files changed, 59 insertions, 4 deletions
diff --git a/graphics-libs/opengtl/DEPENDS b/graphics-libs/opengtl/DEPENDS index 809731a79f..bf6a789972 100755 --- a/graphics-libs/opengtl/DEPENDS +++ b/graphics-libs/opengtl/DEPENDS @@ -1 +1,4 @@ -depends llvm +depends llvm && +depends cmake && +depends zlib && +depends libpng diff --git a/graphics-libs/opengtl/DETAILS b/graphics-libs/opengtl/DETAILS index edffded797..ad7395c75c 100755 --- a/graphics-libs/opengtl/DETAILS +++ b/graphics-libs/opengtl/DETAILS @@ -1,9 +1,9 @@ SPELL=opengtl SPELLX=OpenGTL - VERSION=0.9.7 + VERSION=0.9.16 + SOURCE_HASH=sha512:8d1ca8cdf352f04a90cf6fb3eaeb1684e333cbd3b8e46a19dc8d28d7891a5eb79072d4d2fc3d76a1628f22f0e07cca8139e84f01006f0f6de1402b371efaa2b5 SOURCE="${SPELLX}-${VERSION}.tar.bz2" - SOURCE_URL[0]=http://www.${SPELL}.org/download/${SOURCE} - SOURCE_HASH=sha512:ede62170e70cd19bda6aaccaa15c5ce4c9a611a3220bcc1ce102405c1d2a78ec1c3bc1f245e915231323eb0304f6abe666bfb706033a3dceca377dbe0a77afee + SOURCE_URL[0]=http://download.opengtl.org/$SOURCE SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}" WEB_SITE="http://www.opengtl.org/" LICENSE[0]=LGPL diff --git a/graphics-libs/opengtl/HISTORY b/graphics-libs/opengtl/HISTORY index 9ad8923555..2505acd2f9 100644 --- a/graphics-libs/opengtl/HISTORY +++ b/graphics-libs/opengtl/HISTORY @@ -1,3 +1,9 @@ +2012-01-31 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.9.16 + * DEPENDS: add cmake, zlib, libpng + * PRE_BUILD: added, to apply patch + * llvm-3.0.diff: added, fix linking + 2008-12-02 Julien "_kaze_" ROZO <julien@rozo.org> * BUILD, DEPENDS, DETAILS, HISTORY: spell created diff --git a/graphics-libs/opengtl/PRE_BUILD b/graphics-libs/opengtl/PRE_BUILD new file mode 100755 index 0000000000..ce68a0cea2 --- /dev/null +++ b/graphics-libs/opengtl/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +#bzcat $SPELL_DIRECTORY/llvm-3.0.diff.bz2 | patch -p1 +cat $SPELL_DIRECTORY/llvm-3.0.diff | patch -p1 diff --git a/graphics-libs/opengtl/llvm-3.0.diff b/graphics-libs/opengtl/llvm-3.0.diff new file mode 100644 index 0000000000..d9c299db27 --- /dev/null +++ b/graphics-libs/opengtl/llvm-3.0.diff @@ -0,0 +1,42 @@ +diff -r ff57c0b7e75b OpenGTL/GTLCore/CMakeLists.txt +--- a/OpenGTL/GTLCore/CMakeLists.txt Sun Jan 22 09:58:38 2012 +0100 ++++ b/OpenGTL/GTLCore/CMakeLists.txt Tue Jan 31 21:14:40 2012 +0100 +@@ -30,7 +30,7 @@ + ${LLVM_LIBRARIES_PATH}/LLVMSupport.lib + ${LLVM_LIBRARIES_PATH}/LLVMSystem.lib ) + else(MSVC) +- FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS ) ++ FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "BitWriter Linker BitReader JIT Interpreter Support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS ) + endif(MSVC) + + include_directories( ${LLVM_INCLUDE_DIR} ) +@@ -140,7 +140,9 @@ + set(EXTRA_GTLCORE_LINK_OPTIONS -Wl,-u,__ZTVN4llvm3JITE ) + endif() + +-target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS}) ++target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS} ++ LLVMLinker LLVMExecutionEngine LLVMX86Info LLVMX86CodeGen ++) + + # Set the ABI version of the library + set_target_properties(GTLCore PROPERTIES VERSION ${OPENGTL_LIB_VERSION} SOVERSION ${OPENGTL_LIB_SOVERSION} ) +diff -r ff57c0b7e75b cmake/modules/FindLLVM.cmake +--- a/cmake/modules/FindLLVM.cmake Sun Jan 22 09:58:38 2012 +0100 ++++ b/cmake/modules/FindLLVM.cmake Tue Jan 31 21:14:53 2012 +0100 +@@ -38,7 +38,7 @@ + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libdir OUTPUT_VARIABLE LLVM_LIB_DIR ) + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIR ) + +- find_library(LLVM_SHARED_LIB NAMES LLVM-${LLVM_VERSION} PATHS ${LLVM_LIB_DIR}) ++ find_library(LLVM_SHARED_LIB NAMES LLVMCore PATHS ${LLVM_LIB_DIR}) + + exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) + +@@ -97,4 +97,4 @@ + message(FATAL_ERROR "Could NOT find LLVM") + endif(LLVM_FIND_REQUIRED) + endif(LLVM_FOUND) +-endif (LLVM_INCLUDE_DIR) +\ No newline at end of file ++endif (LLVM_INCLUDE_DIR) |