[med-svn] r7548 - in trunk/packages/vxl/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Fri Aug 26 09:20:44 UTC 2011
Author: malat-guest
Date: 2011-08-26 09:20:44 +0000 (Fri, 26 Aug 2011)
New Revision: 7548
Added:
trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch
Modified:
trunk/packages/vxl/trunk/debian/changelog
trunk/packages/vxl/trunk/debian/control
trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
trunk/packages/vxl/trunk/debian/patches/series
Log:
Attempt to rebuild vxl with new ffmpeg
Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog 2011-08-25 21:56:01 UTC (rev 7547)
+++ trunk/packages/vxl/trunk/debian/changelog 2011-08-26 09:20:44 UTC (rev 7548)
@@ -1,3 +1,10 @@
+vxl (1.14.0-9) UNRELEASED; urgency=low
+
+ * Rename libmcal to libmul_mcal. Closes: #639269
+ * Fix compilation with libav/0.7.2. Closes: #638251
+
+ -- 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
Modified: trunk/packages/vxl/trunk/debian/control
===================================================================
--- trunk/packages/vxl/trunk/debian/control 2011-08-25 21:56:01 UTC (rev 7547)
+++ trunk/packages/vxl/trunk/debian/control 2011-08-26 09:20:44 UTC (rev 7548)
@@ -5,7 +5,7 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 7), cmake, libtiff-dev,
+Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 7), cmake (>= 2.4.5), libtiff-dev,
libdcmtk2-dev, libpng-dev, libjpeg-dev, zlib1g-dev, libexpat-dev, python-dev,
libgeotiff-dev, libcoin60-dev, libavifile-0.7-dev,
libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev,
Added: trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/fix_libav07.patch 2011-08-26 09:20:44 UTC (rev 7548)
@@ -0,0 +1,13 @@
+Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v2.txx
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_istream_v2.txx 2011-08-26 11:18:20.000000000 +0200
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_istream_v2.txx 2011-08-26 11:18:42.000000000 +0200
+@@ -145,7 +145,7 @@
+ 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 == CODEC_TYPE_VIDEO ) {
++ if ( enc->codec_type == AVMEDIA_TYPE_VIDEO ) {
+ is_->vid_index_ = i;
+ break;
+ }
Modified: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2011-08-25 21:56:01 UTC (rev 7547)
+++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2011-08-26 09:20:44 UTC (rev 7548)
@@ -1,7 +1,7 @@
Index: vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -44,11 +44,11 @@
)
AUX_SOURCE_DIRECTORY(Templates osl_sources)
@@ -20,8 +20,8 @@
SUBDIRS(examples)
Index: vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -22,9 +22,9 @@
iowin32.c iowin32.h)
ENDIF(WIN32)
@@ -37,8 +37,8 @@
ENDIF(ZLIB_FOUND)
Index: vxl-1.14.0/contrib/gel/gst/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -16,9 +16,9 @@
AUX_SOURCE_DIRECTORY(Templates gst_sources)
@@ -55,8 +55,8 @@
+TARGET_LINK_LIBRARIES(gel_gst vbl)
Index: vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-26 16:12:54.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-28 12:09:32.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -1,4 +1,4 @@
# Nothing to be tested yet
@@ -65,8 +65,8 @@
+TARGET_LINK_LIBRARIES( osl_test_include oxl_osl )
Index: vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/xcv/CMakeLists.txt 2011-04-26 16:12:54.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/xcv/CMakeLists.txt 2011-04-28 12:09:32.000000000 +0200
++++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -32,6 +32,6 @@
ADD_EXECUTABLE(xcv ${xcv_sources})
@@ -77,8 +77,8 @@
ENDIF (HAS_VGUI)
Index: vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
++++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -41,7 +41,7 @@
IF(BUILD_OXL)
@@ -90,8 +90,8 @@
IF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
Index: vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-04-26 16:13:01.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -36,10 +36,10 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
@@ -107,8 +107,8 @@
IF( BUILD_TESTING )
Index: vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt 2011-04-26 17:04:17.000000000 +0200
-+++ vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt 2011-04-26 17:04:28.000000000 +0200
+--- vxl-1.14.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt 2011-04-28 12:09:32.000000000 +0200
++++ vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt 2011-04-28 12:09:40.000000000 +0200
@@ -6,7 +6,7 @@
ENDIF(BUILD_GEL)
IF(BUILD_OXL)
@@ -118,3 +118,23 @@
ENDIF(BUILD_OXL)
IF(BUILD_GEL)
+Index: vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/mul/mcal/CMakeLists.txt 2011-08-26 11:12:16.000000000 +0200
++++ vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt 2011-08-26 11:13:14.000000000 +0200
+@@ -18,11 +18,11 @@
+ )
+ AUX_SOURCE_DIRECTORY(Templates mcal_sources)
+
+-ADD_LIBRARY(mcal ${mcal_sources})
+-SET_TARGET_PROPERTIES(mcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+-INSTALL_TARGETS(/lib mcal)
++ADD_LIBRARY(mul_mcal ${mcal_sources})
++SET_TARGET_PROPERTIES(mul_mcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib mul_mcal)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mcal ${mcal_sources})
+-TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vul)
++TARGET_LINK_LIBRARIES(mul_mcal mbl vnl vnl_algo vul)
+
+ IF (BUILD_TESTING)
+ SUBDIRS(tests)
Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series 2011-08-25 21:56:01 UTC (rev 7547)
+++ trunk/packages/vxl/trunk/debian/patches/series 2011-08-26 09:20:44 UTC (rev 7548)
@@ -1,3 +1,4 @@
+fix_libav07.patch
ffmpeg_C99.patch
vxl.soname.patch
vxl.soname2.patch
More information about the debian-med-commit
mailing list