Thanks, applied as 2b17dae362a4d98e4db74ce0e0bbaf9bc2444b22. Michael
[sent from post-receive hook] On Wed, 28 Sep 2022 16:29:18 +0200, Bastian Krause <[email protected]> wrote: > Signed-off-by: Bastian Krause <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in > index 8c1f6c50ed34..3f11e921b526 100644 > --- a/rules/wpewebkit.in > +++ b/rules/wpewebkit.in > @@ -9,6 +9,7 @@ menuconfig WPEWEBKIT > select HOST_SYSTEM_PERL > select HOST_SYSTEM_PERL_JSON > select HOST_SYSTEM_RUBY > + select ALSA_LIB if WPEWEBKIT_WEBRTC > select GLIB > select LIBWPE > select CAIRO > @@ -38,8 +39,10 @@ menuconfig WPEWEBKIT > select LIBEPOXY > select LIBGCRYPT > select LIBTASN1 > + select OPENSSL if WPEWEBKIT_WEBRTC > select GSTREAMER1 if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > select GST_PLUGINS_BASE1 if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > + select GST_PLUGINS_BASE1_ALSA if WPEWEBKIT_WEBRTC > select GST_PLUGINS_BASE1_APP if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > select GST_PLUGINS_BASE1_AUDIOCONVERT if WPEWEBKIT_AUDIO > select GST_PLUGINS_BASE1_AUDIOMIXER if WPEWEBKIT_AUDIO > @@ -47,23 +50,29 @@ menuconfig WPEWEBKIT > select GST_PLUGINS_BASE1_EGL if WPEWEBKIT_VIDEO > select GST_PLUGINS_BASE1_GIO if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > select GST_PLUGINS_BASE1_GL if WPEWEBKIT_VIDEO > + select GST_PLUGINS_BASE1_OPENGL if WPEWEBKIT_VIDEO > select GST_PLUGINS_BASE1_PLAYBACK if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > + select GST_PLUGINS_BASE1_TYPEFIND if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > select GST_PLUGINS_BASE1_VIDEOCONVERT if WPEWEBKIT_VIDEO > + select GST_PLUGINS_BASE1_VIDEORATE if WPEWEBKIT_WEBRTC > select GST_PLUGINS_BASE1_VOLUME if WPEWEBKIT_AUDIO > select GST_PLUGINS_GOOD1 if (WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO) && RUNTIME > select GST_PLUGINS_GOOD1_AUDIOFX if WPEWEBKIT_AUDIO > + select GST_PLUGINS_GOOD1_AUDIOPARSERS if WPEWEBKIT_AUDIO > select GST_PLUGINS_GOOD1_AUTODETECT if WPEWEBKIT_AUDIO > + select GST_PLUGINS_GOOD1_DEINTERLACE if WPEWEBKIT_VIDEO > select GST_PLUGINS_GOOD1_INTERLEAVE if WPEWEBKIT_AUDIO > select GST_PLUGINS_GOOD1_ISOMP4 if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > select GST_PLUGINS_GOOD1_MATROSKA if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > select GST_PLUGINS_GOOD1_VIDEOFILTER if WPEWEBKIT_VIDEO > - select GST_PLUGINS_BAD1 if (WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO) && RUNTIME > + select GST_PLUGINS_BAD1 if WPEWEBKIT_VIDEO || > WPEWEBKIT_AUDIO > # fdkaac is preferred but currently not available > select GST_PLUGINS_BAD1_FDKAAC if WPEWEBKIT_AUDIO && BROKEN > select GST_PLUGINS_BAD1_DEBUGUTILS if WPEWEBKIT_VIDEO > select GST_PLUGINS_BAD1_OPUS if WPEWEBKIT_AUDIO > select GST_PLUGINS_BAD1_SUBENC if WPEWEBKIT_VIDEO > select GST_PLUGINS_BAD1_VIDEOPARSERS if WPEWEBKIT_VIDEO > + select GST_PLUGINS_BAD1_WEBRTC if WPEWEBKIT_WEBRTC > select WPEBACKEND_FDO > select QT5 if WPEWEBKIT_QT > select QT5_MODULE_QTDECLARATIVE if WPEWEBKIT_QT > @@ -91,6 +100,11 @@ config WPEWEBKIT_AUDIO > bool > prompt "audio support" > > +config WPEWEBKIT_WEBRTC > + bool > + depends on WPEWEBKIT_AUDIO && WPEWEBKIT_VIDEO > + prompt "WebRTC support" > + > config WPEWEBKIT_ENABLE_LOGGING > bool > prompt "enable logging support" > diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make > index 837d4dcba14e..3819c5667240 100644 > --- a/rules/wpewebkit.make > +++ b/rules/wpewebkit.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit > # > # Paths and names > # > -WPEWEBKIT_VERSION := 2.34.6 > -WPEWEBKIT_MD5 := c9705270b342474cca28cf51632ccbbe > +WPEWEBKIT_VERSION := 2.38.0 > +WPEWEBKIT_MD5 := e0e6b98c86351c39e41da475afc50780 > WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION) > WPEWEBKIT_SUFFIX := tar.xz > WPEWEBKIT_URL := > https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX) > @@ -39,12 +39,22 @@ WPEWEBKIT_CONF_OPT := \ > -DDEBUG_FISSION=OFF \ > -DENABLE_ACCESSIBILITY=OFF \ > -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ > + -DENABLE_DOCUMENTATION=OFF \ > -DENABLE_ENCRYPTED_MEDIA=OFF \ > - -DENABLE_GTKDOC=OFF\ > + -DENABLE_GAMEPAD=OFF \ > + -DENABLE_INTROSPECTION=OFF \ > + -DENABLE_JAVASCRIPTCORE=ON \ > + -DENABLE_JOURNALD_LOG=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \ > -DENABLE_MEDIA_SOURCE=ON \ > + -DENABLE_MEDIA_STREAM=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \ > + -DENABLE_PDFJS=ON \ > + -DENABLE_WEB_RTC=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \ > + -DENABLE_WEBXR=OFF \ > -DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \ > + -DENABLE_WEBCORE=ON \ > -DENABLE_WEBDRIVER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBDRIVER) \ > - -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ \ > + -DENABLE_WEBKIT=ON \ > + -DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \ > -DENABLE_WEB_CRYPTO=ON \ > -DENABLE_WPE_QT_API=$(call ptx/onoff,PTXCONF_WPEWEBKIT_QT) \ > -DENABLE_XSLT=ON \ > @@ -52,15 +62,16 @@ WPEWEBKIT_CONF_OPT := \ > -DPORT=WPE \ > -DSHOULD_INSTALL_JS_SHELL=OFF \ > -DSHOW_BINDINGS_GENERATION_PROGRESS=ON \ > - -DUSE_LD_GOLD=OFF \ > + -DUSE_64KB_PAGE_BLOCK=OFF \ > -DUSE_APPLE_ICU=OFF \ > + -DUSE_AVIF=OFF \ > + -DUSE_GSTREAMER_GL=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \ > + -DUSE_JPEGXL=OFF \ > -DUSE_LCMS=OFF \ > -DUSE_OPENJPEG=OFF \ > -DUSE_SOUP2=ON \ > - -DUSE_SYSTEMD=$(call ptx/onoff,PTXCONF_WPEWEBKIT_JOURNALD) \ > -DUSE_THIN_ARCHIVES=ON \ > - -DUSE_WOFF2=OFF \ > - -DWTF_CPU_ARM64_CORTEXA53=OFF > + -DUSE_WOFF2=OFF > > WPEWEBKIT_SYSTEM_MALLOC := OFF > ifdef PTXCONF_WPEWEBKIT_QT
