[oe-commits] [meta-openembedded] 32/69: libsdl-ttf/libsdl2-ttf: refresh patches

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master
in repository meta-openembedded.

commit c631d3e11be04f4e32a3e76b7d532559a7a3f131
Author: Andreas Müller <schnitzeltony at gmail.com>
AuthorDate: Mon Mar 26 17:10:19 2018 +0200

    libsdl-ttf/libsdl2-ttf: refresh patches
    
    Different code bases cannot share patches cleanly. So have explict patch folder
    for each version.
    
    Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../libsdl-ttf/files/automake_foreign.patch         | 13 -------------
 .../use.pkg-config.for.freetype2.patch              | 17 +++++++++++------
 .../libsdl-ttf/libsdl2-ttf/automake_foreign.patch   | 21 +++++++++++++++++++++
 .../use.pkg-config.for.freetype2.patch              | 13 +++++++++----
 4 files changed, 41 insertions(+), 23 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
deleted file mode 100644
index 2d5bd6d..0000000
--- a/meta-oe/recipes-support/libsdl-ttf/files/automake_foreign.patch
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch
similarity index 80%
copy from meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch
copy to meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch
index 8a11f66..1116c34 100644
--- a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch
+++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch
@@ -1,16 +1,21 @@
-freetype-config was removed from oe-core in
+From 8cf318197eea91bec6057308befbb29426d69014 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie at 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 at 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 865075e..d7a5a81 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -86,39 +86,11 @@ case "$host" in
+@@ -90,39 +90,11 @@ case "$host" in
  esac
  AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
  
@@ -54,4 +59,4 @@ index 408e8d6..5f9e730 100644
 +)
  
  dnl Check for SDL
- SDL_VERSION=2.0.0
+ SDL_VERSION=1.2.4
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch
new file mode 100644
index 0000000..871e6e9
--- /dev/null
+++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch
@@ -0,0 +1,21 @@
+From f9c4ad3a171d676e3818b8f6897f325ccf0b2203 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at 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
diff --git a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch
similarity index 83%
rename from meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch
rename to meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch
index 8a11f66..1dfbec6 100644
--- a/meta-oe/recipes-support/libsdl-ttf/files/use.pkg-config.for.freetype2.patch
+++ b/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch
@@ -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 at 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 at 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.