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

[Mathieu Malaterre]

Author: malat
Date: 2013-05-28 10:38:22 +0000 (Tue, 28 May 2013)
New Revision: 13725

Added:
   trunk/packages/vxl/trunk/debian/patches/ocl.soname.patch
Modified:
   trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch
   trunk/packages/vxl/trunk/debian/patches/series
Log:
Add SONAME to OCL libs

Added: trunk/packages/vxl/trunk/debian/patches/ocl.soname.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/ocl.soname.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/ocl.soname.patch	2013-05-28 10:38:22 UTC (rev 13725)
@@ -0,0 +1,40 @@
+Description: ocl libs needs SONAME
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/CMakeLists.txt	2013-05-28 10:32:00.000000000 +0000
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/CMakeLists.txt	2013-05-28 10:32:00.000000000 +0000
+@@ -26,6 +26,7 @@
+ 
+ ADD_LIBRARY(boxm2_ocl ${boxm2_ocl_sources})
+ TARGET_LINK_LIBRARIES(boxm2_ocl boxm2 boxm2_basic boxm2_io bocl boct bsta brdb expatpp vpgl vgl_xio vgl vil vnl_algo vnl vbl_io vbl vsl vcl)
++SET_TARGET_PROPERTIES(boxm2_ocl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 
+ #install the .h .txx and libs
+ INSTALL_TARGETS(/lib boxm2_ocl)
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/algo/CMakeLists.txt	2013-05-28 10:32:00.000000000 +0000
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/algo/CMakeLists.txt	2013-05-28 10:32:00.000000000 +0000
+@@ -17,6 +17,7 @@
+ 
+ ADD_LIBRARY(boxm2_ocl_algo  ${boxm2_ocl_algo_sources})
+ TARGET_LINK_LIBRARIES(boxm2_ocl_algo boxm2_ocl vgl vil vul)
++SET_TARGET_PROPERTIES(boxm2_ocl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 
+ #tests
+ IF( BUILD_TESTING )
+Index: vxl-1.17.0/contrib/brl/bbas/bocl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bocl/CMakeLists.txt	2013-05-28 10:32:00.000000000 +0000
++++ vxl-1.17.0/contrib/brl/bbas/bocl/CMakeLists.txt	2013-05-28 10:32:00.000000000 +0000
+@@ -18,6 +18,7 @@
+   )
+   AUX_SOURCE_DIRECTORY(Templates bocl_sources)
+   ADD_LIBRARY(bocl ${bocl_sources} )
++  SET_TARGET_PROPERTIES(bocl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 
+   TARGET_LINK_LIBRARIES(bocl brdb vnl vnl_algo vbl_io vpgl vgl vil vbl vul ${OPENCL_LIBRARIES})
+ 

Modified: trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch	2013-05-28 10:38:12 UTC (rev 13724)
+++ trunk/packages/vxl/trunk/debian/patches/remove_contrib_testing.patch	2013-05-28 10:38:22 UTC (rev 13725)
@@ -1,5 +1,9 @@
-Description: remove test
- Most tests are failing anyway. Furthermore boxm_scene_to_bvxm_grid loops for ever
+Description: remove test from contrib section
+ Most tests from contrib are failing anyway. Furthermore
+ boxm_scene_to_bvxm_grid loops for ever So this patch deactive any test within
+ the contrib section. According to upstream test within the 'core' vxl are
+ supposed to run.
+ ref: https://sourceforge.net/mailarchive/message.php?msg_id=30891566
 Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2013-05-28 10:38:12 UTC (rev 13724)
+++ trunk/packages/vxl/trunk/debian/patches/series	2013-05-28 10:38:22 UTC (rev 13725)
@@ -13,3 +13,4 @@
 opencl_unix.patch
 ocl_comp.patch
 remove_contrib_testing.patch
+ocl.soname.patch