diff options
| author | Rashad Kanavath <rashad.kanavath@c-s.fr> | 2015-12-04 11:36:59 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-12-07 23:12:58 (GMT) |
| commit | 0e95520b9940ca28175d29380a833699676d0f0b (patch) | |
| tree | 9b76d19eb5c4cccc7b2c4757217333979ab8a0e3 | |
| parent | f2f1e998dc9096474d1b902b0ad0da50b3fac6b8 (diff) | |
| download | mxe-0e95520b9940ca28175d29380a833699676d0f0b.zip mxe-0e95520b9940ca28175d29380a833699676d0f0b.tar.gz mxe-0e95520b9940ca28175d29380a833699676d0f0b.tar.bz2 | |
ossim: fixes subdir and build
| -rw-r--r-- | src/ossim-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/ossim.mk | 10 |
2 files changed, 34 insertions, 5 deletions
diff --git a/src/ossim-1-fixes.patch b/src/ossim-1-fixes.patch new file mode 100644 index 0000000..7d12594 --- /dev/null +++ b/src/ossim-1-fixes.patch @@ -0,0 +1,29 @@ +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 + +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 15116e6..b19566f 100644 --- a/src/ossim.mk +++ b/src/ossim.mk @@ -6,7 +6,7 @@ $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.20 $(PKG)_CHECKSUM := a9148cbc7eebaed1d09d139e68c038592edcf74318ec2623f21494aa56879f52 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-1 -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-1.tar.gz +$(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 libpng openthreads proj tiff zlib @@ -23,10 +23,10 @@ define $(PKG)_BUILD -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ -DCMAKE_MODULE_PATH='$(1)/ossim_package_support/cmake/CMakeModules' \ - -DBUILD_OSSIM_FREETYPE_SUPPORT=ON \ - -DBUILD_OSSIM_APPS=OFF \ - -DBUILD_OSSIM_CURL_APPS=OFF \ - -DBUILD_OSSIM_TEST_APPS=OFF \ + -DBUILD_OSSIM_FREETYPE_SUPPORT=TRUE \ + -DBUILD_OSSIM_CURL_APPS=FALSE \ + -DBUILD_OSSIM_TEST_APPS=FALSE \ + -DBUILD_OSSIM_APPS=FALSE \ -DCMAKE_CXX_FLAGS='-DGEOS_INLINE=1' \ '$(1)/ossim' |