Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
0ba67a8e
Commit
0ba67a8e
authored
7 years ago
by
Clément Bœsch
Browse files
Options
Downloads
Patches
Plain Diff
build: remove special freetype check
Since
52ccc4a0
was merged, it's pointless to keep our special version.
parent
0a0517bb
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+1
-21
1 addition, 21 deletions
configure
with
1 addition
and
21 deletions
configure
+
1
−
21
View file @
0ba67a8e
...
@@ -1354,26 +1354,6 @@ require_pkg_config(){
...
@@ -1354,26 +1354,6 @@ require_pkg_config(){
use_pkg_config
"
$@
"
||
die
"ERROR:
$pkg
not found using pkg-config
$pkg_config_fail_message
"
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
(){
hostcc_e
(){
eval printf
'%s\\n'
$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
...
@@ -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 libflite
&&
require libflite
"flite/flite.h"
flite_init
$flite_libs
enabled fontconfig
&&
enable
libfontconfig
enabled fontconfig
&&
enable
libfontconfig
enabled libfontconfig
&&
require_pkg_config fontconfig
"fontconfig/fontconfig.h"
FcInit
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 libfribidi
&&
require_pkg_config fribidi fribidi.h fribidi_version_info
enabled libgme
&&
require libgme gme/gme.h gme_new_emu
-lgme
-lstdc
++
enabled libgme
&&
require libgme gme/gme.h gme_new_emu
-lgme
-lstdc
++
enabled libgsm
&&
{
for
gsm_hdr
in
"gsm.h"
"gsm/gsm.h"
;
do
enabled libgsm
&&
{
for
gsm_hdr
in
"gsm.h"
"gsm/gsm.h"
;
do
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment