Skip to content

Commit 0693bf1

Browse files
magomezmagomez
committed
Add the infrastructure to build wpe 2.50
1 parent 8eb4185 commit 0693bf1

File tree

4 files changed

+62
-7
lines changed

4 files changed

+62
-7
lines changed

‎package/cog/cog.mk‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ifeq ($(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
88
COG_VERSION = 0.18.0
99
endif
1010

11+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_50),y)
12+
COG_VERSION = 0.18.0
13+
endif
14+
1115
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_46),y)
1216
COG_VERSION = 0.18.0
1317
endif
@@ -51,7 +55,7 @@ ifneq ($(BR2_PACKAGE_COG_PLATFORM_HEADLESS)$(BR2_PACKAGE_COG_PLATFORM_FDO)$(BR2_
5155
COG_DEPENDENCIES += wpebackend-fdo
5256
endif
5357

54-
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
58+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT2_50)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
5559
COG_FDO_PLATFORM_CMAKE_OPTION = COG_PLATFORM_WL
5660
COG_CONF_OPTS_CMAKE += \
5761
-DCOG_PLATFORM_GTK4=OFF \
@@ -103,7 +107,7 @@ COG_CONF_OPTS_CMAKE += -DCOG_PLATFORM_DRM=OFF
103107
endif
104108

105109
ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y)
106-
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
110+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT2_50)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
107111
COG_DBUS_POLICY_FILE = $(@D)/build/com.igalia.Cog.conf
108112
else
109113
COG_DBUS_POLICY_FILE = $(@D)/com.igalia.Cog.conf
@@ -146,7 +150,7 @@ COG_POST_INSTALL_TARGET_HOOKS += COG_AUTOSTART
146150
endif # BR2_PACKAGE_COG_AUTOSTART
147151

148152

149-
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
153+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT2_50)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
150154
ifeq ($(BR2_PACKAGE_LIBMANETTE),y)
151155
COG_DEPENDENCIES += libmanette
152156
endif

‎package/wpe/wpebackend/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ config BR2_PACKAGE_WPEBACKEND_LIBWPE_VERSION
77
default "1.14.0" if BR2_PACKAGE_WPEWEBKIT2_38
88
default "1.14.0" if BR2_PACKAGE_WPEWEBKIT2_42
99
default "1.16.2" if BR2_PACKAGE_WPEWEBKIT2_46
10+
default "1.16.2" if BR2_PACKAGE_WPEWEBKIT2_50
1011
default "1.16.2" if BR2_PACKAGE_WPEWEBKIT_NEXT
1112

1213
config BR2_PACKAGE_WPEBACKEND

‎package/wpe/wpewebkit/Config.in‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,16 @@ config BR2_PACKAGE_WPEWEBKIT2_46
113113
comment "version 2.46 depends on gcc11"
114114
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_11
115115

116+
config BR2_PACKAGE_WPEWEBKIT2_50
117+
bool "2.50"
118+
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12
119+
help
120+
Build WPE WebKit 2.50.x
121+
122+
comment "version 2.50 depends on gcc12"
123+
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_12
124+
125+
116126
config BR2_PACKAGE_WPEWEBKIT_NEXT
117127
bool "next"
118128
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12
@@ -255,7 +265,7 @@ config BR2_PACKAGE_WPEWEBKIT_WEBDRIVER
255265

256266
endif
257267

258-
if BR2_PACKAGE_WPEWEBKIT2_22 || BR2_PACKAGE_WPEWEBKIT2_38 || BR2_PACKAGE_WPEWEBKIT2_42 || BR2_PACKAGE_WPEWEBKIT2_46 || BR2_PACKAGE_WPEWEBKIT_NEXT
268+
if BR2_PACKAGE_WPEWEBKIT2_22 || BR2_PACKAGE_WPEWEBKIT2_38 || BR2_PACKAGE_WPEWEBKIT2_42 || BR2_PACKAGE_WPEWEBKIT2_46 || BR2_PACKAGE_WPEWEBKIT2_50 || BR2_PACKAGE_WPEWEBKIT_NEXT
259269

260270
config BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_VIDEO
261271
bool "Enable native video"
@@ -337,6 +347,28 @@ config BR2_PACKAGE_WPEWEBKIT2_46_GST_DEPS
337347
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
338348
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
339349

350+
config BR2_PACKAGE_WPEWEBKIT2_50_GST_DEPS
351+
bool
352+
default n
353+
select BR2_PACKAGE_GST1_PLUGINS_BAD
354+
select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
355+
select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX
356+
select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC
357+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA
358+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
359+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT
360+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
361+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
362+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT
363+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE
364+
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME
365+
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX
366+
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT
367+
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4
368+
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
369+
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
370+
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
371+
340372
config BR2_PACKAGE_WPEWEBKIT_NEXT_GST_DEPS
341373
bool
342374
default n
@@ -359,7 +391,7 @@ config BR2_PACKAGE_WPEWEBKIT_NEXT_GST_DEPS
359391
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
360392
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
361393

362-
if BR2_PACKAGE_WPEWEBKIT2_28 || BR2_PACKAGE_WPEWEBKIT2_38 || BR2_PACKAGE_WPEWEBKIT2_42 || BR2_PACKAGE_WPEWEBKIT2_46 || BR2_PACKAGE_WPEWEBKIT_NEXT
394+
if BR2_PACKAGE_WPEWEBKIT2_28 || BR2_PACKAGE_WPEWEBKIT2_38 || BR2_PACKAGE_WPEWEBKIT2_42 || BR2_PACKAGE_WPEWEBKIT2_46 || BR2_PACKAGE_WPEWEBKIT2_50 || BR2_PACKAGE_WPEWEBKIT_NEXT
363395

364396
config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA
365397
bool "multimedia support"
@@ -370,6 +402,7 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA
370402
select BR2_PACKAGE_WPEWEBKIT2_38_GST_DEPS if BR2_PACKAGE_WPEWEBKIT2_38
371403
select BR2_PACKAGE_WPEWEBKIT2_42_GST_DEPS if BR2_PACKAGE_WPEWEBKIT2_42
372404
select BR2_PACKAGE_WPEWEBKIT2_46_GST_DEPS if BR2_PACKAGE_WPEWEBKIT2_46
405+
select BR2_PACKAGE_WPEWEBKIT2_50_GST_DEPS if BR2_PACKAGE_WPEWEBKIT2_50
373406
select BR2_PACKAGE_WPEWEBKIT_NEXT_GST_DEPS if BR2_PACKAGE_WPEWEBKIT_NEXT
374407
# Needed for WebAudio, to enable "audiointerleave" from audiomixer
375408
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER

‎package/wpe/wpewebkit/wpewebkit.mk‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ WPEWEBKIT_VERSION_VALUE = 2.46
2929
WPEWEBKIT_VERSION = wpe-2.46
3030
endif
3131

32+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_50),y)
33+
WPEWEBKIT_VERSION_VALUE = 2.50
34+
WPEWEBKIT_VERSION = wpe-2.50
35+
endif
36+
3237
ifeq ($(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
3338
WPEWEBKIT_VERSION_VALUE = main
3439
WPEWEBKIT_VERSION = 09f6529795c6951c70453acd520dbd23fa280af5
@@ -193,7 +198,7 @@ WPEWEBKIT_CONF_OPTS += \
193198
-DENABLE_BREAKPAD=OFF
194199

195200
else
196-
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
201+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT2_50)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
197202

198203
WPEWEBKIT_CONF_OPTS += \
199204
-DENABLE_ACCESSIBILITY=OFF \
@@ -227,6 +232,18 @@ WPEWEBKIT_CONF_OPTS += \
227232
WPEWEBKIT_DEPENDENCIES += libbacktrace
228233
endif
229234

235+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_50),y)
236+
WPEWEBKIT_CONF_OPTS += \
237+
-DUSE_JPEGXL=OFF \
238+
-DUSE_AVIF=OFF \
239+
-DUSE_GBM=OFF \
240+
-DUSE_GSTREAMER_TRANSCODER=OFF \
241+
-DENABLE_WPE_1_1_API=ON \
242+
-DUSE_ATK=OFF \
243+
-DUSE_LIBDRM=OFF
244+
WPEWEBKIT_DEPENDENCIES += libbacktrace
245+
endif
246+
230247
ifeq ($(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
231248
WPEWEBKIT_CONF_OPTS += \
232249
-DUSE_JPEGXL=OFF \
@@ -287,7 +304,7 @@ else
287304
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
288305
endif
289306
endif
290-
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
307+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38)$(BR2_PACKAGE_WPEWEBKIT2_42)$(BR2_PACKAGE_WPEWEBKIT2_46)$(BR2_PACKAGE_WPEWEBKIT2_50)$(BR2_PACKAGE_WPEWEBKIT_NEXT),y)
291308
WPEWEBKIT_CONF_OPTS += \
292309
-DENABLE_GAMEPAD=ON \
293310
-DENABLE_INTROSPECTION=OFF \

0 commit comments

Comments
 (0)