Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Fri, Feb 28, 2014 at 02:41:40PM +0100, Matthieu Crapet wrote:
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- fix missing $ for STAGING_INCDIR (jpeg version detection)
- add DESCRIPTION
- no more QA warnings
Use this to reveal:
sed -i -e '/^verbose/s/no/yes/' ${S}/mk/Autoconf.mk
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 35
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
index 32f376f..0c663c1 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -1,21 +1,49 @@
+SUMMARY = Framebuffer image and doc viewer tools
+DESCRIPTION = The fbida project contains a few applications for viewing and
editing images, \
+ with the main focus being photos.
HOMEPAGE = http://linux.bytesex.org/fbida/;
-SUMMARY = frame buffer image and doc viewer tools
AUTHOR = Gerd Hoffmann
SECTION = utils
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-DEPENDS = virtual/libiconv libpng jpeg fontconfig freetype libexif curl
libungif tiff
+DEPENDS = virtual/libiconv jpeg fontconfig freetype libexif curl
+PR = r1
you don't need this
+
+# Note: SRCREV is 3 revisions ahead of 2.09
It would be better to add
PV = 2.09+git${SRCPV}
and rename the recipe to fbida_git.bb that way it will be clear from
package version which revision was used.
SRC_URI = git://git.kraxel.org/fbida
SRCREV = cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d
S = ${WORKDIR}/git
EXTRA_OEMAKE = STRIP=
+PACKAGECONFIG ??= gif png
+PACKAGECONFIG[gif] = ,,libungif
+PACKAGECONFIG[png] = ,,libpng
+PACKAGECONFIG[tiff] = ,,tiff
+
do_compile() {
-sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
+sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
+sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:'
${S}/GNUmakefile
+
+if [ -z ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ];
then
+sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
+# Be sure to respect preferences (force to no)
+# Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
+if [ -z ${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)} ]; then
+sed -i -e '/^HAVE_LIBUNGIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)} ]; then
+sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+if [ -z ${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)} ];
then
+sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
+fi
+
oe_runmake
}
@@ -24,4 +52,3 @@ do_install() {
}
RDEPENDS_${PN} = ttf-dejavu-sans-mono
-
--
1.8.5.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Regards, Matt -Message d'origine- De : openembedded-devel-boun...@lists.openembedded.org [mailto:openembedded-devel-boun...@lists.openembedded.org] De la part de Martin Jansa Envoyé : vendredi 28 février 2014 15:00 À : openembedded-devel@lists.openembedded.org Objet : Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG [...] ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide Thanks -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Friday 28 February 2014 15:45:32 Martin Jansa wrote: On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide IMO, I think four spaces for multi-line indentation is not ideal. The indentation is there for readability; it should line up with the opening quote on the first line if there is one. IIRC we only ended up with these after your search and replace in meta-oe because it was too hard to do otherwise. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Fri, Feb 28, 2014 at 03:43:56PM +, Paul Eggleton wrote: On Friday 28 February 2014 15:45:32 Martin Jansa wrote: On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide IMO, I think four spaces for multi-line indentation is not ideal. The indentation is there for readability; it should line up with the opening quote on the first line if there is one. IIRC we only ended up with these after your search and replace in meta-oe because it was too hard to do otherwise. http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082663.html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082665.html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082868.html -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
On Friday 28 February 2014 16:57:54 Martin Jansa wrote: On Fri, Feb 28, 2014 at 03:43:56PM +, Paul Eggleton wrote: On Friday 28 February 2014 15:45:32 Martin Jansa wrote: On Fri, Feb 28, 2014 at 02:21:58PM +, Matthieu CRAPET wrote: Thanks Martin for your great help! Concerning shell function tabs, maybe a line may be added in wiki: http://www.openembedded.org/wiki/Migrating_metadata_to_OE-Core Updated there and in http://www.openembedded.org/wiki/Styleguide IMO, I think four spaces for multi-line indentation is not ideal. The indentation is there for readability; it should line up with the opening quote on the first line if there is one. IIRC we only ended up with these after your search and replace in meta-oe because it was too hard to do otherwise. http://lists.openembedded.org/pipermail/openembedded-core/2013-August/082663 .html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/08266 5.html http://lists.openembedded.org/pipermail/openembedded-core/2013-August/08286 8.html My comment still stands. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
