[oe-commits] Mark Brown : alsa-utils 1.0.18: Remove xmlto usage from the build

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 05d2fe50ba4f1bffdd6adf80975c3b0129664bac
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=05d2fe50ba4f1bffdd6adf80975c3b0129664bac

Author: Mark Brown <broonie at sirena.org.uk>
Date:   Wed Jan 21 23:47:35 2009 +0000

alsa-utils 1.0.18: Remove xmlto usage from the build

It's not available on all hosts and some have broken installs.

---

 packages/alsa/alsa-utils_1.0.18.bb                |    4 +---
 packages/alsa/files/alsa-utils-remove-xmlto.patch |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/alsa/alsa-utils_1.0.18.bb b/packages/alsa/alsa-utils_1.0.18.bb
index db113fc..8f43982 100644
--- a/packages/alsa/alsa-utils_1.0.18.bb
+++ b/packages/alsa/alsa-utils_1.0.18.bb
@@ -4,11 +4,9 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
 
-# needs 'xmlto', and fails anyway when you install it
-DEFAULT_PREFERENCE = "-9999"
-
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://alsa-utils-automake.patch;patch=1 \
+	   file://alsa-utils-remove-xmlto.patch;patch=1 \
 	  "
 
 inherit autotools
diff --git a/packages/alsa/files/alsa-utils-remove-xmlto.patch b/packages/alsa/files/alsa-utils-remove-xmlto.patch
new file mode 100644
index 0000000..a02bdba
--- /dev/null
+++ b/packages/alsa/files/alsa-utils-remove-xmlto.patch
@@ -0,0 +1,15 @@
+--- alsa-utils-1.0.18.orig/alsactl/Makefile.am	2008-10-29 12:42:11.000000000 +0000
++++ alsa-utils-1.0.18/alsactl/Makefile.am	2009-01-21 23:43:19.000000000 +0000
+@@ -1,11 +1,8 @@
+ SUBDIRS = init
+ 
+ sbin_PROGRAMS=alsactl
+-man_MANS=alsactl.1 alsactl_init.7
++man_MANS=alsactl.1
+ 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 $?