diff options
-rw-r--r-- | meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb | 11 |
2 files changed, 20 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch b/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch new file mode 100644 index 0000000000..2d5bd6d910 --- /dev/null +++ b/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: SDL2_ttf-2.0.14/Makefile.am | ||
2 | =================================================================== | ||
3 | --- SDL2_ttf-2.0.14.orig/Makefile.am | ||
4 | +++ SDL2_ttf-2.0.14/Makefile.am | ||
5 | @@ -1,6 +1,8 @@ | ||
6 | # Makefile.am for the SDL truetype font loading library and viewer | ||
7 | lib_LTLIBRARIES = libSDL2_ttf.la | ||
8 | |||
9 | +AUTOMAKE_OPTIONS = foreign | ||
10 | + | ||
11 | libSDL2_ttfincludedir = $(includedir)/SDL2 | ||
12 | libSDL2_ttfinclude_HEADERS = \ | ||
13 | SDL_ttf.h | ||
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb index f2441f9cfc..4601593ad8 100644 --- a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb | |||
@@ -1,23 +1,25 @@ | |||
1 | SUMMARY = "Simple DirectMedia Layer truetype font library" | 1 | SUMMARY = "Simple DirectMedia Layer truetype font library" |
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | DEPENDS = "virtual/libsdl2 freetype" | 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=cb33e7c4df9fbde389f149ad6bc93ce5" |
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 \ | 9 | file://use.pkg-config.for.freetype2.patch \ |
10 | file://automake_foreign.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1" | 12 | SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1" |
12 | SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" | 13 | SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" |
13 | 14 | ||
14 | S = "${WORKDIR}/SDL2_ttf-${PV}" | 15 | S = "${WORKDIR}/SDL2_ttf-${PV}" |
15 | 16 | ||
16 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig distro_features_check |
17 | 18 | ||
18 | do_configure_prepend() { | 19 | # links to libGL.so |
19 | touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog | 20 | REQUIRED_DISTRO_FEATURES += "x11 opengl" |
20 | 21 | ||
22 | do_configure_prepend() { | ||
21 | # Removing these files fixes a libtool version mismatch. | 23 | # Removing these files fixes a libtool version mismatch. |
22 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" | 24 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" |
23 | 25 | ||
@@ -25,3 +27,4 @@ do_configure_prepend() { | |||
25 | rm -f ${S}/acinclude/$i | 27 | rm -f ${S}/acinclude/$i |
26 | done | 28 | done |
27 | } | 29 | } |
30 | ASNEEDED = "" | ||