[oe] [meta-handheld] [PATCH 2/2] linux(-kexecboot): update from 3.1.7 to 3.1.8

2012-01-10 Thread Andrea Adami
* apply latest stable patchset
* bump PR

Signed-off-by: Andrea Adami 
---
 recipes-kernel/linux/linux-kexecboot_3.1.bb |8 
 recipes-kernel/linux/linux_3.1.bb   |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes-kernel/linux/linux-kexecboot_3.1.bb 
b/recipes-kernel/linux/linux-kexecboot_3.1.bb
index 9e2fb69..8a7f38f 100644
--- a/recipes-kernel/linux/linux-kexecboot_3.1.bb
+++ b/recipes-kernel/linux/linux-kexecboot_3.1.bb
@@ -1,12 +1,12 @@
 require linux-kexecboot.inc
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
 
 SRC_URI += 
"${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \
+   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.8.bz2;name=stablepatch \
file://defconfig \
file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
"
@@ -22,5 +22,5 @@ SRC_URI_append_poodle = " \
 
 SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931"
 SRC_URI[kernel.sha256sum] = 
"2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
-SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed"
-SRC_URI[stablepatch.sha256sum] = 
"44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11ab0bc9d"
+SRC_URI[stablepatch.md5sum] = "54fac8e4b0b55201e012ef0337a6cc87"
+SRC_URI[stablepatch.sha256sum] = 
"e191f1fd3d3e0a27e3e5116391a97b47b0c2adc3f6f779df1996766b37759d30"
diff --git a/recipes-kernel/linux/linux_3.1.bb 
b/recipes-kernel/linux/linux_3.1.bb
index baa0b34..3dc2759 100644
--- a/recipes-kernel/linux/linux_3.1.bb
+++ b/recipes-kernel/linux/linux_3.1.bb
@@ -1,11 +1,11 @@
 require linux.inc
 
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.6"
 
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)"
 
 SRC_URI += 
"${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \
+   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.8.bz2;name=stablepatch \
file://defconfig \
file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
"
@@ -21,5 +21,5 @@ SRC_URI_append_poodle = " \
 
 SRC_URI[kernel.md5sum] = "8d43453f8159b2332ad410b19d86a931"
 SRC_URI[kernel.sha256sum] = 
"2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
-SRC_URI[stablepatch.md5sum] = "13ea1e611a0a580138b8203e6f1353ed"
-SRC_URI[stablepatch.sha256sum] = 
"44f2611ce923db17254eeb618ed06703acf4dd6dcc8357b360e11ab0bc9d"
+SRC_URI[stablepatch.md5sum] = "54fac8e4b0b55201e012ef0337a6cc87"
+SRC_URI[stablepatch.sha256sum] = 
"e191f1fd3d3e0a27e3e5116391a97b47b0c2adc3f6f779df1996766b37759d30"
-- 
1.7.3.4


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-handheld] [PATCH 1/2] various kernels: remove apply=yes from SRC_URI

2012-01-10 Thread Andrea Adami
* not necessary anymore, obsolete in oe-core

Signed-off-by: Andrea Adami 
---
 recipes-kernel/linux/linux-kexecboot_3.1.bb|2 +-
 .../linux/linux-palm-omap1_2.6.22-omap1.bb |2 +-
 recipes-kernel/linux/linux_3.1.bb  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/linux-kexecboot_3.1.bb 
b/recipes-kernel/linux/linux-kexecboot_3.1.bb
index 5da0cc4..9e2fb69 100644
--- a/recipes-kernel/linux/linux-kexecboot_3.1.bb
+++ b/recipes-kernel/linux/linux-kexecboot_3.1.bb
@@ -6,7 +6,7 @@ S = "${WORKDIR}/linux-${PV}"
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz)"
 
 SRC_URI += 
"${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch
 \
+   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \
file://defconfig \
file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
"
diff --git a/recipes-kernel/linux/linux-palm-omap1_2.6.22-omap1.bb 
b/recipes-kernel/linux/linux-palm-omap1_2.6.22-omap1.bb
index f59779e..52c6aec 100644
--- a/recipes-kernel/linux/linux-palm-omap1_2.6.22-omap1.bb
+++ b/recipes-kernel/linux/linux-palm-omap1_2.6.22-omap1.bb
@@ -9,7 +9,7 @@ inherit kernel
 DEPENDS = ""
 
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-2.6.22.tar.bz2;name=kernel \
-   
http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;apply=yes;name=patch
 \
+   
http://www.muru.com/linux/omap/patches/patch-2.6.22-omap1.bz2;name=patch \
   file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.22"
diff --git a/recipes-kernel/linux/linux_3.1.bb 
b/recipes-kernel/linux/linux_3.1.bb
index 0c65f7b..baa0b34 100644
--- a/recipes-kernel/linux/linux_3.1.bb
+++ b/recipes-kernel/linux/linux_3.1.bb
@@ -5,7 +5,7 @@ PR = "${INC_PR}.5"
 COMPATIBLE_MACHINE = "(akita|c7x0|collie|poodle|tosa|spitz|h1940)"
 
 SRC_URI += 
"${KERNELORG_MIRROR}/linux/kernel/v3.x/linux-${PV}.tar.bz2;name=kernel \
-   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;apply=yes;name=stablepatch
 \
+   
${KERNELORG_MIRROR}/linux/kernel/v3.x/patch-${PV}.7.bz2;name=stablepatch \
file://defconfig \
file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2 \
"
-- 
1.7.3.4


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] RFC: Online forum for developer discussion

2012-01-10 Thread Hudson, Sean
I propose having a monthly, online developer forum that promotes discussion
on longer term technical issues that impact both Yocto and OpenEmbedded.
This would supplement the already existing mailing list and irc communication
channels.  In order to facilitate this, I'd like to propose a telephone/web
conference, which my employer has agreed to host.

This forum would help provide an additional way for the community to discuss
technical issues and share information about planned work and works in progress.

Initial Topics for Discussion might include:
1. layering definitions - discussion on what exists today and how to make 
it better
2. discussions on techniques to make working with oe/yocto better
3. oe/yocto disconnects (opportunities for better alignment)
4. common new user issues
5. documentation (standards, lacks, etc)
6. ?

Regards,
 Sean

Sean Hudson | Embedded Linux Architect for Mentor Embedded Linux
Mentor Graphics - Embedded Software DivisionT



___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe] [PATCH] kexec-tools_2.0.2.bbappend: remove, packages are now split in oe-core

2012-01-10 Thread Andrea Adami
* packaging split from meta-openembedded has been accepted in oe-core
* as per commit id 1f40a5486f703684c5d1d7360ef3cbdf75577495

Signed-off-by: Andrea Adami 
---
 .../kexec/kexec-tools_2.0.2.bbappend   |4 
 1 files changed, 0 insertions(+), 4 deletions(-)
 delete mode 100644 meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend

diff --git a/meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend 
b/meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend
deleted file mode 100644
index c59c916..000
--- a/meta-oe/recipes-kernel/kexec/kexec-tools_2.0.2.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-PACKAGES =+ "kexec kdump"
-
-FILES_kexec = "${sbindir}/kexec"
-FILES_kdump = "${sbindir}/kdump"
-- 
1.7.3.4


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v3 3/3] systemd: conditionally RRECOMMENDS kbd*

2012-01-10 Thread Otavio Salvador
On Tue, Jan 10, 2012 at 18:42, Koen Kooi  wrote:

> Op 10-01-12 12:52, Anders Darander schreef:
> > If the machine lacks keyboard support, there is no need for
> > kbd*-packages.
>
> NAK, this would make the complete systemd machine specific, which we do not
> want.
>

IMO the keyboard support ought to be handled, in systemd case, as a distro
feature so allowing it to be machine independent but allowing for the
flexibility of removing its recommendations if need.

-- 
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854  http://projetos.ossystems.com.br
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v3 3/3] systemd: conditionally RRECOMMENDS kbd*

2012-01-10 Thread Koen Kooi
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Op 10-01-12 12:52, Anders Darander schreef:
> If the machine lacks keyboard support, there is no need for
> kbd*-packages.

NAK, this would make the complete systemd machine specific, which we do not
want.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk8MopkACgkQMkyGM64RGpHj8wCcCH4ow/Ou9KEmgNj/XekDhDGr
QLMAnRIqKHElDl0kRip2iNGWlNCGnLAz
=lY3N
-END PGP SIGNATURE-


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] [PATCH v2] Fix git URL to linux-omap git repo.

2012-01-10 Thread Guillaume GARDET - Oliséo
Ping again...


Le 07/12/2011 14:46, Guillaume GARDET a écrit :
> Signed-off-by: Guillaume GARDET 
> ---
>  recipes/linux/linux-kexecboot_2.6.32.bb |2 +-
>  recipes/linux/linux-omap2_git.bb|2 +-
>  recipes/linux/linux-omap_2.6.26.bb  |2 +-
>  recipes/linux/linux-omap_2.6.27.bb  |2 +-
>  recipes/linux/linux-omap_2.6.28.bb  |2 +-
>  recipes/linux/linux-omap_2.6.29.bb  |2 +-
>  recipes/linux/linux-omap_2.6.31.bb  |2 +-
>  recipes/linux/linux-omap_2.6.32.bb  |2 +-
>  recipes/linux/linux-omap_2.6.37.bb  |2 +-
>  recipes/linux/linux-omap_2.6.38.bb  |2 +-
>  recipes/linux/linux-omap_2.6.39.bb  |2 +-
>  recipes/linux/linux-omap_git.bb |2 +-
>  12 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/recipes/linux/linux-kexecboot_2.6.32.bb 
> b/recipes/linux/linux-kexecboot_2.6.32.bb
> index 4c3294a..0c0d2af 100644
> --- a/recipes/linux/linux-kexecboot_2.6.32.bb
> +++ b/recipes/linux/linux-kexecboot_2.6.32.bb
> @@ -21,7 +21,7 @@ SRC_URI += 
> "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=k
>  SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879"
>  SRC_URI[kernel.sha256sum] = 
> "5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e"
>  
> -SRC_URI_append_omap3 = " 
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git;rev=6833f1a8cdcb65a370f898bde6b6af63f81962df
>  \
> +SRC_URI_append_omap3 = " 
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git;protocol=git;rev=6833f1a8cdcb65a370f898bde6b6af63f81962df
>  \
>  file://defconfig \
>  file://sctp-fix.patch \
>  file://cm-t35/0001-omap3-cm-t35-add-mux-initialization.patch \
> diff --git a/recipes/linux/linux-omap2_git.bb 
> b/recipes/linux/linux-omap2_git.bb
> index cb427e3..ad3a7eb 100644
> --- a/recipes/linux/linux-omap2_git.bb
> +++ b/recipes/linux/linux-omap2_git.bb
> @@ -8,7 +8,7 @@ PV = "2.6.26"
>  #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
>  PR = "r64"
>  
> -SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git
>  \
> +SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git;protocol=git
>  \
>  file://defconfig"
>  
>  SRC_URI_append_beagleboard = " file://no-harry-potter.diff \
> diff --git a/recipes/linux/linux-omap_2.6.26.bb 
> b/recipes/linux/linux-omap_2.6.26.bb
> index 0c8dcd9..0d74820 100644
> --- a/recipes/linux/linux-omap_2.6.26.bb
> +++ b/recipes/linux/linux-omap_2.6.26.bb
> @@ -5,7 +5,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848"
>  PV = "2.6.26"
>  PR = "r65"
>  
> -SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git
>  \
> +SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git;protocol=git
>  \
>  file://defconfig"
>  
>  SRC_URI_append_beagleboard = " file://no-harry-potter.diff \
> diff --git a/recipes/linux/linux-omap_2.6.27.bb 
> b/recipes/linux/linux-omap_2.6.27.bb
> index fdf0fdd..36f86d9 100644
> --- a/recipes/linux/linux-omap_2.6.27.bb
> +++ b/recipes/linux/linux-omap_2.6.27.bb
> @@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = 
> "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
>  SRCREV = "2a3408be17f287fdb5809c9b6c68e7ad96d25b74"
>  PR = "r14"
>  
> -SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git
>  \
> +SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git;protocol=git
>  \
>  file://defconfig"
>  
>  SRC_URI_append = " \
> diff --git a/recipes/linux/linux-omap_2.6.28.bb 
> b/recipes/linux/linux-omap_2.6.28.bb
> index 622a38d..53fcc83 100644
> --- a/recipes/linux/linux-omap_2.6.28.bb
> +++ b/recipes/linux/linux-omap_2.6.28.bb
> @@ -11,7 +11,7 @@ SRCREV = "79d042a081d3e467c735bb0d9569ed6296f85a3c"
>  
>  PV = "2.6.28"
>  
> -SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;branch=omap-2.6.28;protocol=git
>  \
> +SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git;branch=omap-2.6.28;protocol=git
>  \
>  file://defconfig"
>  
>  SRC_URI_append = " \
> diff --git a/recipes/linux/linux-omap_2.6.29.bb 
> b/recipes/linux/linux-omap_2.6.29.bb
> index a87fb25..3248dc3 100644
> --- a/recipes/linux/linux-omap_2.6.29.bb
> +++ b/recipes/linux/linux-omap_2.6.29.bb
> @@ -17,7 +17,7 @@ SRCREV = "58cf2f1425abfd3a449f9fe985e48be2d2555022"
>  # The main PR is now using MACHINE_KERNEL_PR, for omap3 see 
> conf/machine/include/omap3.inc
>  PR_append = "+gitr${SRCREV}"
>  
> -SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git
>  \
> +SRC_URI = 
> "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git;protocol=git
>  \
>  file://defconfig"
>  
>  SRC_URI_append = " \
> diff --git a/recipes/linux/linux-omap_2.6.31.bb 
> b/recipes/linux/linux-omap_2.6.31.bb
> 

[oe] FOSDEM tables ... confirmed!

2012-01-10 Thread Robert Schuster
Hi everyone,
the new year started a bit busy so I did not find the time yet to inform
you about the

 *successfull answer from the FOSDEM organizers:*

as last year we'll get *two tables* for presenting our project.

Let's use this generous opportunity for a really good stand!

FOSDEM is *in 4 weeks*, so start thinking seriously about your
attendance and whether you can help manning the booth.

*We need your help* for the two days to stay close to the tables and
explain the project to a (mostly) technical community.

To all the freelancers and companies out there using OE: Helping out at
the booth is a great way to show your involvement in the project!

I am a bit time constrained right now but will start official booth
preparation ASAP.

Happy new year! :)

Robert



signature.asc
Description: OpenPGP digital signature
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v3 0/3] systemd: package split

2012-01-10 Thread Anders Darander

At least while using rpm-packaging, the systemd package (rpm) got a dependency
on python, as systemd-analyze needs this (in the shebang). When trying to
create a small image using systemd, this isn't always desirable. Thus the
splitting of systemd-analyze to a separate package.

As an RRECOMMENDS for python-pycairo is added for systemd-analyze, we also add
new patch to conditionally build cairo with x11-support. This is desired for
x11-less systems, to reduce build time and size. The actual patch is similar
to how it is solved in oe-core.

Conditionally RRECOMMENDS kbd and kbd-consolefonts: if the machine in
question do not have keyboards, there is no need for kbd and
kbd-consolefonts. 

The first patch should be fine for pulling. The 2nd patch should also be
relativly non-controversial. 

The 3rd patch is new for v2, and can be omitted if more discussions is needed.

All patches has been verified on a few internal arm-based machines, with a
custom distro.



v3: * Set PACKAGE_ARCH for systemd, as its RRECOMMENDS now depends on
MACHINE_FEATURES. 

v2: * The SRC_URI update has been applied to master.

* Let systemd-analyze RDEPENDS on python-dbus, and RRECOMMENDS
  python-pycairo. 

* Add a patch to conditionally enable/disable x11 support when buildling
  cairo. 

* Add patch which makes the systemd's RRECOMMENDS on kbd and
  kbd-consolefonts conditional on the keyboard MACHINE_FEATURES.

The following changes since commit d3a451bbd08f7bb0ddea1aa0b314a72d65c660d4:

  systemd: git repo moved (2012-01-10 08:25:55 +0100)

are available in the git repository at:
  git://github.com/darander/meta-oe systemd-move
  https://github.com/darander/meta-oe/tree/systemd-move

Anders Darander (3):
  systemd: split out systemd-analyze
  cairo: conditionally enable x11 dependencies
  systemd: conditionally RRECOMMENDS kbd*

 meta-oe/recipes-core/systemd/systemd_git.bb  |   13 ++---
 meta-oe/recipes-graphics/cairo/cairo.inc |7 ++-
 meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb   |2 ++
 meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb |2 ++
 4 files changed, 20 insertions(+), 4 deletions(-)

-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v3 2/3] cairo: conditionally enable x11 dependencies

2012-01-10 Thread Anders Darander
Take the same approach to conditionally enable x11 and x11-dependencies as used 
in oe-core.

Signed-off-by: Anders Darander 
---
 meta-oe/recipes-graphics/cairo/cairo.inc |7 ++-
 meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb   |2 ++
 meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb |2 ++
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-graphics/cairo/cairo.inc 
b/meta-oe/recipes-graphics/cairo/cairo.inc
index 6157004..bd38233 100644
--- a/meta-oe/recipes-graphics/cairo/cairo.inc
+++ b/meta-oe/recipes-graphics/cairo/cairo.inc
@@ -1,7 +1,12 @@
 SECTION = "libs"
-DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
+X11DEPENDS = "virtual/libx11 libsm libxrender"
+DEPENDS = "pixman libpng fontconfig glib-2.0"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+   ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'directfb', '', 
d)}"
+PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
+PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
 
 #check for TARGET_FPU=soft and inform configure of the result so it can 
disable some floating points 
 require cairo-fpu.inc
diff --git a/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb 
b/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb
index 9de75ed..e7b65af 100644
--- a/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb
+++ b/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -2,6 +2,8 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
+PR = "r1"
+
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz;name=cairo \
 "
 SRC_URI[cairo.md5sum] = "f101a9e88b783337b20b2e26dfd26d5f"
diff --git a/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb 
b/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb
index e4fec3c..496a605 100644
--- a/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb
+++ b/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb
@@ -5,6 +5,8 @@ DESCRIPTION = "C++ bindings for Cairo graphics library"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9"
 
+PR = "r1"
+
 DEPENDS = "cairo libsigc++-2.0"
 
 SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz;name=archive";
-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v3 3/3] systemd: conditionally RRECOMMENDS kbd*

2012-01-10 Thread Anders Darander
If the machine lacks keyboard support, there is no need for kbd*-packages.

Signed-off-by: Anders Darander 
---
 meta-oe/recipes-core/systemd/systemd_git.bb |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb 
b/meta-oe/recipes-core/systemd/systemd_git.bb
index 0fa61a7..56e5d82 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r8"
+PR = "r9"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -101,7 +101,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
 # of blacklist support, so use proper modprobe from module-init-tools
 # And pull in the kernel modules mentioned in INSTALL
 # swapon -p is also not supported by busybox
-RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
+RRECOMMENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "keyboard", "kbd 
kbd-consolefonts", "", d)} \
   systemd-serialgetty \
   util-linux-agetty \
   util-linux-swaponoff \
@@ -110,6 +110,9 @@ RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
   kernel-module-autofs4 kernel-module-unix 
kernel-module-ipv6 \
 "
 
+# RRECOMMENDS depends on MACHINE_FEATURES, thus this needs to be MACHINE_ARCH
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 # TODO:
 # u-a for runlevel and telinit
 
-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v3 1/3] systemd: split out systemd-analyze

2012-01-10 Thread Anders Darander
Split systemd-analyze to a separate package, to remove the implicit
dependency on python. (At least the rpm-packaging backend created a
run-time dependency on python).

Add an RDEPENDS_${PN}-analyze on python-dbus, as this is required for
systemd-analyze to work.

Signed-off-by: Anders Darander 
---
 meta-oe/recipes-core/systemd/systemd_git.bb |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb 
b/meta-oe/recipes-core/systemd/systemd_git.bb
index bdaaf16..0fa61a7 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r7"
+PR = "r8"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -57,11 +57,15 @@ do_install() {
ln -s ${base_bindir}/systemd ${D}/init
 }
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock"
 
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
+RDEPENDS_${PN}-analyze = "python-dbus"
+RRECOMMENDS_${PN}-analyze = "python-pycairo"
+
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v2 3/3] systemd: conditionally RRECOMMENDS kbd*

2012-01-10 Thread Anders Darander
* Otavio Salvador  [120110 12:20]:

> NACK!

> If you use MACHINE_FEATURES it needs to set PACKAGE_ARCH to machine too.

Thanks for noticing!

I've just submitted a v3, hopefully I've set the PACKAGE_ARCH in a
correct way. (I tried to grep through meta-oe to see how PACKAGE_ARCH is
set).

Please, let me know if I should have set PACKAGE_ARCH to something else,
or in some other way.

Cheers,
Anders

> On Tue, Jan 10, 2012 at 07:00, Anders Darander wrote:

> > If the machine lacks keyboard support, there is no need for kbd*-packages.

> > Signed-off-by: Anders Darander 
> > ---
> >  meta-oe/recipes-core/systemd/systemd_git.bb |4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)

> > diff --git 
> > a/meta-oe/recipes-core/systemd/systemd_git.bbb/meta-oe/recipes-core/systemd/
> > systemd_git.bb
> > index 0fa61a7..7af8357 100644
> > --- a/meta-oe/recipes-core/systemd/systemd_git.bb
> > +++ b/meta-oe/recipes-core/systemd/systemd_git.bb
> > @@ -14,7 +14,7 @@ inherit gitpkgv
> >  PKGV = "v${GITPKGVTAG}"

> >  PV = "git"
> > -PR = "r8"
> > +PR = "r9"

> >  inherit useradd pkgconfig autotools vala perlnative

> > @@ -101,7 +101,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
> >  # of blacklist support, so use proper modprobe from module-init-tools
> >  # And pull in the kernel modules mentioned in INSTALL
> >  # swapon -p is also not supported by busybox
> > -RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
> > +RRECOMMENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "keyboard",
> > "kbd kbd-consolefonts", "", d)} \
> >   systemd-serialgetty \
> >   util-linux-agetty \
> >   util-linux-swaponoff \
-- 
Anders Darander
ChargeStorm AB / eStorm AB

___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH v2 3/3] systemd: conditionally RRECOMMENDS kbd*

2012-01-10 Thread Otavio Salvador
NACK!

If you use MACHINE_FEATURES it needs to set PACKAGE_ARCH to machine too.

On Tue, Jan 10, 2012 at 07:00, Anders Darander wrote:

> If the machine lacks keyboard support, there is no need for kbd*-packages.
>
> Signed-off-by: Anders Darander 
> ---
>  meta-oe/recipes-core/systemd/systemd_git.bb |4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git 
> a/meta-oe/recipes-core/systemd/systemd_git.bbb/meta-oe/recipes-core/systemd/
> systemd_git.bb
> index 0fa61a7..7af8357 100644
> --- a/meta-oe/recipes-core/systemd/systemd_git.bb
> +++ b/meta-oe/recipes-core/systemd/systemd_git.bb
> @@ -14,7 +14,7 @@ inherit gitpkgv
>  PKGV = "v${GITPKGVTAG}"
>
>  PV = "git"
> -PR = "r8"
> +PR = "r9"
>
>  inherit useradd pkgconfig autotools vala perlnative
>
> @@ -101,7 +101,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
>  # of blacklist support, so use proper modprobe from module-init-tools
>  # And pull in the kernel modules mentioned in INSTALL
>  # swapon -p is also not supported by busybox
> -RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
> +RRECOMMENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "keyboard",
> "kbd kbd-consolefonts", "", d)} \
>   systemd-serialgetty \
>   util-linux-agetty \
>   util-linux-swaponoff \
> --
> 1.7.8.3
>
>
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



-- 
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854  http://projetos.ossystems.com.br
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


Re: [oe] [meta-oe][PATCH 1/2] gcc-4.6: Fix ICE on x86_64 seen during vectorization

2012-01-10 Thread Martin Jansa
On Mon, Jan 09, 2012 at 03:44:15PM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj 
> ---
>  .../gcc-4.6/linaro/gcc-4.6-linaro-r106769.patch|   66 ++-
>  meta-oe/recipes-devtools/gcc/gcc-common-4.6.inc|2 +-
>  2 files changed, 49 insertions(+), 19 deletions(-)

Tested together with 2/2 on libav/libvpx/mplayer with
-fno-tree-vectorize removed and it works, no ICE on qemux86-64, thanks!

I'll send patch removing -fno-tree-vectorize from those recipes when
this is in.

Cheers,

> diff --git 
> a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106769.patch 
> b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106769.patch
> index ff34514..3a14923 100644
> --- a/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106769.patch
> +++ b/meta-oe/recipes-devtools/gcc/gcc-4.6/linaro/gcc-4.6-linaro-r106769.patch
> @@ -53,7 +53,7 @@
>  Index: gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c
>  ===
>  --- /dev/null1970-01-01 00:00:00.0 +
> -+++ gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c   
> 2011-09-16 20:32:57.279056697 -0700
>  gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c   
> 2012-01-09 15:03:29.156918805 -0800
>  @@ -0,0 +1,52 @@
>  +/* { dg-require-effective-target vect_int } */
>  +
> @@ -110,7 +110,7 @@ Index: 
> gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c
>  Index: gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c
>  ===
>  --- /dev/null1970-01-01 00:00:00.0 +
> -+++ gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c   
> 2011-09-16 20:32:57.279056697 -0700
>  gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c   
> 2012-01-09 15:03:29.156918805 -0800
>  @@ -0,0 +1,59 @@
>  +/* { dg-require-effective-target vect_int } */
>  +
> @@ -174,7 +174,7 @@ Index: 
> gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c
>  Index: gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c
>  ===
>  --- /dev/null1970-01-01 00:00:00.0 +
> -+++ gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c  
> 2011-09-16 20:32:57.279056697 -0700
>  gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c  
> 2012-01-09 15:03:29.160918806 -0800
>  @@ -0,0 +1,49 @@
>  +/* { dg-require-effective-target vect_int } */
>  +
> @@ -227,8 +227,8 @@ Index: 
> gcc-4_6-branch/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c
>  +
>  Index: gcc-4_6-branch/gcc/tree-vect-loop.c
>  ===
>  gcc-4_6-branch.orig/gcc/tree-vect-loop.c 2011-09-16 20:31:52.0 
> -0700
> -+++ gcc-4_6-branch/gcc/tree-vect-loop.c  2011-09-16 20:32:57.289056641 
> -0700
> +--- gcc-4_6-branch.orig/gcc/tree-vect-loop.c 2012-01-09 15:02:15.0 
> -0800
>  gcc-4_6-branch/gcc/tree-vect-loop.c  2012-01-09 15:03:29.160918806 
> -0800
>  @@ -181,6 +181,8 @@
> stmt_vec_info stmt_info;
> int i;
> @@ -379,8 +379,8 @@ Index: gcc-4_6-branch/gcc/tree-vect-loop.c
>   
>  Index: gcc-4_6-branch/gcc/tree-vect-patterns.c
>  ===
>  gcc-4_6-branch.orig/gcc/tree-vect-patterns.c 2011-09-16 
> 20:31:52.0 -0700
> -+++ gcc-4_6-branch/gcc/tree-vect-patterns.c  2011-09-16 20:32:57.289056641 
> -0700
> +--- gcc-4_6-branch.orig/gcc/tree-vect-patterns.c 2012-01-09 
> 15:02:15.0 -0800
>  gcc-4_6-branch/gcc/tree-vect-patterns.c  2012-01-09 15:03:29.160918806 
> -0800
>  @@ -39,10 +39,13 @@
>   #include "diagnostic-core.h"
>   
> @@ -930,8 +930,8 @@ Index: gcc-4_6-branch/gcc/tree-vect-patterns.c
>   fprintf (vect_dump, "=== vect_pattern_recog ===");
>  Index: gcc-4_6-branch/gcc/tree-vect-slp.c
>  ===
>  gcc-4_6-branch.orig/gcc/tree-vect-slp.c  2011-09-16 20:31:52.0 
> -0700
> -+++ gcc-4_6-branch/gcc/tree-vect-slp.c   2011-09-16 20:32:57.289056641 
> -0700
> +--- gcc-4_6-branch.orig/gcc/tree-vect-slp.c  2012-01-09 15:02:15.0 
> -0800
>  gcc-4_6-branch/gcc/tree-vect-slp.c   2012-01-09 15:03:29.160918806 
> -0800
>  @@ -152,7 +152,9 @@
> if (loop && def_stmt && gimple_bb (def_stmt)
> && flow_bb_inside_loop_p (loop, gimple_bb (def_stmt))
> @@ -945,8 +945,8 @@ Index: gcc-4_6-branch/gcc/tree-vect-slp.c
>   *pattern0 = true;
>  Index: gcc-4_6-branch/gcc/tree-vect-stmts.c
>  ===
>  gcc-4_6-branch.orig/gcc/tree-vect-stmts.c2011-09-16 
> 20:31:52.0 -0700
> -+++ gcc-4_6-branch/gcc/tree-vect-stmts.c 2011-09-16 20:32:57.289056641 
> -0700
>

[oe] [meta-oe][PATCH v2 1/3] systemd: split out systemd-analyze

2012-01-10 Thread Anders Darander
Split systemd-analyze to a separate package, to remove the implicit
dependency on python. (At least the rpm-packaging backend created a
run-time dependency on python).

Add an RDEPENDS_${PN}-analyze on python-dbus, as this is required for
systemd-analyze to work.

Signed-off-by: Anders Darander 
---
 meta-oe/recipes-core/systemd/systemd_git.bb |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb 
b/meta-oe/recipes-core/systemd/systemd_git.bb
index bdaaf16..0fa61a7 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r7"
+PR = "r8"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -57,11 +57,15 @@ do_install() {
ln -s ${base_bindir}/systemd ${D}/init
 }
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock"
 
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
+RDEPENDS_${PN}-analyze = "python-dbus"
+RRECOMMENDS_${PN}-analyze = "python-pycairo"
+
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v2 3/3] systemd: conditionally RRECOMMENDS kbd*

2012-01-10 Thread Anders Darander
If the machine lacks keyboard support, there is no need for kbd*-packages.

Signed-off-by: Anders Darander 
---
 meta-oe/recipes-core/systemd/systemd_git.bb |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb 
b/meta-oe/recipes-core/systemd/systemd_git.bb
index 0fa61a7..7af8357 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@ inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r8"
+PR = "r9"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -101,7 +101,7 @@ RDEPENDS_${PN} += "dbus-systemd udev-systemd"
 # of blacklist support, so use proper modprobe from module-init-tools
 # And pull in the kernel modules mentioned in INSTALL
 # swapon -p is also not supported by busybox
-RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
+RRECOMMENDS_${PN} += "${@base_contains("MACHINE_FEATURES", "keyboard", "kbd 
kbd-consolefonts", "", d)} \
   systemd-serialgetty \
   util-linux-agetty \
   util-linux-swaponoff \
-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v2 0/3] systemd: package split

2012-01-10 Thread Anders Darander

At least while using rpm-packaging, the systemd package (rpm) got a dependency
on python, as systemd-analyze needs this (in the shebang). When trying to
create a small image using systemd, this isn't always desirable. Thus the
splitting of systemd-analyze to a separate package.

As an RRECOMMENDS for python-pycairo is added for systemd-analyze, we also add
new patch to conditionally build cairo with x11-support. This is desired for
x11-less systems, to reduce build time and size. The actual patch is similar
to how it is solved in oe-core.

Conditionally RRECOMMENDS kbd and kbd-consolefonts: if the machine in
question do not have keyboards, there is no need for kbd and
kbd-consolefonts. 

The first patch should be fine for pulling. The 2nd patch should also be
relativly non-controversial. 

The 3rd patch is new for v2, and can be omitted if more discussions is needed.

All patches has been verified on a few internal arm-based machines, with a
custom distro.



v2: * The SRC_URI update has been applied to master.

* Let systemd-analyze RDEPENDS on python-dbus, and RRECOMMENDS
  python-pycairo. 

* Add a patch to conditionally enable/disable x11 support when buildling
  cairo. 

* Add patch which makes the systemd's RRECOMMENDS on kbd and
  kbd-consolefonts conditional on the keyboard MACHINE_FEATURES.

The following changes since commit d3a451bbd08f7bb0ddea1aa0b314a72d65c660d4:

  systemd: git repo moved (2012-01-10 08:25:55 +0100)

are available in the git repository at:
  git://github.com/darander/meta-oe systemd-move
  https://github.com/darander/meta-oe/tree/systemd-move

Anders Darander (3):
  systemd: split out systemd-analyze
  cairo: conditionally enable x11 dependencies
  systemd: conditionally RRECOMMENDS kbd*

 meta-oe/recipes-core/systemd/systemd_git.bb  |   10 +++---
 meta-oe/recipes-graphics/cairo/cairo.inc |7 ++-
 meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb   |2 ++
 meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb |2 ++
 4 files changed, 17 insertions(+), 4 deletions(-)

-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel


[oe] [meta-oe][PATCH v2 2/3] cairo: conditionally enable x11 dependencies

2012-01-10 Thread Anders Darander
Take the same approach to conditionally enable x11 and x11-dependencies as used 
in oe-core.

Signed-off-by: Anders Darander 
---
 meta-oe/recipes-graphics/cairo/cairo.inc |7 ++-
 meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb   |2 ++
 meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb |2 ++
 3 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-graphics/cairo/cairo.inc 
b/meta-oe/recipes-graphics/cairo/cairo.inc
index 6157004..bd38233 100644
--- a/meta-oe/recipes-graphics/cairo/cairo.inc
+++ b/meta-oe/recipes-graphics/cairo/cairo.inc
@@ -1,7 +1,12 @@
 SECTION = "libs"
-DEPENDS = "virtual/libx11 pixman libsm libpng fontconfig libxrender glib-2.0"
+X11DEPENDS = "virtual/libx11 libsm libxrender"
+DEPENDS = "pixman libpng fontconfig glib-2.0"
 DESCRIPTION = "Cairo graphics library"
 LICENSE = "MPL LGPL"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+   ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'directfb', '', 
d)}"
+PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
+PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
 
 #check for TARGET_FPU=soft and inform configure of the result so it can 
disable some floating points 
 require cairo-fpu.inc
diff --git a/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb 
b/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb
index 9de75ed..e7b65af 100644
--- a/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb
+++ b/meta-oe/recipes-graphics/cairo/cairo_1.10.2.bb
@@ -2,6 +2,8 @@ require cairo.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
 
+PR = "r1"
+
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz;name=cairo \
 "
 SRC_URI[cairo.md5sum] = "f101a9e88b783337b20b2e26dfd26d5f"
diff --git a/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb 
b/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb
index e4fec3c..496a605 100644
--- a/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb
+++ b/meta-oe/recipes-graphics/cairo/cairomm_1.10.0.bb
@@ -5,6 +5,8 @@ DESCRIPTION = "C++ bindings for Cairo graphics library"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9"
 
+PR = "r1"
+
 DEPENDS = "cairo libsigc++-2.0"
 
 SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz;name=archive";
-- 
1.7.8.3


___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel