Hello community,

here is the log from the commit of package opencv for openSUSE:Factory checked 
in at 2015-06-12 20:24:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opencv (Old)
 and      /work/SRC/openSUSE:Factory/.opencv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "opencv"

Changes:
--------
--- /work/SRC/openSUSE:Factory/opencv/opencv-qt5.changes        2015-01-30 
17:47:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.opencv.new/opencv-qt5.changes   2015-06-12 
20:24:30.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jun 10 12:42:49 UTC 2015 - sch...@suse.de
+
+- opencv-gles.patch: support Qt5 built with GLES
+
+-------------------------------------------------------------------

New:
----
  opencv-gles.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ opencv-qt5.spec ++++++
--- /var/tmp/diff_new_pack.KwIuyp/_old  2015-06-12 20:24:34.000000000 +0200
+++ /var/tmp/diff_new_pack.KwIuyp/_new  2015-06-12 20:24:34.000000000 +0200
@@ -42,6 +42,8 @@
 Patch5:         opencv-altivec-vector.patch
 # PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor 
version co...@suse.de
 Patch6:         opencv-gcc5.patch
+# PATCH-FIX-UPSTREAM opencv-gles.patch -- support Qt5 built with GLES
+Patch7:         opencv-gles.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 %if 0%{?suse_version} > 1310
@@ -149,6 +151,7 @@
 #%patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # Remove Windows specific files
 rm -f doc/packaging.txt

++++++ opencv-gles.patch ++++++
If Qt5 is configured with -opengl es2 then <QtOpenGL> doesn't define
GL_PERSPECTIVE_CORRECTION_HINT.

Index: opencv-2.4.11/modules/highgui/src/window_QT.cpp
===================================================================
--- opencv-2.4.11.orig/modules/highgui/src/window_QT.cpp
+++ opencv-2.4.11/modules/highgui/src/window_QT.cpp
@@ -3118,7 +3118,9 @@ void OpenGlViewPort::updateGl()
 
 void OpenGlViewPort::initializeGL()
 {
+#ifdef GL_PERSPECTIVE_CORRECTION_HINT
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+#endif
 }
 
 void OpenGlViewPort::resizeGL(int w, int h)

Reply via email to