Commit 1adea549 authored by Adam Borowski's avatar Adam Borowski

Drop all quilt patches.

parent 00a0d325
......@@ -3,8 +3,9 @@ ifrit (4.1.1-1) unstable; urgency=medium
* QA upload.
* New upstream release
+ Uses vtk6 (Closes: #803593)
* Drop all quilt patches.
-- Adam Borowski <kilobyte@angband.pl> Sun, 20 Dec 2015 17:20:54 +0100
-- Adam Borowski <kilobyte@angband.pl> Thu, 14 Jan 2016 08:47:45 +0100
ifrit (3.4.2-2) unstable; urgency=medium
......
GCC 4.3 re-organised includes.
-- Chris Lamb <lamby@debian.org> Sat, 15 Aug 2009 12:45:39 +0100
--- a/core/isystem.cpp
+++ b/core/isystem.cpp
@@ -32,6 +32,7 @@
#include <windows.h>
//#include <winbase.h>
#else
+#include <climits>
#include <limits.h>
#include <sys/time.h>
#include <sys/resource.h>
Description: move SortWorker declaration before usage in Sort
otherwise we see a build failure with gcc 4.7
Origin: vendor
Bug-Debian: http://bugs.debian.org/667207
Forwarded: no
Author: gregor herrmann <gregoa@debian.org>
Last-Update: 2012-05-02
--- a/core/iparticlesplitter.cpp
+++ b/core/iparticlesplitter.cpp
@@ -106,22 +106,6 @@
#define SWAP(i1,i2) { SAVE(1,i1); MOVE(i1,i2); RESTORE(i2,1); }
//
-// Do our own quick sort for efficiency reason (based on a Java code by Denis Ahrens)
-//
-
-template<class T>
-void Sort(iParticleSplitter *me, vtkIdType n, int ncom, int attSort, T *Points, float *Atts, float* Nrms)
-{
- T poi1[3];
- float nrm1[3];
- float *att1; att1 = new float[ncom]; IERROR_ASSERT(att1);
-
- SortWorker(me,0,n-1,ncom,attSort,Points,Atts,Nrms,poi1,att1,nrm1);
-
- delete [] att1;
-}
-
-//
// Recursive worker
//
template<class T>
@@ -179,6 +163,22 @@
}
}
+//
+// Do our own quick sort for efficiency reason (based on a Java code by Denis Ahrens)
+//
+
+template<class T>
+void Sort(iParticleSplitter *me, vtkIdType n, int ncom, int attSort, T *Points, float *Atts, float* Nrms)
+{
+ T poi1[3];
+ float nrm1[3];
+ float *att1; att1 = new float[ncom]; IERROR_ASSERT(att1);
+
+ SortWorker(me,0,n-1,ncom,attSort,Points,Atts,Nrms,poi1,att1,nrm1);
+
+ delete [] att1;
+}
+
};
Description: Explicitely link in libGL to fix FTBFS.
There is probably a cleaner fix for this.
Debian-Bug: http://bugs.debian.org/713651
Author: Barry deFreese <bdefreese@debian.org>
Index: ifrit-3.4.2/build/CMakeLists.txt
===================================================================
--- ifrit-3.4.2.orig/build/CMakeLists.txt 2013-07-12 09:42:43.000000000 -0400
+++ ifrit-3.4.2/build/CMakeLists.txt 2013-07-12 10:56:33.000000000 -0400
@@ -237,14 +237,14 @@
ADD_DEFINITIONS(-DI_CUSTOM_VP1000)
ENDIF(tmp)
ENDIF(CustomVP1000)
-
-IF(Extension:ART)
- FILE(GLOB tmp ${src}/special/artio/*.c)
- IF(tmp)
- SET(sources ${sources} ${tmp})
- INCLUDE_DIRECTORIES(${src}/special/artio)
- ENDIF(tmp)
-ENDIF(Extension:ART)
+
+IF(Extension:ART)
+ FILE(GLOB tmp ${src}/special/artio/*.c)
+ IF(tmp)
+ SET(sources ${sources} ${tmp})
+ INCLUDE_DIRECTORIES(${src}/special/artio)
+ ENDIF(tmp)
+ENDIF(Extension:ART)
#
# Create target
@@ -290,7 +290,7 @@
#
# Add libraries
#
-TARGET_LINK_LIBRARIES(${target} vtkFiltering vtkHybrid vtkRendering)
+TARGET_LINK_LIBRARIES(${target} vtkFiltering vtkHybrid vtkRendering GL)
#
# Optional libraries
#
Author: Andreas Beckmann <anbe@debian.org>
Description: fix FTBFS with CMake 3.2
from /usr/share/cmake-3.2/Help/module/FindVTK.rst:
.
FindVTK
-------
.
This module no longer exists.
.
This module existed in versions of CMake prior to 3.1, but became
only a thin wrapper around ``find_package(VTK NO_MODULE)`` to
provide compatibility for projects using long-outdated conventions.
Now ``find_package(VTK)`` will search for ``VTKConfig.cmake``
directly.
Bug-Debian: #788766
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -135,11 +135,12 @@ IF(Shell:CL)
ENDIF(Shell:CL)
# Find VTK
-SET(VTK_DIR $ENV{VTKDIR})
-INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
-IF(NOT VTK_FOUND)
- MESSAGE(FATAL_ERROR "VTK is not found. Please check that VTKDIR variables is set properly.")
-ENDIF(NOT VTK_FOUND)
+#SET(VTK_DIR $ENV{VTKDIR})
+#INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
+#IF(NOT VTK_FOUND)
+# MESSAGE(FATAL_ERROR "VTK is not found. Please check that VTKDIR variables is set properly.")
+#ENDIF(NOT VTK_FOUND)
+find_package(VTK)
INCLUDE(${VTK_USE_FILE})
IF(VTK_USE_VOLUMEPRO AND VTK_HAVE_VP1000)
03-link-gl.patch
cmake-3.2.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment