Author: titmuss
Date: Fri Aug 8 06:11:37 2008
New Revision: 2807
URL: http://svn.slimdevices.com?rev=2807&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2806): titmuss | 2008-08-08 14:08:38 +0100
Bug: N/A
Description:
Bump version number.
Don't compile portaudio, squeezeplay now directly uses alsa when running on
squeezeos.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug 8 06:11:37 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2799
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2801
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2802
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2806
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass?rev=2807&root=Jive&r1=2806&r2=2807&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/classes/squeezeos-upgrade-image.bbclass
Fri Aug 8 06:11:37 2008
@@ -25,11 +25,11 @@
VERSION=${DISTRO_VERSION}_r${SQUEEZEOS_REVISION}
# Create zip
- zip ${DEPLOY_DIR_IMAGE}/jive_${VERSION}.bin *
+ zip ${DEPLOY_DIR_IMAGE}/${MACHINE}_${VERSION}.bin *
cd ${DEPLOY_DIR_IMAGE}
- rm -f jive.bin
- ln -s jive_${VERSION}.bin jive.bin
+ rm -f ${MACHINE}.bin
+ ln -s ${MACHINE}_${VERSION}.bin ${MACHINE}.bin
# Cleanup
rm -rf ${tmpdir}
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=2807&root=Jive&r1=2806&r2=2807&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Fri Aug
8 06:11:37 2008
@@ -7,7 +7,7 @@
DISTRO = "squeezeos"
DISTRO_NAME = "Logitech SqueezeOS Linux"
-DISTRO_VERSION = "7.2"
+DISTRO_VERSION = "7.3"
MAINTAINER = "Logitech SqueezeOS <[EMAIL PROTECTED]>"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=2807&root=Jive&r1=2806&r2=2807&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Fri Aug 8 06:11:37 2008
@@ -10,15 +10,17 @@
DEPENDS += "lua lua-native luatolua++"
RDEPENDS += "liblua5.1-socket liblua5.1-json liblua5.1-zipfilter
liblua5.1-loop liblua5.1-logging liblua5.1-syslog liblua5.1-filesystem
liblua5.1-profiler liblua5.1-tolua++"
-DEPENDS += "portaudio flac libmad tremor"
+DEPENDS += "flac libmad tremor"
RDEPENDS += "freefont"
-SRC_URI="${SQUEEZEPLAY_SCM};module=squeezeplay"
+SRC_URI = "${SQUEEZEPLAY_SCM};module=squeezeplay"
S = "${WORKDIR}/squeezeplay"
inherit autotools
+
+EXTRA_OECONF = "--disable-portaudio"
CFLAGS_prepend = '-DSQUEEZEPLAY_RELEASE=\\"${DISTRO_VERSION}\\"
-DSQUEEZEPLAY_REVISION=\\"${SQUEEZEOS_REVISION}\\"'
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
