13 files changed, 8 insertions, 257 deletions
diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
index dc84f17a3c..97d3f9ac31 100644
--- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -1,3 +1,6 @@
+# needs a gcc4 fix
+BROKEN = "1"
+
 DESCRIPTION = "Alsa Drivers"
 MAINTAINER = "Pigi"
 SECTION = "base"
diff --git a/packages/alsa/alsa-lib_1.0.10.bb b/packages/alsa/alsa-lib_1.0.10.bb
deleted file mode 100644
index a5d5426316..0000000000
--- a/packages/alsa/alsa-lib_1.0.10.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-
-# configure.in sets -D__arm__ on the command line for any arm system
-# (not just those with the ARM instruction set), this should be removed,
-# (or replaced by a permitted #define).
-#FIXME: remove the following
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
-
-do_stage () {
-	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/alsa/sound
-	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
-	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev"
-FILES_libasound = "${libdir}/libasound.so*"
-FILES_alsa-server = "${bindir}"
-FILES_alsa-conf = "${datadir}"
-FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/"
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index 5075db6273..0da364071b 100644
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 PR = "r0"
@@ -16,7 +16,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
 
-do_stage () {
+do_stage() {
 	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
 	install -d ${STAGING_INCDIR}/alsa/sound
 	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
diff --git a/packages/alsa/alsa-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb
deleted file mode 100644
index 3b926b4853..0000000000
--- a/packages/alsa/alsa-lib_1.0.8.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-PR = "r1"
-
-# configure.in sets -D__arm__ on the command line for any arm system
-# (not just those with the ARM instruction set), this should be removed,
-# (or replaced by a permitted #define).
-#FIXME: remove the following
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
-
-do_stage () {
-	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/alsa/sound
-	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
-	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev"
-FILES_libasound = "${libdir}/libasound.so*"
-FILES_alsa-server = "${bindir}"
-FILES_alsa-conf = "${datadir}"
-FILES_alsa-dev = "${libdir}/pkgconfig/ ${incdir}"
-
diff --git a/packages/alsa/alsa-oss_1.0.10.bb b/packages/alsa/alsa-oss_1.0.10.bb
deleted file mode 100644
index acf2ba7505..0000000000
--- a/packages/alsa/alsa-oss_1.0.10.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
-
-inherit autotools 
-
-do_configure_prepend () {
-	touch NEWS README AUTHORS ChangeLog
-}
-
-do_stage () {
-	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
-	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
-}
diff --git a/packages/alsa/alsa-oss_1.0.11.bb b/packages/alsa/alsa-oss_1.0.11.bb
index 7d388e679a..89cd378c38 100644
--- a/packages/alsa/alsa-oss_1.0.11.bb
+++ b/packages/alsa/alsa-oss_1.0.11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
diff --git a/packages/alsa/alsa-oss_1.0.8.bb b/packages/alsa/alsa-oss_1.0.8.bb
deleted file mode 100644
index f62550bb93..0000000000
--- a/packages/alsa/alsa-oss_1.0.8.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
-
-inherit autotools 
-
-do_configure_prepend () {
-	touch NEWS README AUTHORS ChangeLog
-}
-
-do_stage () {
-	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
-	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
-}
diff --git a/packages/alsa/alsa-tools_1.0.10.bb b/packages/alsa/alsa-tools_1.0.10.bb
deleted file mode 100644
index eed86e5dba..0000000000
--- a/packages/alsa/alsa-tools_1.0.10.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-BROKEN = "1"
-
-DESCRIPTION = "Alsa Tools"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
-
-inherit autotools
diff --git a/packages/alsa/alsa-tools_1.0.11.bb b/packages/alsa/alsa-tools_1.0.11.bb
deleted file mode 100644
index 9512ae8036..0000000000
--- a/packages/alsa/alsa-tools_1.0.11.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-BROKEN = "1"
-
-DESCRIPTION = "Alsa Tools"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
-
-inherit autotools
-
-# this bb file requires quite some work.
-# There is no top level makefile in tools
-# that is why install fails, but actually nothing is compiled
-# in order to fix this, the bb file needs heavy work 
-# (but the tools are not very useful for oe, so I'll leave it for now)
diff --git a/packages/alsa/alsa-tools_1.0.8.bb b/packages/alsa/alsa-tools_1.0.8.bb
deleted file mode 100644
index eed86e5dba..0000000000
--- a/packages/alsa/alsa-tools_1.0.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-BROKEN = "1"
-
-DESCRIPTION = "Alsa Tools"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
-
-inherit autotools
diff --git a/packages/alsa/alsa-utils_1.0.10.bb b/packages/alsa/alsa-utils_1.0.10.bb
deleted file mode 100644
index 94e49ebf25..0000000000
--- a/packages/alsa/alsa-utils_1.0.10.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "ALSA Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib ncurses"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
-
-inherit autotools
-
-# This are all packages that we need to make. Also, the now empty alsa-utils
-# ipk depend on them.
-
-PACKAGES += "alsa-utils-alsamixer"
-PACKAGES += "alsa-utils-midi"
-PACKAGES += "alsa-utils-aplay"
-PACKAGES += "alsa-utils-amixer"
-PACKAGES += "alsa-utils-aconnect"
-PACKAGES += "alsa-utils-iecset"
-PACKAGES += "alsa-utils-speakertest"
-PACKAGES += "alsa-utils-aseqnet"
-PACKAGES += "alsa-utils-alsactl"
-
-
-# We omit alsaconf, because
-# a) this is a bash script
-# b) it creates config files for RedHat, Debian, Mandrake etc, but not
-#    for Familiar, OpenZaurus etc
-
-
-FILES_${PN} = ""
-FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
-FILES_alsa-utils-amixer      = "${bindir}/amixer"
-FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
-FILES_alsa-utils-speakertest = "${bindir}/speaker-test"
-FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
-FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
-FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
-FILES_alsa-utils-iecset      = "${bindir}/iecset"
-FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
-
-DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
-DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
-DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
-#DESCRIPTION_alsa-utils-speaker-test= "??"
-DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
-DESCRIPTION_alsa-utils-aconnect     = "ALSA sequencer connection manager"
-DESCRIPTION_alsa-utils-aseqnet      = "network client/server on ALSA sequencer"
-DESCRIPTION_alsa-utils-alsactl      = "saves/restores ALSA-settings in /etc/asound.state"
-DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configuration files"
-
-RDEPENDS_alsa-utils-aplay  += "alsa-conf"
-RDEPENDS_alsa-utils-amixer += "alsa-conf"
-
-ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb
index 3c5b964c16..83bc8c5c86 100644
--- a/packages/alsa/alsa-utils_1.0.11.bb
+++ b/packages/alsa/alsa-utils_1.0.11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "ALSA Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
@@ -22,12 +22,9 @@ PACKAGES += "alsa-utils-speakertest"
 PACKAGES += "alsa-utils-aseqnet"
 PACKAGES += "alsa-utils-alsactl"
 
-
 # We omit alsaconf, because
 # a) this is a bash script
-# b) it creates config files for RedHat, Debian, Mandrake etc, but not
-#    for Familiar, OpenZaurus etc
-
+# b) it creates config files not suitable for OE-based distros
 
 FILES_${PN} = ""
 FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb
deleted file mode 100644
index 0a93c32e3f..0000000000
--- a/packages/alsa/alsa-utils_1.0.8.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "ALSA Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib ncurses"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
-SRC_URI += "file://alsa-utils-sys-siglist.patch;patch=108"
-
-inherit autotools
-
-# This are all packages that we need to make. Also, the now empty alsa-utils
-# ipk depend on them.
-
-PACKAGES += "alsa-utils-alsamixer"
-PACKAGES += "alsa-utils-midi"
-PACKAGES += "alsa-utils-aplay"
-PACKAGES += "alsa-utils-amixer"
-PACKAGES += "alsa-utils-aconnect"
-PACKAGES += "alsa-utils-iecset"
-PACKAGES += "alsa-utils-speakertest"
-PACKAGES += "alsa-utils-aseqnet"
-PACKAGES += "alsa-utils-alsactl"
-
-
-# We omit alsaconf, because
-# a) this is a bash script
-# b) it creates config files for RedHat, Debian, Mandrake etc, but not
-#    for Familiar, OpenZaurus etc
-
-
-FILES_${PN} = ""
-FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
-FILES_alsa-utils-amixer      = "${bindir}/amixer"
-FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
-FILES_alsa-utils-speakertest = "${bindir}/speaker-test"
-FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
-FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
-FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
-FILES_alsa-utils-iecset      = "${bindir}/iecset"
-FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
-
-DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
-DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
-DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
-#DESCRIPTION_alsa-utils-speaker-test= "??"
-DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
-DESCRIPTION_alsa-utils-aconnect     = "ALSA sequencer connection manager"
-DESCRIPTION_alsa-utils-aseqnet      = "network client/server on ALSA sequencer"
-DESCRIPTION_alsa-utils-alsactl      = "saves/restores ALSA-settings in /etc/asound.state"
-DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configuration files"
-
-RDEPENDS_alsa-utils-aplay  += "alsa-conf"
-RDEPENDS_alsa-utils-amixer += "alsa-conf"
-ALLOW_EMPTY_alsa-utils = "1"