Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de> --- v1 -> v2: - removed extra padding spaces from prompt - removed extra space on _LDFLAGS - added missing license to zlib - added a patch to select opengl dependency
...igure-make-opengl-support-switchable.patch | 38 ++++++++++++ patches/SDL2_ttf-2.0.14/series | 4 ++ rules/sdl2-test.in | 1 + rules/sdl2-ttf.in | 12 ++++ rules/sdl2-ttf.make | 61 +++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch create mode 100644 patches/SDL2_ttf-2.0.14/series create mode 100644 rules/sdl2-ttf.in create mode 100644 rules/sdl2-ttf.make diff --git a/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch new file mode 100644 index 000000000..8295b31f0 --- /dev/null +++ b/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch @@ -0,0 +1,38 @@ +From: Michael Grzeschik <m.grzesc...@pengutronix.de> +Date: Fri, 13 Jul 2018 12:24:59 +0200 +Subject: [PATCH] configure: make opengl support switchable + +Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de> +--- + configure | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/configure b/configure +index 28b828e5b346..e2b73424659d 100755 +--- a/configure ++++ b/configure +@@ -925,6 +925,7 @@ with_freetype_prefix + with_freetype_exec_prefix + with_sdl_prefix + with_sdl_exec_prefix ++enable_opengl + enable_sdltest + with_x + ' +@@ -12953,6 +12954,7 @@ fi + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL support" >&5 + $as_echo_n "checking for OpenGL support... " >&6; } ++if test x$enable_opengl = x; then + have_opengl=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -12975,6 +12977,8 @@ have_opengl=yes + + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_opengl" >&5 + $as_echo "$have_opengl" >&6; } + if test x$have_opengl = xyes; then diff --git a/patches/SDL2_ttf-2.0.14/series b/patches/SDL2_ttf-2.0.14/series new file mode 100644 index 000000000..89c7959a2 --- /dev/null +++ b/patches/SDL2_ttf-2.0.14/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure-make-opengl-support-switchable.patch +# 61c28fd8bd7358c69acd4d51c712869b - git-ptx-patches magic diff --git a/rules/sdl2-test.in b/rules/sdl2-test.in index f822c965c..ba1e84a44 100644 --- a/rules/sdl2-test.in +++ b/rules/sdl2-test.in @@ -4,6 +4,7 @@ config SDL2_TEST tristate prompt "SDL2 test" select SDL2 + select SDL2_TTF help Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in new file mode 100644 index 000000000..f1386d0cf --- /dev/null +++ b/rules/sdl2-ttf.in @@ -0,0 +1,12 @@ +## SECTION=multimedia_sdl + +config SDL2_TTF + tristate + select SDL2 + select FREETYPE + prompt "SDL2 ttf" + help + This is a sample library which allows you to use TrueType + fonts in your SDL applications. It comes with an example + program "showfont" which displays an example string for a + given TrueType font file. diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make new file mode 100644 index 000000000..6224fbde4 --- /dev/null +++ b/rules/sdl2-ttf.make @@ -0,0 +1,61 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Michael Grzeschik <m...@pengutronix.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf + +# +# Paths and names +# +SDL2_TTF_VERSION := 2.0.14 +SDL2_TTF_MD5 := e53c05e1e7f1382c316afd6c763388b1 +SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION) +SDL2_TTF_SUFFIX := tar.gz +SDL2_TTF_URL := https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) +SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) +SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF) +SDL2_TTF_LICENSE := unknown + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +SDL2_TTF_CONF_TOOL := autoconf +SDL2_TTF_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --$(call ptx/endis,PTXCONF_SDL2_OPENGL)-opengl + +ifdef PTXCONF_SDL2_PULSEAUDIO +SDL2_TTF_LDFLAGS := \ + -Wl,-rpath-link,$(SYSROOT)/usr/lib/pulseaudio +endif + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/sdl2-ttf.targetinstall: + @$(call targetinfo) + + @$(call install_init, sdl2-ttf) + @$(call install_fixup, sdl2-ttf,PRIORITY,optional) + @$(call install_fixup, sdl2-ttf,SECTION,base) + @$(call install_fixup, sdl2-ttf,AUTHOR,"Michael Grzeschik <m...@pengutronix.de>") + @$(call install_fixup, sdl2-ttf,DESCRIPTION,missing) + + @$(call install_lib, sdl2-ttf, 0, 0, 0644, libSDL2_ttf-2.0) + + @$(call install_finish, sdl2-ttf) + + @$(call touch) + +# vim: syntax=make -- 2.18.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de