[arch-commits] Commit in opengtl/trunk (2 files)

[Evangelos Foutras]

    Date: Monday, December 24, 2012 @ 20:17:43
  Author: foutrelis
Revision: 173854

upgpkg: opengtl 0.9.17-2

LLVM 3.2 rebuild.

Added:
  opengtl/trunk/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
Modified:
  opengtl/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   34 ++++++++++++++--------
 opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch |   38 +++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-25 00:35:03 UTC (rev 173853)
+++ PKGBUILD	2012-12-25 01:17:43 UTC (rev 173854)
@@ -1,32 +1,42 @@
 # $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer:
+# Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0 at 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:

Added: opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
===================================================================
--- opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch	                        (rev 0)
+++ opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch	2012-12-25 01:17:43 UTC (rev 173854)
@@ -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>