Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26237 - servo:unosmesa, r=asajeffrey

Browse source 
OSMesa is no longer a build dependency

Since https://github.com/servo/servo/pull/25853
This commit is contained in:
bors-servo 2020-04-20 22:29:00 -04:00 • committed by GitHub
commit a5fe8f0e7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -74,7 +74,7 @@ If `./mach bootstrap` doesn't work, file a bug, and, run the commands below:
``` sh
sudo apt install git curl autoconf libx11-dev libfreetype6-dev libgl1-mesa-dri \
libglib2.0-dev xorg-dev gperf g++ build-essential cmake libssl-dev \
liblzma-dev libosmesa6-dev libxmu6 libxmu-dev \
liblzma-dev libxmu6 libxmu-dev \
libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libharfbuzz-dev ccache \
clang libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
libgstreamer-plugins-bad1.0-dev autoconf2.13 llvm-dev
@ -100,7 +100,7 @@ sudo dnf install curl libtool gcc-c++ libXi-devel libunwind-devel \
freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel \
libXrandr-devel gperf fontconfig-devel cabextract ttmkfdir expat-devel \
rpm-build openssl-devel cmake libX11-devel libXcursor-devel \
libXmu-devel mesa-libOSMesa-devel dbus-devel ncurses-devel harfbuzz-devel \
libXmu-devel dbus-devel ncurses-devel harfbuzz-devel \
ccache clang clang-libs python3-devel gstreamer1-devel \
gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel autoconf213
```
@ -118,7 +118,7 @@ If `./mach bootstrap` doesn't work, file a bug, and, run the commands below:
sudo yum install curl libtool gcc-c++ libXi-devel freetype-devel \
mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel \
gperf fontconfig-devel cabextract ttmkfdir python expat-devel rpm-build \
openssl-devel cmake3 libXcursor-devel libXmu-devel mesa-libOSMesa-devel \
openssl-devel cmake3 libXcursor-devel libXmu-devel \
dbus-devel ncurses-devel python34 harfbuzz-devel \
ccache clang clang-libs llvm-toolset-7
```
@ -141,7 +141,7 @@ export LIBCLANG_PATH=/opt/rh/llvm-toolset-7/root/usr/lib64
``` sh
sudo zypper install libX11-devel libexpat-devel Mesa-libEGL-devel Mesa-libGL-devel cabextract cmake \
dbus-1-devel fontconfig-devel freetype-devel gcc-c++ git glib2-devel gperf \
harfbuzz-devel libOSMesa-devel libXcursor-devel libXi-devel libXmu-devel libXrandr-devel libopenssl-devel \
harfbuzz-devel libXcursor-devel libXi-devel libXmu-devel libXrandr-devel libopenssl-devel \
python-pip python-virtualenv rpm-build ccache llvm-clang libclang autoconf213 gstreamer-devel \
gstreamer-plugins-base-devel gstreamer-plugins-bad-devel
```

6
components/config/opts.rs
View file

@ -1009,9 +1009,3 @@ pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result<ServoUrl, ()> {
Err(_) => Err(()),
}
}
impl Opts {
pub fn should_use_osmesa(&self) -> bool {
self.headless
}
}

9
components/servo/lib.rs
View file

@ -118,7 +118,7 @@ use std::rc::Rc;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex};
use surfman::GLApi;
use webrender::{RendererKind, ShaderPrecacheFlags};
use webrender::ShaderPrecacheFlags;
use webrender_surfman::WebrenderSurfman;
use webrender_traits::WebrenderImageHandlerType;
use webrender_traits::{WebrenderExternalImageHandlers, WebrenderExternalImageRegistry};
@ -400,12 +400,6 @@ where
let viewport_size = coordinates.viewport.size.to_f32() / device_pixel_ratio;
let (mut webrender, webrender_api_sender) = {
let renderer_kind = if opts::get().should_use_osmesa() {
RendererKind::OSMesa
} else {
RendererKind::Native
};
let recorder = if opts.webrender_record {
let record_path = PathBuf::from("wr-record.bin");
let recorder = Box::new(webrender::BinaryRecorder::new(&record_path));
@ -436,7 +430,6 @@ where
} else {
ShaderPrecacheFlags::empty()
},
renderer_kind: renderer_kind,
enable_subpixel_aa: opts.enable_subpixel_text_antialiasing,
allow_texture_swizzling: pref!(gfx.texture_swizzling.enabled),
clear_color: None,

5
etc/taskcluster/docker/run.dockerfile
View file

@ -9,7 +9,4 @@ RUN apt-get install -qy --no-install-recommends \
gstreamer1.0-plugins-bad \
gstreamer1.0-libav \
gstreamer1.0-gl \
libunwind8 \
#
# Compiling shaders in OSMesa:
llvm
libunwind8

4
python/servo/bootstrap.py
View file

@ -87,7 +87,7 @@ def linux(context, force=False):
pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev',
'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++',
'build-essential', 'cmake', 'libssl-dev',
'liblzma-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev',
'liblzma-dev', 'libxmu6', 'libxmu-dev',
'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev',
'libharfbuzz-dev', 'ccache', 'clang', 'libunwind-dev',
'libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev',
@ -98,7 +98,7 @@ def linux(context, force=False):
'glib2-devel', 'libX11-devel', 'libXrandr-devel', 'gperf',
'fontconfig-devel', 'cabextract', 'ttmkfdir', 'expat-devel',
'rpm-build', 'openssl-devel', 'cmake',
'libXcursor-devel', 'libXmu-devel', 'mesa-libOSMesa-devel',
'libXcursor-devel', 'libXmu-devel',
'dbus-devel', 'ncurses-devel', 'harfbuzz-devel', 'ccache',
'clang', 'clang-libs', 'autoconf213', 'python3-devel',
'gstreamer1-devel', 'gstreamer1-plugins-base-devel',