* [meta-oe][PATCH] fbida 2.09: cleanups and use PACKAGECONFIG
@ 2014-02-28 13:04 Matthieu Crapet
2014-02-28 13:26 ` Martin Jansa
2014-02-28 13:41 ` [meta-oe][PATCH v2] " Matthieu Crapet
0 siblings, 2 replies; 10+ messages in thread
From: Matthieu Crapet @ 2014-02-28 13:04 UTC (permalink / raw)
To: openembedded-devel
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- fix missing $ for STAGING_INCDIR (jpeg version detection)
- use TABS for (shell) indentation
- 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.Crapet@ingenico.com>
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 39 +++++++++++++++++++++++-----
1 file changed, 33 insertions(+), 6 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..a3abf8f 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
@@ -1,27 +1,54 @@
+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"
+
+# Note: SRCREV is 3 revisions ahead of 2.09
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
- oe_runmake
+ 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
}
do_install() {
- oe_runmake 'DESTDIR=${D}' install
+ oe_runmake 'DESTDIR=${D}' install
}
RDEPENDS_${PN} = "ttf-dejavu-sans-mono"
-
--
1.8.5.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [meta-oe][PATCH] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 13:04 [meta-oe][PATCH] fbida 2.09: cleanups and use PACKAGECONFIG Matthieu Crapet
@ 2014-02-28 13:26 ` Martin Jansa
2014-02-28 13:41 ` [meta-oe][PATCH v2] " Matthieu Crapet
1 sibling, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2014-02-28 13:26 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3442 bytes --]
On Fri, Feb 28, 2014 at 02:04:30PM +0100, Matthieu Crapet wrote:
> There are now 3 packageconfig variables: gif, png, tiff.
>
> Changes:
> - fix missing $ for STAGING_INCDIR (jpeg version detection)
> - use TABS for (shell) indentation
Please don't.
meta-oe layers are using consistent indentation with 4 spaces and no
tabs.
> - 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.Crapet@ingenico.com>
> ---
> meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 39 +++++++++++++++++++++++-----
> 1 file changed, 33 insertions(+), 6 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..a3abf8f 100644
> --- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
> +++ b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
> @@ -1,27 +1,54 @@
> +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"
> +
> +# Note: SRCREV is 3 revisions ahead of 2.09
> 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
> - oe_runmake
> + 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
> }
>
> do_install() {
> - oe_runmake 'DESTDIR=${D}' install
> + oe_runmake 'DESTDIR=${D}' 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.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 13:04 [meta-oe][PATCH] fbida 2.09: cleanups and use PACKAGECONFIG Matthieu Crapet
2014-02-28 13:26 ` Martin Jansa
@ 2014-02-28 13:41 ` Matthieu Crapet
2014-02-28 14:00 ` Martin Jansa
2014-02-28 14:11 ` [meta-oe][PATCH v3] " Matthieu Crapet
1 sibling, 2 replies; 10+ messages in thread
From: Matthieu Crapet @ 2014-02-28 13:41 UTC (permalink / raw)
To: openembedded-devel
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.Crapet@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"
+
+# Note: SRCREV is 3 revisions ahead of 2.09
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 13:41 ` [meta-oe][PATCH v2] " Matthieu Crapet
@ 2014-02-28 14:00 ` Martin Jansa
2014-02-28 14:21 ` Matthieu CRAPET
2014-02-28 14:11 ` [meta-oe][PATCH v3] " Matthieu Crapet
1 sibling, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2014-02-28 14:00 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3483 bytes --]
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.Crapet@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.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [meta-oe][PATCH v3] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 13:41 ` [meta-oe][PATCH v2] " Matthieu Crapet
2014-02-28 14:00 ` Martin Jansa
@ 2014-02-28 14:11 ` Matthieu Crapet
1 sibling, 0 replies; 10+ messages in thread
From: Matthieu Crapet @ 2014-02-28 14:11 UTC (permalink / raw)
To: openembedded-devel
There are now 3 packageconfig variables: gif, png, tiff.
Changes:
- rename recipe to _git (match SRCREV)
- 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.Crapet@ingenico.com>
---
meta-oe/recipes-graphics/fbida/fbida_2.09.bb | 27 ---------------
meta-oe/recipes-graphics/fbida/fbida_git.bb | 52 ++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 27 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/fbida/fbida_2.09.bb
create mode 100644 meta-oe/recipes-graphics/fbida/fbida_git.bb
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb b/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
deleted file mode 100644
index 32f376f..0000000
--- a/meta-oe/recipes-graphics/fbida/fbida_2.09.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-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"
-
-SRC_URI = "git://git.kraxel.org/fbida"
-SRCREV = "cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d"
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = "STRIP="
-
-do_compile() {
- sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I{STAGING_INCDIR}:g' GNUmakefile
- oe_runmake
-}
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
-}
-
-RDEPENDS_${PN} = "ttf-dejavu-sans-mono"
-
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb
new file mode 100644
index 0000000..9eea664
--- /dev/null
+++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb
@@ -0,0 +1,52 @@
+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/"
+AUTHOR = "Gerd Hoffmann"
+SECTION = "utils"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif curl"
+
+SRC_URI = "git://git.kraxel.org/fbida"
+SRCREV = "cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d"
+PV = "2.09+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = "STRIP="
+
+PACKAGECONFIG ??= "gif png"
+PACKAGECONFIG[gif] = ",,libungif"
+PACKAGECONFIG[png] = ",,libpng"
+PACKAGECONFIG[tiff] = ",,tiff"
+
+do_compile() {
+ 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
+}
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+}
+
+RDEPENDS_${PN} = "ttf-dejavu-sans-mono"
--
1.8.5.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 14:00 ` Martin Jansa
@ 2014-02-28 14:21 ` Matthieu CRAPET
2014-02-28 14:45 ` Martin Jansa
0 siblings, 1 reply; 10+ messages in thread
From: Matthieu CRAPET @ 2014-02-28 14:21 UTC (permalink / raw)
To: openembedded-devel
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-bounces@lists.openembedded.org [mailto:openembedded-devel-bounces@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
[...]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 14:21 ` Matthieu CRAPET
@ 2014-02-28 14:45 ` Martin Jansa
2014-02-28 15:43 ` Paul Eggleton
0 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2014-02-28 14:45 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
On Fri, Feb 28, 2014 at 02:21:58PM +0000, 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.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 14:45 ` Martin Jansa
@ 2014-02-28 15:43 ` Paul Eggleton
2014-02-28 15:57 ` Martin Jansa
0 siblings, 1 reply; 10+ messages in thread
From: Paul Eggleton @ 2014-02-28 15:43 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
On Friday 28 February 2014 15:45:32 Martin Jansa wrote:
> On Fri, Feb 28, 2014 at 02:21:58PM +0000, 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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 15:43 ` Paul Eggleton
@ 2014-02-28 15:57 ` Martin Jansa
2014-02-28 16:24 ` Paul Eggleton
0 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2014-02-28 15:57 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
On Fri, Feb 28, 2014 at 03:43:56PM +0000, Paul Eggleton wrote:
> On Friday 28 February 2014 15:45:32 Martin Jansa wrote:
> > On Fri, Feb 28, 2014 at 02:21:58PM +0000, 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.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [meta-oe][PATCH v2] fbida 2.09: cleanups and use PACKAGECONFIG
2014-02-28 15:57 ` Martin Jansa
@ 2014-02-28 16:24 ` Paul Eggleton
0 siblings, 0 replies; 10+ messages in thread
From: Paul Eggleton @ 2014-02-28 16:24 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
On Friday 28 February 2014 16:57:54 Martin Jansa wrote:
> On Fri, Feb 28, 2014 at 03:43:56PM +0000, Paul Eggleton wrote:
> > On Friday 28 February 2014 15:45:32 Martin Jansa wrote:
> > > On Fri, Feb 28, 2014 at 02:21:58PM +0000, 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
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-02-28 16:25 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-28 13:04 [meta-oe][PATCH] fbida 2.09: cleanups and use PACKAGECONFIG Matthieu Crapet
2014-02-28 13:26 ` Martin Jansa
2014-02-28 13:41 ` [meta-oe][PATCH v2] " Matthieu Crapet
2014-02-28 14:00 ` Martin Jansa
2014-02-28 14:21 ` Matthieu CRAPET
2014-02-28 14:45 ` Martin Jansa
2014-02-28 15:43 ` Paul Eggleton
2014-02-28 15:57 ` Martin Jansa
2014-02-28 16:24 ` Paul Eggleton
2014-02-28 14:11 ` [meta-oe][PATCH v3] " Matthieu Crapet
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.