[magics] 09/23: WIP: Test geotiff inclusion
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jun 24 09:33:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository magics.
commit 05d0aa714bee512c2364f5e23b6ded61c5c72ddc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun May 17 06:41:19 2015 +0100
WIP: Test geotiff inclusion
---
debian/patches/geotiff.patch | 13 ++++++++++
debian/patches/series | 1 +
debian/patches/terralib.patch | 57 +++++++++++++++++++++++++++++++++++++++++++
debian/rules | 41 +++++++++++++++----------------
4 files changed, 91 insertions(+), 21 deletions(-)
diff --git a/debian/patches/geotiff.patch b/debian/patches/geotiff.patch
new file mode 100644
index 0000000..58f19b7
--- /dev/null
+++ b/debian/patches/geotiff.patch
@@ -0,0 +1,13 @@
+Index: magics++-2.24.4/cmake/FindGeoTIFF.cmake
+===================================================================
+--- magics++-2.24.4.orig/cmake/FindGeoTIFF.cmake
++++ magics++-2.24.4/cmake/FindGeoTIFF.cmake
+@@ -22,7 +22,7 @@ SET(GEOTIFF_NAMES geotiff)
+
+
+ FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h PATH_PREFIXES geotiff
+- PATHS /usr/local/include/libgeotiff /usr/include/libgeotiff)
++ PATHS /usr/local/include/libgeotiff /usr/include/libgeotiff /usr/include/geotiff )
+
+ FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES})
+
diff --git a/debian/patches/series b/debian/patches/series
index b48eae8..f2016cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ terralib.patch
gcc-4.7.patch
magics-config.patch
fix-headers.patch
+geotiff.patch
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index 5b53e2f..0628896 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -17,3 +17,60 @@ Index: magics++-2.24.4/CMakeLists.txt
${Boost_INCLUDE_DIRS} )
if( MAGICS_ODB )
+Index: magics++-2.24.4/src/CMakeLists.txt
+===================================================================
+--- magics++-2.24.4.orig/src/CMakeLists.txt
++++ magics++-2.24.4/src/CMakeLists.txt
+@@ -97,7 +97,6 @@ add_subdirectory( web )
+ add_subdirectory( visualisers )
+ add_subdirectory( drivers )
+ add_subdirectory( decoders )
+-add_subdirectory( terralib )
+ add_subdirectory( eckit_readers )
+
+ if( metview )
+@@ -123,7 +122,6 @@ ecbuild_add_library( TARGET MagPlusSh
+ ${drivers_srcs}
+ ${qt_srcs}
+ ${decoders_srcs}
+- ${terralib_srcs}
+ ${odb_srcs}
+ TEMPLATES
+ ${common_templates}
+@@ -165,7 +163,6 @@ ecbuild_add_library( TARGET MagPlusSt
+ ${drivers_srcs}
+ ${qt_srcs}
+ ${decoders_srcs}
+- ${terralib_srcs}
+ ${odb_srcs}
+ TEMPLATES
+ ${common_templates}
+@@ -201,9 +198,6 @@ if( metview )
+ ${CMAKE_CURRENT_SOURCE_DIR}/visualisers
+ ${CMAKE_CURRENT_SOURCE_DIR}/drivers
+ ${CMAKE_CURRENT_SOURCE_DIR}/decoders
+- ${CMAKE_CURRENT_SOURCE_DIR}/terralib
+- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/kernel
+- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/utils
+ ${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper )
+
+ ecbuild_add_library( TARGET MagWrapper
+@@ -239,18 +233,6 @@ if( metview )
+
+ )
+ install( FILES magics.h DESTINATION ${INSTALL_INCLUDE_DIR})
+- install( FILES terralib/kernel/TeProjection.h
+- terralib/kernel/TeCoord2D.h
+- terralib/kernel/TeDefines.h
+- terralib/kernel/TePrecision.h
+- terralib/kernel/TeSingleton.h
+- terralib/kernel/TeDatum.h
+- terralib/kernel/TeUtils.h
+- terralib/kernel/TeProgress.h
+- terralib/kernel/TeProgressBase.h
+-
+-
+- DESTINATION ${INSTALL_INCLUDE_DIR})
+ install( FILES VectorOfPointers.h DESTINATION ${INSTALL_INCLUDE_DIR})
+ foreach( file ${attributes_include} )
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/params/${file} DESTINATION ${INSTALL_INCLUDE_DIR})
diff --git a/debian/rules b/debian/rules
index c74d964..d288b99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,32 @@
#!/usr/bin/make -f
-# To enable all, uncomment following line
DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-pie
DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
export DEB_BUILD_MAINT_OPTIONS
export DEB_CFLAGS_MAINT_APPEND
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
-%:
- dh $@ --with python2,python3 --buildsystem=cmake
+CMAKE_ARGS:= \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DENABLE_METVIEW=ON \
+ -DENABLE_CAIRO=ON -DENABLE_GEOTIFF=ON \
+ -DENABLE_BUFR=ON \
+ -DMAGICS_SITE=debian \
+ -DENABLE_PYTHON=ON \
+ -DMAGICS_EXTRA_INCLUDE_DIRS=/usr/include/terralib/kernel
-CFLAGS += -fPIC
+# FIXME: Temporarily disable static libs
+# -DENABLE_STATIC_LIBRARY=ON \
+# CFLAGS += -fPIC
+# LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed" LIBS=" -lX11 -lpng12 -lz" \
+# MAGPLUS_HOME=$(shell pwd)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+%:
+ dh $@ --with python2,python3 --buildsystem=cmake
override_dh_auto_clean:
find . -type l -exec rm {} \;
@@ -27,24 +39,11 @@ override_dh_auto_configure:
ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf share/fonts/truetype/ttf-dejavu/
# Link terralib
[ -e src/terralib ] || ln -sf /usr/include/terralib src/terralib
- # Now build. LDFLAGS is a nasty hack past libtool breakage in install, where it fails
- # to find libraries _it_ created. And it makes stuff in the install step. bah.
- # autoreconf -if
- dh_auto_configure -- \
- -DENABLE_METVIEW=ON \
- -DENABLE_CAIRO=ON -DENABLE_GEOTIFF=ON \
- -DENABLE_BUFR=ON \
- -DMAGICS_SITE='debian' \
- -DENABLE_PYTHON=ON
+ dh_auto_configure -- $(CMAKE_ARGS)
-# FIXME: Temporarily disable static libs
- #-DENABLE_STATIC_LIBRARY=ON \
-
-# LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed" LIBS=" -lX11 -lpng12 -lz" \
-# MAGPLUS_HOME=$(shell pwd)
-override_dh_auto_test check:
- echo "Tests disabled; see README-testfailures.txt for details"
+# §override_dh_auto_test check:
+ #echo "Tests disabled; see README-testfailures.txt for details"
# (ulimit -s 8192; export PYTHONPATH=$(shell pwd)/swig ; export MAGPLUS_HOME=$(shell pwd) ; $(MAKE) check )
override_dh_auto_install:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list