[oe-commits] org.oe.dev merge of '00cf1e9e9df723231465c5cf66641ccf532f713a'
mickeyl commit
oe at amethyst.openembedded.net
Thu Jul 3 14:27:39 UTC 2008
merge of '00cf1e9e9df723231465c5cf66641ccf532f713a'
and 'e238a221b694e010f2ded33d137e1ca76dec2b4f'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 19d1d342ceb54bc6c7c8f703ca12f7619d05a1d7
ViewMTN: http://monotone.openembedded.org/revision/info/19d1d342ceb54bc6c7c8f703ca12f7619d05a1d7
Files:
1
packages/gnash/gnash_0.8.3.bb
conf/machine/davinci-dvevm.conf
conf/machine/davinci-sffsdr.conf
packages/dsplink/dsplink.inc
packages/libsidplay/libsidplay_1.36.59.bb
packages/sqlite/sqlite3.inc
packages/sqlite/sqlite3_3.5.6.bb
packages/swfdec/swfdec_0.7.2.bb
packages/freesmartphone/frameworkd/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
Diffs:
#
# mt diff -r00cf1e9e9df723231465c5cf66641ccf532f713a -r19d1d342ceb54bc6c7c8f703ca12f7619d05a1d7
#
#
#
# add_file "packages/gnash/gnash_0.8.3.bb"
# content [facb94648e617689b38f3bcebae0585eb83d3a2e]
#
# patch "conf/machine/davinci-dvevm.conf"
# from [fc1df96b8886e6db104be2687885c7947b76452d]
# to [b12fca91f474fdad55b2f5419ce9fc3dbbff3621]
#
# patch "conf/machine/davinci-sffsdr.conf"
# from [be522fecc7b21c6304b0e1afb6a2572c608667a7]
# to [504a47e0a86faf044909ca61b0e288a4b53514f6]
#
# patch "packages/dsplink/dsplink.inc"
# from [b86d9cd44a780cd1295db0a8c03477bd56444236]
# to [d492fe354f65326c479a4c150bb2067756c5f296]
#
# patch "packages/libsidplay/libsidplay_1.36.59.bb"
# from [4eba25c269b907542417f2e5d9918af4b61ff4e0]
# to [c981b0a5da5a77e995524d7f74b6517fe0717692]
#
# patch "packages/sqlite/sqlite3.inc"
# from [7e0826d065b34dce9e98e78cb2b91f7146efc3df]
# to [5d606f5488019690535de424e968530e4f0dd8b1]
#
# patch "packages/sqlite/sqlite3_3.5.6.bb"
# from [0edb125c6ed5c435fe50102b3d355f2b8061b1ef]
# to [87fdca587b3ccbbefeeed05cfacc233b7e9153c4]
#
# patch "packages/swfdec/swfdec_0.7.2.bb"
# from [6962105573a0d80aceafe87069b21f0e0fdebb13]
# to [0762edf2e24dc90e87a5d8b2bd766b981a1bc058]
#
============================================================
--- packages/gnash/gnash_0.8.3.bb facb94648e617689b38f3bcebae0585eb83d3a2e
+++ packages/gnash/gnash_0.8.3.bb facb94648e617689b38f3bcebae0585eb83d3a2e
@@ -0,0 +1,6 @@
+require gnash.inc
+
+do_configure() {
+ gnu-configize
+ oe_runconf
+}
============================================================
--- conf/machine/davinci-dvevm.conf fc1df96b8886e6db104be2687885c7947b76452d
+++ conf/machine/davinci-dvevm.conf b12fca91f474fdad55b2f5419ce9fc3dbbff3621
@@ -22,6 +22,7 @@ MACHINE_FEATURES = "kernel26 pcmcia usbh
MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
+MACHINE_EXTRA_RDEPENDS = "dsplink"
MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- conf/machine/davinci-sffsdr.conf be522fecc7b21c6304b0e1afb6a2572c608667a7
+++ conf/machine/davinci-sffsdr.conf 504a47e0a86faf044909ca61b0e288a4b53514f6
@@ -25,6 +25,7 @@ MACHINE_FEATURES = "kernel26 serial"
MACHINE_FEATURES = "kernel26 serial"
+MACHINE_EXTRA_RDEPENDS = "dsplink"
MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
require conf/machine/include/tune-arm926ejs.inc
============================================================
--- packages/dsplink/dsplink.inc b86d9cd44a780cd1295db0a8c03477bd56444236
+++ packages/dsplink/dsplink.inc d492fe354f65326c479a4c150bb2067756c5f296
@@ -66,6 +66,10 @@ do_install () {
do_install () {
install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp
cp ${S}/gpp/BUILD/EXPORT/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/
+
+ install -d ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/mpcsxfergpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/ringiogpp ${D}/${bindir}
}
pkg_postinst_${PN}-module () {
@@ -82,6 +86,7 @@ FILES_${PN}-module = "${sysconfdir} /li
PACKAGES =+ "${PN}-module"
FILES_${PN}-module = "${sysconfdir} /lib/modules"
+FILES_${PN} = "${bindir}/mpcsxfergpp ${bindir}/ringiogpp"
PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/libsidplay/libsidplay_1.36.59.bb 4eba25c269b907542417f2e5d9918af4b61ff4e0
+++ packages/libsidplay/libsidplay_1.36.59.bb c981b0a5da5a77e995524d7f74b6517fe0717692
@@ -3,8 +3,12 @@ LICENSE = "GPL"
PRIORITY = "optional"
LICENSE = "GPL"
-SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz"
+PR = "r1"
+SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz \
+ http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;patch=1 \
+"
+
inherit autotools
do_stage() {
============================================================
--- packages/sqlite/sqlite3.inc 7e0826d065b34dce9e98e78cb2b91f7146efc3df
+++ packages/sqlite/sqlite3.inc 5d606f5488019690535de424e968530e4f0dd8b1
@@ -28,6 +28,7 @@ do_stage() {
do_stage() {
oe_libinstall -so libsqlite3 ${STAGING_LIBDIR}
+ install -m 0644 sqlite3.h ${STAGING_INCDIR}
}
#do_install() {
============================================================
--- packages/sqlite/sqlite3_3.5.6.bb 0edb125c6ed5c435fe50102b3d355f2b8061b1ef
+++ packages/sqlite/sqlite3_3.5.6.bb 87fdca587b3ccbbefeeed05cfacc233b7e9153c4
@@ -1 +1,3 @@ require sqlite3.inc
require sqlite3.inc
+
+PR = "r1"
============================================================
--- packages/swfdec/swfdec_0.7.2.bb 6962105573a0d80aceafe87069b21f0e0fdebb13
+++ packages/swfdec/swfdec_0.7.2.bb 0762edf2e24dc90e87a5d8b2bd766b981a1bc058
@@ -1,7 +1,7 @@ LICENSE = "LGPL"
DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
LICENSE = "LGPL"
-DEPENDS = "pango cairo liboil zlib libmad gtk+ alsa-lib"
+DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.7/${P}.tar.gz \
"
#
# mt diff -re238a221b694e010f2ded33d137e1ca76dec2b4f -r19d1d342ceb54bc6c7c8f703ca12f7619d05a1d7
#
#
#
# patch "packages/freesmartphone/frameworkd/frameworkd.conf"
# from [5e6f2e0547480b2177479b77f8a70a0ecd837b93]
# to [754648990052886c83d81988fcfa1a6222099f6d]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [655476c5576a79469c78d14aaefb466009b2b952]
# to [cc2a6fcbe47a85ed029d1781a671aaaea02c7b90]
#
============================================================
--- packages/freesmartphone/frameworkd/frameworkd.conf 5e6f2e0547480b2177479b77f8a70a0ecd837b93
+++ packages/freesmartphone/frameworkd/frameworkd.conf 754648990052886c83d81988fcfa1a6222099f6d
@@ -13,7 +13,7 @@ disable = 0
[powercontrol-neo]
disable = 0
-[gsmd]
+[ogsmd]
modemtype = ti_calypso
[opreferencesd]
============================================================
--- packages/freesmartphone/frameworkd_git.bb 655476c5576a79469c78d14aaefb466009b2b952
+++ packages/freesmartphone/frameworkd_git.bb cc2a6fcbe47a85ed029d1781a671aaaea02c7b90
@@ -5,7 +5,7 @@ PV = "0.8.0+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPL"
PV = "0.8.0+gitr${SRCREV}"
-PR = "r5"
+PR = "r6"
inherit distutils update-rc.d
More information about the Openembedded-commits
mailing list