Skip to content

Commit 8430548

Browse files
magomezDivya-563
magomez
authored and
Divya-563
committed
wpewebkit: bump 2.38 version to 2.38.5
1 parent a961bf9 commit 8430548

File tree

1 file changed

+143
-86
lines changed

1 file changed

+143
-86
lines changed

‎package/wpe/wpewebkit/wpewebkit.mk‎

Lines changed: 143 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -6,143 +6,153 @@
66

77
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_22),y)
88
WPEWEBKIT_VERSION = 2.22
9-
WPEWEBKIT_VERSION_VALUE = c2bbe41520037aa883e6cab9fc40524f6e2e4cd0
9+
WPEWEBKIT_VERSION_VALUE = 4a3f5e45a87edf439e9d1dfe919e2137972d1bfe
1010
endif
1111

1212
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28),y)
13-
# This is the wpe-2.28-soup3 branch tip.
1413
WPEWEBKIT_VERSION = 2.28
15-
WPEWEBKIT_VERSION_VALUE = b38dddf1dfa82e7d4bb9838df0cf6efbc5e12c8a
14+
WPEWEBKIT_VERSION_VALUE = e66cae2d3edad330166725dabf1dd79074a2b89b
1615
endif
1716

1817
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38),y)
1918
WPEWEBKIT_VERSION = 2.38
20-
WPEWEBKIT_VERSION_VALUE = d65c1c0558af8c29949cc7659c434fc6641ccca4
19+
WPEWEBKIT_VERSION_VALUE = 5da6f8c4c0ce16b8c694b5acd2c3d0c5379f710f
2120
endif
2221

2322
WPEWEBKIT_SITE = $(call github,WebPlatformForEmbedded,WPEWebKit,$(WPEWEBKIT_VERSION_VALUE))
23+
2424
WPEWEBKIT_INSTALL_STAGING = YES
2525
WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause
2626
WPEWEBKIT_LICENSE_FILES = \
2727
Source/WebCore/LICENSE-APPLE \
2828
Source/WebCore/LICENSE-LGPL-2.1
2929

30-
WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \
31-
libgles wpebackend libepoxy cairo jpeg libpng harfbuzz icu webp libsoup \
32-
libgcrypt libxslt openjpeg
30+
WPEWEBKIT_DEPENDENCIES = host-gperf host-ninja host-python host-ruby \
31+
harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \
32+
libpng libxslt openjpeg webp wpebackend
3333

34-
WPEWEBKIT_EXTRA_FLAGS = -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
34+
WPEWEBKIT_CONF_OPTS = \
35+
-GNinja \
36+
-DPORT=WPE \
37+
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
3538

36-
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_22),y)
39+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_22)$(BR2_PACKAGE_WPEWEBKIT2_28),y)
40+
WPEWEBKIT_CONF_OPTS += \
41+
-DENABLE_ACCELERATED_2D_CANVAS=ON
42+
endif
3743

38-
WPEWEBKIT_FLAGS = \
39-
-DPORT=WPE \
40-
-DEXPORT_DEPRECATED_WEBKIT2_C_API=ON \
41-
-DENABLE_ACCELERATED_2D_CANVAS=ON \
42-
-DENABLE_GEOLOCATION=OFF \
43-
-DENABLE_DEVICE_ORIENTATION=OFF \
44-
-DENABLE_GAMEPAD=OFF \
45-
-DENABLE_SUBTLE_CRYPTO=OFF \
46-
-DENABLE_FULLSCREEN_API=OFF \
47-
-DENABLE_NOTIFICATIONS=OFF \
44+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28),y)
45+
WPEWEBKIT_CONF_OPTS += \
46+
-DSILENCE_CROSS_COMPILATION_NOTICES=ON
47+
endif
48+
49+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38),y)
50+
WPEWEBKIT_CONF_OPTS += \
51+
-DENABLE_ACCESSIBILITY=OFF \
52+
-DENABLE_API_TESTS=OFF \
53+
-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
54+
-DENABLE_MINIBROWSER=OFF \
55+
-DUSE_WOFF2=OFF
56+
endif
57+
58+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_22),y)
59+
WPEWEBKIT_CONF_OPTS += \
4860
-DENABLE_DATABASE_PROCESS=OFF \
49-
-DENABLE_INDEXED_DATABASE=OFF \
50-
-DENABLE_MEDIA_STATISTICS=OFF \
61+
-DENABLE_DEVICE_ORIENTATION=OFF \
5162
-DENABLE_FETCH_API=OFF \
52-
-DENABLE_WEBDRIVER=ON \
53-
-DENABLE_SAMPLING_PROFILER=ON \
54-
-DENABLE_TOUCH_EVENTS=OFF \
5563
-DENABLE_FTL_JIT=OFF \
64+
-DENABLE_FULLSCREEN_API=OFF \
65+
-DENABLE_GAMEPAD=OFF \
66+
-DENABLE_GEOLOCATION=OFF \
67+
-DENABLE_INDEXED_DATABASE=OFF \
5668
-DENABLE_MATHML=OFF \
69+
-DENABLE_MEDIA_STATISTICS=OFF \
5770
-DENABLE_METER_ELEMENT=OFF \
71+
-DENABLE_NOTIFICATIONS=OFF \
72+
-DENABLE_SAMPLING_PROFILER=ON \
73+
-DENABLE_SUBTLE_CRYPTO=OFF \
5874
-DENABLE_SVG_FONTS=OFF \
59-
-DENABLE_WEBASSEMBLY=OFF
60-
61-
62-
63-
75+
-DENABLE_TOUCH_EVENTS=OFF \
76+
-DENABLE_VIDEO=ON \
77+
-DENABLE_VIDEO_TRACK=ON \
78+
-DENABLE_WEBASSEMBLY=OFF \
79+
-DEXPORT_DEPRECATED_WEBKIT2_C_API=ON
6480
WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-plugins-base \
6581
gst1-plugins-good gst1-plugins-bad
66-
WPEWEBKIT_FLAGS += \
67-
-DENABLE_VIDEO=ON \
68-
-DENABLE_VIDEO_TRACK=ON
6982

7083
ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_VIDEO),y)
71-
WPEWEBKIT_FLAGS += -DENABLE_NATIVE_VIDEO=ON
84+
WPEWEBKIT_CONF_OPTS += -DENABLE_NATIVE_VIDEO=ON
7285
else
73-
WPEWEBKIT_FLAGS += -DENABLE_NATIVE_VIDEO=OFF
86+
WPEWEBKIT_CONF_OPTS += -DENABLE_NATIVE_VIDEO=OFF
7487
endif
7588

7689
ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_AUDIO),y)
77-
WPEWEBKIT_FLAGS += -DENABLE_NATIVE_AUDIO=ON
90+
WPEWEBKIT_CONF_OPTS += -DENABLE_NATIVE_AUDIO=ON
7891
else
79-
WPEWEBKIT_FLAGS += -DENABLE_NATIVE_AUDIO=OFF
92+
WPEWEBKIT_CONF_OPTS += -DENABLE_NATIVE_AUDIO=OFF
8093
endif
8194

8295
ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_TEXT_SINK),y)
83-
WPEWEBKIT_FLAGS += -DENABLE_TEXT_SINK=ON
96+
WPEWEBKIT_CONF_OPTS += -DENABLE_TEXT_SINK=ON
8497
else
85-
WPEWEBKIT_FLAGS += -DENABLE_TEXT_SINK=OFF
98+
WPEWEBKIT_CONF_OPTS += -DENABLE_TEXT_SINK=OFF
8699
endif
87100

88101
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_WEB_AUDIO),y)
89-
WPEWEBKIT_FLAGS += -DENABLE_WEB_AUDIO=ON
102+
WPEWEBKIT_CONF_OPTS += -DENABLE_WEB_AUDIO=ON
90103
else
91-
WPEWEBKIT_FLAGS += -DENABLE_WEB_AUDIO=OFF
104+
WPEWEBKIT_CONF_OPTS += -DENABLE_WEB_AUDIO=OFF
92105
endif
93106

94107
ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_MEDIA_SOURCE),y)
95-
WPEWEBKIT_FLAGS += -DENABLE_MEDIA_SOURCE=ON
108+
WPEWEBKIT_CONF_OPTS += -DENABLE_MEDIA_SOURCE=ON
96109
else
97-
WPEWEBKIT_FLAGS += -DENABLE_MEDIA_SOURCE=OFF
110+
WPEWEBKIT_CONF_OPTS += -DENABLE_MEDIA_SOURCE=OFF
98111
endif
99112

100113
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_ENCRYPTED_MEDIA),y)
101-
WPEWEBKIT_FLAGS += -DENABLE_ENCRYPTED_MEDIA=ON
114+
WPEWEBKIT_CONF_OPTS += -DENABLE_ENCRYPTED_MEDIA=ON
102115
endif
103116

104117
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CDM),y)
105118
WPEWEBKIT_DEPENDENCIES += wpeframework-clientlibraries
106-
WPEWEBKIT_FLAGS += -DENABLE_OPENCDM=ON
119+
WPEWEBKIT_CONF_OPTS += -DENABLE_OPENCDM=ON
107120
endif
108121

109122
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y)
110-
WPEWEBKIT_FLAGS += -DUSE_GSTREAMER_GL=ON
123+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON
111124
else
112-
WPEWEBKIT_FLAGS += -DUSE_GSTREAMER_GL=OFF
125+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
113126
endif
114127

115128
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_WEBKIT_HTTP_SRC),y)
116-
WPEWEBKIT_FLAGS += -DUSE_GSTREAMER_WEBKIT_HTTP_SRC=ON
129+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_WEBKIT_HTTP_SRC=ON
117130
else
118-
WPEWEBKIT_FLAGS += -DUSE_GSTREAMER_WEBKIT_HTTP_SRC=OFF
131+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_WEBKIT_HTTP_SRC=OFF
119132
endif
120133

121134
endif
122135

123-
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28),y)
124-
125-
WPEWEBKIT_FLAGS = \
126-
-DPORT=WPE \
127-
-DENABLE_ACCESSIBILITY=OFF \
128-
-DENABLE_API_TESTS=OFF \
129-
-DENABLE_MINIBROWSER=OFF \
130-
-DSILENCE_CROSS_COMPILATION_NOTICES=ON \
131-
-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
132-
-DENABLE_ACCELERATED_2D_CANVAS=ON \
133-
-DUSE_WOFF2=OFF
136+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28)$(BR2_PACKAGE_WPEWEBKIT2_38),y)
134137

135138
ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)
136-
WPEWEBKIT_FLAGS += \
139+
WPEWEBKIT_CONF_OPTS += \
137140
-DENABLE_VIDEO=ON \
138141
-DENABLE_MEDIA_SOURCE=ON \
139142
-DENABLE_ENCRYPTED_MEDIA=ON \
140143
-DENABLE_MEDIA_STATISTICS=ON \
141-
-DENABLE_THUNDER=ON \
142144
-DENABLE_WEB_AUDIO=ON
143145
WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-plugins-base gst1-plugins-good
146+
147+
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CLIENTLIBRARIES)$(BR2_PACKAGE_WPEFRAMEWORK_CDM),yy)
148+
WPEWEBKIT_DEPENDENCIES += wpeframework-clientlibraries
149+
WPEWEBKIT_CONF_OPTS += -DENABLE_THUNDER=ON
150+
else
151+
WPEWEBKIT_CONF_OPTS += -DENABLE_THUNDER=OFF
152+
endif
153+
144154
else
145-
WPEWEBKIT_FLAGS += \
155+
WPEWEBKIT_CONF_OPTS += \
146156
-DENABLE_VIDEO=OFF \
147157
-DENABLE_MEDIA_SOURCE=OFF \
148158
-DENABLE_ENCRYPTED_MEDIA=OFF \
@@ -151,15 +161,35 @@ WPEWEBKIT_FLAGS += \
151161
endif
152162

153163
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y)
154-
WPEWEBKIT_FLAGS += -DUSE_GSTREAMER_GL=ON
164+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON
155165
else
156-
WPEWEBKIT_FLAGS += -DUSE_GSTREAMER_GL=OFF
166+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
157167
endif
158168

159-
ifeq ($(BR2_PACKAGE_WPEWEBKIT_WEBDRIVER),y)
160-
WPEWEBKIT_FLAGS += -DENABLE_WEBDRIVER=ON
169+
endif
170+
171+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38),y)
172+
WPEWEBKIT_CONF_OPTS += \
173+
-DENABLE_GAMEPAD=ON \
174+
-DENABLE_INTROSPECTION=OFF \
175+
-DUSE_LCMS=OFF
176+
177+
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
178+
WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON
179+
else
180+
WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF
181+
endif
182+
183+
ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_VIDEO),y)
184+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_VIDEO=ON
161185
else
162-
WPEWEBKIT_FLAGS += -DENABLE_WEBDRIVER=OFF
186+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_VIDEO=OFF
187+
endif
188+
189+
ifeq ($(BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_AUDIO),y)
190+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_AUDIO=ON
191+
else
192+
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_NATIVE_AUDIO=OFF
163193
endif
164194

165195
endif
@@ -178,44 +208,71 @@ WPEWEBKIT_BUILD_TYPE = Release
178208
WPEWEBKIT_CXXFLAGS = -O2 -DNDEBUG
179209
ifeq ($(BR2_PACKAGE_WPEWEBKIT_DEBUG),y)
180210
WPEWEBKIT_BUILD_TYPE = Debug
181-
WPEWEBKIT_FLAGS += -DCMAKE_BUILD_TYPE=Debug
211+
WPEWEBKIT_CONF_OPTS += -DCMAKE_BUILD_TYPE=Debug
182212
WPEWEBKIT_CXXFLAGS = -O0
183213
endif
184214

185-
WEBKIT_COMPILER_FLAGS=$(WPEWEBKIT_SYMBOL_FLAGS) $(WPEWEBKIT_CXXFLAGS) -Wno-cast-align
186-
WPEWEBKIT_EXTRA_FLAGS += \
187-
-DCMAKE_C_FLAGS_RELEASE="$(WEBKIT_COMPILER_FLAGS)" \
188-
-DCMAKE_CXX_FLAGS_RELEASE="$(WEBKIT_COMPILER_FLAGS)" \
189-
-DCMAKE_C_FLAGS_DEBUG="$(WEBKIT_COMPILER_FLAGS)" \
190-
-DCMAKE_CXX_FLAGS_DEBUG="$(WEBKIT_COMPILER_FLAGS)"
215+
WPEWEBKIT_COMPILER_FLAGS=$(WPEWEBKIT_SYMBOL_FLAGS) $(WPEWEBKIT_CXXFLAGS) -Wno-cast-align
216+
WPEWEBKIT_CONF_OPTS += \
217+
-DCMAKE_C_FLAGS_RELEASE="$(WPEWEBKIT_COMPILER_FLAGS)" \
218+
-DCMAKE_CXX_FLAGS_RELEASE="$(WPEWEBKIT_COMPILER_FLAGS)" \
219+
-DCMAKE_C_FLAGS_DEBUG="$(WPEWEBKIT_COMPILER_FLAGS)" \
220+
-DCMAKE_CXX_FLAGS_DEBUG="$(WPEWEBKIT_COMPILER_FLAGS)"
191221

192222
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_PUNCH_HOLE_GSTREAMER),y)
193-
WPEWEBKIT_FLAGS += -DUSE_HOLE_PUNCH_GSTREAMER=ON -DUSE_GSTREAMER_HOLEPUNCH=ON
223+
WPEWEBKIT_CONF_OPTS += -DUSE_HOLE_PUNCH_GSTREAMER=ON -DUSE_GSTREAMER_HOLEPUNCH=ON
194224
else ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_PUNCH_HOLE_EXTERNAL),y)
195-
WPEWEBKIT_FLAGS += -DUSE_HOLE_PUNCH_EXTERNAL=ON -DUSE_EXTERNAL_HOLEPUNCH=ON
225+
WPEWEBKIT_CONF_OPTS += -DUSE_HOLE_PUNCH_EXTERNAL=ON -DUSE_EXTERNAL_HOLEPUNCH=ON
226+
endif
227+
228+
ifeq ($(BR2_PACKAGE_WPEWEBKIT_WEBDRIVER),y)
229+
WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=ON
230+
else
231+
WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
196232
endif
197233

198234
ifeq ($(BR2_PACKAGE_WESTEROS),y)
199235
WPEWEBKIT_DEPENDENCIES += westeros
200-
WPEWEBKIT_FLAGS += -DUSE_WPEWEBKIT_PLATFORM_WESTEROS=ON
236+
WPEWEBKIT_CONF_OPTS += -DUSE_WPEWEBKIT_PLATFORM_WESTEROS=ON
201237
ifeq ($(BR2_PACKAGE_WESTEROS_SINK),y)
202238
WPEWEBKIT_DEPENDENCIES += westeros-sink
203-
WPEWEBKIT_FLAGS += -DUSE_WESTEROS_SINK=ON -DUSE_HOLE_PUNCH_GSTREAMER=ON -DUSE_GSTREAMER_HOLEPUNCH=ON
239+
WPEWEBKIT_CONF_OPTS += \
240+
-DUSE_GSTREAMER_HOLEPUNCH=ON \
241+
-DUSE_HOLE_PUNCH_GSTREAMER=ON \
242+
-DUSE_WESTEROS_SINK=ON
204243
else
205-
WPEWEBKIT_FLAGS += -DUSE_HOLE_PUNCH_GSTREAMER=OFF -DUSE_GSTREAMER_HOLEPUNCH=OFF
244+
WPEWEBKIT_CONF_OPTS += \
245+
-DUSE_GSTREAMER_HOLEPUNCH=OFF \
246+
-DUSE_HOLE_PUNCH_GSTREAMER=OFF
206247
endif
207248
else ifeq ($(BR2_PACKAGE_HAS_NEXUS),y)
208-
WPEWEBKIT_FLAGS += -DUSE_WPEWEBKIT_PLATFORM_BCM_NEXUS=ON
249+
WPEWEBKIT_CONF_OPTS += -DUSE_WPEWEBKIT_PLATFORM_BCM_NEXUS=ON
209250
else ifeq ($(BR2_PACKAGE_HORIZON_SDK),y)
210-
WPEWEBKIT_FLAGS += -DUSE_WPEWEBKIT_PLATFORM_INTEL_CE=ON
251+
WPEWEBKIT_CONF_OPTS += -DUSE_WPEWEBKIT_PLATFORM_INTEL_CE=ON
211252
else ifeq ($(BR2_PACKAGE_INTELCE_SDK),y)
212-
WPEWEBKIT_FLAGS += -DUSE_WPEWEBKIT_PLATFORM_INTEL_CE=ON
253+
WPEWEBKIT_CONF_OPTS += -DUSE_WPEWEBKIT_PLATFORM_INTEL_CE=ON
213254
else ifeq ($(BR2_PACKAGE_RPI_FIRMWARE),y)
214-
WPEWEBKIT_FLAGS += -DUSE_WPEWEBKIT_PLATFORM_RPI=ON
255+
WPEWEBKIT_CONF_OPTS += -DUSE_WPEWEBKIT_PLATFORM_RPI=ON
215256
endif
216257

217-
WPEWEBKIT_CONF_OPTS = \
218-
$(WPEWEBKIT_EXTRA_FLAGS) \
219-
$(WPEWEBKIT_FLAGS)
258+
define WPEWEBKIT_BUILD_CMDS
259+
$(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \
260+
$(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) -- $(NINJA_OPTS) $(WPEWEBKIT_NINJA_OPTS)
261+
endef
262+
263+
define WPEWEBKIT_INSTALL_CMDS
264+
$(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) \
265+
$(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR)
266+
endef
267+
268+
define WPEWEBKIT_INSTALL_STAGING_CMDS
269+
$(TARGET_MAKE_ENV) $(WPEWEBKIT_NINJA_ENV) DESTDIR=$(STAGING_DIR) \
270+
$(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR)
271+
endef
272+
273+
define WPEWEBKIT_INSTALL_TARGET_CMDS
274+
$(TARGET_MAKE_ENV) $(WPEWEBKIT_MAKE_ENV) DESTDIR=$(TARGET_DIR) \
275+
$(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR)
276+
endef
220277

221278
$(eval $(cmake-package))

0 commit comments

Comments
 (0)