diff options
Diffstat (limited to 'extra/opengtl')
-rw-r--r-- | extra/opengtl/PKGBUILD | 36 | ||||
-rw-r--r-- | extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch | 38 |
2 files changed, 61 insertions, 13 deletions
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index fd46570ce..227a66368 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,32 +1,42 @@ -# $Id: PKGBUILD 169817 2012-10-30 10:47:49Z foutrelis $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> +# $Id: PKGBUILD 173974 2012-12-30 15:30:38Z foutrelis $ +# Maintainer: +# Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl pkgver=0.9.17 -pkgrel=1 -pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" +pkgrel=2 +pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64') license=('GPL') depends=('gcc-libs' 'llvm') makedepends=('cmake' 'libpng') optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) -sha1sums=('10369bd11109312466389b3b050469dd69e54d2b') +source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 + opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch) +sha256sums=('89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e' + 'd3e12d964c927e6f659df00e6210815c803c9126b34e9e92d4ccfebd6d30c8d7') build() { - cd "${srcdir}" + cd "$srcdir" + + # Fix build with LLVM 3.2 + patch -d OpenGTL-$pkgver -Np1 -i \ + "$srcdir/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch" + mkdir build cd build - cmake ../OpenGTL-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake ../OpenGTL-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install + cd "$srcdir/build" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch new file mode 100644 index 000000000..c148c88bb --- /dev/null +++ b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch @@ -0,0 +1,38 @@ +diff -upr OpenGTL-0.9.17.orig/CMakeLists.txt OpenGTL-0.9.17/CMakeLists.txt +--- OpenGTL-0.9.17.orig/CMakeLists.txt 2012-06-04 17:51:43.000000000 +0300 ++++ OpenGTL-0.9.17/CMakeLists.txt 2012-12-25 03:00:30.000000000 +0200 +@@ -47,8 +47,8 @@ configure_file(config-endian.h.cmake ${C + + find_package(LLVM REQUIRED) + +-if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" ) ) # There is no way with MSVC to know the llvm version +- message(FATAL_ERROR "LLVM 3.0 or 3.1 is required.") ++if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.2" ) # There is no way with MSVC to know the llvm version ++ message(FATAL_ERROR "LLVM 3.2 is required.") + endif() + + if(MSVC) +diff -upr OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp +--- OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp 2012-06-04 17:51:43.000000000 +0300 ++++ OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp 2012-12-25 02:59:17.000000000 +0200 +@@ -29,7 +29,7 @@ + #include <llvm/PassManager.h> + #include <llvm/Analysis/LoopPass.h> + #include <llvm/Analysis/Verifier.h> +-#include <llvm/Target/TargetData.h> ++#include <llvm/DataLayout.h> + #include <llvm/GlobalVariable.h> + + // GTLCore +diff -upr OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp +--- OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp 2012-06-04 17:51:43.000000000 +0300 ++++ OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp 2012-12-25 02:59:34.000000000 +0200 +@@ -23,7 +23,7 @@ + + #include <llvm/Module.h> + #include <llvm/PassManager.h> +-#include <llvm/Target/TargetData.h> ++#include <llvm/DataLayout.h> + #include <llvm/Target/TargetMachine.h> + #include <llvm/Analysis/Verifier.h> + #include <llvm/Transforms/Utils/Cloning.h> |