mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
servoshell: Upgrade egui
and many other dependencies (#31278)
* servoshell: Upgrade `egui` and many other dependencies This upgrades: - `core-graphics` - `core-text` - `egui` and friends - `font-kit` - `glow` and friends - `harfbuzz-sys` - `jni` - `nix` - `raqote` - `raw-window-handle` - `winit` * Downgrade jni until we can properly upgrade * Update some test results It's unclear why these are now passing, but they are. --------- Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
556bfb7dff
commit
9acf2182cd
20 changed files with 796 additions and 560 deletions
|
@ -486,11 +486,6 @@ class CommandBase(object):
|
|||
if platform.is_macos:
|
||||
util.prepend_paths_to_env(env, "DYLD_LIBRARY_PATH", os.path.join(gstreamer_root, "lib"))
|
||||
|
||||
effective_target = self.cross_compile_target or servo.platform.host_triple()
|
||||
if "msvc" in effective_target:
|
||||
# Always build harfbuzz from source
|
||||
env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"
|
||||
|
||||
if sys.platform != "win32":
|
||||
env.setdefault("CC", "clang")
|
||||
env.setdefault("CXX", "clang++")
|
||||
|
@ -615,7 +610,6 @@ class CommandBase(object):
|
|||
env['OBJCOPY'] = to_ndk_bin("llvm-objcopy")
|
||||
env['YASM'] = to_ndk_bin("yasm")
|
||||
env['STRIP'] = to_ndk_bin("llvm-strip")
|
||||
env['HARFBUZZ_SYS_NO_PKG_CONFIG'] = "true"
|
||||
env['RUST_FONTCONFIG_DLOPEN'] = "on"
|
||||
|
||||
env["LIBCLANG_PATH"] = path.join(llvm_toolchain, "lib64")
|
||||
|
|
|
@ -38,7 +38,7 @@ APT_PKGS = [
|
|||
'libharfbuzz-dev', 'liblzma-dev', 'libudev-dev', 'libunwind-dev',
|
||||
'libvulkan1', 'libx11-dev', 'libxcb-render0-dev', 'libxcb-shape0-dev',
|
||||
'libxcb-xfixes0-dev', 'libxmu-dev', 'libxmu6', 'libegl1-mesa-dev',
|
||||
'llvm-dev', 'm4', 'xorg-dev',
|
||||
'llvm-dev', 'm4', 'xorg-dev', 'libxkbcommon0', "libxkbcommon-x11-0"
|
||||
]
|
||||
|
||||
# https://packages.fedoraproject.org
|
||||
|
@ -56,7 +56,8 @@ DNF_PKGS = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
|
|||
'gstreamer1-devel', 'gstreamer1-plugins-base-devel',
|
||||
'gstreamer1-plugins-good', 'gstreamer1-plugins-bad-free-devel',
|
||||
'gstreamer1-plugins-ugly-free', 'libjpeg-turbo-devel',
|
||||
'zlib', 'libjpeg', 'vulkan-loader']
|
||||
'zlib', 'libjpeg', 'vulkan-loader', 'libxkbcommon',
|
||||
'libxkbcommon-x11']
|
||||
|
||||
# https://voidlinux.org/packages/
|
||||
# 1. open devtools
|
||||
|
@ -71,7 +72,8 @@ XBPS_PKGS = ['libtool', 'gcc', 'libXi-devel', 'freetype-devel',
|
|||
'ncurses-devel', 'harfbuzz-devel', 'ccache', 'glu-devel',
|
||||
'clang', 'gstreamer1-devel', 'gst-plugins-base1-devel',
|
||||
'gst-plugins-good1', 'gst-plugins-bad1-devel',
|
||||
'gst-plugins-ugly1', 'vulkan-loader']
|
||||
'gst-plugins-ugly1', 'vulkan-loader', 'libxkbcommon',
|
||||
'libxkbcommon-x11']
|
||||
|
||||
GSTREAMER_URL = \
|
||||
"https://github.com/servo/servo-build-deps/releases/download/linux/gstreamer-1.16-x86_64-linux-gnu.20190515.tar.gz"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue