pool/opencv
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 510958 from KDE:Extra

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/510958
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2017-07-25 09:35:34 +00:00 committed by Git OBS Bridge
parent 9686033d32
commit 42cb4f5adf
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-Do-not-include-glx.h-when-using-GLES.patch Normal file
View File

@ -0,0 +1,31 @@
From 9be7aaacd55b6264f8b893277f3f44c1f2b37c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 15 Jul 2017 21:14:07 +0200
Subject: [PATCH] Do not include glx.h when using GLES
---
modules/highgui/src/window_QT.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
index 4cfce66..baea0a2 100644
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -54,9 +54,12 @@
#include <unistd.h>
#endif
+// Get GL_PERSPECTIVE_CORRECTION_HINT definition, not available in GLES 2 or
+// OpenGL 3 core profile or later
#ifdef HAVE_QT_OPENGL
- #if defined Q_WS_X11 /* Qt4 */ || defined Q_OS_LINUX /* Qt5 */
- #include <GL/glx.h>
+ #if defined Q_WS_X11 /* Qt4 */ || \
+ (!defined(QT_OPENGL_ES_2) && defined Q_OS_LINUX) /* Qt5 with desktop OpenGL */
+ #include <GL/gl.h>
#endif
#endif
--
2.13.2

7
opencv.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jul 15 19:14:48 UTC 2017 - stefan.bruens@rwth-aachen.de
- Add 0001-Do-not-include-glx.h-when-using-GLES.patch
Fix build for 32bit ARM, including both GLES and desktop GL headers
causes incompatible pointer type errors
-------------------------------------------------------------------
Mon Jun 5 12:15:24 UTC 2017 - tchvatal@suse.com

2
opencv.spec
View File

@ -38,6 +38,8 @@ Patch1: opencv-gles.patch
Patch8: opencv-build-compare.patch
# PATCH-FIX-UPSTREAM opencv-gcc6-fix-pch-support-PR8345.patch -- fix PCH support on GCC 6.x
Patch10: opencv-gcc6-fix-pch-support-PR8345.patch
# PATCH-FIX-OPENSUSE 0001-Do-not-include-glx.h-when-using-GLES.patch -- Fix build error on 32bit ARM, due to incompatible pointer types
Patch11: 0001-Do-not-include-glx.h-when-using-GLES.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: libeigen3-devel