diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-05-06 03:21:22 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-05-06 03:21:22 (GMT) |
| commit | f0d5c1b72f14fb73a3e51894f5a7ef117998d065 (patch) | |
| tree | 9d7a322b26e784df7a243dae542687ff69bbc254 | |
| parent | e2e4a8d486851e07e397cc90205fbb6b3b8114fc (diff) | |
| parent | cde1849c88f43edd20460d8c5a55e9011651f425 (diff) | |
| download | mxe-f0d5c1b72f14fb73a3e51894f5a7ef117998d065.zip mxe-f0d5c1b72f14fb73a3e51894f5a7ef117998d065.tar.gz mxe-f0d5c1b72f14fb73a3e51894f5a7ef117998d065.tar.bz2 | |
Merge pull request #1332 from rkanavath/update_ossim
ossim: upstream patch release. 1.8.20-1 -> 1.8.20-3
| -rw-r--r-- | src/ossim-1-fixes.patch | 30 | ||||
| -rw-r--r-- | src/ossim.mk | 4 |
2 files changed, 2 insertions, 32 deletions
diff --git a/src/ossim-1-fixes.patch b/src/ossim-1-fixes.patch deleted file mode 100644 index 9512a3f..0000000 --- a/src/ossim-1-fixes.patch +++ /dev/null @@ -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() -+{ -+ -+} diff --git a/src/ossim.mk b/src/ossim.mk index b78d377..4f212ae 100644 --- a/src/ossim.mk +++ b/src/ossim.mk @@ -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 |