Attachment 451902 Details for Bug 236592 – Patch against WebKitGTK 2.34.3 for X11-less OpenGL

[patch] Patch against WebKitGTK 2.34.3 for X11-less OpenGL

webkitgtk-2.34.3-findOpenGL.patch (text/plain), 1.54 KB, created by Haelwenn (lanodan) Monnier on 2022-02-14 08:11:00 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Haelwenn (lanodan) Monnier

Created: 2022-02-14 08:11:00 PST

Size: 1.54 KB

patch

obsolete

>diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
>index 7abc3c0..65cd1f2 100644
>--- a/Source/WebCore/platform/graphics/GLContext.cpp
>+++ b/Source/WebCore/platform/graphics/GLContext.cpp
>@@ -31,8 +31,8 @@
> 
> #if USE(GLX)
> #include "GLContextGLX.h"
>-#include "OpenGLShims.h"
> #endif
>+#include "OpenGLShims.h"
> 
> using WTF::ThreadSpecific;
> 
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
>index 0139411..0dc7f05 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
>@@ -69,8 +69,8 @@
> 
> #if USE(GLX)
> #include <GL/glx.h>
>-#include <WebCore/OpenGLShims.h>
> #endif
>+#include <WebCore/OpenGLShims.h>
> 
> #if USE(GSTREAMER)
> #include <gst/gst.h>
>diff --git a/Source/cmake/FindOpenGL.cmake b/Source/cmake/FindOpenGL.cmake
>index e03a421..59c339c 100644
>--- a/Source/cmake/FindOpenGL.cmake
>+++ b/Source/cmake/FindOpenGL.cmake
>@@ -31,7 +31,7 @@
> 
> find_package(PkgConfig QUIET)
> 
>-pkg_check_modules(PC_OPENGL gl)
>+pkg_check_modules(PC_OPENGL opengl)
> 
> if (PC_OPENGL_FOUND)
>     set(OPENGL_DEFINITIONS ${PC_OPENGL_CFLAGS_OTHER})
>@@ -41,7 +41,7 @@ find_path(OPENGL_INCLUDE_DIRS NAMES GL/gl.h
>     HINTS ${PC_OPENGL_INCLUDEDIR} ${PC_OPENGL_INCLUDE_DIRS}
> )
> 
>-set(OPENGL_NAMES ${OPENGL_NAMES} gl GL)
>+set(OPENGL_NAMES ${OPENGL_NAMES} gl GL OpenGL)
> find_library(OPENGL_LIBRARIES NAMES ${OPENGL_NAMES}
>     HINTS ${PC_OPENGL_LIBDIR} ${PC_OPENGL_LIBRARY_DIRS}
> )

Actions: View | Formatted Diff | Diff

Attachments on bug 236592: 451902 | 452176 | 452185 | 452507