saga: 7.7.0 -> 7.8.1

* Remove obsolete patches (merged into this release)
 * rewrite without stdenv
This commit is contained in:
freezeboy 2020-11-05 18:12:42 +01:00
parent 94f44a6895
commit 8e375d71f0
5 changed files with 10 additions and 59 deletions

View file

@ -1,19 +0,0 @@
commit e92b250968e9656084ab5984689747ca615ff6e7
Author: Volker Wichmann <wichmann@laserdata.at>
Date: Sun Mar 5 13:49:53 2017 +0100
saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly
diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp
index 76a1d8d..fa1a66f 100644
--- a/src/saga_core/saga_api/table.cpp
+++ b/src/saga_core/saga_api/table.cpp
@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord)
//---------------------------------------------------------
bool CSG_Table::Del_Records(void)
{
- if( m_Records > 0 )
+ if( m_nRecords > 0 )
{
_Index_Destroy();

View file

@ -1,4 +1,6 @@
{ stdenv
, mkDerivation
, lib
, fetchurl
# native
, autoreconfHook
@ -28,13 +30,13 @@
, fftw
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "saga";
version = "7.7.0";
version = "7.8.1";
src = fetchurl {
url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk";
url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM=";
};
nativeBuildInputs = [
@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
]
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin
++ stdenv.lib.optionals stdenv.isDarwin [
++ lib.optionals stdenv.isDarwin [
Cocoa
unixODBC
poppler
@ -76,16 +78,11 @@ stdenv.mkDerivation rec {
sqlite
];
patches = [
# See https://sourceforge.net/p/saga-gis/bugs/280/
./opencv4.patch
];
enableParallelBuilding = true;
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
meta = with stdenv.lib; {
meta = with lib; {
description = "System for Automated Geoscientific Analyses";
homepage = "http://www.saga-gis.org";
license = licenses.gpl2Plus;

View file

@ -1,13 +0,0 @@
diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp
index c5da854..d3e9cff 100755
--- a/src/modules/imagery/imagery_maxent/me.cpp
+++ b/src/modules/imagery/imagery_maxent/me.cpp
@@ -21,7 +21,7 @@
#ifdef _SAGA_MSW
#define isinf(x) (!_finite(x))
#else
-#define isinf(x) (!finite(x))
+#define isinf(x) (!isfinite(x))
#endif
/** The input array contains a set of log probabilities lp1, lp2, lp3

View file

@ -1,14 +0,0 @@
--- a/src/tools/imagery/imagery_opencv/Makefile.am
+++ b/src/tools/imagery/imagery_opencv/Makefile.am
@@ -7,9 +7,9 @@
if HAVE_CV
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
-CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
+CXX_INCS = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags`
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv --libs`
+AM_LDFLAGS = -fPIC -shared -avoid-version `pkg-config opencv4 --libs`
pkglib_LTLIBRARIES = libimagery_opencv.la
libimagery_opencv_la_SOURCES =\
MLB_Interface.cpp\

View file

@ -25686,7 +25686,7 @@ in
rrootage = callPackage ../games/rrootage { };
saga = libsForQt514.callPackage ../applications/gis/saga {
saga = libsForQt5.callPackage ../applications/gis/saga {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};