Author: bklaas
Date: Tue Mar 29 14:14:14 2011
New Revision: 9401
URL: http://svn.slimdevices.com/jive?rev=9401&view=rev
Log:
r49777@DaddyMac (orig r9391): adrian | 2011-03-18 18:47:01 -0500
Bug: N/A
Description: previous dependancy did not result luartmp module making it into
the image, explicitly include in image include
r49778@DaddyMac (orig r9392): adrian | 2011-03-19 07:52:11 -0500
Bug: N/A
Description: hide some verbose debugging
r49779@DaddyMac (orig r9393): agrundman | 2011-03-19 16:52:57 -0500
Bump Perl modules
r49781@DaddyMac (orig r9395): agrundman | 2011-03-21 14:52:29 -0500
Bump Audio::Scan for 7.6 Fab4
r49782@DaddyMac (orig r9396): ayoung | 2011-03-22 12:22:12 -0500
task : XMLBrowser Library Browser
Remove sqlite sources from the install.
r49783@DaddyMac (orig r9397): ayoung | 2011-03-22 12:22:29 -0500
task : XMLBrowser Library Browser
Switch to onebrowser for SbS (TinySC)
r49785@DaddyMac (orig r9399): bklaas | 2011-03-29 15:06:56 -0500
Bump PR revision in hopes of having the deletion of sqlite sources actually
take effect
r49928@DaddyMac (orig r9400): bklaas | 2011-03-29 16:13:58 -0500
r49780@DaddyMac (orig r9394): agrundman | 2011-03-21 14:52:09 -0500
Bump Audio::Scan for 7.5 Fab4
Added:
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libev-perl_4.03.bb
- copied unchanged from r9221,
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libev-perl_3.9.bb
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libio-aio-perl_3.71.bb
- copied unchanged from r9221,
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libio-aio-perl_3.5.bb
Removed:
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libev-perl_3.9.bb
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libio-aio-perl_3.5.bb
Modified:
7.6/branches/new-setup/ (props changed)
7.6/branches/new-setup/squeezeos/poky/build/conf/local.conf.sample
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libdbd-sqlite-perl_1.32.bb
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
7.6/branches/new-setup/squeezeplay/src/luartmp-squeezeplay/rtmp.c
Propchange: 7.6/branches/new-setup/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Mar 29 14:14:14 2011
@@ -14,8 +14,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9376
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9386
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9394
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9400
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.6/branches/new-setup/squeezeos/poky/build/conf/local.conf.sample
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeos/poky/build/conf/local.conf.sample?rev=9401&r1=9400&r2=9401&view=diff
==============================================================================
--- 7.6/branches/new-setup/squeezeos/poky/build/conf/local.conf.sample
(original)
+++ 7.6/branches/new-setup/squeezeos/poky/build/conf/local.conf.sample Tue Mar
29 14:14:14 2011
@@ -168,6 +168,9 @@
ENABLE_BINARY_LOCALE_GENERATION = "1"
+# This overrides the entry in squeezos.conf
+SQUEEZECENTER_SCM = "svn://svn.slimdevices.com/repos/slim/7.6;proto=http"
+SQUEEZECENTER_SVN_MODULE = "branches/onebrowser"
# Enable the below to build wlan drivers / wps using private source
#SQUEEZEOS_PRIVATE_SVN = "xxxx"
Modified:
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb?rev=9401&r1=9400&r2=9401&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
(original)
+++
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/images/squeezeos-image.bb
Tue Mar 29 14:14:14 2011
@@ -18,3 +18,5 @@
# Simple NTP client
IMAGE_INSTALL += "msntp"
+# Add rtmp.so which is built outside squeezeplay
+IMAGE_INSTALL += "liblua5.1-luartmp"
Modified:
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb?rev=9401&r1=9400&r2=9401&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
(original)
+++
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libaudio-scan-perl_svn.bb
Tue Mar 29 14:14:14 2011
@@ -2,7 +2,7 @@
SECTION = "libs"
LICENSE = "GPL"
PV = "svnr${SRCREV}"
-PR = "r23"
+PR = "r25"
# We want Perl to be as fast as possible, reset the default optimization flags
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer
-frename-registers -O2 -ggdb -feliminate-unused-debug-types"
@@ -10,9 +10,9 @@
ARM_INSTRUCTION_SET = "arm"
# This should match the version currently listed in SBS's modules.conf file
-SRC_URI =
"svn://svn.slimdevices.com/repos/opensource/tags/Audio-Scan;proto=http;module=0.85"
+SRC_URI =
"svn://svn.slimdevices.com/repos/opensource/tags/Audio-Scan;proto=http;module=0.87"
-S = "${WORKDIR}/0.85"
+S = "${WORKDIR}/0.87"
inherit cpan
Modified:
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libdbd-sqlite-perl_1.32.bb
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libdbd-sqlite-perl_1.32.bb?rev=9401&r1=9400&r2=9401&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libdbd-sqlite-perl_1.32.bb
(original)
+++
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/perl/libdbd-sqlite-perl_1.32.bb
Tue Mar 29 14:14:14 2011
@@ -1,7 +1,7 @@
DESCRIPTION = "DBD::SQLite - SQLite driver for the Perl5 Database Interface
(DBI)"
SECTION = "libs"
LICENSE = "Artistic|GPL"
-PR = "r16"
+PR = "r17"
# We want Perl to be as fast as possible, reset the default optimization flags
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer
-frename-registers -O2 -ggdb -feliminate-unused-debug-types"
@@ -19,3 +19,15 @@
FILES_${PN}-doc = "${PERLLIBDIRS}/*.pod"
FILES_${PN} = "${PERLLIBDIRS}"
+
+cpan_do_install() {
+ # from cpan class
+ if [ yes = "yes" ]; then
+ oe_runmake install_vendor
+ fi
+
+ # Remove unnecessary large source files
+ rm -rf ${D}/${prefix}/lib/perl5/auto/share/dist/DBD-SQLite
+}
+
+
Modified:
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb?rev=9401&r1=9400&r2=9401&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
(original)
+++
7.6/branches/new-setup/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
Tue Mar 29 14:14:14 2011
@@ -4,7 +4,7 @@
PV = "${DISTRO_VERSION}+svnr${SRCREV}"
PR = "r4"
-DEPENDS += "squeezeplay luartmp"
+DEPENDS += "squeezeplay"
SRC_URI="${SQUEEZEPLAY_SCM};module=squeezeplay_squeezeos"
Modified: 7.6/branches/new-setup/squeezeplay/src/luartmp-squeezeplay/rtmp.c
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/luartmp-squeezeplay/rtmp.c?rev=9401&r1=9400&r2=9401&view=diff
==============================================================================
--- 7.6/branches/new-setup/squeezeplay/src/luartmp-squeezeplay/rtmp.c (original)
+++ 7.6/branches/new-setup/squeezeplay/src/luartmp-squeezeplay/rtmp.c Tue Mar
29 14:14:14 2011
@@ -339,7 +339,7 @@
header[3] |= ((framesize >> 11) & 0x03);
header[4] |= ((framesize >> 3) & 0xFF);
header[5] |= ((framesize << 5) & 0xE0);
- LOG_DEBUG(log_audio_decode, "aac audio data: %d
timestamp: %d", framesize, entry->ts);
+ // LOG_DEBUG(log_audio_decode, "aac audio data: %d
timestamp: %d", framesize, entry->ts);
if (n > framesize) {
streambuf_feed(header, 7);
streambuf_feed(buf + 2, entry->len - 2);
@@ -365,7 +365,7 @@
} else if ((*buf & 0xF0) == 0x20) {
// MP3 audio
- LOG_DEBUG(log_audio_decode, "mp3 audio data: %d timestamp: %d",
entry->len - 1, entry->ts);
+ // LOG_DEBUG(log_audio_decode, "mp3 audio data: %d timestamp:
%d", entry->len - 1, entry->ts);
if (n >= entry->len - 1) {
streambuf_feed(buf + 1, entry->len - 1);
} else {
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
