diff options
| -rw-r--r-- | src/ossim-1-fixes.patch | 54 | ||||
| -rw-r--r-- | src/ossim.mk | 30 |
2 files changed, 64 insertions, 20 deletions
diff --git a/src/ossim-1-fixes.patch b/src/ossim-1-fixes.patch new file mode 100644 index 0000000..f2c3df9 --- /dev/null +++ b/src/ossim-1-fixes.patch @@ -0,0 +1,54 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Tue, 10 Oct 2017 13:15:27 +1100 +Subject: [PATCH] fix deprecated WIN32 definition + +taken from: +https://github.com/ossimlabs/ossim/issues/153 + +diff --git a/src/util/ossimBatchTest.cpp b/src/util/ossimBatchTest.cpp +index 1111111..2222222 100644 +--- a/src/util/ossimBatchTest.cpp ++++ b/src/util/ossimBatchTest.cpp +@@ -72,7 +72,7 @@ bool ossimBatchTest::initialize(ossimArgumentParser& ap) + } + + // Initialize environment: +-#if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__) ++#if defined(_WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__) + _putenv("DEL_CMD=del /Q"); // For backwards compatiblity. + _putenv("DIFF_CMD=fc /W"); + _putenv("COPY_CMD=copy /Y"); + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Tue, 10 Oct 2017 13:26:49 +1100 +Subject: [PATCH] set windows shared/static defs using cmake options + +taken from: +https://github.com/ossimlabs/ossim/issues/153 + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -34,7 +34,14 @@ ELSE (OSSIM_HAS_HDF5) + message( STATUS "HDF5 components are being excluded from the build." ) + ENDIF (OSSIM_HAS_HDF5) + +-ADD_DEFINITIONS("-DOSSIMMAKINGDLL") ++IF (WIN32) ++ IF (BUILD_SHARED) ++ ADD_DEFINITIONS("-DOSSIMMAKINGDLL") ++ ELSE (BUILD_SHARED) ++ ADD_DEFINITIONS("-DOSSIM_STATIC") ++ ENDIF (BUILD_SHARED) ++ENDIF (WIN32) ++ + ############################### GRAB HEADERS ##################################### + FILE(GLOB ossim_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../include/ossim/*.h") + FILE(GLOB ossim_base_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../include/ossim/base/*.h") diff --git a/src/ossim.mk b/src/ossim.mk index 48b2f42..199bf8e 100644 --- a/src/ossim.mk +++ b/src/ossim.mk @@ -4,31 +4,21 @@ PKG := ossim $(PKG)_WEBSITE := https://trac.osgeo.org/ossim $(PKG)_DESCR := OSSIM $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.20 -$(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 - -define $(PKG)_UPDATE - $(WGET) -q -O- 'http://download.osgeo.org/ossim/source/latest/' | \ - $(SED) -n 's,.*ossim-\([0-9][^>]*\)\.tar.*,\1,p' | \ - head -1 -endef +$(PKG)_VERSION := 43a071a +$(PKG)_CHECKSUM := 1796994c8586e62ef799724969e3bef57178194fafe056db3de41dd6ee0dc931 +# releases have unpredictable names and are based on master branch +$(PKG)_GH_CONF := ossimlabs/ossim/master +$(PKG)_DEPS := gcc freetype geos jpeg hdf5 libgeotiff libpng openthreads proj tiff zlib define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' \ + cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \ -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=TRUE \ -DBUILD_OSSIM_CURL_APPS=FALSE \ - -DBUILD_OSSIM_TEST_APPS=FALSE \ + -DBUILD_OSSIM_TESTS=FALSE \ -DBUILD_OSSIM_APPS=FALSE \ - -DCMAKE_CXX_FLAGS='-DGEOS_INLINE=1' \ - '$(1)/ossim' + -DCMAKE_CXX_FLAGS='-DGEOS_INLINE=1' - $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1 endef |