servo: Merge #20195 - Remove FreeGLUT (from sanxiyn:no-freeglut); r=jdm
authorSeo Sanghyeon <sanxiyn@gmail.com>
Sun, 04 Mar 2018 14:25:06 -0500
changeset 461577 efb6a5abc952b233e9c143f028b2fdc1c09b70b5
parent 461576 7ef3483244619c2dfa0b581676a243de6af02f90
child 461578 2ada4f23fb700412a94700fb7faf0d51fe1ad404
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #20195 - Remove FreeGLUT (from sanxiyn:no-freeglut); r=jdm Current Servo does not require FreeGLUT. Update accordingly. Source-Repo: https://github.com/servo/servo Source-Revision: e3f69668aefaaac36e59509bd978dfda05018486
servo/.travis.yml
servo/README.md
--- a/servo/.travis.yml
+++ b/servo/.travis.yml
@@ -39,17 +39,16 @@ matrix:
       env:
         CCACHE=/usr/bin/ccache
         RUSTFLAGS=-Dwarnings
         CARGO_INCREMENTAL=0
       addons:
         apt:
           packages:
             - cmake
-            - freeglut3-dev
             - gperf
             - libosmesa6-dev
             - libgles2-mesa-dev
             - python-virtualenv
             - xorg-dev
             - ccache
             - libdbus-glib-1-dev
             - libedit-dev
--- a/servo/README.md
+++ b/servo/README.md
@@ -73,43 +73,43 @@ export OPENSSL_LIB_DIR="$(brew --prefix 
 ./mach build ...
 ```
 
 If you've already partially compiled servo but forgot to do this step, run `./mach clean`, set the shell variables, and recompile.
 
 #### On Debian-based Linuxes
 
 ``` sh
-sudo apt install git curl freeglut3-dev autoconf libx11-dev \
+sudo apt install git curl autoconf libx11-dev \
     libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
     gperf g++ build-essential cmake virtualenv python-pip \
     libssl1.0-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev \
     libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev \
     libharfbuzz-dev ccache
 ```
 
 If you using a version prior to **Ubuntu 17.04** or **Debian Sid**, replace `libssl1.0-dev` with `libssl-dev`.
 
 If you are on **Ubuntu 14.04** and encountered errors on installing these dependencies involving `libcheese`, see [#6158](https://github.com/servo/servo/issues/6158) for a workaround.
 
 If `virtualenv` does not exist, try `python-virtualenv`.
 
 #### On Fedora
 
 ``` sh
-sudo dnf install curl freeglut-devel libtool gcc-c++ libXi-devel \
+sudo dnf 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 python-virtualenv python-pip expat-devel \
     rpm-build openssl-devel cmake bzip2-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel \
     dbus-devel ncurses-devel harfbuzz-devel ccache
 ```
 #### On CentOS
 
 ``` sh
-sudo yum install curl freeglut-devel libtool gcc-c++ libXi-devel \
+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 python-virtualenv python-pip expat-devel \
     rpm-build openssl-devel cmake3 bzip2-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel \
     dbus-devel ncurses-devel python34 harfbuzz-devel ccache
 ```
 #### On openSUSE Linux
 ``` sh
 sudo zypper install libX11-devel libexpat-devel libbz2-devel Mesa-libEGL-devel Mesa-libGL-devel cabextract cmake \
@@ -121,17 +121,17 @@ sudo zypper install libX11-devel libexpa
 
 ``` sh
 sudo pacman -S --needed base-devel git python2 python2-virtualenv python2-pip mesa cmake bzip2 libxmu glu \
     pkg-config ttf-fira-sans harfbuzz ccache
 ```
 #### On Gentoo Linux
 
 ```sh
-sudo emerge net-misc/curl media-libs/freeglut \
+sudo emerge net-misc/curl \
     media-libs/freetype media-libs/mesa dev-util/gperf \
     dev-python/virtualenv dev-python/pip dev-libs/openssl \
     x11-libs/libXmu media-libs/glu x11-base/xorg-server \
     media-libs/harfbuzz dev-util/ccache
 ```
 #### On Windows (MSVC)
 
 1. Install Python for Windows (https://www.python.org/downloads/release/python-2714/). The Windows x86-64 MSI installer is fine.