[med-svn] r13721 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2013-05-28 09:38:14 +0000 (Tue, 28 May 2013)
New Revision: 13721

Added:
   trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch
Modified:
   trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch
   trunk/packages/vxl/trunk/debian/patches/series
Log:
remove testing

Modified: trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch	2013-05-28 08:02:17 UTC (rev 13720)
+++ trunk/packages/vxl/trunk/debian/patches/ocl_comp.patch	2013-05-28 09:38:14 UTC (rev 13721)
@@ -2,9 +2,11 @@
 Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: no
 
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt
-@@ -20,6 +20,7 @@ SET(boxm2_multi_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
+@@ -20,6 +20,7 @@
  
  ADD_LIBRARY(boxm2_multi  ${boxm2_multi_sources})
  TARGET_LINK_LIBRARIES(boxm2_multi boxm2)
@@ -12,9 +14,11 @@
  
  #multi gpu implementations
  SUBDIRS(algo)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt
-@@ -15,6 +15,7 @@ SET(boxm2_multi_algo_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
+@@ -15,6 +15,7 @@
  
  ADD_LIBRARY(boxm2_multi_algo  ${boxm2_multi_algo_sources})
  TARGET_LINK_LIBRARIES(boxm2_multi_algo boxm2_multi)# boxm2_ocl boxm2_ocl_pro boct brdb bsta vbl_io vpgl_algo vpgl vgl_xio vgl vnl_algo vnl vbl vil vul vsl vcl)
@@ -22,9 +26,11 @@
  
  IF( BUILD_TESTING )
    SUBDIRS(tests)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt
-@@ -28,6 +28,7 @@ AUX_SOURCE_DIRECTORY(processes boxm2_ocl
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
+@@ -28,6 +28,7 @@
  
  ADD_LIBRARY(boxm2_ocl_pro  ${boxm2_ocl_pro_sources})
  TARGET_LINK_LIBRARIES(boxm2_ocl_pro boxm2_ocl_algo boct brdb vbl_io expatpp vpgl vgl vgl_xio vil vul vbl vsl vcl bvpl_kernels)
@@ -32,9 +38,11 @@
  
  #tests
  IF( BUILD_TESTING )
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt
-@@ -11,3 +11,4 @@ ADD_TEST( boxm2_ocl_pro_test_filter_kern
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt	2013-05-28 10:00:46.000000000 +0200
+@@ -11,3 +11,4 @@
  
  ADD_EXECUTABLE( boxm2_ocl_pro_test_include test_include.cxx )
  TARGET_LINK_LIBRARIES( boxm2_ocl_pro_test_include boxm2_ocl )

Added: trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch	2013-05-28 09:38:14 UTC (rev 13721)
@@ -0,0 +1,14 @@
+Description: remove test
+ Most tests are failing anyway. Furthermore boxm_scene_to_bvxm_grid loops for ever
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+
+Index: vxl-1.17.0/contrib/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/CMakeLists.txt	2013-05-28 11:36:10.000000000 +0200
++++ vxl-1.17.0/contrib/CMakeLists.txt	2013-05-28 11:36:10.000000000 +0200
+@@ -1,3 +1,4 @@
++set(BUILD_TESTING OFF)
+ # This is contrib/CMakeLists.txt
+ # Dependencies: mul --> (rpl,tbl);  oxl --> gel --> brl;  (gel,oxl) --> conversions
+ 

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2013-05-28 08:02:17 UTC (rev 13720)
+++ trunk/packages/vxl/trunk/debian/patches/series	2013-05-28 09:38:14 UTC (rev 13721)
@@ -12,3 +12,4 @@
 sse2.patch
 opencl_unix.patch
 ocl_comp.patch
+remove_contrib_testing.patch