mirror of https://git.ffmpeg.org/ffmpeg.git
build: remove special freetype check
Since 52ccc4a0e
was merged, it's pointless to keep our special version.
This commit is contained in:
parent
0a0517bbf5
commit
0ba67a8eb1
|
@ -1354,26 +1354,6 @@ require_pkg_config(){
|
|||
use_pkg_config "$@" || die "ERROR: $pkg not found using pkg-config$pkg_config_fail_message"
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
echo "#include <ft2build.h>"
|
||||
echo "#include FT_FREETYPE_H"
|
||||
echo "long check_func(void) { return (long) FT_Init_FreeType; }"
|
||||
echo "int main(void) { return 0; }"
|
||||
} | check_ld "cc" $pkg_cflags $pkg_libs \
|
||||
&& set_safe "${pkg}_cflags" $pkg_cflags \
|
||||
&& set_safe "${pkg}_libs" $pkg_libs \
|
||||
|| die "ERROR: $pkg not found"
|
||||
add_cflags $(get_safe "${pkg}_cflags")
|
||||
add_extralibs $(get_safe "${pkg}_libs")
|
||||
}
|
||||
|
||||
hostcc_e(){
|
||||
eval printf '%s\\n' $HOSTCC_E
|
||||
}
|
||||
|
@ -5780,7 +5760,7 @@ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_c
|
|||
enabled libflite && require libflite "flite/flite.h" flite_init $flite_libs
|
||||
enabled fontconfig && enable libfontconfig
|
||||
enabled libfontconfig && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
|
||||
enabled libfreetype && require_libfreetype
|
||||
enabled libfreetype && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
|
||||
enabled libfribidi && require_pkg_config fribidi fribidi.h fribidi_version_info
|
||||
enabled libgme && require libgme gme/gme.h gme_new_emu -lgme -lstdc++
|
||||
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
|
||||
|
|
Loading…
Reference in New Issue