mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Remove some old requirements
Remove some bits left over from Skia and Ubuntu 14.04 support
This commit is contained in:
Daniel Alley
parent
24a45248d4
commit
a3bb64c33c
6 changed files with 18 additions and 121 deletions
18
README.md
18
README.md
|
|
@ -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 \
|
||||
libbz2-dev liblzma-dev libosmesa6-dev libxmu6 libxmu-dev libglu1-mesa-dev \
|
||||
liblzma-dev libosmesa6-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
|
||||
|
|
@ -99,9 +99,9 @@ If `python3 ./mach bootstrap` doesn't work, file a bug, and, run the commands be
|
|||
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 bzip2-devel libX11-devel libXcursor-devel \
|
||||
rpm-build openssl-devel cmake libX11-devel libXcursor-devel \
|
||||
libXmu-devel mesa-libOSMesa-devel dbus-devel ncurses-devel harfbuzz-devel \
|
||||
ccache mesa-libGLU-devel clang clang-libs gstreamer1-devel python3-devel \
|
||||
ccache clang clang-libs python3-devel gstreamer1-devel \
|
||||
gstreamer1-plugins-base-devel gstreamer1-plugins-bad-free-devel autoconf213
|
||||
```
|
||||
|
||||
|
|
@ -118,8 +118,8 @@ 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 bzip2-devel libXcursor-devel libXmu-devel \
|
||||
mesa-libOSMesa-devel dbus-devel ncurses-devel python34 harfbuzz-devel \
|
||||
openssl-devel cmake3 libXcursor-devel libXmu-devel mesa-libOSMesa-devel \
|
||||
dbus-devel ncurses-devel python34 harfbuzz-devel \
|
||||
ccache clang clang-libs llvm-toolset-7
|
||||
```
|
||||
|
||||
|
|
@ -139,17 +139,17 @@ export LIBCLANG_PATH=/opt/rh/llvm-toolset-7/root/usr/lib64
|
|||
#### On openSUSE Linux
|
||||
|
||||
``` sh
|
||||
sudo zypper install libX11-devel libexpat-devel libbz2-devel Mesa-libEGL-devel Mesa-libGL-devel cabextract cmake \
|
||||
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 \
|
||||
python-pip python-virtualenv rpm-build glu-devel ccache llvm-clang libclang autoconf213 gstreamer-devel \
|
||||
python-pip python-virtualenv rpm-build ccache llvm-clang libclang autoconf213 gstreamer-devel \
|
||||
gstreamer-plugins-base-devel gstreamer-plugins-bad-devel
|
||||
```
|
||||
|
||||
#### On Arch Linux
|
||||
|
||||
``` sh
|
||||
sudo pacman -S --needed base-devel git python2 python2-virtualenv python2-pip mesa cmake bzip2 libxmu glu \
|
||||
sudo pacman -S --needed base-devel git python2 python2-virtualenv python2-pip mesa cmake libxmu \
|
||||
pkg-config ttf-fira-sans harfbuzz ccache llvm clang autoconf2.13 gstreamer gstreamer-vaapi
|
||||
```
|
||||
|
||||
|
|
@ -160,7 +160,7 @@ sudo emerge net-misc/curl \
|
|||
media-libs/freetype media-libs/mesa dev-util/gperf \
|
||||
dev-python/virtualenv dev-python/pip dev-libs/openssl \
|
||||
media-libs/harfbuzz dev-util/ccache sys-libs/libunwind \
|
||||
x11-libs/libXmu media-libs/glu x11-base/xorg-server sys-devel/clang \
|
||||
x11-libs/libXmu x11-base/xorg-server sys-devel/clang \
|
||||
media-libs/gstreamer media-libs/gst-plugins-bad media-libs/gst-plugins-base
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -34,10 +34,6 @@ RUN \
|
|||
# blurz
|
||||
libdbus-1-dev \
|
||||
#
|
||||
# Skia
|
||||
libglu1-mesa-dev \
|
||||
libbz2-dev \
|
||||
#
|
||||
# sampling profiler
|
||||
libunwind-dev \
|
||||
#
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ mod headed_window;
|
|||
mod headless_window;
|
||||
mod keyutils;
|
||||
mod resources;
|
||||
mod skia_symbols;
|
||||
mod window_trait;
|
||||
|
||||
use app::App;
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
//! These functions aren't actually called. They are here as a link
|
||||
//! hack because Skia references them.
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
#[no_mangle]
|
||||
pub extern "C" fn glBindVertexArrayOES(_array: usize) {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
#[no_mangle]
|
||||
pub extern "C" fn glDeleteVertexArraysOES(_n: isize, _arrays: *const ()) {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
#[no_mangle]
|
||||
pub extern "C" fn glGenVertexArraysOES(_n: isize, _arrays: *const ()) {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
#[no_mangle]
|
||||
pub extern "C" fn glRenderbufferStorageMultisampleIMG(
|
||||
_: isize,
|
||||
_: isize,
|
||||
_: isize,
|
||||
_: isize,
|
||||
_: isize,
|
||||
) {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
#[no_mangle]
|
||||
pub extern "C" fn glFramebufferTexture2DMultisampleIMG(
|
||||
_: isize,
|
||||
_: isize,
|
||||
_: isize,
|
||||
_: isize,
|
||||
_: isize,
|
||||
_: isize,
|
||||
) {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
#[no_mangle]
|
||||
pub extern "C" fn glDiscardFramebufferEXT(_: isize, _: isize, _: *const ()) {
|
||||
unimplemented!()
|
||||
}
|
||||
|
|
@ -21,33 +21,6 @@ import servo.packages as packages
|
|||
from servo.util import extract, download_file, host_triple
|
||||
|
||||
|
||||
def install_trusty_deps(force):
|
||||
version = str(subprocess.check_output(['gcc', '-dumpversion'])).split('.')
|
||||
gcc = True
|
||||
if int(version[0]) > 4:
|
||||
gcc = False
|
||||
elif int(version[0]) == 4 and int(version[1]) >= 9:
|
||||
gcc = False
|
||||
|
||||
version = str(subprocess.check_output(['clang', '-dumpversion'])).split('.')
|
||||
clang = int(version[0]) < 4
|
||||
|
||||
if gcc:
|
||||
run_as_root(["add-apt-repository", "ppa:ubuntu-toolchain-r/test"], force)
|
||||
run_as_root(["apt-get", "update"])
|
||||
run_as_root(["apt-get", "install", "gcc-4.9", "g++-4.9"], force)
|
||||
run_as_root(['update-alternatives', '--install', '/usr/bin/gcc', 'gcc',
|
||||
'/usr/bin/gcc-4.9', '60', '--slave', '/usr/bin/g++', 'g++',
|
||||
'/usr/bin/g++-4.9'])
|
||||
if clang:
|
||||
run_as_root(["bash", "-c", 'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -'])
|
||||
run_as_root(["apt-add-repository", "deb http://apt.llvm.org/trusty/ llvm-toolchain-xenial-4.0 main"], force)
|
||||
run_as_root(["apt-get", "update"])
|
||||
run_as_root(["apt-get", "install", "clang-4.0"], force)
|
||||
|
||||
return gcc or clang
|
||||
|
||||
|
||||
def check_gstreamer_lib():
|
||||
return subprocess.call(["pkg-config", "--atleast-version=1.16", "gstreamer-1.0"],
|
||||
stdout=PIPE, stderr=PIPE) == 0
|
||||
|
|
@ -113,33 +86,27 @@ def linux(context, force=False):
|
|||
# Please keep these in sync with the packages in README.md
|
||||
pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev',
|
||||
'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++',
|
||||
'build-essential', 'cmake', "libssl-dev", 'libbz2-dev',
|
||||
'build-essential', 'cmake', "libssl-dev",
|
||||
'liblzma-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev',
|
||||
'libglu1-mesa-dev', 'libgles2-mesa-dev', 'libegl1-mesa-dev',
|
||||
'libdbus-1-dev', 'libharfbuzz-dev', 'ccache', 'clang',
|
||||
'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev',
|
||||
'libharfbuzz-dev', 'ccache', 'clang',
|
||||
'autoconf2.13', 'libunwind-dev', 'llvm-dev']
|
||||
pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel',
|
||||
'libunwind-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', 'bzip2-devel',
|
||||
'rpm-build', 'openssl-devel', 'cmake',
|
||||
'libXcursor-devel', 'libXmu-devel', 'mesa-libOSMesa-devel',
|
||||
'dbus-devel', 'ncurses-devel', 'harfbuzz-devel', 'ccache',
|
||||
'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel',
|
||||
'gstreamer1-plugins-base-devel', 'python3-devel',
|
||||
'gstreamer1-plugins-bad-free-devel', 'autoconf213']
|
||||
if context.distro == "Ubuntu" and context.distro_version != "14.04":
|
||||
pkgs_apt += ['libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev',
|
||||
'libgstreamer-plugins-bad1.0-dev']
|
||||
'clang', 'clang-libs', 'autoconf213', 'python3-devel'
|
||||
'gstreamer1-devel', 'gstreamer1-plugins-base-devel',
|
||||
'gstreamer1-plugins-bad-free-devel']
|
||||
|
||||
installed_something = install_linux_deps(context, pkgs_apt, pkgs_dnf, force)
|
||||
|
||||
if not check_gstreamer_lib():
|
||||
installed_something |= gstreamer(context, force)
|
||||
|
||||
if context.distro == "Ubuntu" and context.distro_version == "14.04":
|
||||
installed_something |= install_trusty_deps(force)
|
||||
|
||||
if not installed_something:
|
||||
print("Dependencies were already installed!")
|
||||
|
||||
|
|
@ -150,7 +117,7 @@ def salt(context, force=False):
|
|||
# Ensure Salt dependencies are installed
|
||||
install_salt_dependencies(context, force)
|
||||
# Ensure Salt is installed in the virtualenv
|
||||
# It's not instaled globally because it's a large, non-required dependency,
|
||||
# It's not installed globally because it's a large, non-required dependency,
|
||||
# and the installation fails on Windows
|
||||
print("Checking Salt installation...", end='')
|
||||
reqs_path = os.path.join(context.topdir, 'python', 'requirements-salt.txt')
|
||||
|
|
@ -356,8 +323,6 @@ def get_linux_distribution():
|
|||
base_version = '18.04'
|
||||
elif major == '18':
|
||||
base_version = '16.04'
|
||||
elif major == '17':
|
||||
base_version = '14.04'
|
||||
else:
|
||||
raise Exception('unsupported version of %s: %s' % (distrib, version))
|
||||
|
||||
|
|
@ -372,8 +337,6 @@ def get_linux_distribution():
|
|||
base_version = '18.04'
|
||||
elif major == '18':
|
||||
base_version = '16.04'
|
||||
elif major == '17':
|
||||
base_version = '14.04'
|
||||
else:
|
||||
raise Exception('unsupported version of %s: %s' % (distrib, version))
|
||||
|
||||
|
|
@ -383,12 +346,6 @@ def get_linux_distribution():
|
|||
base_version = '18.04'
|
||||
elif version[0:3] == '0.4':
|
||||
base_version = '16.04'
|
||||
elif version[0:3] == '0.3':
|
||||
base_version = '14.04'
|
||||
elif version == '0.2':
|
||||
base_version = '12.04'
|
||||
elif version == '0.1':
|
||||
base_version = '10.10'
|
||||
else:
|
||||
raise Exception('unsupported version of %s: %s' % (distrib, version))
|
||||
distrib, version = 'Ubuntu', base_version
|
||||
|
|
|
|||
|
|
@ -687,7 +687,7 @@ install them, let us know by filing a bug!")
|
|||
distrib, version, _ = distro.linux_distribution()
|
||||
distrib = six.ensure_str(distrib)
|
||||
version = six.ensure_str(version)
|
||||
if distrib == "Ubuntu" and (version == "16.04" or version == "14.04"):
|
||||
if distrib == "Ubuntu" and version == "16.04":
|
||||
env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"
|
||||
|
||||
if extra_path:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue