Author: titmuss
Date: Wed Nov 26 04:53:17 2008
New Revision: 3439
URL: http://svn.slimdevices.com?rev=3439&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix poky build error.
Added:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils/
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils/no-midi.patch
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
Modified:
7.3/trunk/squeezeos/poky/build/conf/local.conf.sample
7.3/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
Modified: 7.3/trunk/squeezeos/poky/build/conf/local.conf.sample
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/build/conf/local.conf.sample?rev=3439&root=Jive&r1=3438&r2=3439&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/build/conf/local.conf.sample (original)
+++ 7.3/trunk/squeezeos/poky/build/conf/local.conf.sample Wed Nov 26 04:53:17
2008
@@ -171,3 +171,7 @@
#SRCREV_pn-marvell-wlan-tools-src = "${AUTOREV}"
#SRCREV_pn-marvell-gspi-module-src = "${AUTOREV}"
+
+
+# Use cache to prevent checking for package updates in svn
+#BB_SRCREV_POLICY="cache"
Modified: 7.3/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=3439&root=Jive&r1=3438&r2=3439&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Wed Nov
26 04:53:17 2008
@@ -29,9 +29,6 @@
# metadata revision. To get a newer build you need to do an 'svn update' in
poky first
SQUEEZEOS_REVISION = "${METADATA_REVISION}"
-# Don't cache srcrev to ensure we pick up new revisions
-BB_SRCREV_POLICY = "clear"
-
# SqueezePlay application
SRCREV_pn-squeezeplay ?= "${AUTOREV}"
@@ -54,7 +51,6 @@
SRCREV_pn-luasyslog ?= "${AUTOREV}"
SRCREV_pn-lualogging ?= "${AUTOREV}"
SRCREV_pn-luatolua++ ?= "${AUTOREV}"
-SRCREV_pn-portaudio ?= "${AUTOREV}"
# SqueezeOS
SRCREV_pn-linux-jive ?= "${AUTOREV}"
Modified:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb?rev=3439&root=Jive&r1=3438&r2=3439&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
(original)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-lib_1.0.18.bb
Wed Nov 26 04:53:17 2008
@@ -2,6 +2,8 @@
HOMEPAGE = "http://www.alsa-project.org";
SECTION = "libs/multimedia"
LICENSE = "GPL"
+
+PR = "1"
# 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,
@@ -28,7 +30,7 @@
--disable-alisp \
--enable-old-symbols \
--disable-python \
- --with-pcm-plugins=hw,plug,empty"
+ --with-pcm-plugins=hw,plug,multi,route,empty"
do_stage () {
oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
Added:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils/no-midi.patch
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils/no-midi.patch?rev=3439&root=Jive&view=auto
==============================================================================
---
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils/no-midi.patch
(added)
+++
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils/no-midi.patch
Wed Nov 26 04:53:17 2008
@@ -1,0 +1,15 @@
+Index: alsa-utils-1.0.18/Makefile.am
+===================================================================
+--- alsa-utils-1.0.18.orig/Makefile.am 2008-10-29 12:48:00.000000000 +0000
++++ alsa-utils-1.0.18/Makefile.am 2008-11-26 12:45:55.000000000 +0000
+@@ -9,8 +9,8 @@
+ else
+ ALSACONF_DIR=
+ endif
+-SUBDIRS= include alsactl $(ALSACONF_DIR) $(ALSAMIXER_DIR) amidi amixer \
+- aplay iecset seq speaker-test utils m4 po
++SUBDIRS= include alsactl $(ALSACONF_DIR) $(ALSAMIXER_DIR) amixer \
++ aplay iecset speaker-test utils m4 po
+ EXTRA_DIST= config.rpath TODO gitcompile
+ AUTOMAKE_OPTIONS=foreign
+ ACLOCAL_AMFLAGS = -I m4
Added:
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb?rev=3439&root=Jive&view=auto
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
(added)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/alsa/alsa-utils_1.0.18.bb
Wed Nov 26 04:53:17 2008
@@ -1,0 +1,63 @@
+DESCRIPTION = "ALSA Utilities"
+HOMEPAGE = "http://www.alsa-project.org";
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+ file://no-midi.patch;patch=1"
+
+
+inherit autotools
+
+# This are all packages that we need to make. Also, the now empty alsa-utils
+# ipk depend on them.
+
+
+do_configure_append() {
+ for i in $(find ${S} -name Makefile) ; do
+ sed -i -e s:/usr/include/ncurses:${STAGING_INCDIR}/ncurses:g $i
+ done
+}
+
+PACKAGES += "\
+ alsa-utils-alsamixer \
+ alsa-utils-midi \
+ alsa-utils-aplay \
+ alsa-utils-amixer \
+ alsa-utils-aconnect \
+ alsa-utils-iecset \
+ alsa-utils-speakertest \
+ alsa-utils-aseqnet \
+ alsa-utils-aseqdump \
+ alsa-utils-alsaconf \
+ alsa-utils-alsactl "
+
+# We omit alsaconf, because
+# a) this is a bash script
+# b) it creates config files not suitable for OE-based distros
+
+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 ${datadir}/sounds/alsa/
${datadir}/alsa/"
+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"
+FILES_alsa-utils-aseqdump = "${bindir}/aseqdump"
+FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf"
+
+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-speakertest = "ALSA surround speaker test utility"
+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"
+
+ALLOW_EMPTY_alsa-utils = "1"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
