From af7d5f27d01d6b2b9af80ef41a110410bedb8e0e Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Wed, 19 Aug 2015 23:21:00 +0200 Subject: meshlab: 1.3.2 -> 1.3.3 Remove patches that no longer apply (integrated upstream I guess), but forward port the part that adds the missing "include "[1]. Build and run tested. [1]: http://sourceforge.net/p/meshlab/bugs/342/ --- pkgs/applications/graphics/meshlab/default.nix | 12 ++---- pkgs/applications/graphics/meshlab/gcc-4.7.patch | 38 ----------------- pkgs/applications/graphics/meshlab/qt-4.8.patch | 54 ------------------------ 3 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 pkgs/applications/graphics/meshlab/gcc-4.7.patch delete mode 100644 pkgs/applications/graphics/meshlab/qt-4.8.patch (limited to 'pkgs/applications/graphics/meshlab') diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 9352ae092be4..94102663a8c9 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,22 +1,18 @@ {stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { - name = "meshlab-1.3.2"; + name = "meshlab-1.3.3"; src = fetchurl { - url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz"; - sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1"; + url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz"; + sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9"; }; # I don't know why I need this; without this, the rpath set at the beginning of the # buildPhase gets removed from the 'meshlab' binary dontPatchELF = true; - # Patches are from the Arch Linux package - patchPhase = '' - patch -Np0 -i "${./qt-4.8.patch}" - patch -Np1 -i "${./gcc-4.7.patch}" - ''; + patches = [ ./include-unistd.diff ]; buildPhase = '' mkdir -p "$out/include" diff --git a/pkgs/applications/graphics/meshlab/gcc-4.7.patch b/pkgs/applications/graphics/meshlab/gcc-4.7.patch deleted file mode 100644 index 07dc1a08aff5..000000000000 --- a/pkgs/applications/graphics/meshlab/gcc-4.7.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -index 2351b2a..90c6d76 100644 ---- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h -@@ -40,7 +40,7 @@ public: - - //! Reset histogram data. - void Clear() { -- this->::Clear(); -+ Histogram::Clear(); - CV.clear(); - } - /* -diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h -index 5d40404..ab9d0aa 100644 ---- a/vcglib/wrap/gl/trimesh.h -+++ b/vcglib/wrap/gl/trimesh.h -@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) - } - } - -- m.vert.math::Swap(newvert); -+ m.vert.math.Swap(newvert); - m.vn=m.vert.size(); - } - -diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h -index 3e41e63..4af9508 100644 ---- a/vcglib/wrap/ply/plystuff.h -+++ b/vcglib/wrap/ply/plystuff.h -@@ -75,6 +75,7 @@ using namespace vcg; - #define pb_close _close - #define DIR_SEP "\\" - #else -+#include - #define pb_mkdir(n) mkdir(n,0755) - #define pb_access access - #define pb_stat stat diff --git a/pkgs/applications/graphics/meshlab/qt-4.8.patch b/pkgs/applications/graphics/meshlab/qt-4.8.patch deleted file mode 100644 index abfd77d6f25d..000000000000 --- a/pkgs/applications/graphics/meshlab/qt-4.8.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp ---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2011-01-25 18:51:28.000000000 +1100 -+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2012-01-07 11:47:12.836800072 +1100 -@@ -7,6 +7,12 @@ - #include "SyntopiaCore/Logging/Logging.h" - #include "SyntopiaCore/Misc/MiniParser.h" - -+#ifdef Q_WS_MAC -+#include -+#else -+#include -+#endif -+ - using namespace SyntopiaCore::Math; - using namespace SyntopiaCore::Misc; - -diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h ---- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h 2011-01-25 18:51:28.000000000 +1100 -+++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h 2012-01-07 11:45:26.795586149 +1100 -@@ -3,6 +3,12 @@ - #include "SyntopiaCore/Math/Vector3.h" - #include "Object3D.h" - -+#ifdef Q_WS_MAC -+#include -+#else -+#include -+#endif -+ - namespace SyntopiaCore { - namespace GLEngine { - -diff -Nur meshlab.orig/src/external/structuresynth/structuresynth.pro meshlab/src/external/structuresynth/structuresynth.pro ---- meshlab.orig/src/external/structuresynth/structuresynth.pro 2011-01-25 18:49:34.000000000 +1100 -+++ meshlab/src/external/structuresynth/structuresynth.pro 2012-01-07 11:51:46.695981995 +1100 -@@ -113,6 +113,7 @@ - ssynth/StructureSynth/Model/Rendering/TemplateRenderer.cpp - CONFIG+=opengl - QT+=xml opengl script -+unix:LIBS += -lGLU - macx:DESTDIR = ../lib/macx - win32-g++:DESTDIR = ../lib/win32-gcc - win32-msvc2005:DESTDIR = ../lib/win32-msvc2005 -diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro ---- meshlab.orig/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100 -+++ meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100 -@@ -85,6 +85,7 @@ - QT += xmlpatterns - QT += network - QT += script -+unix:LIBS += -lGLU - - - # the following line is needed to avoid mismatch between -- cgit 1.4.1