diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10 | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10')
-rw-r--r-- | meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/configure.patch | 52 | ||||
-rw-r--r-- | meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/use.pkg-config.for.freetype2.patch | 57 |
2 files changed, 109 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/configure.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/configure.patch new file mode 100644 index 000000000..de88f0a34 --- /dev/null +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/configure.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | Index: SDL_ttf-2.0.10/configure.in | ||
2 | =================================================================== | ||
3 | --- SDL_ttf-2.0.10.orig/configure.in 2009-10-12 23:06:38.000000000 +0000 | ||
4 | +++ SDL_ttf-2.0.10/configure.in 2014-07-17 12:33:34.011662505 +0000 | ||
5 | @@ -1,5 +1,4 @@ | ||
6 | dnl Process this file with autoconf to produce a configure script. | ||
7 | -AC_INIT(README) | ||
8 | |||
9 | dnl Set various version strings - taken gratefully from the GTk sources | ||
10 | |||
11 | @@ -11,12 +10,19 @@ | ||
12 | # if backwards compatibility has been broken, | ||
13 | # set BINARY_AGE and INTERFACE_AGE to 0. | ||
14 | |||
15 | -MAJOR_VERSION=2 | ||
16 | -MINOR_VERSION=0 | ||
17 | -MICRO_VERSION=10 | ||
18 | +m4_define([sdlttf_major_version],[2]) | ||
19 | +m4_define([sdlttf_minor_version],[0]) | ||
20 | +m4_define([sdlttf_micro_version],[10]) | ||
21 | +m4_define([sdlttf_version], [sdlttf_major_version.sdlttf_minor_version.sdlttf_micro_version]) | ||
22 | + | ||
23 | +AC_INIT([SDL_ttf], [sdlttf_version]) | ||
24 | + | ||
25 | +MAJOR_VERSION=sdlttf_major_version | ||
26 | +MINOR_VERSION=sdlttf_minor_version | ||
27 | +MICRO_VERSION=sdlttf_micro_version | ||
28 | INTERFACE_AGE=0 | ||
29 | BINARY_AGE=10 | ||
30 | -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION | ||
31 | +VERSION=sdlttf_version | ||
32 | |||
33 | AC_SUBST(MAJOR_VERSION) | ||
34 | AC_SUBST(MINOR_VERSION) | ||
35 | @@ -25,6 +31,8 @@ | ||
36 | AC_SUBST(BINARY_AGE) | ||
37 | AC_SUBST(VERSION) | ||
38 | |||
39 | +AC_CONFIG_MACRO_DIR([acinclude]) | ||
40 | + | ||
41 | # libtool versioning | ||
42 | LT_INIT([win32-dll]) | ||
43 | |||
44 | @@ -42,7 +50,7 @@ | ||
45 | AC_CANONICAL_HOST | ||
46 | |||
47 | dnl Setup for automake | ||
48 | -AM_INIT_AUTOMAKE(SDL_ttf, $VERSION) | ||
49 | +AM_INIT_AUTOMAKE([foreign]) | ||
50 | |||
51 | dnl Check for tools | ||
52 | AC_PROG_LIBTOOL | ||
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/use.pkg-config.for.freetype2.patch new file mode 100644 index 000000000..8a11f6649 --- /dev/null +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf-2.0.10/use.pkg-config.for.freetype2.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | freetype-config was removed from oe-core in | ||
2 | |||
3 | commit 5870bd272b0b077d0826fb900b251884c1c05061 | ||
4 | Author: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
5 | Date: Thu May 22 10:59:33 2014 +0100 | ||
6 | |||
7 | binconfig-disabled: Add class and use | ||
8 | |||
9 | diff --git a/configure.in b/configure.in | ||
10 | index 408e8d6..5f9e730 100644 | ||
11 | --- a/configure.in | ||
12 | +++ b/configure.in | ||
13 | @@ -86,39 +86,11 @@ case "$host" in | ||
14 | esac | ||
15 | AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) | ||
16 | |||
17 | -dnl Check for the FreeType 2 library | ||
18 | -dnl | ||
19 | -dnl Get the cflags and libraries from the freetype-config script | ||
20 | -dnl | ||
21 | -AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is | ||
22 | -installed (optional)], | ||
23 | - freetype_prefix="$withval", freetype_prefix="") | ||
24 | -AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec prefix | ||
25 | -where FREETYPE is installed (optional)], | ||
26 | - freetype_exec_prefix="$withval", freetype_exec_prefix="") | ||
27 | - | ||
28 | -if test x$freetype_exec_prefix != x ; then | ||
29 | - freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" | ||
30 | - if test x${FREETYPE_CONFIG+set} != xset ; then | ||
31 | - FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config | ||
32 | - fi | ||
33 | -fi | ||
34 | -if test x$freetype_prefix != x ; then | ||
35 | - freetype_args="$freetype_args --prefix=$freetype_prefix" | ||
36 | - if test x${FREETYPE_CONFIG+set} != xset ; then | ||
37 | - FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config | ||
38 | - fi | ||
39 | -fi | ||
40 | -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) | ||
41 | -no_freetype="" | ||
42 | -if test "$FREETYPE_CONFIG" = "no" ; then | ||
43 | - AC_MSG_ERROR([ | ||
44 | -*** Unable to find FreeType2 library (http://www.freetype.org/) | ||
45 | -]) | ||
46 | -else | ||
47 | - CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" | ||
48 | - LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" | ||
49 | -fi | ||
50 | +PKG_CHECK_MODULES(FREETYPE2, freetype2, | ||
51 | + CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" | ||
52 | + LIBS="$LIBS $FREETYPE2_LIBS", | ||
53 | + AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) | ||
54 | +) | ||
55 | |||
56 | dnl Check for SDL | ||
57 | SDL_VERSION=2.0.0 | ||