From 6ef3f83b60afbe1213a2c6e103929bab5a3363db Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 5 Jun 2020 10:40:40 -0700 Subject: [PATCH 1/2] Revert "browser(webkit): exclude gstreamer, its plugins and libdrm from webkit distribution (#2476)" This reverts commit fc2432a23a2711e9963db42acfbcdc8230a6c06d. --- browser_patches/webkit/BUILD_NUMBER | 2 +- browser_patches/webkit/archive.sh | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index f038def0438f5..c686973f9b155 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1268 +1267 diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh index b73251eaf2704..b4dc1d471a738 100755 --- a/browser_patches/webkit/archive.sh +++ b/browser_patches/webkit/archive.sh @@ -59,19 +59,9 @@ createZipForLinux() { # copy all relevant binaries cp -t $tmpdir ./WebKitBuild/WPE/Release/bin/MiniBrowser ./WebKitBuild/WPE/Release/bin/WPE*Process # copy all relevant shared objects - # - 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 + 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 # 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 # Injected bundle is loaded dynamicly via dlopen => not bt listed by ldd. @@ -86,14 +76,7 @@ createZipForLinux() { # copy all relevant binaries cp -t $tmpdir ./WebKitBuild/GTK/Release/bin/MiniBrowser ./WebKitBuild/GTK/Release/bin/WebKit*Process # copy all relevant shared objects - # - 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 - + LD_LIBRARY_PATH="$PWD/WebKitBuild/GTK/DependenciesGTK/Root/lib" ldd WebKitBuild/GTK/Release/bin/MiniBrowser | grep -o '[^ ]*WebKitBuild/GTK/[^ ]*' | 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 From 040c661db2c75bde6e3045fc07cc48fbe60fd35e Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Fri, 5 Jun 2020 10:41:27 -0700 Subject: [PATCH 2/2] Update build num --- browser_patches/webkit/BUILD_NUMBER | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index c686973f9b155..8944e21bb8ffc 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1267 +1269