[oe-commits] stephen.arnold42 : gd: added upstream license file and fixed configure warnings
git at git.openembedded.org
git at git.openembedded.org
Wed Apr 2 12:42:10 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: 6ef49ee8a222f5ae58fccf4034cf387b611d92a9
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=6ef49ee8a222f5ae58fccf4034cf387b611d92a9
Author: stephen.arnold42 <stephen.arnold42 at gmail.com>
Date: Tue Apr 1 20:47:44 2014 -0700
gd: added upstream license file and fixed configure warnings
This fixes QA warnings about missing license file and stale configure options,
(includes updates for freetype libpath and disables hardcoded rpaths).
Upstream-Status: Inappropriate (distribution/packaging fix)
Signed-off-by: Stephen Arnold <stephen.arnold42 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/licenses/GD | 53 +++++++++++++++++++++++
meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb | 4 +-
2 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/meta-oe/licenses/GD b/meta-oe/licenses/GD
new file mode 100644
index 0000000..5e17d03
--- /dev/null
+++ b/meta-oe/licenses/GD
@@ -0,0 +1,53 @@
+
+ Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ 2002 by Cold Spring Harbor Laboratory. Funded under Grant
+ P41-RR02188 by the National Institutes of Health.
+
+ Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by
+ Boutell.Com, Inc.
+
+ Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
+ Philip Warner.
+
+ Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
+ Roelofs.
+
+ Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John
+ Ellson (ellson at lucent.com).
+
+ Portions relating to gdft.c copyright 2001, 2002 John Ellson
+ (ellson at lucent.com).
+
+ Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ Pierre-Alain Joye (pierre at libgd.org).
+
+ Portions relating to JPEG and to color quantization copyright 2000,
+ 2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997,
+ 1998, 1999, 2000, 2001, 2002, Thomas G. Lane. This software is
+ based in part on the work of the Independent JPEG Group. See the
+ file README-JPEG.TXT for more information.
+
+ Portions relating to WBMP copyright 2000, 2001, 2002 Maurice
+ Szmurlo and Johan Van den Brande.
+
+ Permission has been granted to copy, distribute and modify gd in
+ any context without fee, including a commercial application,
+ provided that this notice is present in user-accessible supporting
+ documentation.
+
+ This does not affect your ownership of the derived work itself, and
+ the intent is to assure proper credit for the authors of gd, not to
+ interfere with your productive use of gd. If you have questions,
+ ask. "Derived works" includes all programs that utilize the
+ library. Credit must be given in user-accessible documentation.
+
+ This software is provided "AS IS." The copyright holders disclaim
+ all warranties, either express or implied, including but not
+ limited to implied warranties of merchantability and fitness for a
+ particular purpose, with respect to this code and accompanying
+ documentation.
+
+ Although their code does not appear in gd, the authors wish to thank
+ David Koblas, David Rowley, and Hutchison Avenue Software Corporation
+ for their prior contributions.
+
diff --git a/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb b/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
index 957c4eb..5fb5857 100644
--- a/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
+++ b/meta-oe/recipes-support/gd/gd_2.0.35+2.0.36rc1.bb
@@ -15,10 +15,10 @@ S = "${WORKDIR}/gd-2.0.36RC1"
inherit autotools binconfig gettext
-EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \
+EXTRA_OECONF += " --disable-rpath \
--with-png=${STAGING_LIBDIR}/.. \
--with-jpeg=${STAGING_LIBDIR}/.. \
- --with-freetype \
+ --with-freetype=${STAGING_LIBDIR}/.. \
--without-fontconfig \
--without-xpm \
--without-x"
More information about the Openembedded-commits
mailing list