X11: Readd freetype as build dep for 3.1 branch

It's no longer needed for 3.1.2+, but users may still need it for 3.1
or 3.1.1 custom builds if they don't use `builtin_freetype=yes` for
portability.

Partial revert of commit fc7ea4669b039e4cd2b9d20ca639e24528f6bb46.

Fixes #2679.

development/compiling/compiling_for_x11.rst

@@ -27,52 +27,56 @@ required:
 
 Distro-specific oneliners
 ^^^^^^^^^^^^^^^^^^^^^^^^^
+
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **Arch Linux** | ::                                                                                                        |
 |                |                                                                                                           |
-|                |     pacman -S scons pkgconf gcc libxcursor libxinerama libxi libxrandr mesa glu alsa-lib pulseaudio yasm  |
+|                |     pacman -S scons pkgconf gcc libxcursor libxinerama libxi libxrandr mesa glu alsa-lib pulseaudio \     |
+|                |         freetype2 yasm                                                                                    |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **Debian** /   | ::                                                                                                        |
 | **Ubuntu**     |                                                                                                           |
 |                |     sudo apt-get install build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev \     |
-|                |         libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm   |
+|                |         libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libfreetype6-dev libudev-dev libxi-dev \   |
+|                |         libxrandr-dev yasm                                                                                |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **Fedora**     | ::                                                                                                        |
 |                |                                                                                                           |
 |                |     sudo dnf install scons pkgconfig libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel \    |
 |                |         libXi-devel mesa-libGL-devel mesa-libGLU-devel alsa-lib-devel pulseaudio-libs-devel \             |
-|                |         libudev-devel yasm                                                                                |
+|                |         freetype-devel libudev-devel yasm                                                                 |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **FreeBSD**    | ::                                                                                                        |
 |                |                                                                                                           |
 |                |     sudo pkg install scons pkgconf xorg-libraries libXcursor libXrandr libXi xorgproto libGLU alsa-lib \  |
-|                |         pulseaudio yasm                                                                                   |
-|                |                                                                                                           |
+|                |         pulseaudio freetype2 yasm                                                                         |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **Gentoo**     | ::                                                                                                        |
 |                |                                                                                                           |
 |                |     emerge -an dev-util/scons x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXi \   |
-|                |         media-libs/mesa media-libs/glu media-libs/alsa-lib media-sound/pulseaudio dev-lang/yasm           |
+|                |         media-libs/mesa media-libs/glu media-libs/alsa-lib media-sound/pulseaudio media-libs/freetype \   |
+|                |         dev-lang/yasm                                                                                     |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **Mageia**     | ::                                                                                                        |
 |                |                                                                                                           |
-|                |     urpmi scons task-c++-devel pkgconfig "pkgconfig(alsa)" "pkgconfig(glu)" "pkgconfig(libpulse)" \       |
-|                |         "pkgconfig(udev)" "pkgconfig(x11)" "pkgconfig(xcursor)" "pkgconfig(xinerama)" "pkgconfig(xi)" \   |
-|                |         "pkgconfig(xrandr)" yasm                                                                          |
+|                |     urpmi scons task-c++-devel pkgconfig "pkgconfig(alsa)" "pkgconfig(freetype2)" "pkgconfig(glu)" \      |
+|                |         "pkgconfig(libpulse)" "pkgconfig(udev)" "pkgconfig(x11)" "pkgconfig(xcursor)" \                   |
+|                |         "pkgconfig(xinerama)" "pkgconfig(xi)" "pkgconfig(xrandr)" yasm                                    |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **OpenBSD**    | ::                                                                                                        |
 |                |                                                                                                           |
-|                |     pkg_add python scons llvm yasm                                                                        |
+|                |     pkg_add python scons png llvm yasm                                                                    |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **openSUSE**   | ::                                                                                                        |
 |                |                                                                                                           |
 |                |     sudo zypper install scons pkgconfig libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel \ |
-|                |             libXi-devel Mesa-libGL-devel alsa-devel libpulse-devel libudev-devel libGLU1 yasm             |
+|                |         libXi-devel Mesa-libGL-devel alsa-devel libpulse-devel freetype2-devel libpng-devel \             |
+|                |         libudev-devel libGLU1 yasm                                                                        |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 | **Solus**      | ::                                                                                                        |
 |                |                                                                                                           |
 |                |     sudo eopkg install -c system.devel scons libxcursor-devel libxinerama-devel libxi-devel \             |
-|                |         libxrandr-devel mesalib-devel libglu alsa-lib pulseaudio pulseaudio-devel yasm                    |
+|                |         libxrandr-devel mesalib-devel libglu alsa-lib pulseaudio pulseaudio-devel freetype2-devel yasm    |
 +----------------+-----------------------------------------------------------------------------------------------------------+
 
 Compiling