[med-svn] r13649 - in trunk/packages/vxl/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Sun May 19 14:13:47 UTC 2013
Author: malat
Date: 2013-05-19 14:13:47 +0000 (Sun, 19 May 2013)
New Revision: 13649
Added:
trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
Modified:
trunk/packages/vxl/trunk/debian/changelog
trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch
trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
trunk/packages/vxl/trunk/debian/patches/series
trunk/packages/vxl/trunk/debian/patches/sse2.patch
Log:
New upload
Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog 2013-05-19 12:48:57 UTC (rev 13648)
+++ trunk/packages/vxl/trunk/debian/changelog 2013-05-19 14:13:47 UTC (rev 13649)
@@ -1,3 +1,11 @@
+vxl (1.17.0-3) unstable; urgency=low
+
+ * Import old patch and avoid name clash. Closes: #708666, #708668
+ * Re-import old sse2.patch, fix compilation.
+ * Re-import old ffmpeg/C99 patch. Closes: #708740
+
+ -- Mathieu Malaterre <malat at debian.org> Sun, 19 May 2013 16:11:07 +0200
+
vxl (1.17.0-2) unstable; urgency=low
* Upload to sid.
Added: trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch 2013-05-19 14:13:47 UTC (rev 13649)
@@ -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 2013-05-19 13:37:24.126525372 +0000
++++ vxl-1.17.0/core/vidl/tests/test_include.cxx 2013-05-19 13:37:24.122525372 +0000
+@@ -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>
Modified: trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch 2013-05-19 12:48:57 UTC (rev 13648)
+++ trunk/packages/vxl/trunk/debian/patches/fix_alphacomp.patch 2013-05-19 14:13:47 UTC (rev 13649)
@@ -4,10 +4,10 @@
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
+Index: vxl-1.17.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
+--- vxl-1.17.0.orig/v3p/Qv/QvDict.cxx 2013-05-19 13:36:32.070525549 +0000
++++ vxl-1.17.0/v3p/Qv/QvDict.cxx 2013-05-19 13:36:32.062525549 +0000
@@ -9,7 +9,7 @@
# endif
#else
@@ -17,10 +17,10 @@
# 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
+Index: vxl-1.17.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
+--- vxl-1.17.0.orig/core/vil/vil_stream_url.cxx 2013-05-19 13:36:32.070525549 +0000
++++ vxl-1.17.0/core/vil/vil_stream_url.cxx 2013-05-19 13:36:32.066525549 +0000
@@ -25,7 +25,7 @@
# include <sys/socket.h>
# include <netinet/in.h> // htons()
@@ -30,10 +30,10 @@
# endif
# define SOCKET int
#elif defined (VCL_WIN32) && !defined(__CYGWIN__)
-Index: vxl-1.14.0/core/vil1/vil1_stream_url.cxx
+Index: vxl-1.17.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
+--- vxl-1.17.0.orig/core/vil1/vil1_stream_url.cxx 2013-05-19 13:36:32.070525549 +0000
++++ vxl-1.17.0/core/vil1/vil1_stream_url.cxx 2013-05-19 13:36:32.066525549 +0000
@@ -24,7 +24,7 @@
# include <sys/socket.h>
# include <netinet/in.h> // htons()
@@ -43,10 +43,10 @@
# endif
# define SOCKET int
#elif defined (VCL_WIN32) && !defined(__CYGWIN__)
-Index: vxl-1.14.0/core/vul/vul_url.cxx
+Index: vxl-1.17.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
+--- vxl-1.17.0.orig/core/vul/vul_url.cxx 2013-05-19 13:36:32.070525549 +0000
++++ vxl-1.17.0/core/vul/vul_url.cxx 2013-05-19 13:36:32.066525549 +0000
@@ -27,7 +27,7 @@
# include <sys/socket.h>
# include <netinet/in.h> // htons()
Modified: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2013-05-19 12:48:57 UTC (rev 13648)
+++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2013-05-19 14:13:47 UTC (rev 13649)
@@ -6,8 +6,8 @@
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-07-28 20:59:26.547211990 +0200
+--- vxl-1.17.0.orig/contrib/oxl/xcv/CMakeLists.txt 2013-05-19 12:51:30.494534817 +0000
++++ vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt 2013-05-19 12:51:41.350534782 +0000
@@ -32,6 +32,6 @@
ADD_EXECUTABLE(xcv ${xcv_sources})
@@ -18,8 +18,8 @@
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-07-28 20:59:26.547211990 +0200
+--- vxl-1.17.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt 2013-05-19 12:51:30.506534820 +0000
++++ vxl-1.17.0/contrib/conversions/geometry/tests/CMakeLists.txt 2013-05-19 12:51:41.350534782 +0000
@@ -6,7 +6,7 @@
ENDIF(BUILD_GEL)
IF(BUILD_OXL)
@@ -29,3 +29,68 @@
ENDIF(BUILD_OXL)
IF(BUILD_GEL)
+Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2013-05-19 12:52:37.858534588 +0000
++++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2013-05-19 12:53:08.818534483 +0000
+@@ -21,10 +21,10 @@
+ iowin32.c iowin32.h)
+ ENDIF(WIN32)
+
+-ADD_LIBRARY( minizip ${minizip_sources} )
+-TARGET_LINK_LIBRARIES( minizip z)
+-SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+-INSTALL_TARGETS( /lib minizip )
++ADD_LIBRARY( b3p_minizip ${minizip_sources} )
++TARGET_LINK_LIBRARIES( b3p_minizip z)
++SET_TARGET_PROPERTIES(b3p_minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS( /lib b3p_minizip )
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
+
+ ENDIF(ZLIB_FOUND)
+Index: vxl-1.17.0/contrib/gel/gst/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2013-05-19 12:53:12.938534466 +0000
++++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2013-05-19 12:57:34.698533568 +0000
+@@ -16,12 +16,12 @@
+
+ AUX_SOURCE_DIRECTORY(Templates gst_sources)
+
+-ADD_LIBRARY(gst ${gst_sources})
+-SET_TARGET_PROPERTIES(gst PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+-INSTALL_TARGETS(/lib gst)
++ADD_LIBRARY(gel_gst ${gst_sources})
++SET_TARGET_PROPERTIES(gel_gst PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib gel_gst)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
+
+-TARGET_LINK_LIBRARIES(gst vbl)
++TARGET_LINK_LIBRARIES(gel_gst vbl)
+
+ IF( BUILD_TESTING )
+ SUBDIRS(tests)
+Index: vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2013-05-19 12:51:41.250534781 +0000
++++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2013-05-19 13:34:38.678525936 +0000
+@@ -36,10 +36,10 @@
+ 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)
++ vsol brip vpgl_pro vgl vul vpl imesh_algo b3p_minizip)
+
+ IF(ZLIB_FOUND)
+- TARGET_LINK_LIBRARIES( bmdl_pro minizip )
++ TARGET_LINK_LIBRARIES( bmdl_pro b3p_minizip )
+ ENDIF(ZLIB_FOUND)
+
+ IF( BUILD_TESTING )
+Index: vxl-1.17.0/contrib/gel/gst/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/gel/gst/tests/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
++++ vxl-1.17.0/contrib/gel/gst/tests/CMakeLists.txt 2013-05-19 13:31:09.158526657 +0000
+@@ -1,2 +1,2 @@
+ ADD_EXECUTABLE(gst_test_include test_include.cxx )
+-TARGET_LINK_LIBRARIES( gst_test_include gst )
++TARGET_LINK_LIBRARIES( gst_test_include gel_gst )
Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series 2013-05-19 12:48:57 UTC (rev 13648)
+++ trunk/packages/vxl/trunk/debian/patches/series 2013-05-19 14:13:47 UTC (rev 13649)
@@ -1,9 +1,12 @@
fixcompilation2.patch
vxl.soname.patch
-renamelibs.patch
fixingupstream.patch
moresoname.patch
fixxerces.patch
bug708358.patch
bug707472.patch
libav_trunk.patch
+renamelibs.patch
+fix_alphacomp.patch
+ffmpeg_C99.patch
+sse2.patch
Modified: trunk/packages/vxl/trunk/debian/patches/sse2.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/sse2.patch 2013-05-19 12:48:57 UTC (rev 13648)
+++ trunk/packages/vxl/trunk/debian/patches/sse2.patch 2013-05-19 14:13:47 UTC (rev 13649)
@@ -8,10 +8,10 @@
Origin: vendor, http://itk.org/gitweb?p=ITK.git;a=commit;h=b106984
Last-Update: 2012-12-20
-Index: vxl-1.14.0/core/vnl/vnl_math.h
+Index: vxl-1.17.0/core/vnl/vnl_math.h
===================================================================
---- vxl-1.14.0.orig/core/vnl/vnl_math.h 2009-11-21 16:45:28.000000000 +0100
-+++ vxl-1.14.0/core/vnl/vnl_math.h 2011-04-19 12:55:21.000000000 +0200
+--- 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 2013-05-19 16:08:53.018518890 +0200
@@ -44,16 +44,20 @@
#endif
@@ -35,7 +35,7 @@
# define GCC_USE_FAST_IMPL 1
#else
# define GCC_USE_FAST_IMPL 0
-@@ -184,7 +188,7 @@
+@@ -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).
@@ -44,7 +44,7 @@
inline int vnl_math_rnd_halfinttoeven(float x)
{
-@@ -295,7 +299,7 @@
+@@ -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).
@@ -53,7 +53,7 @@
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; }
-@@ -328,7 +332,7 @@
+@@ -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).
@@ -62,7 +62,7 @@
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); }
-@@ -350,7 +354,7 @@
+@@ -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).
@@ -71,7 +71,7 @@
inline int vnl_math_floor(float x)
{
-@@ -435,7 +439,7 @@
+@@ -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).
@@ -80,10 +80,10 @@
inline int vnl_math_ceil(float x)
{
-Index: vxl-1.14.0/core/vil/vil_round.h
+Index: vxl-1.17.0/core/vil/vil_round.h
===================================================================
---- vxl-1.14.0.orig/core/vil/vil_round.h 2011-04-19 12:56:23.000000000 +0200
-+++ vxl-1.14.0/core/vil/vil_round.h 2011-04-19 12:56:15.000000000 +0200
+--- 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 2013-05-19 16:08:53.042518890 +0200
@@ -25,9 +25,10 @@
# endif
#endif
More information about the debian-med-commit
mailing list