aboutsummaryrefslogtreecommitdiff
path: root/package/gstreamer
diff options
context:
space:
mode:
authorGravatar Ricardo Martincoski <ricardo.martincoski@gmail.com>2017-04-11 19:59:13 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-12 21:05:34 +0200
commitc07a46b0ceef9e909b5274f08d00064a5d3410a4 (patch)
tree000f6f650332d057d8a26825b5ea8a3ffb9290cd /package/gstreamer
parent4e677914cd3c810f44944de20cba8d06a5dac0c2 (diff)
downloadbuildroot-c07a46b0ceef9e909b5274f08d00064a5d3410a4.tar.gz
buildroot-c07a46b0ceef9e909b5274f08d00064a5d3410a4.tar.bz2
gst-plugins-base: fix handling of freetype
In 2010 commit 32d319e6f "gst-plugins-base: ensure <stdint.h> is used" introduced a typo (missing backslash) that made the code ineffective. It can be confirmed by looking at the output of: $ make printvars | grep '^GST_PLUGINS_BASE_CONF_ENV\|^FT2_CONFIG' FT2_CONFIG=/bin/false ac_cv_header_stdint_t="stdint.h" GST_PLUGINS_BASE_CONF_ENV= Add the missing backslash to fix the code. While at it, fix the indentation to use one tab instead of two. The (end of the) diff of config.log confirms the code is still needed when the host has freetype-config installed: @@ -1674,10 +1674,8 @@ configure:21882: checking for emmintrin.h configure:21882: result: no configure:21894: checking for stdint types -configure:21917: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -c conftest.c >&5 -configure:21917: $? = 0 configure:21961: result: stdint.h (shortcircuit) -configure:22348: result: make use of stdint.h in _stdint.h (assuming C99 compatible system) +configure:22348: result: make use of stdint.h in _stdint.h configure:22359: checking for localtime_r configure:22359: /tmp/gst/output/host/usr/bin/i686-pc-linux-gnu-gcc -std=gnu99 -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c >&5 configure:22359: $? = 0 @@ -2468,8 +2466,7 @@ Package 'freetype2', required by 'world', not found configure:31257: result: no configure:31298: checking for freetype-config -configure:31316: found /usr/bin/freetype-config -configure:31329: result: /usr/bin/freetype-config +configure:31329: result: /bin/false configure:31339: checking for FreeType - version >= 2.0.9 configure:31427: result: yes configure:32250: creating ./config.status @@ -2789,7 +2786,7 @@ ac_cv_objext='o' ac_cv_path_EGREP='/bin/grep -E' ac_cv_path_FGREP='/bin/grep -F' -ac_cv_path_FT2_CONFIG='/usr/bin/freetype-config' +ac_cv_path_FT2_CONFIG='/bin/false' ac_cv_path_GMSGFMT='/tmp/gst/output/host/usr/bin/msgfmt' ac_cv_path_GREP='/bin/grep' ac_cv_path_MSGFMT='/tmp/gst/output/host/usr/bin/msgfmt' @@ -2818,7 +2815,6 @@ ac_cv_prog_cxx_g='yes' ac_cv_prog_make_make_set='yes' ac_cv_stdint_message='using gnu compiler i686-pc-linux-gnu-gcc (Sourcery CodeBench Lite 2012.09-62) 4.7.2' -ac_cv_stdint_result='(assuming C99 compatible system)' ac_cv_sys_file_offset_bits='no' ac_cv_sys_largefile_CC='no' ac_cv_sys_largefile_source='no' @@ -2965,9 +2961,9 @@ EXEEXT='' FFLAGS=' -Os ' FGREP='/bin/grep -F' -FT2_CFLAGS='-I/usr/include/freetype2' -FT2_CONFIG='/usr/bin/freetype-config' -FT2_LIBS='-lfreetype' +FT2_CFLAGS='' +FT2_CONFIG='/bin/false' +FT2_LIBS='' GCOV='' GCOV_CFLAGS='' GCOV_LIBS='' Detected by check-package. Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/gstreamer')
-rw-r--r--package/gstreamer/gst-plugins-base/gst-plugins-base.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index fc3b2036af..735314365d 100644
--- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -14,9 +14,9 @@ GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
# freetype is only used by examples, but if it is not found
# and the host has a freetype-config script, then the host
# include dirs are added to the search path causing trouble
-GST_PLUGINS_BASE_CONF_ENV =
- FT2_CONFIG=/bin/false \
- ac_cv_header_stdint_t="stdint.h"
+GST_PLUGINS_BASE_CONF_ENV = \
+ FT2_CONFIG=/bin/false \
+ ac_cv_header_stdint_t="stdint.h"
GST_PLUGINS_BASE_CONF_OPTS = \
--disable-examples \