Skip to content

Commit 71dd9c2

Browse files
authored
Revert "browser(webkit): exclude gstreamer, its plugins and libdrm fr… (#2482)
* Revert "browser(webkit): exclude gstreamer, its plugins and libdrm from webkit distribution (#2476)" This reverts commit fc2432a. * Update build num
1 parent 87e0c96 commit 71dd9c2

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

browser_patches/webkit/BUILD_NUMBER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1268
1+
1269

browser_patches/webkit/archive.sh

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,9 @@ createZipForLinux() {
5959
# copy all relevant binaries
6060
cp -t $tmpdir ./WebKitBuild/WPE/Release/bin/MiniBrowser ./WebKitBuild/WPE/Release/bin/WPE*Process
6161
# copy all relevant shared objects
62-
# - exclude gstreamer plugins
63-
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser \
64-
| grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \
65-
| grep -v '/libgst.*so' \
66-
| xargs cp -t $tmpdir
67-
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess \
68-
| grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \
69-
| grep -v '/libgst.*so' \
70-
| xargs cp -t $tmpdir
71-
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess \
72-
| grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \
73-
| grep -v '/libgst.*so' \
74-
| xargs cp -t $tmpdir
62+
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
63+
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
64+
LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
7565
# Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6
7666
ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*\/libvpx.so.5[^ ]*' | xargs cp -t $tmpdir
7767
# Injected bundle is loaded dynamicly via dlopen => not bt listed by ldd.
@@ -86,14 +76,7 @@ createZipForLinux() {
8676
# copy all relevant binaries
8777
cp -t $tmpdir ./WebKitBuild/GTK/Release/bin/MiniBrowser ./WebKitBuild/GTK/Release/bin/WebKit*Process
8878
# copy all relevant shared objects
89-
# - exclude gstreamer plugins
90-
# - exclude libdrm
91-
LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser \
92-
| grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' \
93-
| grep -v '/libgst.*so' \
94-
| grep -v '/libdrm.so' \
95-
| xargs cp -t $tmpdir
96-
79+
LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' | xargs cp -t $tmpdir
9780
# Injected bundle is loaded dynamicly via dlopen => not bt listed by ldd.
9881
cp -t $tmpdir WebKitBuild/GTK/Release/lib/libwebkit2gtkinjectedbundle.so
9982
# Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6

0 commit comments

Comments
 (0)