Skip to contentSkip to conversation

Small fixes

PATCH Applied Martin Jansa 2 participants 4 messages Jan 12, 2012 – Jan 17, 2012

lore
Share & tools
lore
#0 lore raw

cover Small fixes

The following changes since commit 1d2697e6f00cc3771f39f5a7d4384a22d9696b16:

multilib.conf: Clean up file and add missing entries for various dependencies (2012-01-11 23:53:21 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Denis 'GNUtoo' Carikli (1):
alsa-utils: depend on libsamplerate0

Martin Jansa (1):
xorg-*: disable xmlto where it was failing

 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 .../xorg-proto/xorg-proto-common.inc               |    2 +-
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
 .../recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb |    4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.8.3
#1 lore raw

PATCH 1/2 alsa-utils: depend on libsamplerate0

From: Denis 'GNUtoo' Carikli <[email protected]>

We need to depend on libsamplerate0 because it's detected automatically
and if we configure without it we get that issue at runtime trying to run the alsaloop program:
No libsamplerate support.

---
 .../recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb +2 -2
index 9eee60a..196128e 100644
@@ -5,8 +5,8 @@ SECTION = "console/utils"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
-DEPENDS = "alsa-lib ncurses"
-PR = "r3"
+DEPENDS = "alsa-lib ncurses libsamplerate0"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch \
Signature · 1 line
1.7.8.3
#2 lore raw

PATCH 2/2 xorg-*: disable xmlto where it was failing

* meta-oe now provides xmlto-native
http://git.openembedded.org/meta-openembedded/commit/?id=ab8f876ca8fa223c183e3db2029cce88f3435a27
but not the stylesheets for buildhosts without them it's unusable and fails, because xorg macros autodetecting xmlto available, see:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-December/037066.html
after adding xmlto-native and stylesheets-native to DEPENDS we can enable it again

---
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
 .../xorg-proto/xorg-proto-common.inc               |    2 +-
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
index d843d65..d106054 100644
@@ -13,4 +13,4 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no"
+EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto"
meta/recipes-graphics/xorg-proto/xorg-proto-common.inc +1 -1
index 765e30a..856f4d8 100644
@@ -14,7 +14,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
 DEPENDS = "util-macros"
 
 inherit autotools pkgconfig
-EXTRA_OECONF = "--with-fop=no"
+EXTRA_OECONF = "--with-fop=no --without-xmlto"
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 RDEPENDS_${PN}-dev = ""
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -0
index b387790..ca7d33a 100644
@@ -9,4 +9,5 @@ EXTRA_OECONF += "\
                  --enable-glx-tls \
                  --with-pic \
                  --with-int10=x86emu \
+                 --without-xmlto \
 "
Signature · 1 line
1.7.8.3
Applied
#3 lore raw
In reply to Martin Jansa
Quoted 11 lines · Martin Jansa

The following changes since commit 1d2697e6f00cc3771f39f5a7d4384a22d9696b16:

multilib.conf: Clean up file and add missing entries for various dependencies (2012-01-11 23:53:21 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Denis 'GNUtoo' Carikli (1):
alsa-utils: depend on libsamplerate0

Quoted 9 lines

Martin Jansa (1):
xorg-*: disable xmlto where it was failing

  meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    2 +-
  .../xorg-proto/xorg-proto-common.inc               |    2 +-
  .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
  .../recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb |    4 ++--
  4 files changed, 5 insertions(+), 4 deletions(-)

Merged into OE-Core

Thanks
Sau!