Skip to content

wpe: Rename WPEView to WPEThreadedView

Marvin Schmidt requested to merge marv/gstreamer:wpeview-rename into main

WebKit commit b12e7ed2ad3a ("[WPE] Upstream the new WPE platform API https://bugs.webkit.org/show_bug.cgi?id=265286")[1] added a WPEView typedef which clashes with our WPEView class:

x86_64-pc-linux-gnu-c++ -Iext/wpe/libgstwpe.so.p -Iext/wpe -I../gst-plugins-bad-scm/subprojects/gst-plugins-bad/ext/wpe -I. -I../gst-plugins-bad-sc
m/subprojects/gst-plugins-bad -I/usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0 -I/usr/x86_64-pc-linux-gnu/include/libsoup-3.0 -I/usr/x86_64-pc-lin
ux-gnu/include/wpe-1.0 -I/usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0/wpe-platform -I/usr/x86_64-pc-linux-gnu/include/glib-2.0 -I/usr/x86_64-pc-
linux-gnu/lib/glib-2.0/include -I/usr/x86_64-pc-linux-gnu/include/libmount -I/usr/x86_64-pc-linux-gnu/include/blkid -I/usr/x86_64-pc-linux-gnu/incl
ude/wpe-fdo-1.0 -I/usr/x86_64-pc-linux-gnu/include/gstreamer-1.0 -I/usr/x86_64-pc-linux-gnu/include/orc-0.4 -I/usr/x86_64-pc-linux-gnu/lib/gstreame
r-1.0/include -I/usr/x86_64-pc-linux-gnu/include/gio-unix-2.0 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O2 -g -Wno-non
-virtual-dtor -fvisibility=hidden -fno-strict-aliasing -Wformat-nonliteral -Wmissing-declarations -Wredundant-decls -Wwrite-strings -Wformat -Wform
at-security -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wvla -Wpointer-arith -pipe -O2 -mtune=generic -march=x86-64 -O2 -mtune=gen
eric -march=x86-64 -fPIC -pthread -DWPE_ENABLE_XKB=1 -DHAVE_CONFIG_H -DHAVE_CONFIG_H=1 -DWPE_EXTENSION_INSTALL_DIR=/usr/x86_64-pc-linux-gnu/lib/gst
-plugins-bad/wpe-extension -DUSE_WPE2=1 -MD -MQ ext/wpe/libgstwpe.so.p/gstwpesrcbin.cpp.o -MF ext/wpe/libgstwpe.so.p/gstwpesrcbin.cpp.o.d -o ext/wp
e/libgstwpe.so.p/gstwpesrcbin.cpp.o -c ../gst-plugins-bad-scm/subprojects/gst-plugins-bad/ext/wpe/gstwpesrcbin.cpp
In file included from ../gst-plugins-bad-scm/subprojects/gst-plugins-bad/ext/wpe/gstwpesrcbin.cpp:95:
../gst-plugins-bad-scm/subprojects/gst-plugins-bad/ext/wpe/WPEThreadedView.h:35:7: error: using typedef-name 'WPEView' after 'class'
   35 | class WPEView {
      |       ^~~~~~~
In file included from /usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0/wpe-platform/wpe/WPEEnumTypes.h:37,
                 from /usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0/wpe-platform/wpe/wpe-platform.h:30,
                 from /usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0/wpe/WebKitWebView.h:63,
                 from /usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0/wpe/webkit.h:84,
                 from ../gst-plugins-bad-scm/subprojects/gst-plugins-bad/ext/wpe/gstwpevideosrc.h:3,
                 from ../gst-plugins-bad-scm/subprojects/gst-plugins-bad/ext/wpe/gstwpesrcbin.cpp:93:
/usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0/wpe-platform/wpe/WPEView.h:39:29: note: 'WPEView' has a previous declaration here
   39 | WPE_DECLARE_DERIVABLE_TYPE (WPEView, wpe_view, WPE, VIEW, GObject)
      |                             ^~~~~~~
/usr/x86_64-pc-linux-gnu/include/wpe-webkit-2.0/wpe-platform/wpe/WPEDefines.h:47:37: note: in definition of macro 'WPE_DECLARE_DERIVABLE_TYPE'
   47 |     typedef struct _##ModuleObjName ModuleObjName;                                                      \
      |                                     ^~~~~~~~~~~~~

Rename the WPEView class to WPEThreadedView to avoid the collision and also match the filename.

[1] https://github.com/WebKit/WebKit/commit/b12e7ed2ad3a47ab322507ebac214225f2298acc

Merge request reports