diff options
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 101 | ||||
-rw-r--r-- | fix-ossim-trac-2354.diff | 30 | ||||
-rw-r--r-- | lib64bit_cmake_patch.patch | 12 |
4 files changed, 81 insertions, 79 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Thu May 19 02:52:48 UTC 2016 pkgbase = ossim pkgdesc = OSSIM is a powerful suite of geospatial libraries and applications used to process imagery, maps, terrain, and vector data. - pkgver = 1.8.18 - pkgrel = 2 + pkgver = 1.8.20.3 + pkgrel = 1 url = http://www.ossim.org install = ossim.install arch = i686 @@ -24,15 +26,18 @@ pkgbase = ossim depends = podofo depends = liblas depends = bzip2 + depends = freetype2 optdepends = java-environment-common optdepends = openmpi optdepends = gpstk-bin - source = http://download.osgeo.org/ossim/source/latest/ossim-1.8.18.tar.gz + source = http://download.osgeo.org/ossim/source/latest/ossim-1.8.20-3.tar.gz source = ossim.sh source = lib64bit_cmake_patch.patch - md5sums = 7bb918d8e20715d794eef86ad26e1389 - md5sums = cb85c216a099b10f057cddeeae4a57fb - md5sums = 9d676f9787896b096f1015c27e9d0769 + source = fix-ossim-trac-2354.diff + md5sums = eb2265db0d4d9201e255b92317121cfd + md5sums = bea65b5ac33115c85647840825c6b30b + md5sums = 9531d170d973b85bcf8f0889d9415d99 + md5sums = 79e1e01bc9b8de9e0c0f481ccb19a8f7 pkgname = ossim @@ -3,25 +3,31 @@ # Contributor: Christian Wygoda <accounts@wygoda.net> pkgname=ossim -pkgver=1.8.18 -pkgrel=2 +pkgver=1.8.20.3 +_pkgver=1.8.20-3 +pkgrel=1 pkgdesc="OSSIM is a powerful suite of geospatial libraries and applications used to process imagery, maps, terrain, and vector data." url="http://www.ossim.org" license=('LGPL') arch=('i686' 'x86_64') depends=('freetype2' 'gdal' 'libgeotiff' 'libjpeg' 'libtiff' 'openscenegraph' 'openjpeg' 'doxygen' 'hdf5-cpp-fortran' - 'minizip' 'expat' 'ffmpeg' 'qt4' 'podofo' 'liblas' 'bzip2') + 'minizip' 'expat' 'ffmpeg' 'qt4' 'podofo' 'liblas' 'bzip2' 'freetype2') makedepends=('cmake') optdepends=( 'java-environment-common' 'openmpi' 'gpstk-bin' ) -source=(http://download.osgeo.org/ossim/source/latest/${pkgname}-${pkgver}.tar.gz ossim.sh lib64bit_cmake_patch.patch) +source=(http://download.osgeo.org/ossim/source/latest/${pkgname}-${_pkgver}.tar.gz + ossim.sh + lib64bit_cmake_patch.patch + fix-ossim-trac-2354.diff) install=ossim.install -md5sums=('7bb918d8e20715d794eef86ad26e1389' +md5sums=('eb2265db0d4d9201e255b92317121cfd' 'cb85c216a099b10f057cddeeae4a57fb' - '9d676f9787896b096f1015c27e9d0769') + '9531d170d973b85bcf8f0889d9415d99' + '79e1e01bc9b8de9e0c0f481ccb19a8f7') prepare() { - cd ${srcdir} - patch -Np1 -i ../lib64bit_cmake_patch.patch + cd ${srcdir}/${pkgname}-${_pkgver} + patch -p0 < ../lib64bit_cmake_patch.patch + patch -p0 < ../fix-ossim-trac-2354.diff } build() { @@ -35,76 +41,31 @@ build() { mkdir $srcdir/build cd $srcdir/build - OSSIM_DEV_HOME="$srcdir/${pkgname}-${pkgver}"; - buildir="$srcdir/${pkgname}-${pkgver}"; + OSSIM_DEV_HOME="$srcdir/${pkgname}-${_pkgver}"; + buildir="$srcdir/${pkgname}-${_pkgver}"; cmake -G "Unix Makefiles" \ - -DBUILD_CSMAPI=OFF \ - -DBUILD_OMS=ON \ - -DBUILD_OSSIM=ON \ - -DBUILD_OSSIM_PACKAGES=ON \ - -DBUILD_OSSIM_PLUGIN=ON \ - -DBUILD_OSSIMCONTRIB_PLUGIN=OFF \ - -DBUILD_OSSIMCSM_PLUGIN=OFF \ - -DBUILD_OSSIMGEOPDF_PLUGIN=ON \ - -DBUILD_OSSIMGDAL_PLUGIN=ON \ - -DBUILD_OSSIMHDF_PLUGIN=OFF \ - -DBUILD_OSSIMKAKADU_PLUGIN=OFF \ - -DBUILD_OSSIMKMLSUPEROVERLAY_PLUGIN=ON \ - -DBUILD_OSSIMLAS_PLUGIN=ON \ - -DBUILD_OSSIMLIBLAS_PLUGIN=OFF \ - -DBUILD_OSSIMLIBRAW_PLUGIN=ON \ - -DBUILD_OSSIMMRSID_PLUGIN=OFF \ - -DBUILD_OSSIMNDF_PLUGIN=ON \ - -DBUILD_OSSIMOPENJPEG_PLUGIN=OFF \ - -DBUILD_OSSIMHDF5_PLUGIN=ON \ - -DBUILD_OSSIMWORLDWIND_PLUGIN=ON \ - -DBUILD_OSSIMLIBLAS_PLUGIN=ON \ - -DBUILD_OSSIMOPENCV_PLUGIN=ON \ - -DBUILD_OSSIMSQLITE_PLUGIN=ON \ - -DBUILD_OSSIMWEB_PLUGIN=ON \ - -DBUILD_OSSIMPNG_PLUGIN=ON \ - -DBUILD_OSSIMREGISTRATION_PLUGIN=ON \ - -DBUILD_OSSIMQT4=ON \ - -DBUILD_OSSIMGUI=ON \ - -DBUILD_OSSIM_MPI_SUPPORT=OFF \ - -DBUILD_OSSIMPLANET=ON \ - -DBUILD_OSSIMPLANETQT=ON \ - -DBUILD_OSSIMPREDATOR=ON \ - -DBUILD_OSSIM_TEST_APPS=ON \ - -DBUILD_RUNTIME_DIR=bin \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_WMS=ON \ - -DWMS_INCLUDE_DIR=${buildir}/libwms/include \ - -OSSIM_BUILD_DOXYGEN=ON \ - -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_OSSIM_MPI_SUPPORT=OFF \ + -DBUILD_OSSIM_TEST_APPS=OFF \ + -DSubversion_SVN_EXECUTABLE="" \ + -DCMAKE_MODULE_PATH=${buildir}/ossim_package_support/cmake/CMakeModules \ + -DFREETYPE_INCLUDE_DIR_ft2build=/usr/include/freetype2 \ + -DBUILD_WMS=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DBUILD_LIBRARY_DIR=/usr/lib \ - -DOSSIM_DEV_HOME=${buildir} \ - -DCMAKE_MODULE_PATH=${buildir}/ossim_package_support/cmake/CMakeModules \ - -DOSSIM_BUILD_ADDITIONAL_DIRECTORIES="${buildir}/ossimjni" \ - -DOSSIM_COMPILE_WITH_FULL_WARNING=ON \ - -DOSSIM_INSTALL_PLUGINS_WITH_VERSION=OFF \ - -DOSSIM_LIBRARIES=${buildir}/build/lib/libossim.so \ - -DOSSIM_PLUGIN_LINK_TYPE=MODULE \ - -DOSSIMPLANET_ENABLE_EPHEMERIS=ON \ - -DINSTALL_LIBRARY_DIR=/usr/lib \ - ${buildir}/ossim_package_support/cmake - - #-DOSSIM_DEPENDENCIES=${buildir}/local \ - #-DCMAKE_INCLUDE_PATH=${buildir}/local/include \ - #-DCMAKE_LIBRARY_PATH=${buildir}/local/lib \ - #-DMRSID_DIR=${buildir}/mrsid \ - - make -j5 + -DINSTALL_LIBRARY_DIR:PATH=/usr/lib \ + -DINSTALL_RUNTIME_DIR:PATH=/usr/bin/ossim-apps/ \ + -DINSTALL_ARCHIVE_DIR:PATH=/usr/lib \ + ${buildir}/ossim \ + + make -j4 } package() { cd $srcdir/build - buildir="$srcdir/${pkgname}-${pkgver}"; + buildir="$srcdir/${pkgname}-${_pkgver}"; make DESTDIR=${pkgdir} install || return 1 sed -i -e 's|epsg_database_file1: $(OSSIM_DATA)/ossim/share/ossim/projection/ossim_epsg_projections-v7_4.csv|epsg_database_file1: $(OSSIM_DATA)/projection/ossim_epsg_projections-v7_4.csv|g' \ @@ -131,7 +92,7 @@ package() { # Install the configuration file mkdir ${pkgdir}/etc - install -D -m644 ${buildir}/ossim/etc/config_files/dbossim.cfg ${pkgdir}/etc/ossim/dbossim.cfg + #install -D -m644 ${buildir}/ossim/etc/config_files/dbossim.cfg ${pkgdir}/etc/ossim/dbossim.cfg # Install profile.d file install -D ${srcdir}/ossim.sh \ diff --git a/fix-ossim-trac-2354.diff b/fix-ossim-trac-2354.diff new file mode 100644 index 000000000000..2738f998e4d7 --- /dev/null +++ b/fix-ossim-trac-2354.diff @@ -0,0 +1,30 @@ +--- ossim/src/ossim/elevation/ossimElevManager.cpp 2015-12-14 14:17:27.000000000 +0000 ++++ ossim/src/ossim/elevation/ossimElevManager.cpp.new 2016-03-29 14:44:34.310407167 +0000 +@@ -635,6 +635,11 @@ + return spacing; + } + ++inline std::ostream& operator<<(std::ostream& out, std::ostream& obj) ++{ ++ return obj; ++} ++ + std::ostream& ossimElevManager::print(ostream& out) const + { + out << "\nossimElevManager @ "<< (ossim_uint64) this +diff -ur ossim-1.8.20-3.ossim.orig/src/ossim/elevation/ossimElevSource.cpp ossim-1.8.20-3.ossim.gcc6/src/ossim/elevation/ossimElevSource.cpp +--- ossim/src/ossim/elevation/ossimElevSource.cpp 2015-01-29 22:33:13.000000000 +0000 ++++ ossim/src/ossim/elevation/ossimElevSource.cpp.new 2016-03-29 14:44:34.310407167 +0000 +@@ -262,6 +262,11 @@ + theComputeStatsFlag = flag; + } + ++inline std::ostream& operator<<(std::ostream& out, std::ostream& obj) ++{ ++ return obj; ++} ++ + std::ostream& ossimElevSource::print(std::ostream& out) const + { + out << "\nossimElevSource @ "<< (ossim_uint64) this + diff --git a/lib64bit_cmake_patch.patch b/lib64bit_cmake_patch.patch index 31e88ca0cde3..d492ae840b45 100644 --- a/lib64bit_cmake_patch.patch +++ b/lib64bit_cmake_patch.patch @@ -1,5 +1,11 @@ ---- src/ossim-1.8.18/ossim_package_support/cmake/CMakeLists.txt 2015-08-13 09:17:39.811546639 +0000 -+++ src/ossim-1.8.18/ossim_package_support/cmake/CMakeLists.txt 2015-08-13 09:09:28.608232907 +0000 -@@ -257,2 +257,2 @@ +--- ossim_package_support/cmake/CMakeLists.txt 2015-09-03 08:13:44.000000000 -0500 ++++ ossim_package_support/cmake/CMakeLists.txt.cp 2016-05-18 15:21:17.389231844 -0500 +@@ -267,7 +267,7 @@ + ${${PROJECT_NAME}_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc + @ONLY + ) - INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIBSUFFIX}/pkgconfig COMPONENT ossim) + INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib/pkgconfig COMPONENT ossim) + ENDFOREACH(PKGCONFIG_FILE) + + |