[med-svn] r6636 - trunk/packages/vxl/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Apr 26 14:11:13 UTC 2011
Author: malat-guest
Date: 2011-04-26 14:11:10 +0000 (Tue, 26 Apr 2011)
New Revision: 6636
Added:
trunk/packages/vxl/trunk/debian/patches/fixcomp.patch
Modified:
trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
trunk/packages/vxl/trunk/debian/patches/series
Log:
Update patches
Added: trunk/packages/vxl/trunk/debian/patches/fixcomp.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fixcomp.patch (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/fixcomp.patch 2011-04-26 14:11:10 UTC (rev 6636)
@@ -0,0 +1,25 @@
+Index: vxl-1.14.0/contrib/brl/bseg/bvxm/pro/processes/bvxm_update_edges_process.cxx
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvxm/pro/processes/bvxm_update_edges_process.cxx 2011-04-26 16:09:55.000000000 +0200
++++ vxl-1.14.0/contrib/brl/bseg/bvxm/pro/processes/bvxm_update_edges_process.cxx 2011-04-26 16:10:14.000000000 +0200
+@@ -48,6 +48,7 @@
+ return false;
+
+ // this process process has no outputs
++ return true;
+ }
+
+ //: optimizes rpc camera parameters based on edges
+Index: vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/boxm_ray_trace_manager.txx
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/opt/open_cl/boxm_ray_trace_manager.txx 2011-04-26 16:10:20.000000000 +0200
++++ vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/boxm_ray_trace_manager.txx 2011-04-26 16:10:29.000000000 +0200
+@@ -15,6 +15,8 @@
+ #include <vnl/algo/vnl_svd.h>
+ #include <vcl_where_root_dir.h>
+
++#include <malloc.h> // memalign
++
+ //allocate child cells on the array
+ template<class T>
+ static void split(vcl_vector<vnl_vector_fixed<int, 4> >& cell_array,
Modified: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2011-04-26 14:10:38 UTC (rev 6635)
+++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2011-04-26 14:11:10 UTC (rev 6636)
@@ -1,7 +1,7 @@
Index: vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-04-18 21:42:09.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-04-26 13:53:19.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-04-26 15:41:46.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-04-26 15:41:48.000000000 +0200
@@ -44,11 +44,11 @@
)
AUX_SOURCE_DIRECTORY(Templates osl_sources)
@@ -20,8 +20,8 @@
SUBDIRS(examples)
Index: vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-18 21:42:08.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-26 13:53:19.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-26 15:41:46.000000000 +0200
++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-26 15:41:48.000000000 +0200
@@ -22,9 +22,9 @@
iowin32.c iowin32.h)
ENDIF(WIN32)
@@ -37,8 +37,8 @@
ENDIF(ZLIB_FOUND)
Index: vxl-1.14.0/contrib/gel/gst/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-04-18 21:42:09.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-04-26 13:53:20.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-04-26 15:41:46.000000000 +0200
++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-04-26 15:41:48.000000000 +0200
@@ -16,9 +16,9 @@
AUX_SOURCE_DIRECTORY(Templates gst_sources)
@@ -55,11 +55,53 @@
+TARGET_LINK_LIBRARIES(gel_gst vbl)
Index: vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-26 13:54:19.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-26 13:54:30.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-26 15:41:46.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-26 15:41:48.000000000 +0200
@@ -1,4 +1,4 @@
# Nothing to be tested yet
ADD_EXECUTABLE( osl_test_include test_include.cxx )
-TARGET_LINK_LIBRARIES( osl_test_include osl )
+TARGET_LINK_LIBRARIES( osl_test_include oxl_osl )
+Index: vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/oxl/xcv/CMakeLists.txt 2011-04-26 15:41:46.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt 2011-04-26 15:41:48.000000000 +0200
+@@ -32,6 +32,6 @@
+
+ ADD_EXECUTABLE(xcv ${xcv_sources})
+ INSTALL_TARGETS(/bin xcv)
+-TARGET_LINK_LIBRARIES(xcv osl mvl vgui vgl vil1 vnl vul vcl)
++TARGET_LINK_LIBRARIES(xcv oxl_osl mvl vgui vgl vil1 vnl vul vcl)
+
+ ENDIF (HAS_VGUI)
+Index: vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt 2011-04-26 15:41:46.000000000 +0200
++++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt 2011-04-26 15:41:48.000000000 +0200
+@@ -41,7 +41,7 @@
+
+ IF(BUILD_OXL)
+ INCLUDE_DIRECTORIES(${OXL_INCLUDE_DIR})
+- 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.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-04-26 15:41:55.000000000 +0200
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-04-26 15:42:31.000000000 +0200
+@@ -36,10 +36,10 @@
+ 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
+- bgeo vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
++ bgeo 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 )
Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series 2011-04-26 14:10:38 UTC (rev 6635)
+++ trunk/packages/vxl/trunk/debian/patches/series 2011-04-26 14:11:10 UTC (rev 6636)
@@ -6,3 +6,4 @@
opencl_unix.patch
sse2.patch
renamelibs.patch
+fixcomp.patch
More information about the debian-med-commit
mailing list