Hello community,
here is the log from the commit of package opencv for openSUSE:Factory checked
in at 2017-07-25 11:35:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opencv (Old)
and /work/SRC/openSUSE:Factory/.opencv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv"
Tue Jul 25 11:35:34 2017 rev:67 rq:510958 version:3.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2017-07-11
08:24:12.513299329 +0200
+++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2017-07-25
11:35:35.601037204 +0200
@@ -1,0 +2,7 @@
+Sat Jul 15 19:14:48 UTC 2017 - stefan.bru...@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
+
+-------------------------------------------------------------------
New:
----
0001-Do-not-include-glx.h-when-using-GLES.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opencv.spec ++++++
--- /var/tmp/diff_new_pack.Kg7Js8/_old 2017-07-25 11:35:37.556761015 +0200
+++ /var/tmp/diff_new_pack.Kg7Js8/_new 2017-07-25 11:35:37.560760450 +0200
@@ -38,6 +38,8 @@
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
++++++ 0001-Do-not-include-glx.h-when-using-GLES.patch ++++++
>From 9be7aaacd55b6264f8b893277f3f44c1f2b37c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bru...@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
