mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 14:59:55 +00:00
Code Issues Projects Releases Wiki Activity

libsdl-ttf/libsdl2-ttf: refresh patches

Browse Source 
Different code bases cannot share patches cleanly. So have explict patch folder
for each version.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Andreas Müller
2018-03-26 17:10:19 +02:00
committed by Armin Kuster
parent 81ccb9735a
commit c631d3e11b
4 changed files with 92 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch
-13
View File
@@ -1,13 +0,0 @@
Index: SDL2_ttf-2.0.14/Makefile.am
===================================================================
--- SDL2_ttf-2.0.14.orig/Makefile.am
+++ SDL2_ttf-2.0.14/Makefile.am
@@ -1,6 +1,8 @@
# Makefile.am for the SDL truetype font loading library and viewer
lib_LTLIBRARIES = libSDL2_ttf.la
+AUTOMAKE_OPTIONS = foreign
+
libSDL2_ttfincludedir = $(includedir)/SDL2
libSDL2_ttfinclude_HEADERS = \
SDL_ttf.h
meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch
+62
View File
@@ -0,0 +1,62 @@
From 8cf318197eea91bec6057308befbb29426d69014 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 865075e..d7a5a81 100644
--- a/configure.in
+++ b/configure.in
@@ -90,39 +90,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=1.2.4
meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch
+21
View File
@@ -0,0 +1,21 @@
From f9c4ad3a171d676e3818b8f6897f325ccf0b2203 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 9 May 2017 00:57:10 -0700
---
Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 8166d91..8e05e49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
lib_LTLIBRARIES = libSDL2_ttf.la
+AUTOMAKE_OPTIONS = foreign
+
libSDL2_ttfincludedir = $(includedir)/SDL2
libSDL2_ttfinclude_HEADERS = \
SDL_ttf.h
meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch → meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch
+9 -4
View File
@@ -1,13 +1,18 @@
freetype-config was removed from oe-core in
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
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu May 22 10:59:33 2014 +0100
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 408e8d6..5f9e730 100644
index 9b36e15..f300cae 100644
--- a/configure.in
+++ b/configure.in
@@ -86,39 +86,11 @@ case "$host" in