Fix wxGLCanvas::IsDisplaySupported() when using EGL

This commit is contained in:
Scott Talbert 2022-01-10 16:46:39 -05:00
parent 43fffaa858
commit e5d733d5ce
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,23 @@
From d68c3709e49b967272b0794b0dd30e57e46326e8 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Thu, 30 Dec 2021 10:10:56 -0500
Subject: [PATCH] wxGLCanvas EGL: don't assert if eglChooseConfig fails
This assert prevents wxGLCanvas::IsDisplaySupported() from working properly
in the case where unsupported attributes are passed.
---
src/unix/glegl.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/unix/glegl.cpp b/src/unix/glegl.cpp
index fa4ad29b5124..5e831713b51f 100644
--- a/src/unix/glegl.cpp
+++ b/src/unix/glegl.cpp
@@ -578,7 +578,6 @@ EGLConfig *wxGLCanvasEGL::InitConfig(const wxGLAttributes& dispAttrs)
}
else
{
- wxFAIL_MSG("eglChooseConfig failed");
delete config;
return NULL;
}

View File

@ -5,7 +5,7 @@
Name: wxGTK
Version: 3.1.5
Release: 2%{?dist}
Release: 3%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
URL: https://www.wxwidgets.org/
@ -21,6 +21,7 @@ Patch2: catch1-sigstksz.patch
Patch3: gcc11_1.patch
Patch4: gcc11_2.patch
Patch5: gcc11_3.patch
Patch6: https://github.com/wxWidgets/wxWidgets/commit/d68c3709e49b967272b0794b0dd30e57e46326e8.patch
BuildRequires: make
BuildRequires: gcc-c++
@ -304,6 +305,9 @@ fi
%doc html
%changelog
* Mon Jan 10 2022 Scott Talbert <swt@techie.net> - 3.1.5-3
- Fix wxGLCanvas::IsDisplaySupported() when using EGL
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild