mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 17:39:57 +00:00
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>
This commit is contained in:
@@ -1,62 +0,0 @@
|
|||||||
From e6d2c0e130811c15b5f5cc10221fae182cb8609e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
||||||
Date: Thu, 22 May 2014 10:59:33 +0100
|
|
||||||
Subject: [PATCH] freetype-config was removed from oe-core in
|
|
||||||
|
|
||||||
commit 5870bd272b0b077d0826fb900b251884c1c05061
|
|
||||||
|
|
||||||
binconfig-disabled: Add class and use
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.in | 38 +++++---------------------------------
|
|
||||||
1 file changed, 5 insertions(+), 33 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.in b/configure.in
|
|
||||||
index 9b36e15..f300cae 100644
|
|
||||||
--- a/configure.in
|
|
||||||
+++ b/configure.in
|
|
||||||
@@ -86,39 +86,11 @@ case "$host" in
|
|
||||||
esac
|
|
||||||
AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
|
|
||||||
|
|
||||||
-dnl Check for the FreeType 2 library
|
|
||||||
-dnl
|
|
||||||
-dnl Get the cflags and libraries from the freetype-config script
|
|
||||||
-dnl
|
|
||||||
-AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is
|
|
||||||
-installed (optional)],
|
|
||||||
- freetype_prefix="$withval", freetype_prefix="")
|
|
||||||
-AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec prefix
|
|
||||||
-where FREETYPE is installed (optional)],
|
|
||||||
- freetype_exec_prefix="$withval", freetype_exec_prefix="")
|
|
||||||
-
|
|
||||||
-if test x$freetype_exec_prefix != x ; then
|
|
||||||
- freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
|
|
||||||
- if test x${FREETYPE_CONFIG+set} != xset ; then
|
|
||||||
- FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
-if test x$freetype_prefix != x ; then
|
|
||||||
- freetype_args="$freetype_args --prefix=$freetype_prefix"
|
|
||||||
- if test x${FREETYPE_CONFIG+set} != xset ; then
|
|
||||||
- FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
|
|
||||||
-no_freetype=""
|
|
||||||
-if test "$FREETYPE_CONFIG" = "no" ; then
|
|
||||||
- AC_MSG_ERROR([
|
|
||||||
-*** Unable to find FreeType2 library (http://www.freetype.org/)
|
|
||||||
-])
|
|
||||||
-else
|
|
||||||
- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
|
|
||||||
- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
|
|
||||||
-fi
|
|
||||||
+PKG_CHECK_MODULES(FREETYPE2, freetype2,
|
|
||||||
+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
|
|
||||||
+ LIBS="$LIBS $FREETYPE2_LIBS",
|
|
||||||
+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
|
|
||||||
+)
|
|
||||||
|
|
||||||
dnl Check for SDL
|
|
||||||
SDL_VERSION=2.0.0
|
|
||||||
+3
-4
@@ -2,15 +2,14 @@ SUMMARY = "Simple DirectMedia Layer truetype font library"
|
|||||||
SECTION = "libs"
|
SECTION = "libs"
|
||||||
DEPENDS = "virtual/libsdl2 freetype virtual/libgl"
|
DEPENDS = "virtual/libsdl2 freetype virtual/libgl"
|
||||||
LICENSE = "Zlib"
|
LICENSE = "Zlib"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5"
|
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=4bb27d550fdafcd8f8e4fb8cbb2775ef"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \
|
http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \
|
||||||
file://use.pkg-config.for.freetype2.patch \
|
|
||||||
file://automake_foreign.patch \
|
file://automake_foreign.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1"
|
SRC_URI[md5sum] = "04fe06ff7623d7bdcb704e82f5f88391"
|
||||||
SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
|
SRC_URI[sha256sum] = "a9eceb1ad88c1f1545cd7bd28e7cbc0b2c14191d40238f531a15b01b1b22cd33"
|
||||||
|
|
||||||
S = "${WORKDIR}/SDL2_ttf-${PV}"
|
S = "${WORKDIR}/SDL2_ttf-${PV}"
|
||||||
|
|
||||||
Reference in New Issue
Block a user