diff options
| author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-01-12 22:01:00 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-01-12 19:22:45 -0800 |
| commit | 7ec6afebf7640888d554f6000d204925e109cee0 (patch) | |
| tree | 6a6e37d8aa889cbbf889807f4fc42bfb5aedc06b /meta-oe/recipes-graphics/libsdl/libsdl2-ttf | |
| parent | 3254dcee6d6e8d63805d246fb12b387b6ad233ac (diff) | |
| download | meta-openembedded-7ec6afebf7640888d554f6000d204925e109cee0.tar.gz | |
libsdl2-ttf: upgrade 2.0.14 -> 2.0.15
-License-Update: Copyright year updated to 2019.
use.pkg-config.for.freetype2.patch
Removed since source is changed.
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/libsdl/libsdl2-ttf')
| -rw-r--r-- | meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch deleted file mode 100644 index 1dfbec6edd..0000000000 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | From e6d2c0e130811c15b5f5cc10221fae182cb8609e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 3 | Date: Thu, 22 May 2014 10:59:33 +0100 | ||
| 4 | Subject: [PATCH] freetype-config was removed from oe-core in | ||
| 5 | |||
| 6 | commit 5870bd272b0b077d0826fb900b251884c1c05061 | ||
| 7 | |||
| 8 | binconfig-disabled: Add class and use | ||
| 9 | |||
| 10 | --- | ||
| 11 | configure.in | 38 +++++--------------------------------- | ||
| 12 | 1 file changed, 5 insertions(+), 33 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/configure.in b/configure.in | ||
| 15 | index 9b36e15..f300cae 100644 | ||
| 16 | --- a/configure.in | ||
| 17 | +++ b/configure.in | ||
| 18 | @@ -86,39 +86,11 @@ case "$host" in | ||
| 19 | esac | ||
| 20 | AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) | ||
| 21 | |||
| 22 | -dnl Check for the FreeType 2 library | ||
| 23 | -dnl | ||
| 24 | -dnl Get the cflags and libraries from the freetype-config script | ||
| 25 | -dnl | ||
| 26 | -AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is | ||
| 27 | -installed (optional)], | ||
| 28 | - freetype_prefix="$withval", freetype_prefix="") | ||
| 29 | -AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec prefix | ||
| 30 | -where FREETYPE is installed (optional)], | ||
| 31 | - freetype_exec_prefix="$withval", freetype_exec_prefix="") | ||
| 32 | - | ||
| 33 | -if test x$freetype_exec_prefix != x ; then | ||
| 34 | - freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" | ||
| 35 | - if test x${FREETYPE_CONFIG+set} != xset ; then | ||
| 36 | - FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config | ||
| 37 | - fi | ||
| 38 | -fi | ||
| 39 | -if test x$freetype_prefix != x ; then | ||
| 40 | - freetype_args="$freetype_args --prefix=$freetype_prefix" | ||
| 41 | - if test x${FREETYPE_CONFIG+set} != xset ; then | ||
| 42 | - FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config | ||
| 43 | - fi | ||
| 44 | -fi | ||
| 45 | -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) | ||
| 46 | -no_freetype="" | ||
| 47 | -if test "$FREETYPE_CONFIG" = "no" ; then | ||
| 48 | - AC_MSG_ERROR([ | ||
| 49 | -*** Unable to find FreeType2 library (http://www.freetype.org/) | ||
| 50 | -]) | ||
| 51 | -else | ||
| 52 | - CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" | ||
| 53 | - LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" | ||
| 54 | -fi | ||
| 55 | +PKG_CHECK_MODULES(FREETYPE2, freetype2, | ||
| 56 | + CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" | ||
| 57 | + LIBS="$LIBS $FREETYPE2_LIBS", | ||
| 58 | + AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) | ||
| 59 | +) | ||
| 60 | |||
| 61 | dnl Check for SDL | ||
| 62 | SDL_VERSION=2.0.0 | ||
