Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
0ba67a8e
Commit
0ba67a8e
authored
Apr 17, 2017
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: remove special freetype check
Since
52ccc4a0
was merged, it's pointless to keep our special version.
parent
0a0517bb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
21 deletions
+1
-21
configure
configure
+1
-21
No files found.
configure
View file @
0ba67a8e
...
...
@@ -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_
libfreet
ype
enabled libfreetype
&&
require_
pkg_config freetype2
"ft2build.h FT_FREETYPE_H"
FT_Init_FreeT
ype
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment