[visp] 03/08: Remove obsolete patches, bump ABI to 2.10
Olivier Sallou
osallou at debian.org
Mon Mar 16 15:07:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
osallou pushed a commit to branch master
in repository visp.
commit 0213d7ff77e933b8245ec694f51822dd2ad22fce
Author: Fabien Spindler <Fabien.Spindler at inria.fr>
Date: Sat Mar 14 18:19:19 2015 +0100
Remove obsolete patches, bump ABI to 2.10
---
debian/control | 24 +++----
debian/copyright | 2 +-
debian/libvisp-dev.install | 4 +-
debian/{libvisp2.9.install => libvisp2.10.install} | 0
...pConfig.h-in-include-architecture-triplet.patch | 21 ------
.../0002-Fix-compat-with-ffmpeg-libraries.patch | 74 ----------------------
...E-config-files-in-arch-specific-directory.patch | 44 -------------
...commented-lines-in-visp-config.install.in.patch | 31 ---------
...ng-against-useless-dependency-in-FindGSL..patch | 33 ----------
...txt-install-share-data-in-visp-VERSION-if.patch | 52 ---------------
debian/patches/series | 6 --
debian/rules | 29 +++++----
12 files changed, 29 insertions(+), 291 deletions(-)
diff --git a/debian/control b/debian/control
index d0de63c..1587f5b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,18 +18,15 @@ Build-Depends: debhelper (>= 9),
libjpeg-dev,
libpng-dev,
graphviz,
- libswscale-dev,
- libavutil-dev,
- libavformat-dev,
- libavcodec-dev,
- libbz2-dev,
libx11-dev,
libv4l-dev [!hurd-any],
libusb-dev,
libfreenect-dev [!hurd-any],
libois-dev [linux-any],
+ libzbar-dev,
+ libdmtx-dev,
visp-images-data
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/visp.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/visp.git
Homepage: http://www.irisa.fr/lagadic/visp/visp.html
@@ -48,17 +45,14 @@ Depends: libopencv-dev [!any-sparc64 !x32],
libxml2-dev,
libjpeg-dev,
libpng-dev,
- libswscale-dev,
- libavutil-dev,
- libavformat-dev,
- libavcodec-dev,
- libbz2-dev,
libx11-dev,
libv4l-dev [!hurd-any],
libusb-dev,
libfreenect-dev [!hurd-any],
libois-dev [linux-any],
- libvisp2.9 (= ${binary:Version}),
+ libzbar-dev,
+ libdmtx-dev,
+ libvisp2.10 (= ${binary:Version}),
${misc:Depends}
Suggests: libvisp-doc
Multi-Arch: same
@@ -73,7 +67,7 @@ Description: visual servoing library - development files
This package contains development files (headers and shared library
symbolic link).
-Package: libvisp2.9
+Package: libvisp2.10
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
@@ -89,10 +83,10 @@ Description: visual servoing library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp2.9-dbg
+Package: libvisp2.10-dbg
Architecture: any
Section: debug
-Depends: libvisp2.9 (= ${binary:Version}),
+Depends: libvisp2.10 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: visual servoing library - debugging symbols
diff --git a/debian/copyright b/debian/copyright
index 2b2f8b9..b1c973e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: visp at inria.fr
Source: http://www.irisa.fr/lagadic/visp/download.html
Files: *
-Copyright: 2005-2014, INRIA
+Copyright: 2005-2015, Inria
License: GPL-2
See `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libvisp-dev.install b/debian/libvisp-dev.install
index 4470e70..c9adf7b 100644
--- a/debian/libvisp-dev.install
+++ b/debian/libvisp-dev.install
@@ -1,6 +1,6 @@
usr/bin/visp-config
-usr/include/*
usr/include/*/visp/*
usr/lib/*/libvisp.so
+usr/lib/*/cmake/*
usr/lib/*/pkgconfig/*
-usr/lib/*/visp/*.cmake
+usr/lib/*/visp/*
diff --git a/debian/libvisp2.9.install b/debian/libvisp2.10.install
similarity index 100%
rename from debian/libvisp2.9.install
rename to debian/libvisp2.10.install
diff --git a/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch b/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch
deleted file mode 100644
index bbe9c79..0000000
--- a/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Fabien Spindler <Fabien.Spindler at inria.fr>
-Date: Sun, 1 Jun 2014 21:57:17 +0200
-Subject: Install vpConfig.h in include architecture triplet
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9b44006..e3c2f9e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2107,7 +2107,7 @@ CONFIGURE_FILE(${VISP_SOURCE_DIR}/include/vpConfig.h.cmake
-
- # Install vpConfig.h that may differ from the one in include/visp
- INSTALL(FILES ${VISP_BINARY_DIR}/install/vpConfig.h
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/visp
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LIBRARY_ARCHITECTURE}/visp
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT headers
- )
diff --git a/debian/patches/0002-Fix-compat-with-ffmpeg-libraries.patch b/debian/patches/0002-Fix-compat-with-ffmpeg-libraries.patch
deleted file mode 100644
index 76719b2..0000000
--- a/debian/patches/0002-Fix-compat-with-ffmpeg-libraries.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Fabien Spindler <Fabien.Spindler at inria.fr>
-Date: Tue, 3 Jun 2014 15:45:32 +0200
-Subject: Fix compat with ffmpeg libraries
-
----
- src/video/vpFFMPEG.cpp | 25 ++++++++++++++++++++++++-
- 1 file changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/src/video/vpFFMPEG.cpp b/src/video/vpFFMPEG.cpp
-index 744d873..83429c4 100644
---- a/src/video/vpFFMPEG.cpp
-+++ b/src/video/vpFFMPEG.cpp
-@@ -134,8 +134,13 @@ bool vpFFMPEG::openStream(const char *filename, vpFFMPEGColorType colortype)
- {
- videoStream = i;
- //std::cout << "rate: " << pFormatCtx->streams[i]->r_frame_rate.num << " " << pFormatCtx->streams[i]->r_frame_rate.den << std::endl;
-+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55,12,0)
- framerate_stream = pFormatCtx->streams[i]->r_frame_rate.num;
- framerate_stream /= pFormatCtx->streams[i]->r_frame_rate.den;
-+#else
-+ framerate_stream = pFormatCtx->streams[i]->avg_frame_rate.num;
-+ framerate_stream /= pFormatCtx->streams[i]->avg_frame_rate.den;
-+#endif
- found_codec= true;
- break;
- }
-@@ -162,11 +167,19 @@ bool vpFFMPEG::openStream(const char *filename, vpFFMPEGColorType colortype)
- return false; // Could not open codec
- }
-
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,34,0)
- pFrame = avcodec_alloc_frame();
--
-+#else
-+ pFrame = av_frame_alloc(); // libavcodec 55.34.1
-+#endif
-+
- if (color_type == vpFFMPEG::COLORED)
- {
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,34,0)
- pFrameRGB=avcodec_alloc_frame();
-+#else
-+ pFrameRGB=av_frame_alloc(); // libavcodec 55.34.1
-+#endif
-
- if (pFrameRGB == NULL)
- return false;
-@@ -176,7 +189,11 @@ bool vpFFMPEG::openStream(const char *filename, vpFFMPEGColorType colortype)
-
- else if (color_type == vpFFMPEG::GRAY_SCALED)
- {
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,34,0)
- pFrameGRAY=avcodec_alloc_frame();
-+#else
-+ pFrameGRAY=av_frame_alloc(); // libavcodec 55.34.1
-+#endif
-
- if (pFrameGRAY == NULL)
- return false;
-@@ -666,8 +683,14 @@ bool vpFFMPEG::openEncoder(const char *filename, unsigned int w, unsigned int h,
- #else
- pCodecCtx = avcodec_alloc_context3(NULL);
- #endif
-+
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55,34,0)
- pFrame = avcodec_alloc_frame();
- pFrameRGB = avcodec_alloc_frame();
-+#else
-+ pFrame = av_frame_alloc(); // libavcodec 55.34.1
-+ pFrameRGB = av_frame_alloc(); // libavcodec 55.34.1
-+#endif
-
- /* put sample parameters */
- pCodecCtx->bit_rate = (int)bit_rate;
diff --git a/debian/patches/0003-Install-OGRE-config-files-in-arch-specific-directory.patch b/debian/patches/0003-Install-OGRE-config-files-in-arch-specific-directory.patch
deleted file mode 100644
index d75cf1b..0000000
--- a/debian/patches/0003-Install-OGRE-config-files-in-arch-specific-directory.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Fabien Spindler <fabien.spindler at inria.fr>
-Date: Fri, 11 Jul 2014 03:19:52 +0900
-Subject: Install OGRE config files in arch specific directory
-
-* CMakeLists.txt: install OGRE configuration files in arch specific
- directory, change "vpConfig.h" accordingly.
-
-Origin: upstream, http://bugs.debian.org/754164
-Bug-Debian: http://bugs.debian.org/754164
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3c2f9e..e370fb9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -840,7 +840,7 @@ IF(USE_OGRE)
- if(OGRE_PLUGIN_DIR_REL)
- INSTALL(FILES
- ${VISP_HAVE_OGRE_PLUGINS_PATH}/plugins.cfg
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/visp/data/ogre-simulator
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT libraries
- )
-@@ -848,7 +848,7 @@ IF(USE_OGRE)
- if(OGRE_PLUGIN_DIR_DBG)
- INSTALL(FILES
- ${VISP_HAVE_OGRE_PLUGINS_PATH}/plugins_d.cfg
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/visp/data/ogre-simulator
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT libraries
- )
-@@ -2097,7 +2097,7 @@ if(VISP_INSTALL_DIR_OGRE_RESOURCES)
- endif()
- # Only if plugins.cfg created by hand, we change the path to plugins.cfg in install/vpConfig.h
- if(VISP_INSTALL_DIR_OGRE_RESOURCES)
-- SET(VISP_HAVE_OGRE_PLUGINS_PATH ${VISP_ROOT_DIR_DATA_CONFIGCMAKE}/data/ogre-simulator)
-+ SET(VISP_HAVE_OGRE_PLUGINS_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/visp/data/ogre-simulator)
- endif()
-
- # Generate the package dependent file include/visp/vpConfig.h
diff --git a/debian/patches/0004-Remove-commented-lines-in-visp-config.install.in.patch b/debian/patches/0004-Remove-commented-lines-in-visp-config.install.in.patch
deleted file mode 100644
index 485ded8..0000000
--- a/debian/patches/0004-Remove-commented-lines-in-visp-config.install.in.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Fabien Spindler <fabien.spindler at inria.fr>
-Date: Fri, 11 Jul 2014 03:25:53 +0900
-Subject: Remove commented lines in visp-config.install.in
-
-* CMakeModules/visp-config.install.in: remove commented lines in
- visp-config.install.in as they trigger per-architecture differences
- while this file is installed in bin.
-
-Origin: upstream, http://bugs.debian.org/754163
-Bug-Debian: http://bugs.debian.org/754163
----
- CMakeModules/visp-config.install.in | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/CMakeModules/visp-config.install.in b/CMakeModules/visp-config.install.in
-index 0376f57..e4fa2e8 100755
---- a/CMakeModules/visp-config.install.in
-+++ b/CMakeModules/visp-config.install.in
-@@ -48,12 +48,6 @@ relpath=`(cd $relpath/..; pwd)`
-
- PREFIX=$relpath
-
--#CFLAGS="${VISP_CONFIG_CFLAGS_SCRIPT}"
--
--#LIBS="${VISP_CONFIG_LIBS_SCRIPT}"
--
--#VERSION="${VISP_VERSION}"
--
- CFLAGS_CMD=`pkg-config --cflags visp`
- CFLAGS=$CFLAGS_CMD
-
diff --git a/debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch b/debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
deleted file mode 100644
index 3a6d39a..0000000
--- a/debian/patches/0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Fabien Spindler <fabien.spindler at inria.fr>
-Date: Fri, 11 Jul 2014 03:47:21 +0900
-Subject: Avoid linking against useless dependency in FindGSL.cmake if
- possible.
-
-* CMakeModules/FindGSL.cmake: do not link against libgslcblas.so if
- not needed.
-
-Origin: upstream, private email
----
- CMakeModules/FindGSL.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeModules/FindGSL.cmake b/CMakeModules/FindGSL.cmake
-index adecf19..62f89fe 100644
---- a/CMakeModules/FindGSL.cmake
-+++ b/CMakeModules/FindGSL.cmake
-@@ -173,6 +173,7 @@ ELSE(WIN32)
- FOREACH(libs ${GSL_LINK_LIBRARIES})
- STRING(REGEX REPLACE "[-][l]" "" GSL_LIB_ONES ${libs})
- #MESSAGE("GSL_LIB_ONES=${GSL_LIB_ONES} - ${libs}")
-+ if(NOT ${GSL_LIB_ONES} MATCHES "gslcblas")
- MARK_AS_ADVANCED(LIBGSL_${GSL_LIB_ONES})
- FIND_LIBRARY(LIBGSL_${GSL_LIB_ONES}
- NAMES ${GSL_LIB_ONES}
-@@ -186,6 +187,7 @@ ELSE(WIN32)
- #MESSAGE("LIB_GSL=${LIB_GSL} - ${libs}")
- LIST(APPEND GSL_LIBRARIES ${LIBGSL_${GSL_LIB_ONES}})
- ENDIF()
-+ endif()
- ENDFOREACH(libs)
-
- #MESSAGE("GSL_LIBRARIES=${GSL_LIBRARIES}")
diff --git a/debian/patches/0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch b/debian/patches/0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch
deleted file mode 100644
index a019906..0000000
--- a/debian/patches/0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Fabien Spindler <fabien.spindler at inria.fr>
-Date: Sun, 20 Jul 2014 15:36:45 +0900
-Subject: CMakeLists.txt: install share data in visp-VERSION if necessary
-
-* CMakeLists.txt: install share data packaged in libvispX.Y in
- visp-VERSION directory to avoid failures on updates.
-
-Origin: upstream, http://bugs.debian.org/754657
-Bug-Debian: http://bugs.debian.org/754657
----
- CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e370fb9..b5c6fac 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -928,14 +928,14 @@ IF(USE_OGRE)
- if(UNIX)
- install(FILES
- ${VISP_BINARY_DIR}/install/resources.cfg
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/ogre-simulator
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT libraries
- )
- if(OGRE_MEDIA_NOT_AVAILABLE)
- install(DIRECTORY
- data/ogre-simulator/media
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/ogre-simulator
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/ogre-simulator
- FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT libraries
- )
-@@ -2157,7 +2157,7 @@ IF(UNIX)
- foreach(SCENE ${WIREFRAME_SCENES})
- INSTALL(FILES
- "${VISP_SOURCE_DIR}/src/simulator/wireframe-simulator/scene/${SCENE}"
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/wireframe-simulator
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/wireframe-simulator
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT libraries
- )
-@@ -2165,7 +2165,7 @@ IF(UNIX)
- foreach(SCENE ${ROBOT_ARMS_SCENES})
- INSTALL(FILES
- "${VISP_SOURCE_DIR}/src/robot/simulator-robot/arms/${SCENE}"
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp/data/robot-simulator
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/visp-${VISP_VERSION}/data/robot-simulator
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- COMPONENT libraries
- )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ba85b07..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-0001-Install-vpConfig.h-in-include-architecture-triplet.patch
-0002-Fix-compat-with-ffmpeg-libraries.patch
-0003-Install-OGRE-config-files-in-arch-specific-directory.patch
-0004-Remove-commented-lines-in-visp-config.install.in.patch
-0005-Avoid-linking-against-useless-dependency-in-FindGSL..patch
-0006-CMakeLists.txt-install-share-data-in-visp-VERSION-if.patch
diff --git a/debian/rules b/debian/rules
index 1cf04d9..a49c40f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,27 +19,29 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-# Configura package and enable dependencies available on all platforms.
-# libav (ffmpeg): available on all platforms
+# Configure package and enable dependencies available on all platforms.
# opencv: available on all platforms
# coin3: available on all platforms
# lapack: available on all platforms
# libgsl0: available on all platforms
# ogre: available on all platforms
# xml2: available on all platforms
-# libjpeg6b: available on all platforms
+# libjpeg: available on all platforms
# libpng: available on all platforms
# libx11: available on all platforms
CONFIGURE_ARGS= \
- -DCMAKE_INSTALL_LIBDIR:STRING="lib/$(DEB_HOST_MULTIARCH)" \
- -DBUILD_DEMOS=ON -DBUILD_TESTING=ON -DBUILD_EXAMPLES=ON \
- -DBUILD_SHARED_LIBS=ON \
- -DUSE_FFMPEG=ON \
- -DUSE_OPENCV=ON \
- -DUSE_COIN=ON -DUSE_GSL=OFF \
+ -DCMAKE_INSTALL_LIBDIR:STRING="lib/$(DEB_HOST_MULTIARCH)" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_DEMOS=ON -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON \
+ -DBUILD_TUTORIALS=ON \
+ -DBUILD_SHARED_LIBS=ON \
+ -DUSE_FFMPEG=OFF \
+ -DUSE_OPENCV=ON \
+ -DUSE_COIN=ON \
-DUSE_LAPACK=ON -DUSE_GSL=ON -DUSE_OGRE=ON \
- -DUSE_XML2=ON -DUSE_GTK2=ON -DUSE_LIBJPEG=ON \
- -DUSE_LIBPNG=ON -DUSE_X11=ON
+ -DUSE_XML2=ON -DUSE_GTK2=ON -DUSE_LIBJPEG=ON \
+ -DUSE_LIBPNG=ON -DUSE_X11=ON \
+ -DUSE_ZBAR=ON -DUSE_DMTX=ON
# dc1394, v4l and ois are only available on Linux.
ifneq ($(DEB_HOST_ARCH_OS),linux)
@@ -78,7 +80,10 @@ override_dh_auto_build-indep:
dh_auto_build -- html-doc # Generate Doxygen HTML documentation.
override_dh_strip:
- dh_strip -a --dbg-package=libvisp2.9-dbg
+ dh_strip -a --dbg-package=libvisp2.10-dbg
+
+override_dh_installdocs:
+ dh_installdocs -X.md5
# Parallelism is disabled in tests as some cannot run at the same
# time
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp.git
More information about the debian-science-commits
mailing list