d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ossim: upstream patch release. 1.8.20-1 -> 1.8.20-3

This commit is contained in:
Rashad Kanavath 2016-05-04 15:29:36 +02:00
parent fc01badf03
commit cde1849c88
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ossim-1-fixes.patch
View File

@ -1,30 +0,0 @@
This file is part of MXE.
See index.html for further information.
This patch has been taken from:
https://github.com/rkanavath/ossim/commit/643f0b1f6984b97e7a72af7ff05085b7e716f934
This patch MUST be removed when building ossim version > 1.8.20
Merged in https://github.com/ossimlabs/ossim/pull/3
diff -burN ossim-1.8.20-1.orig/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h ossim-1.8.20-1/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h
--- ossim-1.8.20-1.orig/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h 2015-07-21 15:23:00.000000000 +0200
+++ ossim-1.8.20-1/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h 2015-12-04 12:29:00.001900000 +0100
@@ -75,7 +75,7 @@
virtual void close() { }
protected:
- ossimGenericPointCloudHandler() {}
+ ossimGenericPointCloudHandler();
ossimPointBlock m_pointBlock;
};
diff -burN ossim-1.8.20-1.orig/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp ossim-1.8.20-1/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp
--- ossim-1.8.20-1.orig/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp 1970-01-01 01:00:00.000000000 +0100
+++ ossim-1.8.20-1/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp 2015-12-04 12:27:33.000145000 +0100
@@ -0,0 +1,6 @@
+#include <ossim/point_cloud/ossimGenericPointCloudHandler.h>
+
+ossimGenericPointCloudHandler::ossimGenericPointCloudHandler()
+{
+
+}

4
src/ossim.mk
View File

@ -4,8 +4,8 @@
PKG := ossim
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.8.20
$(PKG)_CHECKSUM := a9148cbc7eebaed1d09d139e68c038592edcf74318ec2623f21494aa56879f52
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-1
$(PKG)_CHECKSUM := d7981d0d7e84bdbc26d5bda9e5b80c583d806164e4d6e5fab276c9255a2b407c
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-3
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz
$(PKG)_URL := http://download.osgeo.org/ossim/source/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc freetype geos jpeg libgeotiff libpng openthreads proj tiff zlib