[med-svn] r11154 - in trunk/packages/vxl/branches/experimental: . debian debian/patches debian/source
Mathieu Malaterre
malat at alioth.debian.org
Fri Jun 1 13:49:07 UTC 2012
Author: malat
Date: 2012-06-01 13:49:07 +0000 (Fri, 01 Jun 2012)
New Revision: 11154
Added:
trunk/packages/vxl/branches/experimental/debian/
trunk/packages/vxl/branches/experimental/debian/README.Debian
trunk/packages/vxl/branches/experimental/debian/README.source
trunk/packages/vxl/branches/experimental/debian/changelog
trunk/packages/vxl/branches/experimental/debian/compat
trunk/packages/vxl/branches/experimental/debian/control
trunk/packages/vxl/branches/experimental/debian/copyright
trunk/packages/vxl/branches/experimental/debian/patches/
trunk/packages/vxl/branches/experimental/debian/patches/ffmpeg_C99.patch
trunk/packages/vxl/branches/experimental/debian/patches/fix_alphacomp.patch
trunk/packages/vxl/branches/experimental/debian/patches/fixcomp.patch
trunk/packages/vxl/branches/experimental/debian/patches/install_doxygen.patch
trunk/packages/vxl/branches/experimental/debian/patches/libav_trunk.patch
trunk/packages/vxl/branches/experimental/debian/patches/opencl_unix.patch
trunk/packages/vxl/branches/experimental/debian/patches/png15.patch
trunk/packages/vxl/branches/experimental/debian/patches/removedoxyen.patch
trunk/packages/vxl/branches/experimental/debian/patches/renamelibs.patch
trunk/packages/vxl/branches/experimental/debian/patches/series
trunk/packages/vxl/branches/experimental/debian/patches/sse2.patch
trunk/packages/vxl/branches/experimental/debian/patches/video4linux.patch
trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch
trunk/packages/vxl/branches/experimental/debian/rules
trunk/packages/vxl/branches/experimental/debian/source/
trunk/packages/vxl/branches/experimental/debian/source/format
trunk/packages/vxl/branches/experimental/debian/watch
Log:
Start working on vxl 1.17.0
Added: trunk/packages/vxl/branches/experimental/debian/README.Debian
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/README.Debian (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/README.Debian 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,5 @@
+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
Added: trunk/packages/vxl/branches/experimental/debian/README.source
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/README.source (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/README.source 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,56 @@
+To prevent conflicts with other libraries, common library name have been renamed.
+
+In particular:
+
+libosl.so became liboxl_osl.so (provided by libosl-dev)
+libminizip.so becamse libb3p_minizip.so (provided by libkml-dev)
+libgst.so became liboxl_gst.so (provided by libgst-dev)
+libmcal.so became libmul_mcal.so (provided by libmcal0-dev)
+
+---
+
+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 opencl-headers
+$ cd vxl
+$ dpkg-buildpackage -rfakeroot
+...
+-- Found Open Cl? YES
+...
+
+---
+
+Tests have been deactivated for now, they fails on amd64 with:
+
+The following tests FAILED:
+ 104 - vnl_test_sparse_matrix (SEGFAULT)
+ 361 - mbl_test_sample_stats_1d (Failed)
+ 642 - bsta_test_parzen_sphere (Failed)
+ 650 - bsta_test_beta (Failed)
+ 656 - bsta_algo_test_von_mises_update (Failed)
+ 657 - bsta_algo_test_beta_updater (Failed)
+ 695 - brip_test_mask (Failed)
+ 697 - brip_test_extrema (OTHER_FAULT)
+ 718 - bvxm_test_rpc_registration_process (Failed)
+ 732 - bmdl_classify_process (SEGFAULT)
+ 743 - brec_test_part_hierarchy_learner (Failed)
+ 746 - brec_test_hierarchy_detector2 (SEGFAULT)
+ 761 - boxm_test_update (OTHER_FAULT)
+ 762 - boxm_test_update_multi_bin (OTHER_FAULT)
+ 774 - test_octree_kernel_operator (Failed)
+
+---
+
+Two files are removed to fix compilation on armel, they lead to duplicate symbols linker error such as the following:
+
+cd /build/buildd-vxl_1.14.0-10-armel-8mTKNo/vxl-1.14.0/obj-arm-linux-gnueabi/contrib/brl/bpro/bprb && /usr/bin/cmake -E cmake_link_script CMakeFiles/bprb.dir/link.txt --verbose=1
+/usr/bin/c++ -fPIC -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wl,-z,relro -shared -Wl,-soname,libbprb.so -o ../../../../lib/libbprb.so CMakeFiles/bprb.dir/bprb_parameters.o CMakeFiles/bprb.dir/bprb_process.o CMakeFiles/bprb.dir/bprb_process_ext.o CMakeFiles/bprb.dir/bprb_batch_process_manager.o CMakeFiles/bprb.dir/bprb_null_process.o CMakeFiles/bprb.dir/Templates/bprb_parameters+bool-.o CMakeFiles/bprb.dir/Templates/bprb_parameters+double-.o CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned-.o CMakeFiles/bprb.dir/Templates/bprb_parameters+int-.o CMakeFiles/bprb.dir/Templates/bprb_process_manager+bprb_batch_process_manager-.o CMakeFiles/bprb.dir/Templates/vbl_smart_ptr+bprb_process-.o CMakeFiles/bprb.dir/Templates/bprb_parameters+float-.o CMakeFiles/bprb.dir/Templates/bprb_parameters+vcl_string-.o CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned_int-.o CMakeFiles/bprb.dir/Templates/vbl_smart_ptr+bprb_parameters-.o CMakeFiles/bprb.dir/Templates/bprb_parameters+bprb_filepath-.o ../../../../lib/libbrdb.so ../../../../lib/libbxml.so.1.14.0 ../../../../lib/libvbl.so.1.14.0 ../../../../lib/libvsl.so.1.14.0 ../../../../lib/libexpatpp.so -lexpat ../../../../lib/libvbl_io.so.1.14.0 ../../../../lib/libvbl.so.1.14.0 ../../../../lib/libvsl.so.1.14.0 ../../../../lib/libvul.so.1.14.0 ../../../../lib/libvcl.so.1.14.0 -lm
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned_int-.o:(.rodata+0xa0): multiple definition of `typeinfo name for bprb_param_type<unsigned int>'
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned-.o:(.rodata+0xa0): first defined here
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned_int-.o:(.data.rel.ro+0x0): multiple definition of `typeinfo for bprb_param_type<unsigned int>'
+CMakeFiles/bprb.dir/Templates/bprb_parameters+unsigned-.o:(.data.rel.ro+0x0): first defined here
+collect2: ld returned 1 exit status
+make[3]: *** [lib/libbprb.so] Error 1
+make[3]: Leaving directory `/build/buildd-vxl_1.14.0-10-armel-8mTKNo/vxl-1.14.0/obj-arm-linux-gnueabi'
Added: trunk/packages/vxl/branches/experimental/debian/changelog
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/changelog (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/changelog 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,151 @@
+vxl (1.17.0-1) UNRELEASED; urgency=low
+
+ * New upstream
+
+ -- Mathieu Malaterre <malat at debian.org> Fri, 01 Jun 2012 15:37:27 +0200
+
+vxl (1.14.0-17) unstable; urgency=low
+
+ * Disable test suite for now
+ * Fix test suite compilation on kFreeBSD. Closes: #671653
+
+ -- Mathieu Malaterre <malat at debian.org> Sat, 05 May 2012 21:39:39 +0200
+
+vxl (1.14.0-16) unstable; urgency=low
+
+ * Use my @d.o alias
+ * Set LDFLAGS to remove lintian warnings
+ * Update d/copyright to use dep5
+ * Bump Std-Vers to 3.9.3, no changes needed
+ * Explicitly prefer libtiff5-dev in d/control. Closes: #665026
+ * Fix compilation with png1.5. Closes: #650570
+ * Fix lintian warning about FSF address
+ * Make sure to compile using 2.7 (3.2 generates FTBFS)
+ * Activate test-suite, remove broken tests for now
+
+ -- Mathieu Malaterre <malat at debian.org> Fri, 04 May 2012 14:53:49 +0200
+
+vxl (1.14.0-15) unstable; urgency=low
+
+ * Remove inclusion of doxygen.cmake. Closes: #656922
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 23 Jan 2012 11:07:33 +0100
+
+vxl (1.14.0-14) unstable; urgency=low
+
+ [ Andreas Tille ]
+ * debian/contol
+ - Added myself to Uploaders
+ - Remove libavifile-0.7-dev from Build-Depends
+ Closes: #647787
+
+ [ Mathieu Malaterre ]
+ * Remove libav patch, use upstream patch instead.
+ * Fix missing libraries.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 20 Dec 2011 15:23:03 +0100
+
+vxl (1.14.0-13) unstable; urgency=low
+
+ * Fix videodev2.h compilation on kFreeBSD. Closes: #651464
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Sun, 11 Dec 2011 12:22:27 +0100
+
+vxl (1.14.0-12) unstable; urgency=low
+
+ * Another attempt at fixing alpha building
+ * Add a patch to install doxygen.cmake. Closes: #651314
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 07 Dec 2011 22:15:15 +0100
+
+vxl (1.14.0-11) unstable; urgency=low
+
+ * Fix another compilation issue on alpha
+ * Move pre-build operations in auto_configure, since it was broken
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Sat, 22 Oct 2011 01:46:01 -0400
+
+vxl (1.14.0-10) unstable; urgency=low
+
+ * Fix compilation on alpha. Closes: #643643
+ * Redo d/rules. remove tests for now
+ * Compiles DC1394 plugin only on linux-any
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 28 Sep 2011 12:13:03 +0200
+
+vxl (1.14.0-9) unstable; urgency=low
+
+ * Rename libmcal to libmul_mcal. Closes: #639269
+ * Fix compilation with libav/0.7.2. Closes: #638251
+ * Bump Standard Version to 3.9.2, no changes needed
+ * Compiles DC1394 plugin
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Fri, 26 Aug 2011 11:13:58 +0200
+
+vxl (1.14.0-8) unstable; urgency=low
+
+ * Remove B-D on linux-libc-dev since videodev was deprecated in 2.6.38 anyway
+ * Remove B-D on libdc1394-22-dev to allow building on kfreedbsd-*
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Thu, 05 May 2011 10:40:29 +0200
+
+vxl (1.14.0-7) unstable; urgency=low
+
+ * Fix compilation on armel. Closes: #624512
+ * Explicitly B-D on libav-dev files
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Fri, 29 Apr 2011 09:38:20 +0200
+
+vxl (1.14.0-6) unstable; urgency=low
+
+ * Fix compilation on armel. Closes: #624410
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Thu, 28 Apr 2011 10:46:46 +0200
+
+vxl (1.14.0-5) unstable; urgency=low
+
+ * Rename libs to prevent conflicts. Closes: #623511, #624174
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 26 Apr 2011 11:56:39 +0200
+
+vxl (1.14.0-4) unstable; urgency=low
+
+ * Add another patch for non-intel platform
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 19 Apr 2011 21:29:19 +0200
+
+vxl (1.14.0-3) unstable; urgency=low
+
+ * Remove sse2 instruction from non-sse2 platforms
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 19 Apr 2011 08:32:40 +0200
+
+vxl (1.14.0-2) unstable; urgency=low
+
+ * Start turning more options to ON. Closes: #580671
+ * Update Standard Version to 3.9.1 (no changes needed)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Thu, 07 Apr 2011 17:19:34 +0200
+
+vxl (1.14.0-1) unstable; urgency=low
+
+ [Mathieu Malaterre]
+ * New upstream
+ * Update standard version to 3.8.4 (no change needed)
+
+ [Andreas Tille]
+ * Using Dpkg source format version ‘3.0 (quilt)’ (debian/source/format)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 03 May 2010 17:56:56 +0200
+
+vxl (1.13.0-2) unstable; urgency=low
+
+ * Use system expat (Closes: #560945)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Sun, 13 Dec 2009 11:49:36 +0100
+
+vxl (1.13.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #390999)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 30 Sep 2009 14:07:28 +0200
Added: trunk/packages/vxl/branches/experimental/debian/compat
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/compat (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/compat 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1 @@
+8
Added: trunk/packages/vxl/branches/experimental/debian/control
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/control (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/control 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,43 @@
+Source: vxl
+Homepage: http://vxl.sf.net
+Section: science
+Priority: optional
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+DM-Upload-Allowed: yes
+Uploaders: Mathieu Malaterre <malat at debian.org>,
+ Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 8), 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],
+ libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev,
+ libmpeg2-4-dev, libswscale-dev, libavformat-dev, libavcodec-dev
+Standards-Version: 3.9.3
+X-Python-Version: 2.7
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/vxl/trunk/
+
+Package: libvxl1.14
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Description: C++ Libraries for Computer Vision Research
+ VXL (the Vision-something-Libraries) is a collection of C++ libraries
+ designed for computer vision research and implementation. It was created
+ from TargetJr and the IUE with the aim of making a light, fast and
+ consistent system. VXL is written in ANSI/ISO C++ and is designed to be
+ portable over many platforms.
+
+Package: libvxl1-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libvxl1.14 (= ${binary:Version})
+Provides: libvxl-dev
+Description: C++ Libraries for Computer Vision Research
+ VXL (the Vision-something-Libraries) is a collection of C++ libraries
+ designed for computer vision research and implementation. It was created
+ from TargetJr and the IUE with the aim of making a light, fast and
+ consistent system. VXL is written in ANSI/ISO C++ and is designed to be
+ portable over many platforms.
+ .
+ This package contains the development files needed to build your own
+ VXL applications.
Added: trunk/packages/vxl/branches/experimental/debian/copyright
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/copyright (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/copyright 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,290 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: VXL
+Source: http://vxl.sourceforge.net
+
+Files: *
+Copyright:
+ Copyright (c) 2000-2003 TargetJr Consortium
+ GE Corporate Research and Development (GE CRD)
+ 1 Research Circle
+ Niskayuna, NY 12309
+ All Rights Reserved
+ Reproduction rights limited as described below.
+License: BSD-like
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that (i) the above copyright notice and this permission
+ notice appear in all copies of the software and related documentation,
+ (ii) the name TargetJr Consortium (represented by GE CRD), may not be
+ used in any advertising or publicity relating to the software without
+ the specific, prior written permission of GE CRD, and (iii) any
+ modifications are clearly marked and summarized in a change history
+ log.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ IN NO EVENT SHALL THE TARGETJR CONSORTIUM BE LIABLE FOR ANY SPECIAL,
+ INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY
+ DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON
+ ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE
+ USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Files: contrib/rpl/rgrl/rgrl_copyright.h
+Copyright:
+ Copyright (c) 2002-2004 Rensselaer Polytechnic Institute
+License: BSD (2 clause)
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ * Neither the name of Rensselaer Polytechnic Institute nor the names
+ of any of the authors and contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ .
+ * Modified source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL RENSALLAER POLYTECHNIC INSTITUTE, THE
+ AUTHORS, OR CONTRIBUTORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: v3p/Qv/*
+Copyright:
+ Copyright (c) 1993,94,95,96
+ Institute for Information Processing and Computer Supported New Media (IICM),
+ Graz University of Technology, Austria.
+License:
+ This file is part of VRweb.
+ .
+ VRweb is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ VRweb is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with VRweb; see the file LICENCE. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+
+Files: v3p/zlib/*
+Copyright:
+ Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
+License:
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: v3p/mpeg2/libmpeg2/*
+Copyright:
+ Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+License: GPL (v2 or later)
+ On debian system the license can be found in `/usr/share/common-licenses/GPL-2'
+
+Files: v3p/geotiff/*
+Copyright:
+ Copyright (c) 1999, Frank Warmerdam
+License:
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: core/vul/vul_ios_state.h
+Copyright:
+ Copyright 2002, 2005 Daryle Walker
+License:
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: contrib/rpl/rgrl/*
+Copyright:
+ Copyright 2006-2009 Brad King, Chuck Stewart
+License: BSL (v1.0)
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: contrib/brl/b3p/shapelib/*
+Copyright:
+ Copyright (c) 1999, Frank Warmerdam
+License: MIT/X11 (BSD like)
+ This software is available under the following "MIT Style" license,
+ or at the option of the licensee under the LGPL (see LICENSE.LGPL). This
+ option is discussed in more detail in shapelib.html.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: contrib/brl/b3p/minizip/*
+Copyright:
+ Copyright (C) 1998-2005 Gilles Vollant
+License: zlib/libpng
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+
+Files: vidl_vil1/vidl_vil1_mpegcodec.cxx
+ vidl1/vidl1_mpegcodec.cxx
+Copyright:
+ Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
+ Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+License: GPL-2+
+ On debian system the license can be found in `/usr/share/common-licenses/GPL-2'
+
+Files: vcl/internal/*
+ vcl_atomic_count.h
+Copyright:
+ Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
+ Copyright (c) 2002 Lars Gullik Bjønnes <larsbj at lyx.org>
+ Copyright (c) 2006 Michael van der Westhuizen
+ Copyright (c) 2001-2005 Peter Dimov
+ Copyright 2007 Peter Dimov
+License: BSL (v1.0)
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: debian/*
+Copyright:
+ Copyright 2009-2012, Mathieu Malaterre <malat at debian.org>
+License: GPL-2+
+ The Debian packaging is licensed under the GPL-2 or any later version,
+ see `/usr/share/common-licenses/GPL-2'
Added: trunk/packages/vxl/branches/experimental/debian/patches/ffmpeg_C99.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/ffmpeg_C99.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/ffmpeg_C99.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,15 @@
+Description: Added a missing STD_CONSTANT_MACROS check in vidl_ffmpeg_convert
+Forwarded: not-needed
+Origin: upstream, http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=31498
+Author: Chuck Atkins <chuck.atkins at kitware.com>
+Last-Update: 2012-12-20
+
+Index: vxl-1.17.0/core/vidl/tests/test_include.cxx
+===================================================================
+--- vxl-1.17.0.orig/core/vidl/tests/test_include.cxx 2011-03-15 16:57:23.000000000 +0100
++++ vxl-1.17.0/core/vidl/tests/test_include.cxx 2012-06-01 15:45:17.629752520 +0200
+@@ -1,3 +1,4 @@
++#define __STDC_CONSTANT_MACROS
+ #include <vidl/vidl_config.h> // needed for VIDL_HAS_FFMPEG etc.
+ #include <vidl/vidl_v4l2_pixel_format.h>
+ #include <vidl/vidl_color.h>
Added: trunk/packages/vxl/branches/experimental/debian/patches/fix_alphacomp.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/fix_alphacomp.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/fix_alphacomp.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,58 @@
+Description: __alpha is a processor, not an OS
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2011-12-12
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=28569493
+Bug: https://sourceforge.net/apps/trac/vxl/ticket/66
+
+Index: vxl-1.14.0/v3p/Qv/QvDict.cxx
+===================================================================
+--- vxl-1.14.0.orig/v3p/Qv/QvDict.cxx 2003-10-15 20:23:46.000000000 +0200
++++ vxl-1.14.0/v3p/Qv/QvDict.cxx 2011-10-25 18:04:46.000000000 +0200
+@@ -9,7 +9,7 @@
+ # endif
+ #else
+ # if defined(__alpha) /* there is no inttypes.h here */
+- typedef unsigned long intptr_t;
++// typedef unsigned long intptr_t;
+ # elif defined(__CYGWIN__)
+ # include <sys/types.h> /* for intptr_t on Cygwin */
+ # elif defined(__BORLANDC__)
+Index: vxl-1.14.0/core/vil/vil_stream_url.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vil/vil_stream_url.cxx 2011-11-05 22:18:48.000000000 +0100
++++ vxl-1.14.0/core/vil/vil_stream_url.cxx 2011-11-05 22:18:58.000000000 +0100
+@@ -25,7 +25,7 @@
+ # include <sys/socket.h>
+ # include <netinet/in.h> // htons()
+ # ifdef __alpha
+-# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h]
++//# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h]
+ # endif
+ # define SOCKET int
+ #elif defined (VCL_WIN32) && !defined(__CYGWIN__)
+Index: vxl-1.14.0/core/vil1/vil1_stream_url.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vil1/vil1_stream_url.cxx 2011-11-05 22:19:40.000000000 +0100
++++ vxl-1.14.0/core/vil1/vil1_stream_url.cxx 2011-11-05 22:19:51.000000000 +0100
+@@ -24,7 +24,7 @@
+ # include <sys/socket.h>
+ # include <netinet/in.h> // htons()
+ # ifdef __alpha
+-# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h]
++//# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h]
+ # endif
+ # define SOCKET int
+ #elif defined (VCL_WIN32) && !defined(__CYGWIN__)
+Index: vxl-1.14.0/core/vul/vul_url.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vul/vul_url.cxx 2011-11-05 22:19:20.000000000 +0100
++++ vxl-1.14.0/core/vul/vul_url.cxx 2011-11-05 22:19:30.000000000 +0100
+@@ -27,7 +27,7 @@
+ # include <sys/socket.h>
+ # include <netinet/in.h> // htons()
+ # ifdef __alpha
+-# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h ]
++//# include <fp.h> // htons() [ on e.g. DEC alpha, htons is in machine/endian.h ]
+ # endif
+ # define SOCKET int
+
Added: trunk/packages/vxl/branches/experimental/debian/patches/fixcomp.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/fixcomp.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/fixcomp.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,31 @@
+Description: avoid compiler warning or error (not all paths return a value)
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2011-07-24
+Bug: https://sourceforge.net/apps/trac/vxl/ticket/70
+Applied-Upstream: http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=28125
+
+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,
Added: trunk/packages/vxl/branches/experimental/debian/patches/install_doxygen.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/install_doxygen.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/install_doxygen.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,37 @@
+Description: doxygen.cmake would not be installed otherwise
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2011-07-24
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=28366141
+
+Index: vxl-1.17.0/config/cmake/export/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/config/cmake/export/CMakeLists.txt 2011-12-12 22:02:31.000000000 +0100
++++ vxl-1.17.0/config/cmake/export/CMakeLists.txt 2012-06-01 15:45:09.801752627 +0200
+@@ -48,4 +48,5 @@
+ ${VXL_CMAKE_DIR}/VXLStandardOptions.cmake
+ ${VXL_CMAKE_DIR}/UseVXL.cmake
+ ${VXL_CMAKE_DIR}/UseVGUI.cmake
++ ${VXL_CMAKE_DIR}/../doxygen/doxygen.cmake
+ )
+Index: vxl-1.17.0/config/cmake/Modules/VXLConfig_export.cmake.in
+===================================================================
+--- vxl-1.17.0.orig/config/cmake/Modules/VXLConfig_export.cmake.in 2011-12-13 17:11:34.000000000 +0100
++++ vxl-1.17.0/config/cmake/Modules/VXLConfig_export.cmake.in 2012-06-01 15:45:09.801752627 +0200
+@@ -41,6 +41,11 @@
+ # Clients projects should not use the Find*.cmake files in this directory.
+ SET(VXL_CMAKE_DIR "@CMAKE_INSTALL_PREFIX@/share/vxl/cmake")
+
++# Doxygen Support
++SET(VXL_CMAKE_DOXYGEN_DIR "@CMAKE_INSTALL_PREFIX@/share/vxl/cmake")
++
++
++
+ # VXL Configuration options. You don't have to build with the same options as VXL, but it often helps.
+ SET(VXL_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
+ SET(VXL_BUILD_TESTS "@BUILD_TESTS@")
+@@ -206,3 +211,5 @@
+ SET(VXL_FORCE_V3P_GEOTIFF_deprecated "@VXL_FORCE_V3P_GEOTIFF@")
+ SET(VXL_FORCE_V3P_PNG_deprecated "@VXL_FORCE_V3P_PNG@")
+ SET(VXL_FORCE_V3P_MPEG2_deprecated "@VXL_FORCE_V3P_MPEG2@")
++SET(VXL_FORCE_V3P_RPLY_deprecated "@VXL_FORCE_V3P_RPLY@")
++
Added: trunk/packages/vxl/branches/experimental/debian/patches/libav_trunk.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/libav_trunk.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/libav_trunk.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,1172 @@
+Description: Updated vidl to work with newer ffmpeg.
+Origin: upstream, http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=33908
+Last-Update: 2012-12-20
+Forwarded: not-needed
+Author: Matthew J. Leotta <matt.leotta at gmail.com>
+Bug: https://sourceforge.net/apps/trac/vxl/ticket/69
+
+Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream_v4.txx
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream_v4.txx 2011-12-20 11:07:57.000000000 +0100
+@@ -0,0 +1,540 @@
++// This is core/vidl/vidl_ffmpeg_ostream_v4.txx
++#ifndef vidl_ffmpeg_ostream_v3_txx_
++#define vidl_ffmpeg_ostream_v3_txx_
++#include "vidl_ffmpeg_ostream.h"
++//:
++// \file
++// \author Matt Leotta
++// \author Amitha Perera
++// \author David Law
++// \date 26 Jan 2009
++//
++// Update implementation based on
++// ffmpeg git hash 139f3ac42dcf24eb8c59af4aaab4e9afdccbc996
++//
++//-----------------------------------------------------------------------------
++
++#include "vidl_ffmpeg_init.h"
++#include "vidl_ffmpeg_convert.h"
++#include "vidl_frame.h"
++#include "vidl_convert.h"
++#include <vcl_cstring.h>
++#include <vcl_climits.h>
++#include <vil/vil_memory_chunk.h>
++
++extern "C" {
++#if FFMPEG_IN_SEVERAL_DIRECTORIES
++#include <libavformat/avformat.h>
++#else
++#include <ffmpeg/avformat.h>
++#endif
++}
++
++//-----------------------------------------------------------------------------
++
++
++struct vidl_ffmpeg_ostream::pimpl
++{
++ pimpl()
++ : fmt_cxt_( 0 ),
++ file_opened_( false ),
++ codec_opened_( false ),
++ cur_frame_( 0 ),
++ video_rc_eq_(NULL)
++ { }
++
++ AVFormatContext* fmt_cxt_;
++ bool file_opened_;
++ bool codec_opened_;
++ vil_memory_chunk_sptr bit_buf_;
++ unsigned int cur_frame_;
++ char* video_rc_eq_;
++};
++
++
++//-----------------------------------------------------------------------------
++
++
++//: Constructor
++vidl_ffmpeg_ostream::
++vidl_ffmpeg_ostream()
++ : os_( new vidl_ffmpeg_ostream::pimpl )
++{
++ vidl_ffmpeg_init();
++}
++
++
++//: Destructor
++vidl_ffmpeg_ostream::
++~vidl_ffmpeg_ostream()
++{
++ close();
++ delete os_;
++}
++
++
++//: Constructor - opens a stream
++vidl_ffmpeg_ostream::
++vidl_ffmpeg_ostream(const vcl_string& filename,
++ const vidl_ffmpeg_ostream_params& params)
++ : os_( new vidl_ffmpeg_ostream::pimpl ),
++ filename_(filename), params_(params)
++{
++ vidl_ffmpeg_init();
++}
++
++
++//: Open the stream
++bool
++vidl_ffmpeg_ostream::
++open()
++{
++ // Close any open files
++ close();
++
++ // a raw video packet is the same size as the input image. Others
++ // are smaller.
++ os_->bit_buf_ = new vil_memory_chunk( params_.ni_ * params_.nj_ * 3, VIL_PIXEL_FORMAT_BYTE );
++
++ os_->fmt_cxt_ = avformat_alloc_context();
++
++ AVOutputFormat* file_oformat = 0;
++ if ( params_.file_format_ == vidl_ffmpeg_ostream_params::GUESS ) {
++ file_oformat = av_guess_format(NULL, filename_.c_str(), NULL);
++ if (!file_oformat) {
++ vcl_cerr << "ffmpeg: Unable for find a suitable output format for "
++ << filename_ << '\n';
++ close();
++ return false;
++ }
++ }
++ else {
++ close();
++ return false;
++ }
++
++ os_->fmt_cxt_->oformat = file_oformat;
++ os_->fmt_cxt_->nb_streams = 0;
++
++ // Create stream
++ AVStream* st = av_new_stream( os_->fmt_cxt_, 0 );
++ if ( !st ) {
++ vcl_cerr << "ffmpeg: could not alloc stream\n";
++ close();
++ return false;
++ }
++
++ //os_->fmt_cxt_->nb_streams = 1;
++
++ AVCodecContext *video_enc = st->codec;
++
++ if (vcl_strcmp(file_oformat->name, "mp4") != 0 ||
++ vcl_strcmp(file_oformat->name, "mov") != 0 ||
++ vcl_strcmp(file_oformat->name, "3gp") != 0 )
++ video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER;
++
++ video_enc->codec_type = AVMEDIA_TYPE_VIDEO;
++
++ switch ( params_.encoder_ )
++ {
++ case vidl_ffmpeg_ostream_params::DEFAULT:
++ video_enc->codec_id = file_oformat->video_codec;
++ break;
++ case vidl_ffmpeg_ostream_params::MPEG4:
++ video_enc->codec_id = CODEC_ID_MPEG4;
++ break;
++ case vidl_ffmpeg_ostream_params::MPEG2VIDEO:
++ video_enc->codec_id = CODEC_ID_MPEG2VIDEO;
++ break;
++ case vidl_ffmpeg_ostream_params::MSMPEG4V2:
++ video_enc->codec_id = CODEC_ID_MSMPEG4V2;
++ break;
++ case vidl_ffmpeg_ostream_params::RAWVIDEO:
++ video_enc->codec_id = CODEC_ID_RAWVIDEO;
++ break;
++ case vidl_ffmpeg_ostream_params::LJPEG:
++ video_enc->codec_id = CODEC_ID_LJPEG;
++ break;
++ case vidl_ffmpeg_ostream_params::HUFFYUV:
++ video_enc->codec_id = CODEC_ID_HUFFYUV;
++ break;
++ case vidl_ffmpeg_ostream_params::DVVIDEO:
++ video_enc->codec_id = CODEC_ID_DVVIDEO;
++ break;
++ default:
++ vcl_cout << "ffmpeg: Unknown encoder type\n";
++ return false;
++ }
++
++ AVCodec* codec = avcodec_find_encoder( video_enc->codec_id );
++ if ( !codec )
++ {
++ vcl_cerr << "ffmpeg_writer:: couldn't find encoder for " << video_enc->codec_id << '\n';
++ return false;
++ }
++
++ video_enc->bit_rate = params_.bit_rate_ * 1000;
++ video_enc->bit_rate_tolerance = params_.video_bit_rate_tolerance_;
++ video_enc->time_base.num = 1000;
++ video_enc->time_base.den = int(params_.frame_rate_*1000);
++
++ if ( codec && codec->supported_framerates )
++ {
++ AVRational const* p = codec->supported_framerates;
++ AVRational req = { video_enc->time_base.den, video_enc->time_base.num };
++ AVRational const* best = NULL;
++ AVRational best_error = { INT_MAX, 1 };
++ for (; p->den!=0; p++)
++ {
++ AVRational error = av_sub_q(req, *p);
++ if ( error.num < 0 ) error.num *= -1;
++ if ( av_cmp_q( error, best_error ) < 0 )
++ {
++ best_error= error;
++ best= p;
++ }
++ }
++ video_enc->time_base.den= best->num;
++ video_enc->time_base.num= best->den;
++ }
++
++ video_enc->width = params_.ni_;
++ video_enc->height = params_.nj_;
++ video_enc->sample_aspect_ratio = av_d2q(params_.frame_aspect_ratio_*params_.ni_/params_.nj_, 255);
++
++ // Our source is packed RGB. Use that if possible.
++ video_enc->pix_fmt = PIX_FMT_RGB24;
++ if ( codec && codec->pix_fmts )
++ {
++ const enum PixelFormat* p= codec->pix_fmts;
++ for ( ; *p != -1; p++ )
++ {
++ if ( *p == video_enc->pix_fmt )
++ break;
++ }
++ if ( *p == -1 )
++ video_enc->pix_fmt = codec->pix_fmts[0];
++ }
++ else if ( codec && ( codec->id == CODEC_ID_RAWVIDEO ||
++ codec->id == CODEC_ID_HUFFYUV ) )
++ {
++ // these formats only support the YUV input image formats
++ video_enc->pix_fmt = PIX_FMT_YUV420P;
++ }
++
++ if (!params_.intra_only_)
++ video_enc->gop_size = params_.gop_size_;
++ else
++ video_enc->gop_size = 0;
++ if (params_.video_qscale_ || params_.same_quality_)
++ {
++ video_enc->flags |= CODEC_FLAG_QSCALE;
++ st->quality = FF_QP2LAMBDA * params_.video_qscale_;
++ }
++ // if (bitexact)
++ // video_enc->flags |= CODEC_FLAG_BITEXACT;
++
++ video_enc->mb_decision = params_.mb_decision_;
++ video_enc->mb_cmp = params_.mb_cmp_;
++ video_enc->ildct_cmp = params_.ildct_cmp_;
++ video_enc->me_sub_cmp = params_.sub_cmp_;
++ video_enc->me_cmp = params_.cmp_;
++ video_enc->me_pre_cmp = params_.pre_cmp_;
++ video_enc->pre_me = params_.pre_me_;
++ video_enc->lumi_masking = params_.lumi_mask_;
++ video_enc->dark_masking = params_.dark_mask_;
++ video_enc->spatial_cplx_masking = params_.scplx_mask_;
++ video_enc->temporal_cplx_masking = params_.tcplx_mask_;
++ video_enc->p_masking = params_.p_mask_;
++ video_enc->quantizer_noise_shaping= params_.qns_;
++
++ if (params_.use_umv_)
++ {
++ video_enc->flags |= CODEC_FLAG_H263P_UMV;
++ }
++ if (params_.use_ss_)
++ {
++ video_enc->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
++ }
++ if (params_.use_aiv_)
++ {
++ video_enc->flags |= CODEC_FLAG_H263P_AIV;
++ }
++ if (params_.use_4mv_)
++ {
++ video_enc->flags |= CODEC_FLAG_4MV;
++ }
++ if (params_.use_obmc_)
++ {
++ video_enc->flags |= CODEC_FLAG_OBMC;
++ }
++ if (params_.use_loop_)
++ {
++ video_enc->flags |= CODEC_FLAG_LOOP_FILTER;
++ }
++
++ if (params_.use_part_)
++ {
++ video_enc->flags |= CODEC_FLAG_PART;
++ }
++ if (params_.use_alt_scan_)
++ {
++ video_enc->flags |= CODEC_FLAG_ALT_SCAN;
++ }
++ if (params_.use_scan_offset_)
++ {
++ video_enc->flags |= CODEC_FLAG_SVCD_SCAN_OFFSET;
++ }
++ if (params_.closed_gop_)
++ {
++ video_enc->flags |= CODEC_FLAG_CLOSED_GOP;
++ }
++ if (params_.use_qpel_)
++ {
++ video_enc->flags |= CODEC_FLAG_QPEL;
++ }
++ if (params_.use_qprd_)
++ {
++ video_enc->flags |= CODEC_FLAG_QP_RD;
++ }
++ if (params_.use_cbprd_)
++ {
++ video_enc->flags |= CODEC_FLAG_CBP_RD;
++ }
++ if (params_.b_frames_)
++ {
++ video_enc->max_b_frames = params_.b_frames_;
++ video_enc->b_frame_strategy = 0;
++ video_enc->b_quant_factor = 2.0;
++ }
++ if (params_.do_interlace_dct_)
++ {
++ video_enc->flags |= CODEC_FLAG_INTERLACED_DCT;
++ }
++ if (params_.do_interlace_me_)
++ {
++ video_enc->flags |= CODEC_FLAG_INTERLACED_ME;
++ }
++ video_enc->qmin = params_.video_qmin_;
++ video_enc->qmax = params_.video_qmax_;
++ video_enc->lmin = params_.video_lmin_;
++ video_enc->lmax = params_.video_lmax_;
++ video_enc->max_qdiff = params_.video_qdiff_;
++ video_enc->qblur = params_.video_qblur_;
++ video_enc->qcompress = params_.video_qcomp_;
++
++ // delete when the stream is closed
++ os_->video_rc_eq_ = new char[params_.video_rc_eq_.length()+1];
++ vcl_strcpy(os_->video_rc_eq_, params_.video_rc_eq_.c_str());
++ video_enc->rc_eq = os_->video_rc_eq_;
++
++ video_enc->debug = params_.debug_;
++ video_enc->debug_mv = params_.debug_mv_;
++ video_enc->thread_count = 1;
++
++ video_enc->rc_max_rate = params_.video_rc_max_rate_;
++ video_enc->rc_min_rate = params_.video_rc_min_rate_;
++ video_enc->rc_buffer_size = params_.video_rc_buffer_size_;
++ video_enc->rc_buffer_aggressivity= params_.video_rc_buffer_aggressivity_;
++ video_enc->rc_initial_cplx= params_.video_rc_initial_cplx_;
++ video_enc->i_quant_factor = params_.video_i_qfactor_;
++ video_enc->b_quant_factor = params_.video_b_qfactor_;
++ video_enc->i_quant_offset = params_.video_i_qoffset_;
++ video_enc->b_quant_offset = params_.video_b_qoffset_;
++ video_enc->intra_quant_bias = params_.video_intra_quant_bias_;
++ video_enc->inter_quant_bias = params_.video_inter_quant_bias_;
++ video_enc->dct_algo = params_.dct_algo_;
++ video_enc->idct_algo = params_.idct_algo_;
++ video_enc->me_threshold= params_.me_threshold_;
++ video_enc->mb_threshold= params_.mb_threshold_;
++ video_enc->intra_dc_precision= params_.intra_dc_precision_ - 8;
++ video_enc->strict_std_compliance = params_.strict_;
++ video_enc->error_rate = params_.error_rate_;
++ video_enc->noise_reduction= params_.noise_reduction_;
++ video_enc->scenechange_threshold= params_.sc_threshold_;
++ video_enc->me_range = params_.me_range_;
++ video_enc->coder_type= params_.coder_;
++ video_enc->context_model= params_.context_;
++ video_enc->prediction_method= params_.predictor_;
++
++ if (params_.do_psnr_)
++ video_enc->flags|= CODEC_FLAG_PSNR;
++
++ video_enc->me_method = params_.me_method_;
++
++ // two pass mode
++ if (params_.do_pass_)
++ {
++ if (params_.do_pass_ == 1)
++ {
++ video_enc->flags |= CODEC_FLAG_PASS1;
++ }
++ else
++ {
++ video_enc->flags |= CODEC_FLAG_PASS2;
++ }
++ }
++
++ vcl_strncpy( os_->fmt_cxt_->filename, filename_.c_str(), 1023 );
++
++ if ( avio_open( &os_->fmt_cxt_->pb, filename_.c_str(), URL_WRONLY) < 0 )
++ {
++ vcl_cerr << "ffmpeg: couldn't open " << filename_ << " for writing\n";
++ close();
++ return false;
++ }
++ os_->file_opened_ = true;
++
++ //dump_format( os_->fmt_cxt_, 1, filename_, 1 );
++
++ if ( avcodec_open( video_enc, codec ) < 0 )
++ {
++ vcl_cerr << "ffmpeg: couldn't open codec\n";
++ close();
++ return false;
++ }
++ os_->codec_opened_ = true;
++
++ if ( avformat_write_header( os_->fmt_cxt_, NULL ) < 0 )
++ {
++ vcl_cerr << "ffmpeg: couldn't write header\n";
++ close();
++ return false;
++ }
++
++ return true;
++}
++
++
++//: Close the stream
++void
++vidl_ffmpeg_ostream::
++close()
++{
++ delete os_->video_rc_eq_;
++ os_->video_rc_eq_ = NULL;
++
++ if ( os_->fmt_cxt_ ) {
++
++ if ( os_->file_opened_ ) {
++ av_write_trailer( os_->fmt_cxt_ );
++ avio_close( os_->fmt_cxt_->pb );
++ os_->file_opened_ = false;
++ }
++
++ if ( os_->fmt_cxt_->nb_streams > 0 ) {
++ if ( os_->codec_opened_ ) {
++ for ( unsigned i = 0; i < os_->fmt_cxt_->nb_streams; ++i ) {
++ AVCodecContext* codec = os_->fmt_cxt_->streams[i]->codec;
++ if ( codec->stats_in ) {
++ av_freep( codec->stats_in );
++ }
++ avcodec_close( codec );
++ }
++ }
++ os_->codec_opened_ = false;
++ for ( unsigned i = 0; i < os_->fmt_cxt_->nb_streams; ++i ) {
++ av_free( os_->fmt_cxt_->streams[i] );
++ }
++ }
++
++ av_free( os_->fmt_cxt_ );
++ os_->fmt_cxt_ = 0;
++ }
++}
++
++
++//: Return true if the stream is open for writing
++bool
++vidl_ffmpeg_ostream::
++is_open() const
++{
++ return os_->file_opened_;
++}
++
++
++//: Write and image to the stream
++// \retval false if the image could not be written
++bool
++vidl_ffmpeg_ostream::
++write_frame(const vidl_frame_sptr& frame)
++{
++ if (!is_open()) {
++ // resize to the first frame
++ params_.size(frame->ni(),frame->nj());
++ open();
++ }
++
++ AVCodecContext* codec = os_->fmt_cxt_->streams[0]->codec;
++
++ if (unsigned( codec->width ) != frame->ni() ||
++ unsigned( codec->height) != frame->nj() ) {
++ vcl_cerr << "ffmpeg: Input image has wrong size. Expecting ("
++ << codec->width << 'x' << codec->height << "), got ("
++ << frame->ni() << 'x' << frame->nj() << ")\n";
++ return false;
++ }
++
++ PixelFormat fmt = vidl_pixel_format_to_ffmpeg(frame->pixel_format());
++
++ vidl_pixel_format target_fmt = vidl_pixel_format_from_ffmpeg(codec->pix_fmt);
++ static vidl_frame_sptr temp_frame = new vidl_shared_frame(NULL,frame->ni(),frame->nj(),target_fmt);
++
++ AVFrame out_frame;
++ avcodec_get_frame_defaults( &out_frame );
++
++ // The frame is in the correct format to encode directly
++ if ( codec->pix_fmt == fmt )
++ {
++ avpicture_fill((AVPicture*)&out_frame, (uint8_t*) frame->data(),
++ fmt, frame->ni(), frame->nj());
++ }
++ else
++ {
++ if (!temp_frame->data()) {
++ unsigned ni = frame->ni();
++ unsigned nj = frame->nj();
++ unsigned out_size = vidl_pixel_format_buffer_size(ni,nj,target_fmt);
++ temp_frame = new vidl_memory_chunk_frame(ni, nj, target_fmt,
++ new vil_memory_chunk(out_size, VIL_PIXEL_FORMAT_BYTE));
++ }
++ // try conversion with FFMPEG functions
++ if (!vidl_ffmpeg_convert(frame, temp_frame)) {
++ // try conversion with vidl functions
++ if (!vidl_convert_frame(*frame, *temp_frame)) {
++ vcl_cout << "unable to convert " << frame->pixel_format() << " to "<<target_fmt<<vcl_endl;
++ return false;
++ }
++ }
++ avpicture_fill((AVPicture*)&out_frame, (uint8_t*) temp_frame->data(),
++ codec->pix_fmt, frame->ni(), frame->nj());
++ }
++
++ AVPacket pkt;
++ av_init_packet( &pkt );
++ pkt.stream_index = 0;
++
++ out_frame.pts = os_->cur_frame_;
++
++ int ret = avcodec_encode_video( codec, (uint8_t*)os_->bit_buf_->data(), os_->bit_buf_->size(), &out_frame );
++
++ if ( ret ) {
++ pkt.data = (uint8_t*)os_->bit_buf_->data();
++ pkt.size = ret;
++ if ( codec->coded_frame ) {
++ pkt.pts = codec->coded_frame->pts;
++ }
++ if ( codec->coded_frame && codec->coded_frame->key_frame ) {
++ pkt.flags |= AV_PKT_FLAG_KEY;
++ }
++ av_interleaved_write_frame( os_->fmt_cxt_, &pkt );
++ }
++ else {
++ return false;
++ }
++
++ ++os_->cur_frame_;
++ return true;
++}
++
++#endif // vidl_ffmpeg_ostream_v3_txx_
+Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v3.txx
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v3.txx 2011-12-20 11:07:57.000000000 +0100
+@@ -0,0 +1,569 @@
++// This is core/vidl/vidl_ffmpeg_istream_v3.txx
++#ifndef vidl_ffmpeg_istream_v3_txx_
++#define vidl_ffmpeg_istream_v3_txx_
++#include "vidl_ffmpeg_istream.h"
++//:
++// \file
++// \author Matt Leotta
++// \author Amitha Perera
++// \date 3 Nov 2011
++//
++// Update implementation based on
++// ffmpeg git hash 139f3ac42dcf24eb8c59af4aaab4e9afdccbc996
++
++//-----------------------------------------------------------------------------
++
++#include "vidl_ffmpeg_init.h"
++#include "vidl_frame.h"
++#include "vidl_ffmpeg_convert.h"
++
++#include <vcl_string.h>
++#include <vcl_iostream.h>
++
++extern "C" {
++#if FFMPEG_IN_SEVERAL_DIRECTORIES
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libswscale/swscale.h>
++#else
++#include <ffmpeg/avcodec.h>
++#include <ffmpeg/avformat.h>
++#include <ffmpeg/swscale.h>
++#endif
++}
++
++//--------------------------------------------------------------------------------
++
++struct vidl_ffmpeg_istream::pimpl
++{
++ pimpl()
++ : fmt_cxt_( NULL ),
++ vid_index_( -1 ),
++ vid_str_( NULL ),
++ last_dts( 0 ),
++ frame_( NULL ),
++ num_frames_( -2 ), // sentinel value to indicate not yet computed
++ sws_context_( NULL ),
++ cur_frame_( NULL ),
++ deinterlace_( false ),
++ frame_number_offset_( 0 )
++ {
++ }
++
++ AVFormatContext* fmt_cxt_;
++ int vid_index_;
++ AVStream* vid_str_;
++
++ //: Decode time of last frame.
++ int64_t last_dts;
++
++ //: Start time of the stream, to offset the dts when computing the frame number.
++ int64_t start_time;
++
++ //: The last successfully read frame.
++ //
++ // If frame_->data[0] is not NULL, then the frame corresponds to
++ // the codec state, so that codec.width and so on apply to the
++ // frame data.
++ AVFrame* frame_;
++
++ //: number of counted frames
++ int num_frames_;
++
++ //: A software scaling context
++ //
++ // This is the context used for the software scaling and colour
++ // conversion routines. Since the conversion is likely to be the
++ // same for each frame, we save the context to avoid re-creating it
++ // every time.
++ SwsContext* sws_context_;
++
++ //: A contiguous memory buffer to store the current image data
++ vil_memory_chunk_sptr contig_memory_;
++
++ //: The last successfully decoded frame.
++ mutable vidl_frame_sptr cur_frame_;
++
++ //: Apply deinterlacing on the frames?
++ bool deinterlace_;
++
++ //: Some codec/file format combinations need a frame number offset.
++ // These codecs have a delay between reading packets and generating frames.
++ unsigned frame_number_offset_;
++};
++
++
++//--------------------------------------------------------------------------------
++
++//: Constructor
++vidl_ffmpeg_istream::
++vidl_ffmpeg_istream()
++ : is_( new vidl_ffmpeg_istream::pimpl )
++{
++ vidl_ffmpeg_init();
++}
++
++
++//: Constructor - from a filename
++vidl_ffmpeg_istream::
++vidl_ffmpeg_istream(const vcl_string& filename)
++ : is_( new vidl_ffmpeg_istream::pimpl )
++{
++ vidl_ffmpeg_init();
++ open(filename);
++}
++
++
++//: Destructor
++vidl_ffmpeg_istream::
++~vidl_ffmpeg_istream()
++{
++ close();
++ delete is_;
++}
++
++//: Open a new stream using a filename
++bool
++vidl_ffmpeg_istream::
++open(const vcl_string& filename)
++{
++ // Close any currently opened file
++ close();
++
++ // Open the file
++ int err;
++ if ( ( err = avformat_open_input( &is_->fmt_cxt_, filename.c_str(), NULL, NULL ) ) != 0 ) {
++ return false;
++ }
++
++ // Get the stream information by reading a bit of the file
++ if ( av_find_stream_info( is_->fmt_cxt_ ) < 0 ) {
++ return false;
++ }
++
++ // Find a video stream. Use the first one we find.
++ is_->vid_index_ = -1;
++ for ( unsigned i = 0; i < is_->fmt_cxt_->nb_streams; ++i ) {
++ AVCodecContext *enc = is_->fmt_cxt_->streams[i]->codec;
++ if ( enc->codec_type == AVMEDIA_TYPE_VIDEO ) {
++ is_->vid_index_ = i;
++ break;
++ }
++ }
++ if ( is_->vid_index_ == -1 ) {
++ return false;
++ }
++
++ av_dump_format( is_->fmt_cxt_, 0, filename.c_str(), 0 );
++ AVCodecContext *enc = is_->fmt_cxt_->streams[is_->vid_index_]->codec;
++
++ // Open the stream
++ AVCodec* codec = avcodec_find_decoder(enc->codec_id);
++ if ( !codec || avcodec_open( enc, codec ) < 0 ) {
++ return false;
++ }
++
++ is_->vid_str_ = is_->fmt_cxt_->streams[ is_->vid_index_ ];
++ is_->frame_ = avcodec_alloc_frame();
++
++ if ( is_->vid_str_->start_time == int64_t(1)<<63 ) {
++ is_->start_time = 0;
++ }
++ else {
++ is_->start_time = is_->vid_str_->start_time;
++ }
++
++ // The MPEG 2 codec has a latency of 1 frame when encoded in an AVI
++ // stream, so the dts of the last packet (stored in last_dts) is
++ // actually the next frame's dts.
++ if ( is_->vid_str_->codec->codec_id == CODEC_ID_MPEG2VIDEO &&
++ vcl_string("avi") == is_->fmt_cxt_->iformat->name ) {
++ is_->frame_number_offset_ = 1;
++ }
++
++ return true;
++}
++
++
++//: Close the stream
++void
++vidl_ffmpeg_istream::
++close()
++{
++ if ( is_->frame_ ) {
++ av_freep( &is_->frame_ );
++ }
++
++ is_->num_frames_ = -2;
++ is_->contig_memory_ = 0;
++ is_->vid_index_ = -1;
++ if ( is_->vid_str_ ) {
++ avcodec_close( is_->vid_str_->codec );
++ is_->vid_str_ = 0;
++ }
++ if ( is_->fmt_cxt_ ) {
++ av_close_input_file( is_->fmt_cxt_ );
++ is_->fmt_cxt_ = 0;
++ }
++}
++
++
++//: Return true if the stream is open for reading
++bool
++vidl_ffmpeg_istream::
++is_open() const
++{
++ return ! ! is_->frame_;
++}
++
++
++//: Return true if the stream is in a valid state
++bool
++vidl_ffmpeg_istream::
++is_valid() const
++{
++ return is_open() && is_->frame_->data[0] != 0;
++}
++
++
++//: Return true if the stream support seeking
++bool
++vidl_ffmpeg_istream::
++is_seekable() const
++{
++ return true;
++}
++
++
++//: Return the number of frames if known
++// returns -1 for non-seekable streams
++int
++vidl_ffmpeg_istream::num_frames() const
++{
++ // to get an accurate frame count, quickly run through the entire
++ // video. We'll only do this if the user hasn't read any frames,
++ // because we have no guarantee that we can successfully seek back
++ // to anywhere but the beginning. There is logic in advance() to
++ // ensure this.
++ vidl_ffmpeg_istream* mutable_this = const_cast<vidl_ffmpeg_istream*>(this);
++ if ( mutable_this->is_->num_frames_ == -2 ) {
++ mutable_this->is_->num_frames_ = 0;
++ while (mutable_this->advance()) {
++ ++mutable_this->is_->num_frames_;
++ }
++ av_seek_frame( mutable_this->is_->fmt_cxt_,
++ mutable_this->is_->vid_index_,
++ 0,
++ AVSEEK_FLAG_BACKWARD );
++ }
++
++ return is_->num_frames_;
++}
++
++
++//: Return the current frame number
++unsigned int
++vidl_ffmpeg_istream::
++frame_number() const
++{
++ // Quick return if the stream isn't open.
++ if ( !is_valid() ) {
++ return static_cast<unsigned int>(-1);
++ }
++
++ return ((is_->last_dts - is_->start_time)
++ * is_->vid_str_->r_frame_rate.num / is_->vid_str_->r_frame_rate.den
++ * is_->vid_str_->time_base.num + is_->vid_str_->time_base.den/2)
++ / is_->vid_str_->time_base.den
++ - int(is_->frame_number_offset_);
++}
++
++
++//: Return the width of each frame
++unsigned int
++vidl_ffmpeg_istream
++::width() const
++{
++ // Quick return if the stream isn't open.
++ if ( !is_open() ) {
++ return 0;
++ }
++
++ return is_->fmt_cxt_->streams[is_->vid_index_]->codec->width;
++}
++
++
++//: Return the height of each frame
++unsigned int
++vidl_ffmpeg_istream
++::height() const
++{
++ // Quick return if the stream isn't open.
++ if ( !is_open() ) {
++ return 0;
++ }
++
++ return is_->fmt_cxt_->streams[is_->vid_index_]->codec->height;
++}
++
++
++//: Return the pixel format
++vidl_pixel_format
++vidl_ffmpeg_istream
++::format() const
++{
++ // Quick return if the stream isn't open.
++ if ( !is_open() ) {
++ return VIDL_PIXEL_FORMAT_UNKNOWN;
++ }
++
++ AVCodecContext* enc = is_->fmt_cxt_->streams[is_->vid_index_]->codec;
++ vidl_pixel_format fmt = vidl_pixel_format_from_ffmpeg(enc->pix_fmt);
++ if (fmt == VIDL_PIXEL_FORMAT_UNKNOWN)
++ return VIDL_PIXEL_FORMAT_RGB_24;
++ return fmt;
++}
++
++
++//: Return the frame rate (0.0 if unspecified)
++double
++vidl_ffmpeg_istream
++::frame_rate() const
++{
++ // Quick return if the stream isn't open.
++ if ( !is_open() ) {
++ return 0.0;
++ }
++
++ return static_cast<double>(is_->vid_str_->r_frame_rate.num) / is_->vid_str_->r_frame_rate.den;
++}
++
++
++//: Return the duration in seconds (0.0 if unknown)
++double
++vidl_ffmpeg_istream
++::duration() const
++{
++ // Quick return if the stream isn't open.
++ if ( !is_open() ) {
++ return 0.0;
++ }
++ return static_cast<double>(is_->vid_str_->time_base.num)/is_->vid_str_->time_base.den
++ * static_cast<double>(is_->vid_str_->duration);
++}
++
++
++//: Advance to the next frame (but don't acquire an image)
++bool
++vidl_ffmpeg_istream::
++advance()
++{
++ // Quick return if the file isn't open.
++ if ( !is_open() ) {
++ return false;
++ }
++
++ // See the comment in num_frames(). This is to make sure that once
++ // we start reading frames, we'll never try to march to the end to
++ // figure out how many frames there are.
++ if ( is_->num_frames_ == -2 ) {
++ is_->num_frames_ = -1;
++ }
++
++ AVCodecContext* codec = is_->fmt_cxt_->streams[is_->vid_index_]->codec;
++
++ AVPacket pkt;
++ int got_picture = 0;
++
++ while ( got_picture == 0 ) {
++ if ( av_read_frame( is_->fmt_cxt_, &pkt ) < 0 ) {
++ break;
++ }
++ is_->last_dts = pkt.dts;
++
++ // Make sure that the packet is from the actual video stream.
++ if (pkt.stream_index==is_->vid_index_)
++ {
++ if ( avcodec_decode_video2( codec,
++ is_->frame_, &got_picture,
++ &pkt ) < 0 ) {
++ vcl_cerr << "vidl_ffmpeg_istream: Error decoding packet!\n";
++ return false;
++ }
++ }
++ av_free_packet( &pkt );
++ }
++
++ // From ffmpeg apiexample.c: some codecs, such as MPEG, transmit the
++ // I and P frame with a latency of one frame. You must do the
++ // following to have a chance to get the last frame of the video.
++ if ( !got_picture ) {
++ av_init_packet(&pkt);
++ pkt.data = NULL;
++ pkt.size = 0;
++ if ( avcodec_decode_video2( codec,
++ is_->frame_, &got_picture,
++ &pkt ) >= 0 ) {
++ is_->last_dts += int64_t(is_->vid_str_->time_base.den) * is_->vid_str_->r_frame_rate.den
++ / is_->vid_str_->time_base.num / is_->vid_str_->r_frame_rate.num;
++ }
++ }
++
++ // The cached frame is out of date, whether we managed to get a new
++ // frame or not.
++ if (is_->cur_frame_)
++ is_->cur_frame_->invalidate();
++ is_->cur_frame_ = 0;
++
++ if ( ! got_picture ) {
++ is_->frame_->data[0] = NULL;
++ }
++
++ return got_picture != 0;
++}
++
++
++//: Read the next frame from the stream
++vidl_frame_sptr
++vidl_ffmpeg_istream::read_frame()
++{
++ if (advance())
++ return current_frame();
++ return NULL;
++}
++
++
++//: Return the current frame in the stream
++vidl_frame_sptr
++vidl_ffmpeg_istream::current_frame()
++{
++ // Quick return if the stream isn't valid
++ if ( !is_valid() ) {
++ return NULL;
++ }
++ AVCodecContext* enc = is_->fmt_cxt_->streams[is_->vid_index_]->codec;
++ // If we have not already converted this frame, try to convert it
++ if ( !is_->cur_frame_ && is_->frame_->data[0] != 0 )
++ {
++ int width = enc->width;
++ int height = enc->height;
++
++ // Deinterlace if requested
++ if ( is_->deinterlace_ ) {
++ avpicture_deinterlace( (AVPicture*)is_->frame_, (AVPicture*)is_->frame_,
++ enc->pix_fmt, width, height );
++ }
++
++ // If the pixel format is not recognized by vidl then convert the data into RGB_24
++ vidl_pixel_format fmt = vidl_pixel_format_from_ffmpeg(enc->pix_fmt);
++ if (fmt == VIDL_PIXEL_FORMAT_UNKNOWN)
++ {
++ int size = width*height*3;
++ if (!is_->contig_memory_)
++ is_->contig_memory_ = new vil_memory_chunk(size, VIL_PIXEL_FORMAT_BYTE);
++ else
++ is_->contig_memory_->set_size(size, VIL_PIXEL_FORMAT_BYTE);
++
++ // Reuse the previous context if we can.
++ is_->sws_context_ = sws_getCachedContext(
++ is_->sws_context_,
++ width, height, enc->pix_fmt,
++ width, height, PIX_FMT_RGB24,
++ SWS_BILINEAR,
++ NULL, NULL, NULL );
++
++ if ( is_->sws_context_ == NULL ) {
++ vcl_cerr << "vidl_ffmpeg_istream: couldn't create conversion context\n";
++ return vidl_frame_sptr();
++ }
++
++ AVPicture rgb_frame;
++ avpicture_fill(&rgb_frame, (uint8_t*)is_->contig_memory_->data(), PIX_FMT_RGB24, width, height);
++
++ sws_scale( is_->sws_context_,
++ is_->frame_->data, is_->frame_->linesize,
++ 0, height,
++ rgb_frame.data, rgb_frame.linesize );
++
++ is_->cur_frame_ = new vidl_shared_frame(is_->contig_memory_->data(),width,height,
++ VIDL_PIXEL_FORMAT_RGB_24);
++ }
++ else
++ {
++ // Test for contiguous memory. Sometimes FFMPEG uses scanline buffers larger
++ // than the image width. The extra memory is used in optimized decoding routines.
++ // This leads to a segmented image buffer, not supported by vidl.
++ AVPicture test_frame;
++ avpicture_fill(&test_frame, is_->frame_->data[0], enc->pix_fmt, width, height);
++ if (test_frame.data[1] == is_->frame_->data[1] &&
++ test_frame.data[2] == is_->frame_->data[2] &&
++ test_frame.linesize[0] == is_->frame_->linesize[0] &&
++ test_frame.linesize[1] == is_->frame_->linesize[1] &&
++ test_frame.linesize[2] == is_->frame_->linesize[2] )
++ {
++ is_->cur_frame_ = new vidl_shared_frame(is_->frame_->data[0], width, height, fmt);
++ }
++ // Copy the image into contiguous memory.
++ else
++ {
++ if (!is_->contig_memory_) {
++ int size = avpicture_get_size( enc->pix_fmt, width, height );
++ is_->contig_memory_ = new vil_memory_chunk(size, VIL_PIXEL_FORMAT_BYTE);
++ }
++ avpicture_fill(&test_frame, (uint8_t*)is_->contig_memory_->data(), enc->pix_fmt, width, height);
++ av_picture_copy(&test_frame, (AVPicture*)is_->frame_, enc->pix_fmt, width, height);
++ // use a shared frame because the vil_memory_chunk is reused for each frame
++ is_->cur_frame_ = new vidl_shared_frame(is_->contig_memory_->data(),width,height,fmt);
++ }
++ }
++ }
++
++ return is_->cur_frame_;
++}
++
++
++//: Seek to the given frame number
++// \returns true if successful
++bool
++vidl_ffmpeg_istream::
++seek_frame(unsigned int frame)
++{
++ // Quick return if the stream isn't open.
++ if ( !is_open() ) {
++ return false;
++ }
++
++ // We rely on the initial cast to make sure all the operations happen in int64.
++ int64_t req_timestamp =
++ int64_t(frame + is_->frame_number_offset_)
++ * is_->vid_str_->time_base.den
++ * is_->vid_str_->r_frame_rate.den
++ / is_->vid_str_->time_base.num
++ / is_->vid_str_->r_frame_rate.num
++ + is_->start_time;
++
++ // Seek to a keyframe before the timestamp that we want.
++ int seek = av_seek_frame( is_->fmt_cxt_, is_->vid_index_, req_timestamp, AVSEEK_FLAG_BACKWARD );
++
++ if ( seek < 0 )
++ return false;
++
++ avcodec_flush_buffers( is_->vid_str_->codec );
++
++ // We got to a key frame. Forward until we get to the frame we want.
++ while ( true )
++ {
++ if ( ! advance() ) {
++ return false;
++ }
++ if ( is_->last_dts >= req_timestamp ) {
++ if ( is_->last_dts > req_timestamp ) {
++ vcl_cerr << "Warning: seek went into the future!\n";
++ return false;
++ }
++ return true;
++ }
++ }
++}
++
++#endif // vidl_ffmpeg_istream_v3_txx_
+Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_istream.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_istream.cxx 2009-09-20 23:34:34.000000000 +0200
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_istream.cxx 2011-12-20 11:07:57.000000000 +0100
+@@ -23,8 +23,10 @@
+
+ #if LIBAVFORMAT_BUILD < ((52<<16)+(2<<8)+0) // before ver 52.2.0
+ # include "vidl_ffmpeg_istream_v1.txx"
+-#else
++#elif LIBAVFORMAT_BUILD < ((53<<16)+(0<<8)+0) // before ver 53.0.0
+ # include "vidl_ffmpeg_istream_v2.txx"
++#else
++# include "vidl_ffmpeg_istream_v3.txx"
+ #endif
+
+ #else // VIDL_HAS_FFMPEG
+Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_ostream.cxx 2009-09-20 23:34:34.000000000 +0200
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_ostream.cxx 2011-12-20 11:07:57.000000000 +0100
+@@ -23,8 +23,10 @@
+ # include "vidl_ffmpeg_ostream_v1.txx"
+ #elif LIBAVCODEC_BUILD < ((52<<16)+(10<<8)+0) // before ver 52.10.0
+ # include "vidl_ffmpeg_ostream_v2.txx"
+-#else
++#elif LIBAVCODEC_BUILD < ((53<<16)+(0<<8)+0) // before ver 53.0.0
+ # include "vidl_ffmpeg_ostream_v3.txx"
++#else
++# include "vidl_ffmpeg_ostream_v4.txx"
+ #endif
+
+ #else // VIDL_HAS_FFMPEG
+Index: vxl-1.14.0/core/vidl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/CMakeLists.txt 2011-12-20 11:06:25.000000000 +0100
++++ vxl-1.14.0/core/vidl/CMakeLists.txt 2011-12-20 11:09:20.000000000 +0100
+@@ -75,7 +75,8 @@
+ vidl_ffmpeg_convert.h vidl_ffmpeg_convert.cxx
+ vidl_ffmpeg_istream_v1.txx vidl_ffmpeg_ostream_v1.txx
+ vidl_ffmpeg_istream_v2.txx vidl_ffmpeg_ostream_v2.txx
+- vidl_ffmpeg_ostream_v3.txx
++ vidl_ffmpeg_istream_v3.txx vidl_ffmpeg_ostream_v3.txx
++ vidl_ffmpeg_ostream_v4.txx
+ )
+ # Stub implementation, when ffmeg is not available
+ ELSE( FFMPEG_FOUND )
Added: trunk/packages/vxl/branches/experimental/debian/patches/opencl_unix.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/opencl_unix.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/opencl_unix.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,40 @@
+Description: opencl package on debian was not supported
+Author: Mathieu Malaterre <malat at debian.org>
+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
+===================================================================
+--- 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)
+
+ 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
Added: trunk/packages/vxl/branches/experimental/debian/patches/png15.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/png15.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/png15.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,51 @@
+Description: fix build against newer libpng
+ Remove direct access to png_info struct, and use png_get_* functions
+ instead. This is required with newer versions of libpng (1.5 at least)
+ which no longer support directly accessing said struct.
+Author: Matthew Woehlke <matthew.woehlke at kitware.com>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/650570
+Origin: upstream, http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=34802
+
+--- vxl-1.14.0.orig/core/vil/file_formats/vil_png.cxx
++++ vxl-1.14.0/core/vil/file_formats/vil_png.cxx
+@@ -189,15 +189,15 @@ struct vil_png_structures
+
+ bool alloc_image()
+ {
+- rows = new png_byte* [info_ptr->height];
++ rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)];
+ if (rows == 0)
+ return ok = problem("couldn't allocate space for image");
+
+ unsigned long linesize;
+ if (png_get_bit_depth(png_ptr, info_ptr) == 16)
+- linesize = 2 * info_ptr->width;
++ linesize = 2 * png_get_image_width(png_ptr, info_ptr);
+ else
+- linesize = info_ptr->width;
++ linesize = png_get_image_width(png_ptr, info_ptr);
+
+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
+ linesize *= 2;
+--- vxl-1.14.0.orig/core/vil1/file_formats/vil1_png.cxx
++++ vxl-1.14.0/core/vil1/file_formats/vil1_png.cxx
+@@ -181,15 +181,15 @@ struct vil1_png_structures
+
+ bool alloc_image()
+ {
+- rows = new png_byte* [info_ptr->height];
++ rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)];
+ if (rows == 0)
+ return ok = problem("couldn't allocate space for image");
+
+ unsigned long linesize;
+ if (png_get_bit_depth( png_ptr, info_ptr ) == 16)
+- linesize = 2 * info_ptr->width;
++ linesize = 2 * png_get_image_width(png_ptr, info_ptr);
+ else
+- linesize = info_ptr->width;
++ linesize = png_get_image_width(png_ptr, info_ptr);
+
+ if (png_get_color_type( png_ptr, info_ptr ) == PNG_COLOR_TYPE_GRAY_ALPHA)
+ linesize *= 2;
Added: trunk/packages/vxl/branches/experimental/debian/patches/removedoxyen.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/removedoxyen.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/removedoxyen.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,19 @@
+Description: missing doxy_header.html file
+Author: Dominique Belhachemi <domibel at debian.org>
+Last-Update: 2012-01-23
+Forwarded: no
+Bug: http://bugs.debian.org/656922
+
+Index: vxl-1.14.0/config/cmake/Modules/UseVXL.cmake
+===================================================================
+--- vxl-1.14.0.orig/config/cmake/Modules/UseVXL.cmake 2012-01-23 11:05:18.000000000 +0100
++++ vxl-1.14.0/config/cmake/Modules/UseVXL.cmake 2012-01-23 11:05:27.000000000 +0100
+@@ -132,7 +132,7 @@
+ ENDIF(VXL_PROVIDE_OLD_CACHE_NAMES)
+
+ # Allow use of VXL's cmake/doxygen framework
+- INCLUDE(${VXL_CMAKE_DOXYGEN_DIR}/doxygen.cmake)
++ #INCLUDE(${VXL_CMAKE_DOXYGEN_DIR}/doxygen.cmake)
+
+ IF(VXL_PROVIDE_STANDARD_OPTIONS)
+ # Provide the standard set of VXL CMake options to the project.
Added: trunk/packages/vxl/branches/experimental/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/renamelibs.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/renamelibs.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,87 @@
+Description: debian specific patch to prevent library name clash.
+ Why is everybody using 3 letters for a library name ?
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2011-07-24
+Forwarded: not-needed
+
+Index: vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
++++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-06-01 15:45:00.281752759 +0200
+@@ -44,11 +44,11 @@
+ )
+ AUX_SOURCE_DIRECTORY(Templates osl_sources)
+
+-ADD_LIBRARY(osl ${osl_sources})
+-SET_TARGET_PROPERTIES(osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+-INSTALL_TARGETS(/lib osl)
++ADD_LIBRARY(oxl_osl ${osl_sources})
++SET_TARGET_PROPERTIES(oxl_osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib oxl_osl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
+-TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
++TARGET_LINK_LIBRARIES(oxl_osl vnl_algo vnl vgl vil1 vbl)
+
+ IF (BUILD_EXAMPLES)
+ SUBDIRS(examples)
+Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
++++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 15:45:00.281752759 +0200
+@@ -21,9 +21,10 @@
+ iowin32.c iowin32.h)
+ ENDIF(WIN32)
+
+-ADD_LIBRARY( minizip ${minizip_sources} )
+-SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+-INSTALL_TARGETS( /lib minizip )
++ADD_LIBRARY( b3p_minizip ${minizip_sources} )
++SET_TARGET_PROPERTIES(b3p_minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS( /lib b3p_minizip )
++TARGET_LINK_LIBRARIES(b3p_minizip z)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
+
+ ENDIF(ZLIB_FOUND)
+Index: vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oxl/xcv/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
++++ vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt 2012-06-01 15:45:00.301752758 +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.17.0/contrib/conversions/geometry/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt 2006-05-12 20:45:17.000000000 +0200
++++ vxl-1.17.0/contrib/conversions/geometry/tests/CMakeLists.txt 2012-06-01 15:45:00.301752758 +0200
+@@ -6,7 +6,7 @@
+ ENDIF(BUILD_GEL)
+ IF(BUILD_OXL)
+ INCLUDE_DIRECTORIES(${OXL_INCLUDE_DIR})
+- LINK_LIBRARIES( osl )
++ LINK_LIBRARIES( oxl_osl )
+ ENDIF(BUILD_OXL)
+
+ IF(BUILD_GEL)
+Index: vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/mcal/tests/CMakeLists.txt 2009-12-26 16:50:38.000000000 +0100
++++ vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt 2012-06-01 15:45:00.305752758 +0200
+@@ -6,11 +6,11 @@
+ test_trivial_ca.cxx
+ test_general_ca.cxx
+ )
+-TARGET_LINK_LIBRARIES( mcal_test_all mcal vnl testlib )
++TARGET_LINK_LIBRARIES( mcal_test_all mul_mcal vnl testlib )
+
+ ADD_TEST( mcal_test_pca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_pca)
+ ADD_TEST( mcal_test_trivial_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_trivial_ca)
+ ADD_TEST( mcal_test_general_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_general_ca)
+
+ ADD_EXECUTABLE( mcal_test_include test_include.cxx )
+-TARGET_LINK_LIBRARIES( mcal_test_include mcal )
++TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal )
Added: trunk/packages/vxl/branches/experimental/debian/patches/series
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/series (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/series 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,6 @@
+vxl.soname.patch
+sse2.patch
+renamelibs.patch
+fix_alphacomp.patch
+install_doxygen.patch
+ffmpeg_C99.patch
Added: trunk/packages/vxl/branches/experimental/debian/patches/sse2.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/sse2.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/sse2.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,98 @@
+From: Tom Vercauteren <tom.vercauteren at gmail.com>
+Date: Tue, 19 May 2009 09:29:23 -0400
+Subject: [PATCH] COMP: Use vanilla implementation in rounding function when gcc-xml is used
+
+---
+ Utilities/vxl/core/vnl/vnl_math.h | 19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+Origin: vendor, http://itk.org/gitweb?p=ITK.git;a=commit;h=b106984
+Last-Update: 2012-12-20
+
+Index: vxl-1.17.0/core/vnl/vnl_math.h
+===================================================================
+--- vxl-1.17.0.orig/core/vnl/vnl_math.h 2012-03-16 16:27:06.000000000 +0100
++++ vxl-1.17.0/core/vnl/vnl_math.h 2012-06-01 15:44:56.321752813 +0200
+@@ -44,16 +44,20 @@
+ #endif
+
+ // Figure out when the fast implementation can be used
+-#if VNL_CONFIG_ENABLE_SSE2_ROUNDING
++#if VNL_CONFIG_ENABLE_SSE2_ROUNDING && defined(__SSE2__)
+ # if !VXL_HAS_EMMINTRIN_H
+ # error "Required file emmintrin.h for SSE2 not found"
+ # else
+ # include <emmintrin.h> // sse 2 intrinsics
++# define USE_SSE2_IMPL 1
+ # endif
++#else
++# define USE_SSE2_IMPL 0
+ #endif
+ // Turn on fast impl when using GCC on Intel-based machines with the following exception:
+ // PPC with Mac OS X
+-#if defined(__GNUC__) && (!defined(__APPLE__) || !defined(__ppc__) )
++// GCCXML
++#if defined(__GNUC__) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64)) && (!defined(__APPLE__) || !defined(__ppc__) )
+ # define GCC_USE_FAST_IMPL 1
+ #else
+ # define GCC_USE_FAST_IMPL 0
+@@ -201,7 +205,7 @@
+ // We assume that the rounding mode is not changed from the default
+ // one (or at least that it is always restored to the default one).
+
+-#if VNL_CONFIG_ENABLE_SSE2_ROUNDING // Fast sse2 implementation
++#if USE_SSE2_IMPL // Fast sse2 implementation
+
+ inline int vnl_math_rnd_halfinttoeven(float x)
+ {
+@@ -312,7 +316,7 @@
+ // We also assume that the rounding mode is not changed from the default
+ // one (or at least that it is always restored to the default one).
+
+-#if VNL_CONFIG_ENABLE_SSE2_ROUNDING || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL
++#if USE_SSE2_IMPL || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL
+
+ inline int vnl_math_rnd_halfintup(float x) { return vnl_math_rnd_halfinttoeven(2*x+0.5f)>>1; }
+ inline int vnl_math_rnd_halfintup(double x) { return vnl_math_rnd_halfinttoeven(2*x+0.5)>>1; }
+@@ -345,7 +349,7 @@
+ // We assume that the rounding mode is not changed from the default
+ // one (or at least that it is always restored to the default one).
+
+-#if VNL_CONFIG_ENABLE_SSE2_ROUNDING || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL
++#if USE_SSE2_IMPL || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL
+
+ inline int vnl_math_rnd(float x) { return vnl_math_rnd_halfinttoeven(x); }
+ inline int vnl_math_rnd(double x) { return vnl_math_rnd_halfinttoeven(x); }
+@@ -367,7 +371,7 @@
+ // We also assume that the rounding mode is not changed from the default
+ // one (or at least that it is always restored to the default one).
+
+-#if VNL_CONFIG_ENABLE_SSE2_ROUNDING // Fast sse2 implementation
++#if USE_SSE2_IMPL // Fast sse2 implementation
+
+ inline int vnl_math_floor(float x)
+ {
+@@ -452,7 +456,7 @@
+ // We also assume that the rounding mode is not changed from the default
+ // one (or at least that it is always restored to the default one).
+
+-#if VNL_CONFIG_ENABLE_SSE2_ROUNDING // Fast sse2 implementation
++#if USE_SSE2_IMPL // Fast sse2 implementation
+
+ inline int vnl_math_ceil(float x)
+ {
+Index: vxl-1.17.0/core/vil/vil_round.h
+===================================================================
+--- vxl-1.17.0.orig/core/vil/vil_round.h 2009-05-08 17:47:55.000000000 +0200
++++ vxl-1.17.0/core/vil/vil_round.h 2012-06-01 15:44:56.321752813 +0200
+@@ -25,9 +25,10 @@
+ # endif
+ #endif
+
++#define DEFINED_INTEL (defined(__i386__) || defined(__x86_64__))
+ // Turn on fast impl when using GCC on Intel-based machines with the following exception:
+ // PPC with Mac OS X
+-#if defined(__GNUC__) && (!defined(__APPLE__) || !defined(__ppc__) )
++#if defined(__GNUC__) && DEFINED_INTEL
+ # define GCC_USE_FAST_IMPL 1
+ #else
+ # define GCC_USE_FAST_IMPL 0
Added: trunk/packages/vxl/branches/experimental/debian/patches/video4linux.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/video4linux.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/video4linux.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,62 @@
+Description: videodev interface has been deprecated
+ Applied upstream as:
+ http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=33926
+ and
+ http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=33927
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2011-07-24
+Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=28568330
+Bug: https://sourceforge.net/apps/trac/vxl/ticket/63
+
+Index: vxl-1.14.0/contrib/oul/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/oul/CMakeLists.txt 2011-12-08 15:42:19.000000000 +0100
++++ vxl-1.14.0/contrib/oul/CMakeLists.txt 2011-12-08 15:43:58.000000000 +0100
+@@ -17,6 +17,11 @@
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul ${oul_sources})
+
+ SUBDIRS(ouel ouml)
++# V4L has been removed in 2.6.38
++# commit 88ae7624a6fe890e5a8ca57b25420f66e1389f8b
++CHECK_INCLUDE_FILE("linux/videodev.h" OUL_HAVE_LINUX_VIDEODEV_H)
++IF(OUL_HAVE_LINUX_VIDEODEV_H)
+ IF(CMAKE_SYSTEM MATCHES "Linux*")
+ SUBDIRS(oufgl)
+ ENDIF(CMAKE_SYSTEM MATCHES "Linux*")
++ENDIF(OUL_HAVE_LINUX_VIDEODEV_H)
+Index: vxl-1.14.0/core/vidl/vidl_v4l2_control.h
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_v4l2_control.h 2011-12-08 15:44:12.000000000 +0100
++++ vxl-1.14.0/core/vidl/vidl_v4l2_control.h 2011-12-08 15:44:15.000000000 +0100
+@@ -15,7 +15,6 @@
+ #include <vcl_vector.h>
+
+ extern "C" {
+-#include <asm/types.h> /* for videodev2.h */
+ #include <linux/videodev2.h>
+ };
+
+Index: vxl-1.14.0/core/vidl/vidl_v4l2_device.h
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_v4l2_device.h 2011-12-08 15:44:30.000000000 +0100
++++ vxl-1.14.0/core/vidl/vidl_v4l2_device.h 2011-12-08 15:44:33.000000000 +0100
+@@ -18,7 +18,6 @@
+ #include <vcl_iosfwd.h>
+ #include <vcl_iostream.h>
+ extern "C" {
+-#include <asm/types.h> /* for videodev2.h */
+ #include <linux/videodev2.h>
+ };
+
+Index: vxl-1.14.0/core/vidl/vidl_v4l2_pixel_format.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_v4l2_pixel_format.cxx 2011-12-08 15:44:20.000000000 +0100
++++ vxl-1.14.0/core/vidl/vidl_v4l2_pixel_format.cxx 2011-12-08 15:44:26.000000000 +0100
+@@ -11,7 +11,6 @@
+ #include "vidl_v4l2_pixel_format.h"
+
+ extern "C" {
+-#include <asm/types.h> /* for videodev2.h */
+ #include <sys/time.h>
+ #include <linux/videodev2.h>
+ };
Added: trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,1428 @@
+Description: adding SONAME to library to be public
+Author: Mathieu Malaterre <malat at debian.org>
+Last-Update: 2011-07-24
+
+Index: vxl-1.17.0/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/CMakeLists.txt 2012-06-01 15:44:00.729753582 +0200
++++ vxl-1.17.0/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -12,6 +12,26 @@
+
+ PROJECT(vxl)
+
++SET(VXL_MAJOR_VERSION 1)
++SET(VXL_MINOR_VERSION 14)
++SET(VXL_BUILD_VERSION 0)
++SET(VXL_VERSION
++ "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
++SET(VXL_API_VERSION
++ "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
++SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}
++ VERSION "${VXL_VERSION}"
++ SOVERSION "${VXL_API_VERSION}"
++)
++SET(NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(V3P_NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
++
++
++
+ SET( LIBRARY_OUTPUT_PATH ${vxl_BINARY_DIR}/lib CACHE PATH
+ "Output directory for the vxl libraries" )
+
+Index: vxl-1.17.0/v3p/netlib/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/v3p/netlib/CMakeLists.txt 2012-06-01 15:44:00.737753582 +0200
++++ vxl-1.17.0/v3p/netlib/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -8,6 +8,7 @@
+ )
+
+ ADD_LIBRARY( netlib ${netlib_sources} )
++SET_TARGET_PROPERTIES(netlib PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS( /lib netlib )
+ INSTALL_FILES( /include/vxl/v3p/netlib .h triangle )
+
+@@ -462,6 +463,7 @@
+
+ # Create a netlib library with mangled symbols.
+ ADD_LIBRARY(v3p_netlib ${v3p_netlib_sources})
++SET_TARGET_PROPERTIES(v3p_netlib PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS( /lib v3p_netlib )
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${v3p_netlib_sources})
+ IF(UNIX)
+Index: vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2012-06-01 15:44:00.781753581 +0200
++++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -21,6 +21,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(rsdl ${rsdl_sources})
++SET_TARGET_PROPERTIES(rsdl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib rsdl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rsdl ${rsdl_sources})
+ TARGET_LINK_LIBRARIES( rsdl vnl vbl )
+Index: vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/clsfy/CMakeLists.txt 2012-06-01 15:44:00.821753579 +0200
++++ vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -53,6 +53,7 @@
+ AUX_SOURCE_DIRECTORY(Templates clsfy_sources)
+
+ ADD_LIBRARY(clsfy ${clsfy_sources})
++SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib clsfy)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/clsfy ${clsfy_sources})
+ TARGET_LINK_LIBRARIES(clsfy vpdfl mbl vnl_algo vnl_io vnl vbl vsl vul)
+Index: vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2012-06-01 15:44:00.825753579 +0200
++++ vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -37,6 +37,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vpdfl_sources)
+
+ ADD_LIBRARY(vpdfl ${vpdfl_sources})
++SET_TARGET_PROPERTIES(vpdfl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vpdfl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vpdfl ${vpdfl_sources})
+ TARGET_LINK_LIBRARIES(vpdfl mbl vnl_algo vnl_io vnl vsl vul)
+Index: vxl-1.17.0/v3p/Qv/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2012-06-01 15:44:00.749753580 +0200
++++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -169,6 +169,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY( Qv ${Qv_sources} )
++SET_TARGET_PROPERTIES(Qv PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ TARGET_LINK_LIBRARIES( Qv vcl )
+
+Index: vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/prip/vpyr/CMakeLists.txt 2012-06-01 15:44:00.961753578 +0200
++++ vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -23,6 +23,7 @@
+ )
+
+ ADD_LIBRARY(vpyr ${vpyr_sources})
++SET_TARGET_PROPERTIES(vpyr PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vpyr)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vpyr ${vpyr_sources})
+ TARGET_LINK_LIBRARIES(vpyr vmap)
+Index: vxl-1.17.0/core/vgl/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vgl/algo/CMakeLists.txt 2012-06-01 15:44:01.821753567 +0200
++++ vxl-1.17.0/core/vgl/algo/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -44,6 +44,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources)
+
+ ADD_LIBRARY(vgl_algo ${vgl_algo_sources})
++SET_TARGET_PROPERTIES(vgl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vgl_algo vgl vnl_algo vnl )
+
+ INSTALL_TARGETS(/lib vgl_algo)
+Index: vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-06-01 15:44:01.021753578 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -19,6 +19,7 @@
+ AUX_SOURCE_DIRECTORY(Templates bgrl_sources)
+
+ ADD_LIBRARY(bgrl ${bgrl_sources})
++SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bgrl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
+
+Index: vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-06-01 15:44:01.029753578 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+@@ -17,7 +17,9 @@
+ )
+
+ ADD_LIBRARY(bgrl2 ${bgrl2_sources})
+-
++SET_TARGET_PROPERTIES(bgrl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bgrl2)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl2 ${bgrl2_sources})
+ TARGET_LINK_LIBRARIES( bgrl2 vbl )
+
+ #Algorithms on graphs
+Index: vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vdgl/CMakeLists.txt 2012-06-01 15:44:01.561753569 +0200
++++ vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -23,6 +23,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vdgl_sources)
+
+ ADD_LIBRARY(vdgl ${vdgl_sources})
++SET_TARGET_PROPERTIES(vdgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vdgl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vdgl ${vdgl_sources})
+ TARGET_LINK_LIBRARIES(vdgl vsol vgl_algo vgl vnl_algo vnl vbl_io vbl vsl vul vcl)
+Index: vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2012-06-01 15:44:01.573753570 +0200
++++ vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -8,6 +8,7 @@
+ AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources )
+
+ ADD_LIBRARY( vtol_algo ${vtol_algo_sources} )
++SET_TARGET_PROPERTIES(vtol_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vtol_algo)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol/algo ${vtol_algo_sources})
+ TARGET_LINK_LIBRARIES( vtol_algo vtol vsol vdgl vil_algo vgl_algo vgl vil vbl )
+Index: vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2012-06-01 15:44:01.585753570 +0200
++++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -35,6 +35,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vtol ${vtol_sources})
++SET_TARGET_PROPERTIES(vtol PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vtol)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol ${vtol_sources})
+ TARGET_LINK_LIBRARIES(vtol vdgl vsol vnl vbl vul ${CMAKE_THREAD_LIBS})
+Index: vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2012-06-01 15:44:01.737753568 +0200
++++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -113,6 +113,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(mvl ${mvl_sources})
++SET_TARGET_PROPERTIES(mvl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib mvl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/mvl ${mvl_sources})
+ TARGET_LINK_LIBRARIES(mvl vil1 vnl_algo vnl vbl vgl vgl_algo vul)
+Index: vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/prip/vdtop/CMakeLists.txt 2012-06-01 15:44:00.973753577 +0200
++++ vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -26,6 +26,7 @@
+ )
+
+ ADD_LIBRARY(vdtop ${vdtop_sources})
++SET_TARGET_PROPERTIES(vdtop PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vdtop)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vdtop ${vdtop_sources})
+ TARGET_LINK_LIBRARIES(vdtop vmap vil)
+Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 15:44:01.265753573 +0200
++++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -22,6 +22,8 @@
+ ENDIF(WIN32)
+
+ ADD_LIBRARY( minizip ${minizip_sources} )
++SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS( /lib minizip )
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
+
+ ENDIF(ZLIB_FOUND)
+Index: vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2012-06-01 15:44:01.757753567 +0200
++++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -77,6 +77,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vipl ${vipl_sources})
++SET_TARGET_PROPERTIES(vipl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vipl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vipl ${vipl_sources})
+ TARGET_LINK_LIBRARIES(vipl vil vil1 vnl vbl)
+Index: vxl-1.17.0/core/vul/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2012-06-01 15:44:01.865753566 +0200
++++ vxl-1.17.0/core/vul/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -76,6 +76,7 @@
+
+ ENDIF(APPLE)
+
++SET_TARGET_PROPERTIES(vul PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vul vcl )
+
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul
+Index: vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-06-01 15:44:01.045753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -20,6 +20,7 @@
+ )
+
+ ADD_LIBRARY(bdgl ${bdgl_sources})
++SET_TARGET_PROPERTIES(bdgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bdgl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdgl ${bdgl_sources})
+
+Index: vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-06-01 15:44:01.049753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -10,6 +10,7 @@
+ AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
+
+ ADD_LIBRARY(bdpg ${bdpg_sources})
++SET_TARGET_PROPERTIES(bdpg PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bdpg)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdpg ${bdpg_sources})
+
+Index: vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2012-06-01 15:44:01.057753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -38,6 +38,7 @@
+
+ AUX_SOURCE_DIRECTORY(Templates bgui_sources)
+ ADD_LIBRARY(bgui ${bgui_sources})
++ SET_TARGET_PROPERTIES(bgui PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bgui)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgui ${bgui_sources})
+
+Index: vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-06-01 15:44:01.065753577 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+@@ -60,6 +60,7 @@
+ )
+
+ ADD_LIBRARY(bgui3d ${bgui3d_sources})
++SET_TARGET_PROPERTIES(bgui3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ SET(BGUI3D_FOUND "YES" CACHE INTERNAL "Was bgui3d successfully built?" )
+ TARGET_LINK_LIBRARIES(bgui3d ${COIN3D_LIBRARY} vgui vpgl vnl_algo vnl vgl_algo vgl vul)
+
+Index: vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-06-01 15:44:01.077753577 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -31,6 +31,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bil_algo_sources)
+
+ ADD_LIBRARY( bil_algo ${bil_algo_sources} )
++SET_TARGET_PROPERTIES(bil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bil_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil/algo ${bil_algo_sources})
+
+ TARGET_LINK_LIBRARIES( bil_algo vil_algo vil vnl_algo vnl vgl_algo vgl vbl vsol)
+
+Index: vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2012-06-01 15:44:01.085753577 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -11,6 +11,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bil_sources)
+
+ ADD_LIBRARY(bil ${bil_sources})
++SET_TARGET_PROPERTIES(bil PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bil)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil ${bil_sources})
+
+ TARGET_LINK_LIBRARIES(bil vil vil_io vsl vidl)
+
+Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-06-01 15:44:01.097753577 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -13,6 +13,9 @@
+ )
+
+ ADD_LIBRARY( bmsh3d_algo ${bmsh3d_algo_sources})
++SET_TARGET_PROPERTIES(bmsh3d_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bmsh3d_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bmsh3d/algo ${bmsh3d_algo_sources})
+ TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d rply vgl vnl vul)
+
+ IF( BUILD_TESTING )
+Index: vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-06-01 15:44:01.117753575 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -5,6 +5,7 @@
+ )
+
+ ADD_LIBRARY( bnl_algo ${bnl_algo_sources} )
++SET_TARGET_PROPERTIES(bnl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bnl_algo)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl/algo ${bnl_algo_sources})
+ TARGET_LINK_LIBRARIES( bnl_algo vnl )
+Index: vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2012-06-01 15:44:01.125753575 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -8,6 +8,7 @@
+ )
+
+ ADD_LIBRARY(bnl ${bnl_sources})
++SET_TARGET_PROPERTIES(bnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bnl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl ${bnl_sources})
+
+Index: vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2012-06-01 15:44:01.133753575 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -24,6 +24,7 @@
+ AUX_SOURCE_DIRECTORY(Templates bsol_sources)
+
+ ADD_LIBRARY(bsol ${bsol_sources})
++SET_TARGET_PROPERTIES(bsol PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bsol)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsol ${bsol_sources})
+ TARGET_LINK_LIBRARIES(bsol vsol vgl_algo vgl vnl vbl)
+Index: vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2012-06-01 15:44:01.149753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -62,6 +62,7 @@
+
+ AUX_SOURCE_DIRECTORY(Templates bsta_sources)
+ ADD_LIBRARY(bsta ${bsta_sources})
++SET_TARGET_PROPERTIES(bsta PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bsta)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/bsta ${bsta_sources})
+
+Index: vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-06-01 15:44:01.153753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -8,6 +8,9 @@
+ )
+
+ ADD_LIBRARY( bsta_vis ${bsta_vis_sources} )
++SET_TARGET_PROPERTIES(bsta_vis PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bsta_vis)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsta/vis ${bsta_vis_sources})
+
+ TARGET_LINK_LIBRARIES( bsta_vis bsta bsvg vnl )
+
+Index: vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2012-06-01 15:44:01.165753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -19,6 +19,7 @@
+ )
+
+ ADD_LIBRARY(btol ${btol_sources})
++SET_TARGET_PROPERTIES(btol PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib btol)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btol ${btol_sources})
+
+Index: vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2012-06-01 15:44:01.173753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -26,6 +26,7 @@
+ AUX_SOURCE_DIRECTORY(Templates bugl_sources)
+
+ ADD_LIBRARY(bugl ${bugl_sources})
++SET_TARGET_PROPERTIES(bugl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bugl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bugl ${bugl_sources})
+ TARGET_LINK_LIBRARIES(bugl vnl vgl_algo vgl vbl)
+Index: vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-06-01 15:44:01.185753574 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -38,6 +38,7 @@
+
+ #Create BVGL library
+ ADD_LIBRARY(bvgl ${bvgl_sources})
++SET_TARGET_PROPERTIES(bvgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bvgl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvgl ${bvgl_sources})
+ TARGET_LINK_LIBRARIES(bvgl vsol vgl_algo vgl_io vgl vnl_algo vnl vil vbl)
+Index: vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-06-01 15:44:01.205753574 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -32,6 +32,9 @@
+ ENDIF(ECW_FOUND)
+
+ ADD_LIBRARY(bwm_algo ${bwm_algo_sources})
++SET_TARGET_PROPERTIES(bwm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bwm_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bwm/algo ${bwm_algo})
+
+ TARGET_LINK_LIBRARIES( bwm_algo bwm sdet vtol vil vil_algo vgl vgl_algo vnl vnl_algo vsol vpgl vpgl_algo vpgl_file_formats bgui brip vdgl bsta vgui vul vcl shapelib )
+
+Index: vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2012-06-01 15:44:01.217753575 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+@@ -27,6 +27,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bxml_sources)
+
+ ADD_LIBRARY(bxml ${bxml_sources})
++SET_TARGET_PROPERTIES(bxml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bxml)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bxml ${bxml_sources})
+
+ TARGET_LINK_LIBRARIES( bxml vbl_io vul vbl )
+ IF(EXPAT_FOUND)
+Index: vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-06-01 15:44:01.237753575 +0200
++++ vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -23,6 +23,9 @@
+ ENDIF (NETLIB_FOUND)
+
+ ADD_LIBRARY( imesh_algo ${imesh_algo_sources} )
++SET_TARGET_PROPERTIES(imesh_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib imesh_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/imesh/algo ${imesh_algo_sources})
+
+ IF(NETLIB_FOUND)
+
+Index: vxl-1.17.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2012-06-01 15:44:01.285753574 +0200
++++ vxl-1.17.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -14,6 +14,9 @@
+ AUX_SOURCE_DIRECTORY(processes brip_pro_sources)
+
+ ADD_LIBRARY(brip_pro ${brip_pro_sources})
++SET_TARGET_PROPERTIES(brip_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib brip_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/brip_pro ${brip_pro_sources})
+ TARGET_LINK_LIBRARIES(brip_pro bprb brdb brip vil_pro vil vsl)
+
+ IF( BUILD_TESTING )
+Index: vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-06-01 15:44:01.297753574 +0200
++++ vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -14,6 +14,9 @@
+ AUX_SOURCE_DIRECTORY(processes bvgl_pro_sources)
+
+ ADD_LIBRARY(bvgl_pro ${bvgl_pro_sources})
++SET_TARGET_PROPERTIES(bvgl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvgl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/bvgl_pro ${bvgl_pro_sources})
+
+ TARGET_LINK_LIBRARIES(bvgl_pro bprb vil_pro bvgl vil vil_io)
+
+Index: vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-01 15:44:01.329753572 +0200
++++ vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -16,6 +16,9 @@
+ AUX_SOURCE_DIRECTORY(processes vil_pro_sources)
+
+ ADD_LIBRARY(vil_pro ${vil_pro_sources})
++SET_TARGET_PROPERTIES(vil_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vil_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vil_pro ${vil_pro_sources})
+
+ TARGET_LINK_LIBRARIES(vil_pro bbas_pro bprb bil bil_algo vil_algo vil_io vil vnl vul vsl)
+
+Index: vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-06-01 15:44:01.361753573 +0200
++++ vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -16,6 +16,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bmdl_sources)
+
+ ADD_LIBRARY(bmdl ${bmdl_sources})
++SET_TARGET_PROPERTIES(bmdl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bmdl)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl ${bmdl_sources})
+
+ TARGET_LINK_LIBRARIES(bmdl vil_algo imesh vgl_algo vgl vnl vil)
+
+Index: vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-06-01 15:44:01.369753573 +0200
++++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -31,6 +31,9 @@
+ AUX_SOURCE_DIRECTORY(processes bmdl_pro_sources)
+
+ ADD_LIBRARY(bmdl_pro ${bmdl_pro_sources})
++ SET_TARGET_PROPERTIES(bmdl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++ INSTALL_TARGETS(/lib bmdl_pro)
++ 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
+ vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
+Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-06-01 15:44:01.377753573 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -20,6 +20,9 @@
+ )
+
+ ADD_LIBRARY(boxm_algo ${boxm_algo_sources})
++SET_TARGET_PROPERTIES(boxm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib boxm_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/algo ${boxm_algo_sources})
+
+ IF( BUILD_TESTING )
+ SUBDIRS(tests)
+Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-06-01 15:44:01.381753573 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -19,6 +19,9 @@
+ AUX_SOURCE_DIRECTORY(processes boxm_algo_pro_sources)
+
+ ADD_LIBRARY(boxm_algo_pro ${boxm_algo_pro_sources} )
++ SET_TARGET_PROPERTIES(boxm_algo_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++ INSTALL_TARGETS(/lib boxm_algo_pro)
++ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/algo/pro ${boxm_algo_pro_sources})
+
+ TARGET_LINK_LIBRARIES(boxm_algo_pro boxm_algo boxm boxm_sample boxm_util boct bprb brdb bsta_pro vil_pro bsta vpgl_pro vpgl vpgl_algo vil vsol vgl brip vcl rply)
+ # Need bsta_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<bsta_histogram_base> >
+Index: vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2012-06-01 15:44:01.409753571 +0200
++++ vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+@@ -40,6 +40,7 @@
+ AUX_SOURCE_DIRECTORY(Templates brip_sources)
+
+ ADD_LIBRARY(brip ${brip_sources})
++SET_TARGET_PROPERTIES(brip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib brip)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/brip ${brip_sources})
+
+Index: vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-06-01 15:44:01.437753572 +0200
++++ vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+@@ -19,6 +19,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bvpl_sources)
+
+ ADD_LIBRARY(bvpl ${bvpl_sources})
++SET_TARGET_PROPERTIES(bvpl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl ${bvpl_sources})
+
+ TARGET_LINK_LIBRARIES(bvpl bvpl_kernels bvpl_functors bvxm_grid bdgl bsta vnl vnl_io vil_algo vgl vpl vul vbl_io vsl vbl)
+
+Index: vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-06-01 15:44:01.485753570 +0200
++++ vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+@@ -12,6 +12,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bvxm_algo_sources)
+
+ ADD_LIBRARY( bvxm_algo ${bvxm_algo_sources})
++SET_TARGET_PROPERTIES(bvxm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvxm_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/algo ${bgrl_sources})
+
+ TARGET_LINK_LIBRARIES( bvxm_algo bsta bvxm_grid_io boxm_util vnl vgl)
+
+Index: vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2012-06-01 15:44:01.513753571 +0200
++++ vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+@@ -55,6 +55,7 @@
+ AUX_SOURCE_DIRECTORY(Templates sdet_sources)
+
+ ADD_LIBRARY(sdet ${sdet_sources})
++SET_TARGET_PROPERTIES(sdet PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib sdet)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/sdet ${sdet_sources})
+
+Index: vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2012-06-01 15:44:01.521753571 +0200
++++ vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+@@ -33,6 +33,7 @@
+ )
+
+ ADD_LIBRARY(segv ${segv_sources})
++SET_TARGET_PROPERTIES(segv PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib segv)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/segv ${segv_sources})
+
+Index: vxl-1.17.0/contrib/gel/geml/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/geml/CMakeLists.txt 2012-06-01 15:44:01.593753570 +0200
++++ vxl-1.17.0/contrib/gel/geml/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+@@ -12,6 +12,7 @@
+ )
+
+ ADD_LIBRARY(geml ${geml_sources})
++SET_TARGET_PROPERTIES(geml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib geml)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/geml ${geml_sources})
+ TARGET_LINK_LIBRARIES(geml vil1 vnl)
+Index: vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2012-06-01 15:44:01.601753570 +0200
++++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+@@ -33,6 +33,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(gevd ${gevd_sources})
++SET_TARGET_PROPERTIES(gevd PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib gevd)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gevd ${gevd_sources})
+ TARGET_LINK_LIBRARIES(gevd vtol vsol vdgl vil1 vil vnl vgl vbl vul)
+Index: vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/gkll/CMakeLists.txt 2012-06-01 15:44:01.609753570 +0200
++++ vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -20,6 +20,7 @@
+ ENDIF(BUILD_OXL)
+
+ ADD_LIBRARY(gkll ${gkll_sources})
++SET_TARGET_PROPERTIES(gkll PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib gkll)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gkll ${gkll_sources})
+
+Index: vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/gmvl/CMakeLists.txt 2012-06-01 15:44:01.617753568 +0200
++++ vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -21,6 +21,7 @@
+ AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
+
+ ADD_LIBRARY(gmvl ${gmvl_sources})
++SET_TARGET_PROPERTIES(gmvl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib gmvl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gmvl ${gmvl_sources})
+ TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
+Index: vxl-1.17.0/contrib/gel/gst/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2012-06-01 15:44:01.621753568 +0200
++++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -17,6 +17,7 @@
+ AUX_SOURCE_DIRECTORY(Templates gst_sources)
+
+ ADD_LIBRARY(gst ${gst_sources})
++SET_TARGET_PROPERTIES(gst PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib gst)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
+
+Index: vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/gtrl/CMakeLists.txt 2012-06-01 15:44:01.629753568 +0200
++++ vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -25,6 +25,7 @@
+ ENDIF(NETLIB_FOUND)
+
+ ADD_LIBRARY(gtrl ${gtrl_sources})
++SET_TARGET_PROPERTIES(gtrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib gtrl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gtrl ${gtrl_sources})
+
+Index: vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vgel/CMakeLists.txt 2012-06-01 15:44:01.673753569 +0200
++++ vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -20,6 +20,7 @@
+ ENDIF(BUILD_OXL)
+
+ ADD_LIBRARY(vgel ${vgel_sources})
++SET_TARGET_PROPERTIES(vgel PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vgel)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel ${vgel_sources})
+
+Index: vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2012-06-01 15:44:01.685753568 +0200
++++ vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -15,6 +15,7 @@
+ )
+
+ ADD_LIBRARY(vgel_kl ${vgel_kl_sources})
++SET_TARGET_PROPERTIES(vgel_kl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vgel_kl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
+
+Index: vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vifa/CMakeLists.txt 2012-06-01 15:44:01.697753567 +0200
++++ vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -31,6 +31,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vifa_sources)
+
+ ADD_LIBRARY(vifa ${vifa_sources})
++SET_TARGET_PROPERTIES(vifa PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vifa)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vifa ${vifa_sources})
+ TARGET_LINK_LIBRARIES(vifa gevd vtol vsol vdgl vnl vgl vbl vul vil vcl)
+Index: vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-06-01 15:44:01.705753567 +0200
++++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -37,6 +37,7 @@
+
+
+ ADD_LIBRARY(vmal ${vmal_sources})
++SET_TARGET_PROPERTIES(vmal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vmal)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
+
+Index: vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vsol/CMakeLists.txt 2012-06-01 15:44:01.713753567 +0200
++++ vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -63,6 +63,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vsol_sources)
+
+ ADD_LIBRARY(vsol ${vsol_sources})
++SET_TARGET_PROPERTIES(vsol PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vsol)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsol ${vsol_sources})
+ TARGET_LINK_LIBRARIES(vsol vgl_algo vgl_io vgl vnl vbl_io vbl vsl vul vcl)
+Index: vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/vsrl/CMakeLists.txt 2012-06-01 15:44:01.729753568 +0200
++++ vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -60,6 +60,7 @@
+ ENDIF (HAS_VGUI)
+
+ ADD_LIBRARY(vsrl ${vsrl_sources})
++SET_TARGET_PROPERTIES(vsrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vsrl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsrl ${vsrl_sources})
+
+Index: vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/ipts/CMakeLists.txt 2012-06-01 15:44:00.837753579 +0200
++++ vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+@@ -16,6 +16,7 @@
+ )
+
+ ADD_LIBRARY(ipts ${ipts_sources})
++SET_TARGET_PROPERTIES(ipts PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib ipts)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/ipts ${ipts_sources})
+ TARGET_LINK_LIBRARIES(ipts vimt_algo vimt vgl vil_algo vil)
+Index: vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2012-06-01 15:44:00.845753579 +0200
++++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -121,6 +121,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(mbl ${mbl_sources})
++SET_TARGET_PROPERTIES(mbl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl)
+
+ INSTALL_TARGETS(/lib mbl)
+Index: vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2012-06-01 15:44:00.865753580 +0200
++++ vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -15,6 +15,7 @@
+ AUX_SOURCE_DIRECTORY(Templates mil_algo_sources)
+
+ ADD_LIBRARY(mil_algo ${mil_algo_sources})
++SET_TARGET_PROPERTIES(mil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib mil_algo)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil/algo ${mil_algo_sources})
+ TARGET_LINK_LIBRARIES(mil_algo mil mbl vnl vsl)
+Index: vxl-1.17.0/contrib/mul/mil/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/mil/CMakeLists.txt 2012-06-01 15:44:00.873753580 +0200
++++ vxl-1.17.0/contrib/mul/mil/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -37,6 +37,7 @@
+ AUX_SOURCE_DIRECTORY(Templates mil_sources)
+
+ ADD_LIBRARY(mil ${mil_sources})
++SET_TARGET_PROPERTIES(mil PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib mil)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil ${mil_sources})
+ TARGET_LINK_LIBRARIES(mil mbl vimt vnl vbl_io vgl vil1 vbl vsl)
+Index: vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/mil3d/CMakeLists.txt 2012-06-01 15:44:00.881753580 +0200
++++ vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -20,6 +20,7 @@
+ AUX_SOURCE_DIRECTORY(Templates mil3d_sources)
+
+ ADD_LIBRARY(mil3d ${mil3d_sources})
++SET_TARGET_PROPERTIES(mil3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib mil3d)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil3d ${mil3d_sources})
+ TARGET_LINK_LIBRARIES(mil3d mil vbl_io vnl_io vnl vgl vbl vsl)
+Index: vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/mvl2/CMakeLists.txt 2012-06-01 15:44:00.893753578 +0200
++++ vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -52,6 +52,7 @@
+ ENDIF (AVIFILE_FOUND)
+
+ ADD_LIBRARY(mvl2 ${mvl2_sources})
++SET_TARGET_PROPERTIES(mvl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib mvl2)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mvl2 ${mvl2_sources})
+ TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
+Index: vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2012-06-01 15:44:00.897753578 +0200
++++ vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -49,6 +49,7 @@
+ AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
+
+ ADD_LIBRARY(pdf1d ${pdf1d_sources})
++SET_TARGET_PROPERTIES(pdf1d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib pdf1d)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/pdf1d ${pdf1d_sources})
+ TARGET_LINK_LIBRARIES( pdf1d mbl vbl vnl_io vnl vsl )
+Index: vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2012-06-01 15:44:00.905753578 +0200
++++ vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -36,6 +36,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
+
+ ADD_LIBRARY(vil3d_algo ${vil3d_algo_sources})
++SET_TARGET_PROPERTIES(vil3d_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vil3d_algo)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/algo ${vil3d_algo_sources})
+ TARGET_LINK_LIBRARIES( vil3d_algo vil3d vil_algo vil vnl vgl )
+Index: vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/vil3d/CMakeLists.txt 2012-06-01 15:44:00.909753578 +0200
++++ vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -49,6 +49,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
+
+ ADD_LIBRARY(vil3d ${vil3d_sources})
++SET_TARGET_PROPERTIES(vil3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vil3d vil vul vsl vcl vnl )
+
+ INSTALL_TARGETS(/lib vil3d)
+Index: vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2012-06-01 15:44:00.917753578 +0200
++++ vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -7,6 +7,7 @@
+ )
+
+ ADD_LIBRARY(vil3d_io ${vil3d_io_sources})
++SET_TARGET_PROPERTIES(vil3d_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vil3d_io)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/io ${vil3d_io_sources})
+ TARGET_LINK_LIBRARIES( vil3d_io vil3d vil_io )
+Index: vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2012-06-01 15:44:00.929753579 +0200
++++ vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -11,6 +11,7 @@
+ )
+
+ ADD_LIBRARY(vimt_algo ${vimt_algo_sources})
++SET_TARGET_PROPERTIES(vimt_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vimt_algo)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt/algo ${vimt_algo_sources})
+ TARGET_LINK_LIBRARIES( vimt_algo vimt vil_algo vgl vcl )
+Index: vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/vimt/CMakeLists.txt 2012-06-01 15:44:00.937753579 +0200
++++ vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -35,6 +35,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vimt_sources)
+
+ ADD_LIBRARY(vimt ${vimt_sources})
++SET_TARGET_PROPERTIES(vimt PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vimt)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt ${vimt_sources})
+ TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil_io vil )
+Index: vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2012-06-01 15:44:00.953753579 +0200
++++ vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -34,6 +34,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
+
+ ADD_LIBRARY(vimt3d ${vimt3d_sources})
++SET_TARGET_PROPERTIES(vimt3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vimt3d)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt3d ${vimt3d_sources})
+ TARGET_LINK_LIBRARIES(vimt3d vil3d_algo vil3d_io vil3d vimt mbl vnl_algo vgl vnl_io vnl vil vsl vul)
+Index: vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oul/ouel/CMakeLists.txt 2012-06-01 15:44:01.785753566 +0200
++++ vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -11,6 +11,7 @@
+ )
+
+ ADD_LIBRARY(ouel ${ouel_sources})
++SET_TARGET_PROPERTIES(ouel PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib ouel)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouel ${ouel_sources})
+ TARGET_LINK_LIBRARIES( ouel vnl_algo vnl )
+Index: vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oul/oufgl/CMakeLists.txt 2012-06-01 15:44:01.797753567 +0200
++++ vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -15,6 +15,7 @@
+ )
+
+ ADD_LIBRARY(oufgl ${oufgl_sources})
++SET_TARGET_PROPERTIES(oufgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib oufgl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/oufgl ${oufgl_sources})
+ TARGET_LINK_LIBRARIES( oufgl vil vil1 rt)
+Index: vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oul/ouml/CMakeLists.txt 2012-06-01 15:44:01.809753567 +0200
++++ vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -20,6 +20,7 @@
+ )
+
+ ADD_LIBRARY(ouml ${ouml_sources})
++SET_TARGET_PROPERTIES(ouml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib ouml)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouml ${ouml_sources})
+ TARGET_LINK_LIBRARIES( ouml vgl vnl_algo vnl_io vnl vil1 vsl vpl )
+Index: vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2012-06-01 15:44:01.745753568 +0200
++++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+@@ -45,6 +45,7 @@
+ AUX_SOURCE_DIRECTORY(Templates osl_sources)
+
+ ADD_LIBRARY(osl ${osl_sources})
++SET_TARGET_PROPERTIES(osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib osl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
+ TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
+Index: vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/prip/vmap/CMakeLists.txt 2012-06-01 15:44:00.985753577 +0200
++++ vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -28,6 +28,7 @@
+ )
+
+ ADD_LIBRARY(vmap ${vmap_sources})
++SET_TARGET_PROPERTIES(vmap PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vmap)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vmap ${vmap_sources})
+ TARGET_LINK_LIBRARIES(vmap vcl)
+Index: vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2012-06-01 15:44:00.789753581 +0200
++++ vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -161,6 +161,7 @@
+ AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
+
+ ADD_LIBRARY( rgrl ${rgrl_sources} )
++SET_TARGET_PROPERTIES(rgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib rgrl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rgrl ${rgrl_sources})
+ TARGET_LINK_LIBRARIES( rgrl rrel rsdl vil3d vil vnl_algo vnl vbl vul)
+Index: vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2012-06-01 15:44:00.797753581 +0200
++++ vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -84,6 +84,7 @@
+ )
+
+ ADD_LIBRARY(rgtl ${rgtl_sources})
++SET_TARGET_PROPERTIES(rgtl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(rgtl vnl_algo vnl vcl)
+
+ INSTALL_TARGETS(/lib rgtl)
+Index: vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2012-06-01 15:44:00.813753580 +0200
++++ vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -41,6 +41,7 @@
+ )
+
+ ADD_LIBRARY(rtvl ${rtvl_sources})
++SET_TARGET_PROPERTIES(rtvl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(rtvl rgtl vnl_algo vnl)
+
+ INSTALL_TARGETS(/lib rtvl)
+Index: vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2012-06-01 15:44:01.769753566 +0200
++++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -52,6 +52,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vepl ${vepl_sources})
++SET_TARGET_PROPERTIES(vepl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vepl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl ${vepl_sources})
+ TARGET_LINK_LIBRARIES(vepl vipl vil ${CMAKE_THREAD_LIBS})
+Index: vxl-1.17.0/core/testlib/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/testlib/CMakeLists.txt 2012-06-01 15:44:01.881753566 +0200
++++ vxl-1.17.0/core/testlib/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -29,6 +29,7 @@
+ )
+
+ ADD_LIBRARY( testlib ${testlib_sources} )
++SET_TARGET_PROPERTIES(testlib PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( testlib vcl )
+ INSTALL_TARGETS( /lib testlib)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
+Index: vxl-1.17.0/core/vbl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vbl/CMakeLists.txt 2012-06-01 15:44:01.889753566 +0200
++++ vxl-1.17.0/core/vbl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -42,6 +42,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vbl_sources)
+
+ ADD_LIBRARY(vbl ${vbl_sources})
++SET_TARGET_PROPERTIES(vbl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vbl vcl )
+
+ INSTALL_TARGETS(/lib vbl)
+Index: vxl-1.17.0/core/vbl/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vbl/io/CMakeLists.txt 2012-06-01 15:44:01.897753566 +0200
++++ vxl-1.17.0/core/vbl/io/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -17,6 +17,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
+
+ ADD_LIBRARY(vbl_io ${vbl_io_sources})
++SET_TARGET_PROPERTIES(vbl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vbl_io vbl vsl )
+
+ INSTALL_TARGETS(/lib vbl_io)
+Index: vxl-1.17.0/core/vcsl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vcsl/CMakeLists.txt 2012-06-01 15:44:01.909753564 +0200
++++ vxl-1.17.0/core/vcsl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -63,6 +63,7 @@
+ AUX_SOURCE_DIRECTORY( Templates vcsl_sources )
+
+ ADD_LIBRARY( vcsl ${vcsl_sources} )
++ SET_TARGET_PROPERTIES(vcsl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vcsl vnl vbl )
+
+ INSTALL_TARGETS(/lib vcsl)
+Index: vxl-1.17.0/core/vgl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vgl/CMakeLists.txt 2012-06-01 15:44:01.829753566 +0200
++++ vxl-1.17.0/core/vgl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -69,6 +69,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vgl_sources)
+
+ ADD_LIBRARY(vgl ${vgl_sources})
++SET_TARGET_PROPERTIES(vgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vgl vcl )
+ doxygen_add_library(core/vgl
+ #DEPENDS core/vsl core/vnl
+Index: vxl-1.17.0/core/vgl/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vgl/io/CMakeLists.txt 2012-06-01 15:44:01.841753565 +0200
++++ vxl-1.17.0/core/vgl/io/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+@@ -29,6 +29,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
+
+ ADD_LIBRARY(vgl_io ${vgl_io_sources})
++SET_TARGET_PROPERTIES(vgl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vgl_io vgl vsl )
+
+ INSTALL_TARGETS(/lib vgl_io)
+Index: vxl-1.17.0/core/vgui/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2012-06-01 15:44:01.917753564 +0200
++++ vxl-1.17.0/core/vgui/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -518,6 +518,7 @@
+ )
+
+ ADD_LIBRARY(vgui ${vgui_sources})
++SET_TARGET_PROPERTIES(vgui PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vgui)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vgui ${vgui_sources})
+ SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
+Index: vxl-1.17.0/core/vgui/wx/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vgui/wx/CMakeLists.txt 2012-06-01 15:44:01.929753564 +0200
++++ vxl-1.17.0/core/vgui/wx/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -24,6 +24,7 @@
+ )
+
+ ADD_LIBRARY(vgui_wx ${vgui_wx_sources})
++SET_TARGET_PROPERTIES(vgui_wx PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(vgui_wx vgui ${wxWidgets_LIBRARIES})
+
+ IF (BUILD_TESTING)
+Index: vxl-1.17.0/core/vidl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2012-06-01 15:44:01.937753565 +0200
++++ vxl-1.17.0/core/vidl/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -128,6 +128,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vidl_sources)
+
+ ADD_LIBRARY(vidl ${vidl_sources})
++SET_TARGET_PROPERTIES(vidl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vidl)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl ${vidl_sources})
+
+Index: vxl-1.17.0/core/vidl/gui/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vidl/gui/CMakeLists.txt 2012-06-01 15:44:01.945753565 +0200
++++ vxl-1.17.0/core/vidl/gui/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -12,6 +12,7 @@
+ )
+
+ ADD_LIBRARY(vidl_gui ${vidl_gui_sources})
++SET_TARGET_PROPERTIES(vidl_gui PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vidl_gui)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl/gui ${vidl_gui_sources})
+ TARGET_LINK_LIBRARIES( vidl_gui vidl vgui vil )
+Index: vxl-1.17.0/core/vil/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vil/algo/CMakeLists.txt 2012-06-01 15:44:01.961753565 +0200
++++ vxl-1.17.0/core/vil/algo/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -57,6 +57,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
+
+ ADD_LIBRARY(vil_algo ${vil_algo_sources})
++SET_TARGET_PROPERTIES(vil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ TARGET_LINK_LIBRARIES( vil_algo vil vnl_algo vnl vcl )
+
+Index: vxl-1.17.0/core/vil/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2012-06-01 15:44:01.969753565 +0200
++++ vxl-1.17.0/core/vil/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -340,6 +340,7 @@
+ TARGET_LINK_LIBRARIES( vil nsl vil_network socket )
+ ENDIF (SOLARIS)
+
++SET_TARGET_PROPERTIES(vil PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil
+ ${vil_sources}
+ ${vil_network_sources}
+Index: vxl-1.17.0/core/vil/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2012-06-01 15:44:01.977753563 +0200
++++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -15,6 +15,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vil_io ${vil_io_sources})
++SET_TARGET_PROPERTIES(vil_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vil_io vil vsl )
+
+ INSTALL_TARGETS(/lib vil_io)
+Index: vxl-1.17.0/core/vil1/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2012-06-01 15:44:01.985753563 +0200
++++ vxl-1.17.0/core/vil1/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -169,6 +169,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vil1 ${vil1_sources})
++SET_TARGET_PROPERTIES(vil1 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vil1)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1 ${vil1_sources})
+
+Index: vxl-1.17.0/core/vil1/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vil1/io/CMakeLists.txt 2012-06-01 15:44:01.997753563 +0200
++++ vxl-1.17.0/core/vil1/io/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -15,6 +15,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
+
+ ADD_LIBRARY(vil1_io ${vil1_io_sources})
++SET_TARGET_PROPERTIES(vil1_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vil1_io vil1 vsl )
+ INSTALL_TARGETS(/lib vil1_io)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
+Index: vxl-1.17.0/core/vnl/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vnl/algo/CMakeLists.txt 2012-06-01 15:44:02.009753564 +0200
++++ vxl-1.17.0/core/vnl/algo/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -102,6 +102,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
+
+ ADD_LIBRARY( vnl_algo ${vnl_algo_sources})
++ SET_TARGET_PROPERTIES(vnl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vnl_algo ${NETLIB_LIBRARIES} vnl )
+
+ INSTALL_TARGETS(/lib vnl_algo)
+Index: vxl-1.17.0/core/vnl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2012-06-01 15:44:02.021753564 +0200
++++ vxl-1.17.0/core/vnl/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -264,6 +264,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vnl ${vnl_sources})
++SET_TARGET_PROPERTIES(vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vnl vcl )
+
+ INSTALL_TARGETS(/lib vnl)
+Index: vxl-1.17.0/core/vnl/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2012-06-01 15:44:02.029753564 +0200
++++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -26,6 +26,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vnl_io ${vnl_io_sources} )
++SET_TARGET_PROPERTIES(vnl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vnl_io vnl vsl )
+
+ INSTALL_TARGETS(/lib vnl_io)
+Index: vxl-1.17.0/core/vnl/xio/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vnl/xio/CMakeLists.txt 2012-06-01 15:44:02.041753564 +0200
++++ vxl-1.17.0/core/vnl/xio/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -11,6 +11,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
+
+ ADD_LIBRARY(vnl_xio ${vnl_xio_sources} )
++SET_TARGET_PROPERTIES(vnl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vnl_xio vnl vsl )
+
+ INSTALL_TARGETS(/lib vnl_xio)
+Index: vxl-1.17.0/core/vpdl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vpdl/CMakeLists.txt 2012-06-01 15:44:02.053753562 +0200
++++ vxl-1.17.0/core/vpdl/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+@@ -48,6 +48,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
+
+ ADD_LIBRARY(vpdl ${vpdl_sources})
++SET_TARGET_PROPERTIES(vpdl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vpdl vnl_algo vnl )
+
+ INSTALL_TARGETS(/lib vpdl)
+Index: vxl-1.17.0/core/vsl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vsl/CMakeLists.txt 2012-06-01 15:44:02.073753562 +0200
++++ vxl-1.17.0/core/vsl/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -36,6 +36,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vsl_sources)
+
+ ADD_LIBRARY(vsl ${vsl_sources})
++SET_TARGET_PROPERTIES(vsl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vsl vcl )
+
+ INSTALL_TARGETS(/lib vsl)
+Index: vxl-1.17.0/core/vul/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vul/io/CMakeLists.txt 2012-06-01 15:44:01.873753566 +0200
++++ vxl-1.17.0/core/vul/io/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -5,6 +5,7 @@
+ )
+
+ ADD_LIBRARY(vul_io ${vul_io_sources})
++SET_TARGET_PROPERTIES(vul_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(vul_io vul vsl)
+
+ INSTALL_TARGETS(/lib vul_io)
+Index: vxl-1.17.0/v3p/dcmtk/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/v3p/dcmtk/CMakeLists.txt 2012-06-01 15:44:00.757753580 +0200
++++ vxl-1.17.0/v3p/dcmtk/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -453,6 +453,7 @@
+ TARGET_LINK_LIBRARIES( dcmtk ${ZLIB_LIBRARIES} )
+ ENDIF( DCMTK_HAVE_ZLIB )
+
++SET_TARGET_PROPERTIES(dcmtk PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS( /lib dcmtk )
+
+ IF( BUILD_TESTING )
+Index: vxl-1.17.0/vcl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/vcl/CMakeLists.txt 2012-06-01 15:44:02.085753563 +0200
++++ vxl-1.17.0/vcl/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -360,6 +360,7 @@
+ #AUX_SOURCE_DIRECTORY(Templates vcl_sources)
+
+ ADD_LIBRARY(vcl ${vcl_sources})
++SET_TARGET_PROPERTIES(vcl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ # CMake can automatically figure out the compiler characteristics on
+ # Windows too. No need to do manual config.
+Index: vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-06-01 15:44:01.277753573 +0200
++++ vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -12,6 +12,9 @@
+ SET( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
+
+ ADD_LIBRARY( expatpp ${expatpp_sources} )
++ SET_TARGET_PROPERTIES( expatpp PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++ INSTALL_TARGETS(/lib expatpp)
++ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/expatpp ${expatpp_sources})
+ TARGET_LINK_LIBRARIES( expatpp ${EXPAT_LIBRARIES} )
+
+ IF( BUILD_TESTING )
+Index: vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-06-01 15:44:01.229753575 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -12,7 +12,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bsvg_sources)
+
+ ADD_LIBRARY(bsvg ${bsvg_sources})
+-
++SET_TARGET_PROPERTIES( bsvg PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bsvg)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsvg ${bsvg_sources})
+ TARGET_LINK_LIBRARIES( bsvg bxml )
+
+ IF( BUILD_TESTING )
+Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-06-01 15:44:01.105753576 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -32,7 +32,9 @@
+ )
+
+ ADD_LIBRARY( bmsh3d ${bmsh3d_sources})
+-
++SET_TARGET_PROPERTIES( bmsh3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bmsh3d)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bmsh3d ${bmsh3d_sources})
+ TARGET_LINK_LIBRARIES( bmsh3d vgl vgl_algo vnl vul)
+
+ SUBDIRS( algo )
+Index: vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2012-06-01 15:44:01.353753572 +0200
++++ vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -18,7 +18,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bprb_sources)
+
+ ADD_LIBRARY(bprb ${bprb_sources})
+-
++SET_TARGET_PROPERTIES( bprb PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bprb)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/bprb ${bprb_sources})
+ TARGET_LINK_LIBRARIES(bprb brdb bxml vbl vsl)
+
+ IF(BUILD_TESTING)
+Index: vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2012-06-01 15:44:01.257753573 +0200
++++ vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -15,7 +15,9 @@
+ AUX_SOURCE_DIRECTORY(Templates brdb_sources)
+
+ ADD_LIBRARY(brdb ${brdb_sources})
+-
++SET_TARGET_PROPERTIES( brdb PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib brdb)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/brdb ${brdb_sources})
+ # brdb should not depend on any library that uses it
+ TARGET_LINK_LIBRARIES(brdb vbl_io vbl vsl)
+
+Index: vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boct/CMakeLists.txt 2012-06-01 15:44:01.545753569 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+@@ -14,7 +14,9 @@
+ AUX_SOURCE_DIRECTORY(Templates boct_sources)
+
+ ADD_LIBRARY(boct ${boct_sources})
+-
++SET_TARGET_PROPERTIES( boct PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib boct)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boct ${boct_sources})
+ TARGET_LINK_LIBRARIES(boct vcl vgl vgl_io vnl_io vbl vnl)
+
+ #tests
Added: trunk/packages/vxl/branches/experimental/debian/rules
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/rules (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/rules 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,74 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+export LDFLAGS=-Wl,--as-needed
+
+VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
+SOVERSION = $(shell echo $(VER_FULL) | cut -f1-2 -d.)
+VER_MAJOR = $(shell echo $(VER_FULL) | cut -f1 -d.)
+
+UPSTREAM_SRC = vxl-$(VER_FULL)
+DEBIAN_SRC_DIR = vxl-$(VER_FULL)
+DEBIAN_SRC_TAR = vxl_$(VER_FULL).orig.tar.gz
+
+# CMAKE_SKIP_RPATH=OFF is required when BUILD_TESTING=ON
+CMAKE_EXTRA_FLAGS = \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_SKIP_RPATH:BOOL=OFF \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DVXL_USING_NATIVE_ZLIB:BOOL=ON \
+ -DVXL_USING_NATIVE_JPEG:BOOL=ON \
+ -DVXL_USING_NATIVE_MPEG2:BOOL=ON \
+ -DVXL_USING_NATIVE_PNG:BOOL=ON \
+ -DVXL_USING_NATIVE_TIFF:BOOL=ON \
+ -DVXL_USING_NATIVE_SHAPELIB:BOOL=ON \
+ -DVXL_USING_NATIVE_GEOTIFF:BOOL=ON \
+ -DVXL_USING_NATIVE_EXPAT:BOOL=ON \
+ -DBUILD_VGUI:BOOL=ON \
+ -DBUILD_BGUI3D:BOOL=ON \
+ -DVXL_BUILD_DCMTK:BOOL=ON \
+ -DBUILD_OXL:BOOL=ON \
+ -DBUILD_CORE_GEOMETRY:BOOL=ON \
+ -DBUILD_CORE_IMAGING:BOOL=ON \
+ -DBUILD_CORE_NUMERICS:BOOL=ON \
+ -DBUILD_CORE_PROBABILITY:BOOL=ON \
+ -DBUILD_CORE_SERIALISATION:BOOL=ON \
+ -DBUILD_CORE_UTILITIES:BOOL=ON \
+ -DBUILD_CORE_VIDEO:BOOL=ON \
+ -DBUILD_EXAMPLES:BOOL=OFF \
+ -DPYTHON_INCLUDE_DIR="/usr/include/python2.7" \
+ -DPYTHON_LIBRARY="/usr/lib/python2.7/config/libpython2.7.so" \
+ -DBUILD_TESTING:BOOL=ON
+
+pkg_lib = libvxl$(SOVERSION)
+pkg_dev = libvxl$(VER_MAJOR)-dev
+#pkg_examples = vxl$(VER_MAJOR)-examples
+
+%:
+ dh $@ --buildsystem=cmake --parallel --with python2
+
+override_dh_auto_configure:
+ # remove duplicate from bprb_parameters+unsigned_int-.cxx
+ rm -f $(CURDIR)/contrib/brl/bpro/bprb/Templates/bprb_parameters+unsigned-.cxx
+ # remove duplicate from bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gauss_f1-.3---.cxx
+ rm -f $(CURDIR)/contrib/brl/bseg/bvxm/grid/Templates/bvxm_voxel_grid+bsta_num_obs+bsta_mixture_fixed+bsta_num_obs+bsta_gaussian_sphere+float.1--.3---.cxx
+ dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
+
+override_dh_lintian:
+ echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
+ dh_lintian
+
+override_dh_install:
+ dh_install -p$(pkg_lib) debian/tmp/usr/lib/lib*.so.* usr/lib
+ dh_install -p$(pkg_dev) debian/tmp/usr/lib/lib*.so usr/lib
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include
+ dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/vxl/cmake/*.cmake
+
+# too many tests failure, with erratic behavior
+# http://bugs.debian.org/671601
+override_dh_auto_test:
+
+get-orig-source:
+ uscan --verbose --force-download --repack
Property changes on: trunk/packages/vxl/branches/experimental/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/vxl/branches/experimental/debian/source/format
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/source/format (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/source/format 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/packages/vxl/branches/experimental/debian/watch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/watch (rev 0)
+++ trunk/packages/vxl/branches/experimental/debian/watch 2012-06-01 13:49:07 UTC (rev 11154)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/vxl/vxl-([b\d\.]+)\.zip
More information about the debian-med-commit
mailing list