diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-02-15 22:17:49 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-25 17:45:49 +0100 |
commit | 29c0360331fa286cabaf1ac4470abeea7eb3e14a (patch) | |
tree | 0f0fb87d4646898af8904ab3e03e6f0a1ff034ab /meta-oe/recipes-support/libsdl-ttf | |
parent | ae71c305b994d5b8c4548938ba545c6add4398ec (diff) | |
download | meta-openembedded-contrib-29c0360331fa286cabaf1ac4470abeea7eb3e14a.tar.gz |
libsdl-ttf: update to 2.0.11
* Licence changed to Zlib [1]
* patch does not apply anymore and does not seem to miss
[1] https://www.libsdl.org/projects/SDL_ttf/
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/libsdl-ttf')
-rw-r--r-- | meta-oe/recipes-support/libsdl-ttf/files/configure.patch | 52 | ||||
-rw-r--r-- | meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb (renamed from meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb) | 20 |
2 files changed, 7 insertions, 65 deletions
diff --git a/meta-oe/recipes-support/libsdl-ttf/files/configure.patch b/meta-oe/recipes-support/libsdl-ttf/files/configure.patch deleted file mode 100644 index de88f0a34a..0000000000 --- a/meta-oe/recipes-support/libsdl-ttf/files/configure.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: SDL_ttf-2.0.10/configure.in -=================================================================== ---- SDL_ttf-2.0.10.orig/configure.in 2009-10-12 23:06:38.000000000 +0000 -+++ SDL_ttf-2.0.10/configure.in 2014-07-17 12:33:34.011662505 +0000 -@@ -1,5 +1,4 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(README) - - dnl Set various version strings - taken gratefully from the GTk sources - -@@ -11,12 +10,19 @@ - # if backwards compatibility has been broken, - # set BINARY_AGE and INTERFACE_AGE to 0. - --MAJOR_VERSION=2 --MINOR_VERSION=0 --MICRO_VERSION=10 -+m4_define([sdlttf_major_version],[2]) -+m4_define([sdlttf_minor_version],[0]) -+m4_define([sdlttf_micro_version],[10]) -+m4_define([sdlttf_version], [sdlttf_major_version.sdlttf_minor_version.sdlttf_micro_version]) -+ -+AC_INIT([SDL_ttf], [sdlttf_version]) -+ -+MAJOR_VERSION=sdlttf_major_version -+MINOR_VERSION=sdlttf_minor_version -+MICRO_VERSION=sdlttf_micro_version - INTERFACE_AGE=0 - BINARY_AGE=10 --VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION -+VERSION=sdlttf_version - - AC_SUBST(MAJOR_VERSION) - AC_SUBST(MINOR_VERSION) -@@ -25,6 +31,8 @@ - AC_SUBST(BINARY_AGE) - AC_SUBST(VERSION) - -+AC_CONFIG_MACRO_DIR([acinclude]) -+ - # libtool versioning - LT_INIT([win32-dll]) - -@@ -42,7 +50,7 @@ - AC_CANONICAL_HOST - - dnl Setup for automake --AM_INIT_AUTOMAKE(SDL_ttf, $VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools - AC_PROG_LIBTOOL diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb index ad3792e22e..0249abe24a 100644 --- a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb +++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb @@ -1,33 +1,27 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" DEPENDS = "virtual/libsdl freetype" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" - -PR = "r2" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303" SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ - file://configure.patch \ file://use.pkg-config.for.freetype2.patch \ " +SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa" +SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7" S = "${WORKDIR}/SDL_ttf-${PV}" -EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config " inherit autotools -TARGET_CC_ARCH += "${LDFLAGS}" - do_configure_prepend() { + # make autoreconf happy + touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog # Removing these files fixes a libtool version mismatch. MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" for i in ${MACROS}; do - rm -f ${S}/acinclude/$i + rm -f ${S}/acinclude/$i done - } - -SRC_URI[md5sum] = "814e6e17e8879254208d23b3b7e0354b" -SRC_URI[sha256sum] = "7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a" |