mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

wpe: Fix build with -Werror enabled

Browse source 
Including gl.h from WPEThreadedView.h leads to GST_LEVEL_DEFAULT detected as
redefined. The proposed fix is to include config.h from the CPP implementation
file and disable gl.h inclusion in the header, by using forward declarations.
This commit is contained in:
Philippe Normand 2019-06-05 12:47:16 +01:00
parent 7117ba0a53
commit 5105bc8041
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/wpe/WPEThreadedView.cpp
View file

@ -17,12 +17,20 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "WPEThreadedView.h"
#include <gst/gl/gl.h>
#include <gst/gl/egl/gsteglimage.h>
#include <gst/gl/egl/gstgldisplay_egl.h>
#include <cstdio>
#include <mutex>
#define GST_CAT_DEFAULT wpe_src_debug
GST_DEBUG_CATEGORY_EXTERN (wpe_src_debug);
// -70 is the GLib priority we use internally in WebKit, for WPE.
#define WPE_GLIB_SOURCE_PRIORITY -70

7
ext/wpe/WPEThreadedView.h
View file

@ -21,16 +21,15 @@
#include <EGL/egl.h>
#include <glib.h>
#include <gst/gl/gl.h>
#include <gst/gl/gstglfuncs.h>
#include <gst/gl/egl/gsteglimage.h>
#include <gst/gl/egl/gstgldisplay_egl.h>
#include <wpe/fdo.h>
#include <wpe/fdo-egl.h>
#include <wpe/webkit.h>
#include "gstwpesrc.h"
GST_DEBUG_CATEGORY_EXTERN(wpe_src_debug);
typedef struct _GstGLContext GstGLContext;
typedef struct _GstGLDisplay GstGLDisplay;
typedef struct _GstEGLImage GstEGLImage;
class WPEThreadedView {
public:

2
ext/wpe/gstwpesrc.cpp
View file

@ -60,10 +60,10 @@
#endif
#include "gstwpesrc.h"
#include <gst/video/video.h>
#include <gst/gl/gl.h>
#include <gst/gl/egl/gstglmemoryegl.h>
#include <gst/gl/wayland/gstgldisplay_wayland.h>
#include <gst/video/video.h>
#include <xkbcommon/xkbcommon.h>
#include "WPEThreadedView.h"