From 0417dabdbd0c876f43c673c1d536c3a6910b5215 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 18 Oct 2020 14:51:37 +0200 Subject: [PATCH 1/2] CMake: use correct media sources in WXQT build Only check for gstreamer in Unix GTK builds. Closes #18945 --- build/cmake/init.cmake | 2 +- build/cmake/lib/media/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 166b90412b..52678cbc49 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -447,7 +447,7 @@ if(wxUSE_GUI) endif() endif() - if(wxUSE_MEDIACTRL AND UNIX AND NOT APPLE AND NOT WIN32) + if(wxUSE_MEDIACTRL AND WXGTK AND NOT APPLE AND NOT WIN32) find_package(GSTREAMER 1.0 COMPONENTS video) if(NOT GSTREAMER_FOUND) find_package(GSTREAMER 0.10 COMPONENTS interfaces) diff --git a/build/cmake/lib/media/CMakeLists.txt b/build/cmake/lib/media/CMakeLists.txt index 4a0aa959c8..e4a9497820 100644 --- a/build/cmake/lib/media/CMakeLists.txt +++ b/build/cmake/lib/media/CMakeLists.txt @@ -17,7 +17,7 @@ elseif(WXOSX_COCOA) wx_append_sources(MEDIA_FILES MEDIA_OSX_COCOA) elseif(WXOSX_IPHONE) wx_append_sources(MEDIA_FILES MEDIA_OSX_IPHONE) -elseif(UNIX) +elseif(WXGTK) wx_append_sources(MEDIA_FILES MEDIA_UNIX) elseif(WXQT) wx_append_sources(MEDIA_FILES MEDIA_QT) @@ -30,7 +30,7 @@ if(WXOSX) "-framework CoreMedia" "-weak_framework AVKit" ) -elseif(UNIX) +elseif(WXGTK) wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INCLUDE_DIRS}) if(GSTREAMER_INTERFACES_INCLUDE_DIRS) wx_lib_include_directories(wxmedia PUBLIC ${GSTREAMER_INTERFACES_INCLUDE_DIRS}) From 62896efd70050273cd66c399f12a587a8a2448cf Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 18 Oct 2020 15:32:47 +0200 Subject: [PATCH 2/2] CMake: disable wxUSE_GLCANVAS_EGL in non-GTK3 builds Closes #18947 --- build/cmake/init.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 52678cbc49..4b56f6bfa3 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -397,7 +397,7 @@ if(wxUSE_GUI) message(WARNING "opengl not found, wxGLCanvas won't be available") wx_option_force_value(wxUSE_OPENGL OFF) endif() - if(UNIX AND NOT OpenGL_EGL_FOUND) + if(UNIX AND (NOT WXGTK3 OR NOT OpenGL_EGL_FOUND)) wx_option_force_value(wxUSE_GLCANVAS_EGL OFF) endif() endif()