[opencv] 07/13: Update patches/disable_opengl_test_build

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to branch master
in repository opencv.

commit 6cbd860b88203cdaecd1a837a2fcb349dfb3f999
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Wed May 10 04:29:02 2017 +0900

    Update patches/disable_opengl_test_build
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/disable_opengl_test_build | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/patches/disable_opengl_test_build b/debian/patches/disable_opengl_test_build
index bf88e61..549b569 100644
--- a/debian/patches/disable_opengl_test_build
+++ b/debian/patches/disable_opengl_test_build
@@ -1,12 +1,14 @@
+diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
+index 8c97ea865a..3d50dd28f0 100644
 --- a/samples/gpu/CMakeLists.txt
 +++ b/samples/gpu/CMakeLists.txt
-@@ -96,9 +96,6 @@
+@@ -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)
+-  if(NOT HAVE_OPENGL)
+-    list(REMOVE_ITEM install_list "opengl.cpp")
+-  endif()
    install(FILES ${install_list}
            DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
            PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git