First shot at freetype. Only tested on Win64, hope for build reports …

ffmpeg/cppbuild.sh

@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
 fi
 
 DISABLE="--disable-w32threads --disable-iconv --disable-opencl --disable-sdl --disable-bzlib --disable-lzma"
-ENABLE="--enable-pthreads --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libopenh264 --enable-libx264 --enable-libx265 --enable-libvpx"
+ENABLE="--enable-pthreads --enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-openssl --enable-libopenh264 --enable-libx264 --enable-libx265 --enable-libvpx --enable-libfreetype"
 
 # minimal configuration to support MPEG-4 streams with H.264 and AAC as well as Motion JPEG
 # DISABLE="--disable-w32threads --disable-iconv --disable-libxcb --disable-opencl --disable-sdl --disable-bzlib --disable-lzma --disable-everything"
@@ -24,6 +24,7 @@ X265=x265_2.4
 VPX_VERSION=v1.6.1
 ALSA_VERSION=1.1.4.1
 FFMPEG_VERSION=3.3.2
+FREETYPE_VERSION=2.8
 download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz
 download http://downloads.sourceforge.net/project/lame/lame/3.99/$LAME.tar.gz $LAME.tar.gz
 download http://downloads.xiph.org/releases/speex/$SPEEX.tar.gz $SPEEX.tar.gz
@@ -34,6 +35,7 @@ download ftp://ftp.videolan.org/pub/videolan/x264/snapshots/last_stable_x264.tar
 download https://ftp.videolan.org/pub/videolan/x265/$X265.tar.gz $X265.tar.gz
 download https://chromium.googlesource.com/webm/libvpx/+archive/$VPX_VERSION.tar.gz libvpx-$VPX_VERSION.tar.gz
 download ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$ALSA_VERSION.tar.bz2 alsa-lib-$ALSA_VERSION.tar.bz2
+download http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.bz2 freetype-$FREETYPE_VERSION.tar.bz2
 download http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2 ffmpeg-$FFMPEG_VERSION.tar.bz2
 
 mkdir -p $PLATFORM
@@ -50,6 +52,7 @@ tar --totals -xjf ../last_stable_x264.tar.bz2
 tar --totals -xzf ../$X265.tar.gz
 mkdir -p libvpx-$VPX_VERSION
 tar --totals -xzf ../libvpx-$VPX_VERSION.tar.gz -C libvpx-$VPX_VERSION
+tar --totals -xjf ../freetype-$FREETYPE_VERSION.tar.bz2
 tar --totals -xjf ../ffmpeg-$FFMPEG_VERSION.tar.bz2
 X264=`echo x264-snapshot-*`
 
@@ -104,6 +107,10 @@ case $PLATFORM in
         LDFLAGS= ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --sdk-path=$ANDROID_NDK --disable-tools --target=armv7-android-gcc --disable-runtime-cpu-detect --disable-neon --disable-neon-asm
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --disable-shared --with-pic --host=arm-linux
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-android.patch
         ./configure --prefix=.. $DISABLE $ENABLE --enable-cross-compile --cross-prefix="$ANDROID_BIN-" --ranlib="$ANDROID_BIN-ranlib" --sysroot="$ANDROID_ROOT" --target-os=linux --arch=arm --extra-cflags="-I../include/ $CFLAGS" --extra-ldflags="$ANDROID_ROOT/usr/lib/crtbegin_so.o -L../lib/ -L$ANDROID_CPP/libs/armeabi/ $LDFLAGS" --extra-libs="-lgnustl_static $LIBS" --disable-symver --disable-programs
@@ -161,6 +168,10 @@ case $PLATFORM in
         ASFLAGS="-D__ANDROID__" ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --disable-tools --target=x86-android-gcc
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --disable-shared --with-pic --host=i686-linux
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-android.patch
         ./configure --prefix=.. $DISABLE $ENABLE --enable-cross-compile --cross-prefix="$ANDROID_BIN-" --ranlib="$ANDROID_BIN-ranlib" --sysroot="$ANDROID_ROOT" --target-os=linux --arch=atom --extra-cflags="-I../include/ $CFLAGS" --extra-ldflags="$ANDROID_ROOT/usr/lib/crtbegin_so.o -L../lib/ -L$ANDROID_CPP/libs/x86/ $LDFLAGS" --extra-libs="-lgnustl_static $LIBS" --disable-symver --disable-programs
@@ -203,6 +214,10 @@ case $PLATFORM in
         ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --target=x86-linux-gcc --as=yasm
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --with-pic --host=i686-linux
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-linux.patch
         PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE --enable-libxcb --cc="gcc -m32" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl"
@@ -245,6 +260,10 @@ case $PLATFORM in
         ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --target=x86_64-linux-gcc --as=yasm
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --with-pic --host=x86_64-linux CFLAGS="-m64"
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-linux.patch
         PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE --enable-libxcb --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl"
@@ -326,6 +345,10 @@ case $PLATFORM in
         ./configure --host=arm-linux-gnueabihf --prefix=$INSTALL_PATH --disable-python
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --with-pic --host=arm-linux-gnueabihf
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-linux.patch
         if [ $CROSSCOMPILE -eq 1 ]
@@ -373,6 +396,10 @@ case $PLATFORM in
         ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --target=generic-gnu
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --with-pic --target=ppc64le-linux CFLAGS="-m64"
+        make -j $MAKEJ
+        make install 
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-linux.patch
         PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE --enable-libxcb --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl"
@@ -415,6 +442,10 @@ case $PLATFORM in
         ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --with-pic
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-macosx.patch
         PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE --enable-indev=avfoundation --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-lstdc++ -ldl" --disable-doc --disable-programs
@@ -455,6 +486,10 @@ case $PLATFORM in
         ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --target=x86-win32-gcc
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --with-pic --target=x86_64-win64-gcc
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-windows.patch
         PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE --enable-indev=dshow --target-os=mingw32 --cc="gcc -m32" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lgcc -lgcc_eh -lWs2_32 -lcrypt32 -lpthread -Wl,-Bdynamic"
@@ -495,6 +530,10 @@ case $PLATFORM in
         ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-examples --target=x86_64-win64-gcc
         make -j $MAKEJ
         make install
+        cd ../freetype-$FREETYPE_VERSION
+        ./configure --prefix=$INSTALL_PATH --with-harfbuzz=no --with-png=no --enable-static --with-pic --target=x86_64-win64-gcc CFLAGS="-m64"
+        make -j $MAKEJ
+        make install
         cd ../ffmpeg-$FFMPEG_VERSION
         patch -Np1 < ../../../ffmpeg-$FFMPEG_VERSION-windows.patch
         PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE --enable-indev=dshow --target-os=mingw32 --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lgcc -lgcc_eh -lWs2_32 -lcrypt32 -lpthread -Wl,-Bdynamic"

ffmpeg/ffmpeg-3.3.2-android.patch

@@ -1,7 +1,24 @@
 diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-android/configure
 --- ffmpeg-3.3.2/configure	2017-06-07 11:04:02.000000000 +0900
 +++ ffmpeg-3.3.2-android/configure	2017-06-23 20:32:00.139387669 +0900
-@@ -5804,7 +5804,7 @@
+@@ -1353,10 +1353,8 @@
+ require_libfreetype(){
+     log require_libfreetype "$@"
+     pkg="freetype2"
+-    check_cmd $pkg_config --exists --print-errors $pkg \
+-      || die "ERROR: $pkg not found"
+-    pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
+-    pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
++    pkg_cflags="-I../include/freetype2"
++    pkg_libs="-lfreetype"
+     {
+         echo "#include <ft2build.h>"
+         echo "#include FT_FREETYPE_H"
+
+diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-android/configure
+--- ffmpeg-3.3.2/configure	2017-06-07 11:04:02.000000000 +0900
++++ ffmpeg-3.3.2-android/configure	2017-06-23 20:32:00.139387669 +0900
+@@ -5802,7 +5802,7 @@
                                 { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
                                   require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
                                 require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
@@ -10,7 +27,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-android/configure
  enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
                                 check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
                                 { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-@@ -5823,7 +5823,7 @@
+@@ -5821,7 +5821,7 @@
  enabled libsnappy         && require snappy snappy-c.h snappy_compress -lsnappy
  enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"
  enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
@@ -19,7 +36,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-android/configure
  enabled libtesseract      && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate
  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
  enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
-@@ -5871,7 +5871,7 @@
+@@ -5869,7 +5869,7 @@
                                 die "ERROR: libx264 must be installed and version must be >= 0.118."; } &&
                               { check_cpp_condition x264.h "X264_MPEG2" &&
                                 enable libx262; }
@@ -28,7 +45,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-android/configure
                               { check_cpp_condition x265.h "X265_BUILD >= 68" ||
                                 die "ERROR: libx265 version must be >= 68."; }
  enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs
-@@ -5916,10 +5916,10 @@
+@@ -5914,10 +5914,10 @@
                                  check_header OMX_Core.h ; } ||
                                 die "ERROR: OpenMAX IL headers not found"; }
  enabled openssl           && { use_pkg_config openssl openssl/ssl.h OPENSSL_init_ssl ||

ffmpeg/ffmpeg-3.3.2-macosx.patch

@@ -1,7 +1,24 @@
+diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-android/configure
+--- ffmpeg-3.3.2/configure	2017-06-07 11:04:02.000000000 +0900
++++ ffmpeg-3.3.2-macosx/configure	2017-06-23 20:59:05.705559621 +0900
+@@ -1353,10 +1353,8 @@
+ require_libfreetype(){
+     log require_libfreetype "$@"
+     pkg="freetype2"
+-    check_cmd $pkg_config --exists --print-errors $pkg \
+-      || die "ERROR: $pkg not found"
+-    pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
+-    pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
++    pkg_cflags="-I../include/freetype2"
++    pkg_libs="-lfreetype"
+     {
+         echo "#include <ft2build.h>"
+         echo "#include FT_FREETYPE_H"
+
 diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-macosx/configure
 --- ffmpeg-3.3.2/configure	2017-06-07 11:04:02.000000000 +0900
 +++ ffmpeg-3.3.2-macosx/configure	2017-06-23 20:59:05.705559621 +0900
-@@ -4815,7 +4815,7 @@
+@@ -4813,7 +4813,7 @@
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
          install_name_dir_default='$(SHLIBDIR)'
@@ -10,7 +27,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-macosx/configure
          enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
          strip="${strip} -x"
          add_ldflags -Wl,-dynamic,-search_paths_first
-@@ -5804,7 +5804,7 @@
+@@ -5802,7 +5802,7 @@
                                 { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
                                   require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
                                 require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
@@ -19,7 +36,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-macosx/configure
  enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
                                 check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
                                 { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-@@ -5823,7 +5823,7 @@
+@@ -5821,7 +5821,7 @@
  enabled libsnappy         && require snappy snappy-c.h snappy_compress -lsnappy
  enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"
  enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
@@ -28,7 +45,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-macosx/configure
  enabled libtesseract      && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate
  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
  enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
-@@ -5871,7 +5871,7 @@
+@@ -5869,7 +5869,7 @@
                                 die "ERROR: libx264 must be installed and version must be >= 0.118."; } &&
                               { check_cpp_condition x264.h "X264_MPEG2" &&
                                 enable libx262; }

ffmpeg/ffmpeg-3.3.2-windows.patch

@@ -1,7 +1,24 @@
+diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-android/configure
+--- ffmpeg-3.3.2/configure	2017-06-07 11:04:02.000000000 +0900
++++ ffmpeg-3.3.2-windows/configure	2017-06-23 21:02:55.749734057 +0900
+@@ -1353,10 +1353,8 @@
+ require_libfreetype(){
+     log require_libfreetype "$@"
+     pkg="freetype2"
+-    check_cmd $pkg_config --exists --print-errors $pkg \
+-      || die "ERROR: $pkg not found"
+-    pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
+-    pkg_libs=$($pkg_config --libs $pkg_config_flags $pkg)
++    pkg_cflags="-I../include/freetype2"
++    pkg_libs="-lfreetype"
+     {
+         echo "#include <ft2build.h>"
+         echo "#include FT_FREETYPE_H"
+
 diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-windows/configure
 --- ffmpeg-3.3.2/configure	2017-06-07 11:04:02.000000000 +0900
 +++ ffmpeg-3.3.2-windows/configure	2017-06-23 21:02:55.749734057 +0900
-@@ -5804,7 +5804,7 @@
+@@ -5802,7 +5802,7 @@
                                 { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
                                   require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
                                 require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
@@ -10,7 +27,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-windows/configure
  enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
                                 check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
                                 { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-@@ -5823,7 +5823,7 @@
+@@ -5821,7 +5821,7 @@
  enabled libsnappy         && require snappy snappy-c.h snappy_compress -lsnappy
  enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr && LIBSOXR="-lsoxr"
  enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
@@ -19,7 +36,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-windows/configure
  enabled libtesseract      && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate
  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
  enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
-@@ -5836,22 +5836,18 @@
+@@ -5834,22 +5834,18 @@
 
  enabled libvpx            && {
      enabled libvpx_vp8_decoder && {
@@ -42,7 +59,7 @@ diff -ruN ffmpeg-3.3.2/configure ffmpeg-3.3.2-windows/configure
              check_lib "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx ||
                  disable libvpx_vp9_encoder;
      }
-@@ -5864,14 +5860,14 @@
+@@ -5862,14 +5858,14 @@
  enabled libwebp           && {
      enabled libwebp_encoder      && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
      enabled libwebp_anim_encoder && { use_pkg_config "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit || disable libwebp_anim_encoder; } }