diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-24 00:49:38 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-24 00:49:38 -0700 |
| commit | 6e4a9ce4b0809e1eeb57f514f5ea71e2e77355bb (patch) | |
| tree | 777883bcc66e4420c1eaf7aaea255326b46690e7 /extra/opengtl | |
| parent | d1d93fafb9ef98fdd0c9a5a486c179c03cbbfb33 (diff) | |
Wed Apr 24 00:49:37 PDT 2013
Diffstat (limited to 'extra/opengtl')
| -rw-r--r-- | extra/opengtl/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch | 38 |
2 files changed, 5 insertions, 50 deletions
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index 227a66368..67d61514a 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173974 2012-12-30 15:30:38Z foutrelis $ +# $Id: PKGBUILD 183549 2013-04-23 00:30:16Z eric $ # Maintainer: # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl -pkgver=0.9.17 -pkgrel=2 +pkgver=0.9.18 +pkgrel=1 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') @@ -13,18 +13,11 @@ 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 - opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch) -sha256sums=('89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e' - 'd3e12d964c927e6f659df00e6210815c803c9126b34e9e92d4ccfebd6d30c8d7') +source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2) +sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8') build() { 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 \ 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 deleted file mode 100644 index c148c88bb..000000000 --- a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch +++ /dev/null @@ -1,38 +0,0 @@ -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> |