[med-svn] r13714 - in trunk/packages/vxl/trunk/debian: . patches

Mathieu Malaterre malat at alioth.debian.org
Mon May 27 12:46:07 UTC 2013 

Author: malat
Date: 2013-05-27 12:46:07 +0000 (Mon, 27 May 2013)
New Revision: 13714

Removed:
   trunk/packages/vxl/trunk/debian/README.Debian
Modified:
   trunk/packages/vxl/trunk/debian/README.source
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/control
   trunk/packages/vxl/trunk/debian/patches/opencl_unix.patch
   trunk/packages/vxl/trunk/debian/patches/series
   trunk/packages/vxl/trunk/debian/rules
Log:
New upload for VXL

Deleted: trunk/packages/vxl/trunk/debian/README.Debian
===================================================================
--- trunk/packages/vxl/trunk/debian/README.Debian	2013-05-27 12:35:59 UTC (rev 13713)
+++ trunk/packages/vxl/trunk/debian/README.Debian	2013-05-27 12:46:07 UTC (rev 13714)
@@ -1,5 +0,0 @@
-When building vxl from source, if you have opencl installed on your system
-the build system actually automatically detects those libs and will try to build
-them
-
- -- Mathieu Malaterre <malat at debian.org>  Wed, 11 Apr 2012 10:21:29 +0200

Modified: trunk/packages/vxl/trunk/debian/README.source
===================================================================
--- trunk/packages/vxl/trunk/debian/README.source	2013-05-27 12:35:59 UTC (rev 13713)
+++ trunk/packages/vxl/trunk/debian/README.source	2013-05-27 12:46:07 UTC (rev 13714)
@@ -9,19 +9,6 @@
 
 ---
 
-Furthermore the package makes use of OpenCL. Since OpenCL is only available in contrib
-the opencl related library are not installed. However when reduilding the package, opencl
-is properly detected by cmake:
-
-# apt-get install nvidia-cuda-dev
-$ cd vxl
-$ dpkg-buildpackage -rfakeroot
-...
--- Found Open Cl? YES
-...
-
----
-
 Tests have been deactivated for now, they fails on amd64 with:
 
 The following tests FAILED:

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2013-05-27 12:35:59 UTC (rev 13713)
+++ trunk/packages/vxl/trunk/debian/changelog	2013-05-27 12:46:07 UTC (rev 13714)
@@ -1,3 +1,11 @@
+vxl (1.17.0-4) unstable; urgency=low
+
+  * Fix builds on arm* by removing duplicate symbols
+  * Re-activate testing. Closes: #671601
+  * Build OpenCL modules. Closes: #697784
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 27 May 2013 14:11:24 +0200
+
 vxl (1.17.0-3) unstable; urgency=low
 
   * Import old patch and avoid name clash. Closes: #708666, #708668

Modified: trunk/packages/vxl/trunk/debian/control
===================================================================
--- trunk/packages/vxl/trunk/debian/control	2013-05-27 12:35:59 UTC (rev 13713)
+++ trunk/packages/vxl/trunk/debian/control	2013-05-27 12:46:07 UTC (rev 13714)
@@ -9,7 +9,7 @@
  libdcmtk2-dev, libpng-dev, libjpeg-dev, zlib1g-dev, libexpat-dev, python-dev (>= 2.6.6-3~),
  libgeotiff-dev, libcoin60-dev, libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev, libshp-dev, opencl-headers, libavifile-0.7-dev,
- libmpeg2-4-dev, libswscale-dev, libavformat-dev, libavcodec-dev, libbz2-dev, freeglut3-dev
+ libmpeg2-4-dev, libswscale-dev, libavformat-dev, libavcodec-dev, libbz2-dev, freeglut3-dev, ocl-icd-opencl-dev
 Standards-Version: 3.9.4
 X-Python-Version: 2.7
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/

Modified: trunk/packages/vxl/trunk/debian/patches/opencl_unix.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/opencl_unix.patch	2013-05-27 12:35:59 UTC (rev 13713)
+++ trunk/packages/vxl/trunk/debian/patches/opencl_unix.patch	2013-05-27 12:46:07 UTC (rev 13714)
@@ -3,38 +3,16 @@
 Last-Update: 2011-07-24
 Bug: http://sourceforge.net/apps/trac/vxl/ticket/64
 
-Index: vxl-1.14.0/contrib/brl/bmods/find_open_cl.cmake
+Index: vxl-1.17.0/config/cmake/Modules/NewCMake/FindOpenCL.cmake
 ===================================================================
---- vxl-1.14.0.orig/contrib/brl/bmods/find_open_cl.cmake	2009-12-04 17:54:32.000000000 +0100
-+++ vxl-1.14.0/contrib/brl/bmods/find_open_cl.cmake	2011-04-13 18:30:36.000000000 +0200
-@@ -33,6 +33,15 @@
-       SET(OPENCL_LIBRARIES ${OPENCL_LIBRARY})
-     ENDIF(OPENCL_LIBRARY)
-   ENDIF(OPENCL_INCLUDE_PATH)
-+ELSEIF(UNIX)
-+  FIND_PATH(OPENCL_INCLUDE_PATH CL/cl.h "Include for OpenCL on OSX")
-+  IF(OPENCL_INCLUDE_PATH)
-+    FIND_LIBRARY(OPENCL_LIBRARY cuda "OpenCL lib for OSX")
-+    IF(OPENCL_LIBRARY)
-+      SET(OPENCL_FOUND "YES")
-+      SET(OPENCL_LIBRARIES ${OPENCL_LIBRARY})
-+    ENDIF(OPENCL_LIBRARY)
-+  ENDIF(OPENCL_INCLUDE_PATH)
- ENDIF (APPLE)
+--- vxl-1.17.0.orig/config/cmake/Modules/NewCMake/FindOpenCL.cmake	2010-11-01 03:33:00.000000000 +0000
++++ vxl-1.17.0/config/cmake/Modules/NewCMake/FindOpenCL.cmake	2013-05-27 12:33:00.491853556 +0000
+@@ -71,7 +71,7 @@
  
- MESSAGE(STATUS "Found Open Cl? ${OPENCL_FOUND}")
-Index: vxl-1.14.0/contrib/brl/bcl/bcl_cl.h
-===================================================================
---- vxl-1.14.0.orig/contrib/brl/bcl/bcl_cl.h	2011-04-13 18:30:39.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bcl/bcl_cl.h	2011-04-13 18:30:49.000000000 +0200
-@@ -21,6 +21,10 @@
- 
- #include <cl.h>
- 
-+#else
-+
-+#include <CL/cl.h>
-+
- #endif
- 
- #endif
+ IF (UNIX)
+   FIND_PATH( OPENCL_INCLUDE_PATH CL/cl_gl.h PATHS /usr/include /usr/include/nvidia-current)
+-  FIND_PATH(OPENCL_LIBRARY_PATH libOpenCL.so PATHS /usr/lib /usr/lib/nvidia-current)
++  FIND_LIBRARY(OPENCL_LIBRARY_PATH NAMES libOpenCL.so PATHS /usr/lib /usr/lib/nvidia-current)
+   FIND_LIBRARY(OPENCL_LIBRARIES NAMES libOpenCL.so PATHS /usr/lib /usr/lib/nvidia-current)
+   IF (OPENCL_INCLUDE_PATH)
+     IF (OPENCL_LIBRARY_PATH)

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2013-05-27 12:35:59 UTC (rev 13713)
+++ trunk/packages/vxl/trunk/debian/patches/series	2013-05-27 12:46:07 UTC (rev 13714)
@@ -10,3 +10,4 @@
 fix_alphacomp.patch
 ffmpeg_C99.patch
 sse2.patch
+opencl_unix.patch

Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules	2013-05-27 12:35:59 UTC (rev 13713)
+++ trunk/packages/vxl/trunk/debian/rules	2013-05-27 12:46:07 UTC (rev 13714)
@@ -60,6 +60,8 @@
 	dh $@ --buildsystem=cmake --parallel --with python2
 
 override_dh_auto_configure:
+	# remove duplicate from boxm_block+boct_tree+short.vnl_vector_fixed+float
+	rm -f $(CURDIR)/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
 override_dh_lintian:
@@ -75,6 +77,7 @@
 # too many tests failure, with erratic behavior
 # http://bugs.debian.org/671601
 override_dh_auto_test:
+	dh_auto_test || true
 
 get-orig-source:
 	uscan --verbose --force-download --rename

More information about the debian-med-commit mailing list