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 fc2432a23a.

* Update build num
This commit is contained in:
Yury Semikhatsky 2020-06-05 10:43:06 -07:00 коммит произвёл GitHub
Родитель 87e0c96ef2
Коммит 71dd9c2f02
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 5 добавлений и 22 удалений

Просмотреть файл

@ -1 +1 @@
1268
1269

Просмотреть файл

@ -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