[visp] 01/02: Add patch to fix arch-dependent files in "Multi-Arch: same" package
Thomas Moulard
thomas_moulard-guest at moszumanska.debian.org
Thu Jul 10 18:37:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
thomas_moulard-guest pushed a commit to branch master
in repository visp.
commit cb87bbcd0735e9d8773a918430fc0eca73a86bda
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date: Fri Jul 11 03:31:02 2014 +0900
Add patch to fix arch-dependent files in "Multi-Arch: same" package
Closes: #754163, #754164
---
...pConfig.h-in-include-architecture-triplet.patch | 6 +--
.../0002-Fix-compat-with-ffmpeg-libraries.patch | 6 +--
...tall-OGRE-config-files-in-arch-specific-d.patch | 44 ++++++++++++++++++++++
...ove-commented-lines-in-visp-config.instal.patch | 31 +++++++++++++++
debian/patches/series | 2 +
5 files changed, 79 insertions(+), 10 deletions(-)
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
index c9cc60e..bbe9c79 100644
--- a/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch
+++ b/debian/patches/0001-Install-vpConfig.h-in-include-architecture-triplet.patch
@@ -1,7 +1,6 @@
-From 3f2be63a8fc682bc41ccb36b79005d15eca842ac Mon Sep 17 00:00:00 2001
From: Fabien Spindler <Fabien.Spindler at inria.fr>
Date: Sun, 1 Jun 2014 21:57:17 +0200
-Subject: [PATCH 1/2] Install vpConfig.h in include architecture triplet
+Subject: Install vpConfig.h in include architecture triplet
---
CMakeLists.txt | 2 +-
@@ -20,6 +19,3 @@ index 9b44006..e3c2f9e 100644
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
COMPONENT headers
)
---
-1.9.1
-
diff --git a/debian/patches/0002-Fix-compat-with-ffmpeg-libraries.patch b/debian/patches/0002-Fix-compat-with-ffmpeg-libraries.patch
index d395267..76719b2 100644
--- a/debian/patches/0002-Fix-compat-with-ffmpeg-libraries.patch
+++ b/debian/patches/0002-Fix-compat-with-ffmpeg-libraries.patch
@@ -1,7 +1,6 @@
-From 590cba1ca215a798327f589aad02d041c6ca28b5 Mon Sep 17 00:00:00 2001
From: Fabien Spindler <Fabien.Spindler at inria.fr>
Date: Tue, 3 Jun 2014 15:45:32 +0200
-Subject: [PATCH 2/2] Fix compat with ffmpeg libraries
+Subject: Fix compat with ffmpeg libraries
---
src/video/vpFFMPEG.cpp | 25 ++++++++++++++++++++++++-
@@ -73,6 +72,3 @@ index 744d873..83429c4 100644
/* put sample parameters */
pCodecCtx->bit_rate = (int)bit_rate;
---
-1.9.1
-
diff --git a/debian/patches/0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch b/debian/patches/0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch
new file mode 100644
index 0000000..d75cf1b
--- /dev/null
+++ b/debian/patches/0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch
@@ -0,0 +1,44 @@
+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-Subject-Remove-commented-lines-in-visp-config.instal.patch b/debian/patches/0004-Subject-Remove-commented-lines-in-visp-config.instal.patch
new file mode 100644
index 0000000..485ded8
--- /dev/null
+++ b/debian/patches/0004-Subject-Remove-commented-lines-in-visp-config.instal.patch
@@ -0,0 +1,31 @@
+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/series b/debian/patches/series
index 0eb4519..3afa626 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
0001-Install-vpConfig.h-in-include-architecture-triplet.patch
0002-Fix-compat-with-ffmpeg-libraries.patch
+0003-Subject-Install-OGRE-config-files-in-arch-specific-d.patch
+0004-Subject-Remove-commented-lines-in-visp-config.instal.patch
--
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