[opencv] 05/11: Add patches/disable_opengl_test_build
Nobuhiro Iwamatsu
iwamatsu at moszumanska.debian.org
Sat Aug 20 12:28:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
iwamatsu pushed a commit to branch master
in repository opencv.
commit 364151edaf15455c1b2a374e4b93c1cf9ffe579f
Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
Date: Sun Aug 7 17:47:31 2016 +0900
Add patches/disable_opengl_test_build
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at debian.org>
---
debian/changelog | 1 +
debian/patches/disable_opengl_test_build | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 16 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ded6886..31e3ee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
opencv (3.1.0+dfsg-1~exp0) UNRELEASED; urgency=medium
* Update to 3.1.0.
+ * Add patches/disable_opengl_test_build.
-- Nobuhiro Iwamatsu <iwamatsu at debian.org> Sat, 25 Jun 2016 06:15:45 +0900
diff --git a/debian/patches/disable_opengl_test_build b/debian/patches/disable_opengl_test_build
new file mode 100644
index 0000000..cb54ffa
--- /dev/null
+++ b/debian/patches/disable_opengl_test_build
@@ -0,0 +1,14 @@
+diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
+index 6085cac..7d3622e 100644
+--- a/samples/gpu/CMakeLists.txt
++++ b/samples/gpu/CMakeLists.txt
+@@ -96,9 +96,6 @@ endif()
+
+ if(INSTALL_C_EXAMPLES AND NOT WIN32)
+ file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+- if(NOT WITH_OPENGL)
+- list(REMOVE_ITEM all_samples "opengl.cpp")
+- endif(NOT WITH_OPENGL)
+ install(FILES ${install_list}
+ DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
+ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
diff --git a/debian/patches/series b/debian/patches/series
index 08287bf..ae6304f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ support_multiarch
#optimize_i586.patch
support_x32
# ffmpeg_2.9.patch
+disable_opengl_test_build
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list