Hello community,
here is the log from the commit of package ASL for openSUSE:Factory checked in
at 2016-07-14 09:47:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ASL (Old)
and /work/SRC/openSUSE:Factory/.ASL.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ASL"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ASL/ASL.changes 2016-02-16 09:19:05.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.ASL.new/ASL.changes 2016-07-14
09:47:14.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 7 18:02:10 UTC 2016 - antoine.belv...@laposte.net
+
+- Fix build with vtk >= 7.0 (boo#985255):
+ * Add ASL-0.1.6-update-vtk-in-cmakelist.patch
+
+-------------------------------------------------------------------
New:
----
ASL-0.1.6-update-vtk-in-cmakelist.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ASL.spec ++++++
--- /var/tmp/diff_new_pack.1x6nZW/_old 2016-07-14 09:47:15.000000000 +0200
+++ /var/tmp/diff_new_pack.1x6nZW/_new 2016-07-14 09:47:15.000000000 +0200
@@ -28,6 +28,9 @@
# Fix build with GCC 5.3.0 and Boost 1.60.0
# upstream commit 3bb6d19ffda77242a73c2ab2e1eece9459d1ec47
Patch0: ASL-Explicitly-define-namespace.patch
+# PATCH-FIX-UPSTREAM ASL-0.1.6-update-vtk-in-cmakelist.patch -- fix build with
recent vtk
+# upstream commit 6cc6c8057ffc821b65b2408b1eae1f55a2dfc869
+Patch1: ASL-0.1.6-update-vtk-in-cmakelist.patch
BuildRequires: cmake >= 3.0.2
BuildRequires: doxygen
BuildRequires: fdupes
@@ -96,6 +99,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i 's/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/'
doc/Developer-Guide/Doxyfile.in
%build
++++++ ASL-0.1.6-update-vtk-in-cmakelist.patch ++++++
>From 6cc6c8057ffc821b65b2408b1eae1f55a2dfc869 Mon Sep 17 00:00:00 2001
From: arcan1s <i...@arcanis.me>
Date: Sat, 27 Feb 2016 00:18:09 +0300
Subject: [PATCH] Update CMakeLists to newest vtk (>=7.0)
First of all need to update version in module search because in other
hand exception will arise. The second issue is the fact that vtkftgl
component has been dropped (and seems is not required anymore by ASL).
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 203e0b8..cd7789e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ include(ASLBuildFunctions)
find_package(OpenCL 1.1 REQUIRED)
# ToDo: check - system component might be not needed any longer on new
versions of Boost
find_package(Boost 1.55 REQUIRED COMPONENTS program_options filesystem system)
-find_package(VTK 6.1 COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore
vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtkftgl
vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
+find_package(VTK 7.0 COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore
vtkIOCore vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtksys
vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
include(${VTK_USE_FILE})
include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
