Merge branch 'feature/fontconfig-2.13' into develop

# Conflicts:
#	README.md

.travis.yml

@@ -11,6 +11,7 @@ addons:
     packages:
       - gcc-4.9
       - g++-4.9
+      - gperf
 
 env: FF_ROOT=$TRAVIS_BUILD_DIR FF_VERSION=3.4.2 FF_CPU=2
 

README.md

@@ -17,7 +17,7 @@ This repository builds ffmpeg, ffprobe and ffserver for Mac OSX and Linux using
     - [fdk-aac 0.1.6](https://sourceforge.net/projects/opencore-amr/) for AAC de/encoding
     - [LAME 3.100](http://lame.sourceforge.net/) for MP3 encoding
 - others
-    - [fontconfig 2.12.1](https://www.freedesktop.org/wiki/Software/fontconfig/)
+    - [fontconfig 2.13.0](https://www.freedesktop.org/wiki/Software/fontconfig/)
     - [FreeType 2.9.1](https://www.freetype.org/)
     - [frei0r 1.6.1](https://frei0r.dyne.org/)
     - [zlib 1.2.11](https://zlib.net/)

build.sh

@@ -175,6 +175,27 @@ make install
 checkExecutionStatus "installation of zlib" $?
 endBlock zlib
 
+# download util-linux (used for fontconfig)
+startBlock util-linux
+cd "$FF_SOURCE"
+curl -O https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-2.32.tar.gz
+checkExecutionStatus "download of util-linux" $?
+
+# build util-linux
+tar -zxf util-linux*.tar.gz
+cd util-linux-*/
+# ipcrm and ipcs doesn't compile and wall doesn't install on OSX
+# mount and su installation on (linux)-buildserver is not allowed
+./configure --prefix="$FF_OUT" --enable-shared=no \
+    --disable-ipcrm --disable-ipcs --disable-wall \
+    --disable-mount --disable-su
+checkExecutionStatus "configuration of util-linux" $?
+make -j $FF_CPU
+checkExecutionStatus "compilation of util-linux" $?
+make install
+checkExecutionStatus "installation of util-linux" $?
+endBlock util-linux
+
 # download frei0r
 startBlock frei0r
 cd "$FF_SOURCE"
@@ -212,8 +233,7 @@ endBlock freetype
 # download fontconfig
 startBlock fontconfig
 cd "$FF_SOURCE"
-# version 2.12.3 is not workling on linux --> use the latest working version
-curl -O https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.gz
+curl -O https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.0.tar.gz
 checkExecutionStatus "download of fontconfig" $?
 
 # build fontconfig