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

[Mathieu Malaterre]

Author: malat
Date: 2013-05-30 08:45:53 +0000 (Thu, 30 May 2013)
New Revision: 13765

Added:
   trunk/packages/vxl/trunk/debian/patches/opencl_kfreebsd.patch
Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/control
   trunk/packages/vxl/trunk/debian/patches/series
Log:
Next upload of VXL

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2013-05-30 07:10:50 UTC (rev 13764)
+++ trunk/packages/vxl/trunk/debian/changelog	2013-05-30 08:45:53 UTC (rev 13765)
@@ -1,3 +1,10 @@
+vxl (1.17.0-5) unstable; urgency=low
+
+  * Use libcoin80-dev for transition
+  * Fix compilation of opencl module on kFreeBSD
+
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 30 May 2013 10:44:57 +0200
+
 vxl (1.17.0-4) unstable; urgency=low
 
   * Fix builds on arm* by removing duplicate symbols

Modified: trunk/packages/vxl/trunk/debian/control
===================================================================
--- trunk/packages/vxl/trunk/debian/control	2013-05-30 07:10:50 UTC (rev 13764)
+++ trunk/packages/vxl/trunk/debian/control	2013-05-30 08:45:53 UTC (rev 13765)
@@ -7,7 +7,7 @@
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 9), cmake (>= 2.4.5), libtiff5-dev | libtiff-dev,
  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],
+ libgeotiff-dev, libcoin80-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, ocl-icd-opencl-dev
 Standards-Version: 3.9.4

Added: trunk/packages/vxl/trunk/debian/patches/opencl_kfreebsd.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/opencl_kfreebsd.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/opencl_kfreebsd.patch	2013-05-30 08:45:53 UTC (rev 13765)
@@ -0,0 +1,15 @@
+Description: file was not portable on kFreeBSD
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+--- vxl-1.17.0.orig/contrib/brl/bbas/bocl/bocl_cl.h
++++ vxl-1.17.0/contrib/brl/bbas/bocl/bocl_cl.h
+@@ -13,7 +13,7 @@
+ // \endverbatim
+ 
+ #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \
+-    defined(UNIX) || defined(linux)
++    defined(UNIX) || defined(linux) || defined(__FreeBSD_kernel__)
+   #include <CL/cl.h>
+   #include <CL/cl_gl.h>
+   #define GL_SHARING_EXTENSION "cl_khr_gl_sharing"

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2013-05-30 07:10:50 UTC (rev 13764)
+++ trunk/packages/vxl/trunk/debian/patches/series	2013-05-30 08:45:53 UTC (rev 13765)
@@ -14,3 +14,4 @@
 ocl_comp.patch
 remove_contrib_testing.patch
 ocl.soname.patch
+opencl_kfreebsd.patch