browser(webkit): exclude gstreamer, its plugins and libdrm from webki…

…t distribution (#2541)
microsoft · Jun 19, 2020 · 5043a36 · 5043a36
1 parent c8a963d
commit 5043a36
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER
@@ -1 +1 @@
-1289
+1290
diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh
@@ -59,9 +59,19 @@ createZipForLinux() {
     # copy all relevant binaries
     cp -t $tmpdir ./WebKitBuild/WPE/Release/bin/MiniBrowser ./WebKitBuild/WPE/Release/bin/WPE*Process
     # copy all relevant shared objects
-    LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
-    LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
-    LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' | xargs cp -t $tmpdir
+    # - exclude gstreamer plugins
+    LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/MiniBrowser \
+        | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \
+        | grep -v '/libgst.*so' \
+        | xargs cp -t $tmpdir
+    LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPENetworkProcess \
+        | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \
+        | grep -v '/libgst.*so' \
+        | xargs cp -t $tmpdir
+    LD_LIBRARY_PATH="$PWD/WebKitBuild/WPE/DependenciesWPE/Root/lib" ldd WebKitBuild/WPE/Release/bin/WPEWebProcess \
+        | grep -o '[^ ]*WebKitBuild/WPE/[^ ]*' \
+        | grep -v '/libgst.*so' \
+        | xargs cp -t $tmpdir
     # Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6
     ldd WebKitBuild/WPE/Release/bin/MiniBrowser | grep -o '[^ ]*\/libvpx.so.5[^ ]*' | xargs cp -t $tmpdir
     # Copy some wayland libraries required for Web Process t
@@ -78,7 +88,14 @@ createZipForLinux() {
     # copy all relevant binaries
     cp -t $tmpdir ./WebKitBuild/GTK/Release/bin/MiniBrowser ./WebKitBuild/GTK/Release/bin/WebKit*Process
     # copy all relevant shared objects
-    LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' | xargs cp -t $tmpdir
+    # - exclude gstreamer plugins
+    # - exclude libdrm
+    LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser \
+        | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' \
+        | grep -v '/libgst.*so' \
+        | grep -v '/libdrm.so' \
+        | xargs cp -t $tmpdir
+
     # Injected bundle is loaded dynamicly via dlopen => not bt listed by ldd.
     cp -t $tmpdir WebKitBuild/GTK/Release/lib/libwebkit2gtkinjectedbundle.so
     # Copy libvpx.so.5 as Ubuntu 20.04 comes with libvpx.so.6