mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 02:31:27 +00:00
ftgl: initial add 2.1.3-rc5
Have this in meta-qt5-extra for a while but now it is required by upcoming chromium-bsi (meta-games). So move a layer 'up'. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,38 @@
|
|||||||
|
From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||||
|
Date: Sun, 23 Oct 2016 22:46:43 +0200
|
||||||
|
Subject: [PATCH] use pkg-config to find freetype2
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Upstream-Status: inappropriate [OE specific]
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||||
|
---
|
||||||
|
configure.ac | 9 +++++++--
|
||||||
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 53560ea..b5bb6a3 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup)
|
||||||
|
|
||||||
|
AC_PATH_X
|
||||||
|
|
||||||
|
-AC_CHECK_FT2([9.0.3],[],
|
||||||
|
- [AC_MSG_ERROR([FreeType2 is required to compile this library])])
|
||||||
|
+PKG_CHECK_MODULES(FT2, freetype2,
|
||||||
|
+ CFLAGS="$CFLAGS $FT2_CFLAGS"
|
||||||
|
+ LIBS="$LIBS $FT2_LIBS",
|
||||||
|
+ AC_MSG_ERROR([FreeType2 is required to compile this library])
|
||||||
|
+)
|
||||||
|
+AC_SUBST([FT2_CFLAGS])
|
||||||
|
+AC_SUBST([FT2_LIBS])
|
||||||
|
|
||||||
|
AC_PATH_XTRA
|
||||||
|
|
||||||
|
--
|
||||||
|
2.5.5
|
||||||
|
|
||||||
+38
@@ -0,0 +1,38 @@
|
|||||||
|
From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||||
|
Date: Sun, 23 Oct 2016 23:54:14 +0200
|
||||||
|
Subject: [PATCH] Makefile.am: remove useless and breaking code
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||||
|
---
|
||||||
|
Makefile.am | 9 ---------
|
||||||
|
1 file changed, 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index 89a8a7f..e582a34 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -24,15 +24,6 @@ EXTRA_DIST = \
|
||||||
|
m4 \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
-# Print out an informative summary.
|
||||||
|
-all-local:
|
||||||
|
- @$(ECHO) "Done."
|
||||||
|
- @$(ECHO)
|
||||||
|
- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \
|
||||||
|
- $(ECHO) "---" ;\
|
||||||
|
- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
|
||||||
|
- fi
|
||||||
|
- @$(ECHO)
|
||||||
|
|
||||||
|
# Upload documentation
|
||||||
|
DOC = docs/html docs/latex/ftgl.pdf
|
||||||
|
--
|
||||||
|
2.5.5
|
||||||
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
SUMMARY = "OpenGL frontend to Freetype 2"
|
||||||
|
HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
|
||||||
|
LICENSE = "MIT"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
|
DEPENDS += " \
|
||||||
|
freetype \
|
||||||
|
freeglut \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI = " \
|
||||||
|
${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||||
|
file://0001-use-pkg-config-to-find-freetype2.patch \
|
||||||
|
file://0002-Makefile.am-remove-useless-and-breaking-code.patch \
|
||||||
|
"
|
||||||
|
SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503"
|
||||||
|
SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/ftgl-2.1.3~rc5"
|
||||||
|
|
||||||
|
# undefined reference to symbol 'sin@@GLIBC_2.4'
|
||||||
|
CFLAGS += "-lm"
|
||||||
Reference in New Issue
Block a user