Author: richard
Date: Thu Jan 22 06:56:57 2009
New Revision: 3915
URL: http://svn.slimdevices.com?rev=3915&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3914): richard | 2009-01-22 14:50:51 +0000
Bug: N/A
Descripiton:
Poky updates for compiling closed source squeezeplay module.
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private_svn.bb
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private-src_svn.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 22 06:56:57 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3856
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3910
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3914
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/branches/pango/squeezeos/poky/build/conf/local.conf.sample
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample?rev=3915&root=Jive&r1=3914&r2=3915&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample (original)
+++ 7.4/branches/pango/squeezeos/poky/build/conf/local.conf.sample Thu Jan 22
06:56:57 2009
@@ -166,13 +166,16 @@
# Enable the below to build wlan drivers / wps using private source
#SQUEEZEOS_PRIVATE_SVN = "xxxx"
-#PREFERRED_PROVIDER_marvell-wlan-tools = "marvell-wlan-tools-src"
-#PREFERRED_PROVIDER_marvell-gspi-module = "marvell-gspi-module-src"
-#PREFERRED_PROVIDER_marvell-wps = "marvell-wps-src"
+# Lines with ## are used on the build server
+##PREFERRED_PROVIDER_marvell-wlan-tools = "marvell-wlan-tools-src"
+##PREFERRED_PROVIDER_marvell-gspi-module = "marvell-gspi-module-src"
+##PREFERRED_PROVIDER_marvell-wps = "marvell-wps-src"
+##ENABLE_SPPRIVATE = "yes"
-#SRCREV_pn-marvell-wlan-tools-src = "${AUTOREV}"
-#SRCREV_pn-marvell-gspi-module-src = "${AUTOREV}"
-#SRCREV_pn-marvell-wps-src = "${AUTOREV}"
+##SRCREV_pn-marvell-wlan-tools-src = "${AUTOREV}"
+##SRCREV_pn-marvell-gspi-module-src = "${AUTOREV}"
+##SRCREV_pn-marvell-wps-src = "${AUTOREV}"
+##SRCREV_pn-squeezeplay-private = "${AUTOREV}"
# Use cache to prevent checking for package updates in svn
#BB_SRCREV_POLICY="cache"
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private-src_svn.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private-src_svn.bb?rev=3915&root=Jive&r1=3914&r2=3915&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private-src_svn.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private-src_svn.bb
Thu Jan 22 06:56:57 2009
@@ -1,31 +1,0 @@
-DESCRIPTION = "SqueezePlay - Private code"
-LICENSE = "Confidential"
-
-PV = "${DISTRO_VERSION}+svnr${SRCREV}"
-#PR = "r0"
-
-DEPENDS += "squeezeplay axtls"
-
-SRC_URI="${SQUEEZEOS_PRIVATE_SVN};module=squeezeplay_private"
-
-S = "${WORKDIR}/squeezeplay_private"
-
-inherit autotools
-
-CFLAGS_prepend = '-I${STAGING_INCDIR}/squeezeplay'
-
-EXTRA_OEMAKE = "all"
-
-
-do_install() {
- autotools_do_install
-
- # move lua libraries to correct location
- rm ${D}${libdir}/*
- mkdir -p ${D}${libdir}/lua/5.1
- install -m 0755 .libs/spprivate.so ${D}${libdir}/lua/5.1/spprivate.so
-}
-
-
-FILES_${PN} += "${datadir} ${libdir}/lua/5.1"
-FILES_${PN}-dbg += "${libdir}/lua/5.1/.debug"
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private_svn.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private_svn.bb?rev=3915&root=Jive&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private_svn.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-private_svn.bb
Thu Jan 22 06:56:57 2009
@@ -1,0 +1,23 @@
+DESCRIPTION = "SqueezePlay - Private code"
+LICENSE = "Confidential"
+
+PV = "${DISTRO_VERSION}+svnr${SRCREV}"
+#PR = "r0"
+
+DEPENDS += "axtls"
+
+SRC_URI="${SQUEEZEOS_PRIVATE_SVN};module=squeezeplay_private"
+
+S = "${WORKDIR}/squeezeplay_private"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-shared"
+
+do_stage() {
+ autotools_stage_all
+}
+
+# Just build a shared library, don't install any packages
+FILES_${PN} = ""
+FILES_${PN}-dbg = ""
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=3915&root=Jive&r1=3914&r2=3915&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Thu Jan 22 06:56:57 2009
@@ -22,6 +22,10 @@
EXTRA_OECONF = "--disable-portaudio"
+# Optional close source package
+DEPENDS += "$...@base_conditional('ENABLE_SPPRIVATE', 'yes',
'squeezeplay-private', '', d)}"
+EXTRA_OECONF += "$...@base_conditional('ENABLE_SPPRIVATE', 'yes',
'--with-spprivate', '', d)}"
+
CFLAGS_prepend = '-DSQUEEZEPLAY_RELEASE=\\"${DISTRO_VERSION}\\"
-DSQUEEZEPLAY_REVISION=\\"${SQUEEZEOS_REVISION}\\"'
CFLAGS += -I${STAGING_INCDIR}/glib-2.0
-I${STAGING_INCDIR}/../lib/glib-2.0/include -I${STAGING_INCDIR}/pango-1.0
-I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/cairo
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
