[OE-core] [PATCH 20/46] alsa-utils_1.0.23.bb: Remove xmlto requirement

[Khem Raj]

Patch imported from OE

Use uclibceabi instead of uclibcgnueabi

inherit gettext class instead of adding gettext to DEPENDS directly

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../alsa-utils-remove-xmlto.patch                  |   18 ++++++++++++++++++
 meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb  |   12 +++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch
new file mode 100644
index 0000000..53ff95a
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/alsa-utils-remove-xmlto.patch
@@ -0,0 +1,18 @@
+Index: alsa-utils-1.0.19/alsactl/Makefile.am
+===================================================================
+--- alsa-utils-1.0.19.orig/alsactl/Makefile.am	2009-06-24 01:08:16.000000000 -0400
++++ alsa-utils-1.0.19/alsactl/Makefile.am	2009-06-24 01:08:26.000000000 -0400
+@@ -2,13 +2,7 @@
+ 
+ sbin_PROGRAMS=alsactl
+ man_MANS=alsactl.1
+-if USE_XMLTO
+-man_MANS += alsactl_init.7
+-endif
+ EXTRA_DIST=alsactl.1 alsactl_init.xml
+ 
+ alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c
+ noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
+-
+-%.7: %.xml
+-	xmlto man $?
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
index 46283cc..c03c61a 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
@@ -5,11 +5,13 @@ 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 gettext"
-PR = "r0"
+DEPENDS = "alsa-lib ncurses"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-           file://ncursesfix.patch;patch=1 "
+           file://ncursesfix.patch \
+           file://alsa-utils-remove-xmlto.patch \
+          "
 
 SRC_URI[md5sum] = "cb0cf46029ac9549cf3a31bff6a4f4e1"
 SRC_URI[sha256sum] = "b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666a1f7b0"
@@ -20,9 +22,9 @@ SRC_URI[sha256sum] = "b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666
 #
 EXTRA_OECONF = "--disable-xmlto"
 EXTRA_OECONF_linux-uclibc = "--disable-nls"
-EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+EXTRA_OECONF_linux-uclibceabi = "--disable-nls"
 
-inherit autotools
+inherit autotools gettext
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
 # ipk depend on them.
-- 
1.7.4.1