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 | |
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')
-rw-r--r-- | meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch | 62 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb (renamed from meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb) | 7 |
2 files changed, 3 insertions, 66 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 1dfbec6ed..000000000 --- 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 | ||
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb index 6224ad3e7..7d896cf00 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.15.bb | |||
@@ -2,15 +2,14 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" | |||
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | DEPENDS = "virtual/libsdl2 freetype virtual/libgl" | 3 | DEPENDS = "virtual/libsdl2 freetype virtual/libgl" |
4 | LICENSE = "Zlib" | 4 | LICENSE = "Zlib" |
5 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5" | 5 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=4bb27d550fdafcd8f8e4fb8cbb2775ef" |
6 | 6 | ||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ | 8 | http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ |
9 | file://use.pkg-config.for.freetype2.patch \ | ||
10 | file://automake_foreign.patch \ | 9 | file://automake_foreign.patch \ |
11 | " | 10 | " |
12 | SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1" | 11 | SRC_URI[md5sum] = "04fe06ff7623d7bdcb704e82f5f88391" |
13 | SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" | 12 | SRC_URI[sha256sum] = "a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33" |
14 | 13 | ||
15 | S = "${WORKDIR}/SDL2_ttf-${PV}" | 14 | S = "${WORKDIR}/SDL2_ttf-${PV}" |
16 | 15 | ||