Author: malat Date: 2012-06-19 08:41:23 +0000 (Tue, 19 Jun 2012) New Revision: 11383
Added: trunk/packages/vxl/branches/experimental/debian/patches/bits.patch trunk/packages/vxl/branches/experimental/debian/patches/fixosl.patch Log: Import patch from trunk Copied: trunk/packages/vxl/branches/experimental/debian/patches/bits.patch (from rev 11382, trunk/packages/vxl/trunk/debian/patches/bits.patch) =================================================================== --- trunk/packages/vxl/branches/experimental/debian/patches/bits.patch (rev 0) +++ trunk/packages/vxl/branches/experimental/debian/patches/bits.patch 2012-06-19 08:41:23 UTC (rev 11383) @@ -0,0 +1,74 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vxl (1.17.0-1) UNRELEASED; urgency=low + . + * New upstream +Author: Mathieu Malaterre <ma...@debian.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt ++++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt +@@ -36,10 +36,10 @@ IF(EXPAT_FOUND) + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources}) + + TARGET_LINK_LIBRARIES(bmdl_pro bmdl bprb vil vil_io vpgl_file_formats vgl_io +- vsol brip vpgl_pro vgl vul vpl imesh_algo minizip) ++ vsol brip vpgl_pro vgl vul vpl imesh_algo b3p_minizip) + + IF(ZLIB_FOUND) +- TARGET_LINK_LIBRARIES( bmdl_pro minizip ) ++ TARGET_LINK_LIBRARIES( bmdl_pro b3p_minizip ) + ENDIF(ZLIB_FOUND) + + IF( BUILD_TESTING ) +--- vxl-1.17.0.orig/contrib/oxl/osl/tests/CMakeLists.txt ++++ vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt +@@ -1,4 +1,4 @@ + ADD_EXECUTABLE( osl_test_include test_include.cxx ) +-TARGET_LINK_LIBRARIES( osl_test_include osl ) ++TARGET_LINK_LIBRARIES( osl_test_include oxl_osl ) + ADD_EXECUTABLE( osl_test_template_include test_template_include.cxx ) +-TARGET_LINK_LIBRARIES( osl_test_template_include osl ) ++TARGET_LINK_LIBRARIES( osl_test_template_include oxl_osl ) +--- vxl-1.17.0.orig/contrib/mul/msm/CMakeLists.txt ++++ vxl-1.17.0/contrib/mul/msm/CMakeLists.txt +@@ -38,7 +38,7 @@ SET(msm_sources + + AUX_SOURCE_DIRECTORY(Templates msm_sources) + ADD_LIBRARY(msm ${msm_sources} ) +-TARGET_LINK_LIBRARIES(msm mcal vimt vnl_algo vnl_io vnl vgl vul vsl) ++TARGET_LINK_LIBRARIES(msm mul_mcal vimt vnl_algo vnl_io vnl vgl vul vsl) + + SUBDIRS(utils) + SUBDIRS(tools) +--- vxl-1.17.0.orig/contrib/mul/mcal/CMakeLists.txt ++++ vxl-1.17.0/contrib/mul/mcal/CMakeLists.txt +@@ -20,8 +20,9 @@ SET(mcal_sources + ) + AUX_SOURCE_DIRECTORY(Templates mcal_sources) + +-ADD_LIBRARY(mcal ${mcal_sources}) +-TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vnl_io vul) ++ADD_LIBRARY(mul_mcal ${mcal_sources}) ++TARGET_LINK_LIBRARIES(mul_mcal mbl vnl vnl_algo vnl_io vul) ++INSTALL_TARGETS(/lib mul_mcal) + + IF (BUILD_TESTING) + SUBDIRS(tests) Copied: trunk/packages/vxl/branches/experimental/debian/patches/fixosl.patch (from rev 11382, trunk/packages/vxl/trunk/debian/patches/fixosl.patch) =================================================================== --- trunk/packages/vxl/branches/experimental/debian/patches/fixosl.patch (rev 0) +++ trunk/packages/vxl/branches/experimental/debian/patches/fixosl.patch 2012-06-19 08:41:23 UTC (rev 11383) @@ -0,0 +1,44 @@ +Index: vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-06-06 07:44:51.000000000 +0000 ++++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-06-06 07:44:58.308086711 +0000 +@@ -42,7 +42,7 @@ + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources}) + + IF(BUILD_OXL) +- TARGET_LINK_LIBRARIES(vmal mvl osl vil) ++ TARGET_LINK_LIBRARIES(vmal mvl oxl_osl vil) + ENDIF(BUILD_OXL) + + IF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD) +Index: vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt +=================================================================== +--- vxl-1.17.0.orig/contrib/mul/mcal/tests/CMakeLists.txt 2012-06-06 07:44:53.000000000 +0000 ++++ vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt 2012-06-06 07:44:58.308086711 +0000 +@@ -6,11 +6,11 @@ + test_trivial_ca.cxx + test_general_ca.cxx + ) +-TARGET_LINK_LIBRARIES( mcal_test_all mul_mcal vnl testlib ) ++TARGET_LINK_LIBRARIES( mcal_test_all mul_mcal vnl vnl_algo vsl testlib ) + + ADD_TEST( mcal_test_pca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_pca) + ADD_TEST( mcal_test_trivial_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_trivial_ca) + ADD_TEST( mcal_test_general_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_general_ca) + + ADD_EXECUTABLE( mcal_test_include test_include.cxx ) +-TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal ) ++TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal vnl_algo) +Index: vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx +=================================================================== +--- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx 2010-11-22 16:11:21.000000000 +0000 ++++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx 2012-06-06 07:46:51.784085147 +0000 +@@ -11,7 +11,7 @@ + #include <aio.h> //for aio_read + //#include <fcntl.h> // for open (not really necessary + #include <strings.h> //includes bzero +- ++#include <unistd.h> //close + + //: baio_info struct: wrapper for status variables + struct baio_info { _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit