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

Eric Bélanger eric at nymeria.archlinux.org
Tue Apr 23 00:26:02 UTC 2013


    Date: Tuesday, April 23, 2013 @ 02:26:02
  Author: eric
Revision: 183547

upgpkg: opengtl 0.9.18-1

Upstream update, Remove old patch

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

----------------------------------------------+
 PKGBUILD                                     |   15 ++-------
 opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch |   38 -------------------------
 2 files changed, 4 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-22 23:40:38 UTC (rev 183546)
+++ PKGBUILD	2013-04-23 00:26:02 UTC (rev 183547)
@@ -4,8 +4,8 @@
 # Contributor: Andries Radu <admiral0 at 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 @@
 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 \

Deleted: opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
===================================================================
--- opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch	2013-04-22 23:40:38 UTC (rev 183546)
+++ opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch	2013-04-23 00:26:02 UTC (rev 183547)
@@ -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>




More information about the arch-commits mailing list