Author: adrian
Date: Sun Mar 6 03:40:13 2011
New Revision: 9343
URL: http://svn.slimdevices.com/jive?rev=9343&view=rev
Log:
Bug: N/A
Description: updates to build luartmp:
rtmp.so is built from include files which are only staged when squeezeplay has
been built. It must therefore be built after squeezeplay and so is included as
a dependancy for squeezeplay-squeezeos
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/lua/luartmp_svn.bb
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Modified: 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=9343&r1=9342&r2=9343&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.6/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Sun Mar
6 03:40:13 2011
@@ -60,6 +60,7 @@
SRCREV_pn-luatolua++ ?= "${AUTOREV}"
SRCREV_pn-luamd5 ?= "${AUTOREV}"
SRCREV_pn-luaexpat ?= "${AUTOREV}"
+SRCREV_pn-luartmp ?= "${AUTOREV}"
# SqueezeCenter
SRCREV_pn-squeezecenter ?= "${AUTOREV}"
Modified: 7.6/trunk/squeezeos/poky/meta-squeezeos/packages/lua/luartmp_svn.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/lua/luartmp_svn.bb?rev=9343&r1=9342&r2=9343&view=diff
==============================================================================
--- 7.6/trunk/squeezeos/poky/meta-squeezeos/packages/lua/luartmp_svn.bb
(original)
+++ 7.6/trunk/squeezeos/poky/meta-squeezeos/packages/lua/luartmp_svn.bb Sun Mar
6 03:40:13 2011
@@ -1,3 +1,6 @@
+# This file builds the squeezeplay specific rtmp.so library which is loaded by
Rtmp.lua to support rtmp playback
+# It depends on include files which are only staged once squeezeplay is built
and is therefore not built as part of squeezeplay
+
DESCRIPTION = "LUA rtmp"
SECTION = "libs"
LICENSE = "copyright"
@@ -9,11 +12,15 @@
SRC_URI="${SQUEEZEPLAY_SCM};module=luartmp-squeezeplay"
-S = "${WORKDIR}/luartmp"
+S = "${WORKDIR}/luartmp-squeezeplay"
+
+do_compile() {
+ ${CC} -I${STAGING_INCDIR}/squeezeplay
-I${STAGING_INCDIR}/squeezeplay/ui -I${STAGING_INC}/lua -I${STAGING_INC}/SDL
-shared rtmp.c -o rtmp.so
+}
do_install() {
mkdir -p ${D}${libdir}/lua/5.1
- install -m 0755 .libs/rtmp.so ${D}${libdir}/lua/5.1
+ install -m 0755 rtmp.so ${D}${libdir}/lua/5.1
}
PACKAGES = "liblua5.1-luartmp-dbg liblua5.1-luartmp"
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb?rev=9343&r1=9342&r2=9343&view=diff
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
(original)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-squeezeos_svn.bb
Sun Mar 6 03:40:13 2011
@@ -2,9 +2,9 @@
LICENSE = "Logitech Public Source License"
PV = "${DISTRO_VERSION}+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
-DEPENDS += "squeezeplay"
+DEPENDS += "squeezeplay luartmp"
SRC_URI="${SQUEEZEPLAY_SCM};module=squeezeplay_squeezeos"
Modified:
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=9343&r1=9342&r2=9343&view=diff
==============================================================================
---
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.6/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Sun Mar 6 03:40:13 2011
@@ -2,7 +2,7 @@
LICENSE = "Logitech Public Source License"
PV = "${DISTRO_VERSION}+svnr${SRCREV}"
-PR = "r23"
+PR = "r24"
DEPENDS += "libsdl libsdl-ttf libsdl-gfx libsdl-image"
DEPENDS += "lua lua-native luatolua++"
@@ -38,6 +38,8 @@
install -d ${STAGING_INCDIR}/squeezeplay/ui
install -d ${STAGING_INCDIR}/squeezeplay/audio
install -m 0644 src/log.h ${STAGING_INCDIR}/squeezeplay/log.h
+ install -m 0644 src/config.h ${STAGING_INCDIR}/squeezeplay/config.h
+ install -m 0644 src/common.h ${STAGING_INCDIR}/squeezeplay/common.h
install -m 0644 src/types.h ${STAGING_INCDIR}/squeezeplay/types.h
install -m 0644 src/ui/jive.h ${STAGING_INCDIR}/squeezeplay/ui/jive.h
install -m 0644 src/audio/fifo.h
${STAGING_INCDIR}/squeezeplay/audio/fifo.h
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
