Author: smr Date: 2010-12-24 22:56:58 +0000 (Fri, 24 Dec 2010) New Revision: 5620
Added: trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch Modified: trunk/packages/elastix/trunk/debian/changelog trunk/packages/elastix/trunk/debian/compat trunk/packages/elastix/trunk/debian/control trunk/packages/elastix/trunk/debian/patches/series trunk/packages/elastix/trunk/debian/rules Log: Patch and configuration to build elastix 4.4. Modified: trunk/packages/elastix/trunk/debian/changelog =================================================================== --- trunk/packages/elastix/trunk/debian/changelog 2010-12-24 02:35:55 UTC (rev 5619) +++ trunk/packages/elastix/trunk/debian/changelog 2010-12-24 22:56:58 UTC (rev 5620) @@ -1,6 +1,6 @@ -elastix (4.3-1) UNRELEASED; urgency=low +elastix (4.4-1) experimental; urgency=low * New package. Closes: #607030. - -- Steve M. Robbins <[email protected]> Mon, 13 Dec 2010 22:42:52 -0600 + -- Steve M. Robbins <[email protected]> Thu, 23 Dec 2010 20:22:28 -0600 Modified: trunk/packages/elastix/trunk/debian/compat =================================================================== --- trunk/packages/elastix/trunk/debian/compat 2010-12-24 02:35:55 UTC (rev 5619) +++ trunk/packages/elastix/trunk/debian/compat 2010-12-24 22:56:58 UTC (rev 5620) @@ -1 +1 @@ -7 +8 Modified: trunk/packages/elastix/trunk/debian/control =================================================================== --- trunk/packages/elastix/trunk/debian/control 2010-12-24 02:35:55 UTC (rev 5619) +++ trunk/packages/elastix/trunk/debian/control 2010-12-24 22:56:58 UTC (rev 5620) @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian-Med Packaging Team <[email protected]> Uploaders: Steve M. Robbins <[email protected]> -Build-Depends: quilt, debhelper (>= 7), cmake, libinsighttoolkit3-dev, doxygen +Build-Depends: quilt, debhelper (>= 8), cmake, libinsighttoolkit3-dev (>= 3.20.0-5), doxygen Standards-Version: 3.7.3 Package: elastix Added: trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch =================================================================== --- trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch (rev 0) +++ trunk/packages/elastix/trunk/debian/patches/build-static-ann.patch 2010-12-24 22:56:58 UTC (rev 5620) @@ -0,0 +1,39 @@ +Description: Build convenience static ANN library +Author: Steve Robbins <[email protected]> +Forwarded: no + +The ANN library sources are included with elastix to implement +KNNGraphAlphaMutualInformationMetric. The ANN library reported isn't +meant to be shared (c.f. #602582) so we change the build procedure to +NOT install it, and therefore it must be built statically. + + + +--- elastix-4.4.orig/src/Common/KNN/ann_1.1/CMakeLists.txt ++++ elastix-4.4/src/Common/KNN/ann_1.1/CMakeLists.txt +@@ -25,7 +25,7 @@ + ) + + # Create the ANNlib library +-ADD_LIBRARY( ANNlib SHARED ${ANN_SRCS} ) ++ADD_LIBRARY( ANNlib STATIC ${ANN_SRCS} ) + + # Necessary, because in windows dll_export is needed for creating the + # dll, but dll_import for using it in a program. +@@ -34,16 +34,3 @@ + # Group in IDE's like Visual Studio + SET_PROPERTY( TARGET ANNlib PROPERTY FOLDER "libraries" ) + +-# Install +-IF( WIN32 ) +- INSTALL( TARGETS ANNlib +- RUNTIME DESTINATION . +- LIBRARY DESTINATION . ) +- #COMPONENT libraries ) +-ELSE() +- INSTALL( TARGETS ANNlib +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib ) +- #COMPONENT libraries ) +-ENDIF() +- Modified: trunk/packages/elastix/trunk/debian/patches/series =================================================================== --- trunk/packages/elastix/trunk/debian/patches/series 2010-12-24 02:35:55 UTC (rev 5619) +++ trunk/packages/elastix/trunk/debian/patches/series 2010-12-24 22:56:58 UTC (rev 5620) @@ -0,0 +1 @@ +build-static-ann.patch Modified: trunk/packages/elastix/trunk/debian/rules =================================================================== --- trunk/packages/elastix/trunk/debian/rules 2010-12-24 02:35:55 UTC (rev 5619) +++ trunk/packages/elastix/trunk/debian/rules 2010-12-24 22:56:58 UTC (rev 5620) @@ -3,10 +3,14 @@ %: dh $@ --sourcedirectory=src --parallel +# Need -DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON, otherwise +# KNN is not built, and link of elastix fails. +# DEB_CMAKE_EXTRA_FLAGS += \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RELEASE \ - -DCMAKE_SKIP_RPATH=ON + -DCMAKE_SKIP_RPATH=ON \ + -DUSE_KNNGraphAlphaMutualInformationMetric:BOOL=ON override_dh_auto_configure: dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
