From b0a3d81b8fc27c5a0fe8cc5978ce8d2897a972ff73411efe738166db79a36717 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 12 Jun 2015 18:24:29 +0000 Subject: [PATCH] Accepting request 311630 from KDE:Extra 1 OBS-URL: https://build.opensuse.org/request/show/311630 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=56 --- opencv-gles.patch | 17 +++++++++++++++++ opencv-qt5.changes | 5 +++++ opencv-qt5.spec | 3 +++ 3 files changed, 25 insertions(+) create mode 100644 opencv-gles.patch diff --git a/opencv-gles.patch b/opencv-gles.patch new file mode 100644 index 0000000..b60e0e1 --- /dev/null +++ b/opencv-gles.patch @@ -0,0 +1,17 @@ +If Qt5 is configured with -opengl es2 then 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) diff --git a/opencv-qt5.changes b/opencv-qt5.changes index bf256d7..26e1c4b 100644 --- a/opencv-qt5.changes +++ b/opencv-qt5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 10 12:42:49 UTC 2015 - schwab@suse.de + +- opencv-gles.patch: support Qt5 built with GLES + ------------------------------------------------------------------- Mon Jan 26 09:46:21 UTC 2015 - tittiatcoke@gmail.com diff --git a/opencv-qt5.spec b/opencv-qt5.spec index bc1ed64..d765f42 100644 --- a/opencv-qt5.spec +++ b/opencv-qt5.spec @@ -42,6 +42,8 @@ Patch4: opencv-pkgconfig.patch Patch5: opencv-altivec-vector.patch # PATCH-FIX-UPSTREAM opencv-gcc5.patch -- support gcc versions without minor version coolo@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 @@ This package contains the documentation and examples for the OpenCV library. #%patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Remove Windows specific files rm -f doc/packaging.txt