[oe-commits] org.oe.dev merge of '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
mickeyl commit
oe at amethyst.openembedded.net
Wed Sep 3 19:14:53 UTC 2008
merge of '8757cea2a30d383fc8b9e31dc7ae714a4df33a64'
and 'ca29e1912671c0d9322d55bfb15de7d18a7379d6'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6bbfda34b1293722716d998155092fd88a6e2529
ViewMTN: http://monotone.openembedded.org/revision/info/6bbfda34b1293722716d998155092fd88a6e2529
Files:
1
conf/distro/include/sane-srcrevs.inc
contrib/python/generate-manifest-2.5.py
packages/freesmartphone/frameworkd_git.bb
packages/freesmartphone/fso-sounds.bb
packages/python/python-2.5-manifest.inc
packages/python/python_2.5.2.bb
packages/bluez/bluez-cups-backend_3.36.bb
packages/bluez/bluez-gstreamer-plugin_3.36.bb
packages/bluez/bluez-libs_3.36.bb
packages/bluez/bluez-utils-alsa_3.36.bb
packages/bluez/bluez-utils_3.36.bb
packages/vnc/x11vnc_0.9.3.bb
Diffs:
#
# mt diff -r8757cea2a30d383fc8b9e31dc7ae714a4df33a64 -r6bbfda34b1293722716d998155092fd88a6e2529
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [e8e8c89f786f6acabf5bf59613ebdf7c5eb43909]
# to [c7bf22a704aa46b6931b3a1de5cc783c1255d69a]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [a971b5ac6ae0a98cd7a45562b0dfd4991014637f]
# to [a4fed01002a31d26fb074c4cc8d3c9aa9781badc]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [94282092330a8a0df7d9b488b224bda765e10cc9]
# to [e61d106c2ee8ed96d511f9ecd91b691915744e70]
#
# patch "packages/freesmartphone/fso-sounds.bb"
# from [ed58502e0a98204c925aee068e7c055d73727a7e]
# to [1e72755e027460a03ac8362ba7ff898b2b259fb8]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [13b67caca5703e8fb96a7cf8044439b362803e36]
# to [ad0640bf271aee3f9908624e53aac886402d641e]
#
# patch "packages/python/python_2.5.2.bb"
# from [437e0240108d8f5b46ff45d7960aa2572d4526a2]
# to [099c7ab1919b1355631502567db282c216a573d3]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc e8e8c89f786f6acabf5bf59613ebdf7c5eb43909
+++ conf/distro/include/sane-srcrevs.inc c7bf22a704aa46b6931b3a1de5cc783c1255d69a
@@ -43,6 +43,7 @@ SRCREV_pn-frameworkd ?= "99c8433e0069ece
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe"
+SRCREV_pn-fso-sounds ?= "fcadedec08294c5eebd176483695828959a76e0b"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
============================================================
--- contrib/python/generate-manifest-2.5.py a971b5ac6ae0a98cd7a45562b0dfd4991014637f
+++ contrib/python/generate-manifest-2.5.py a4fed01002a31d26fb074c4cc8d3c9aa9781badc
@@ -289,8 +289,8 @@ if __name__ == "__main__":
m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core",
"lib-dynload/resource.so" )
- m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core python-re",
- "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" )
+ m.addPackage( 1, "python-shell", "Python Shell-Like Functionality", "python-core python-re",
+ "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" )
m.addPackage( 0, "python-robotparser", "Python robots.txt parser", "python-core python-netclient",
"robotparser.*")
============================================================
--- packages/freesmartphone/frameworkd_git.bb 94282092330a8a0df7d9b488b224bda765e10cc9
+++ packages/freesmartphone/frameworkd_git.bb e61d106c2ee8ed96d511f9ecd91b691915744e70
@@ -5,7 +5,7 @@ PV = "0.8.2+gitr${SRCREV}"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPL"
PV = "0.8.2+gitr${SRCREV}"
-PR = "r3"
+PR = "r0"
inherit distutils update-rc.d
============================================================
--- packages/freesmartphone/fso-sounds.bb ed58502e0a98204c925aee068e7c055d73727a7e
+++ packages/freesmartphone/fso-sounds.bb 1e72755e027460a03ac8362ba7ff898b2b259fb8
@@ -1,14 +1,18 @@ SECTION = "multimedia"
DESCRIPTION = "A set of notification sounds"
LICENSE = "PD"
SECTION = "multimedia"
-PV = "0.0.0"
+PV = "0.0.1+gitr${SRCREV}"
PR = "r0"
-SRC_URI = "http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid"
+SRC_URI = "\
+ http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid \
+ ${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master \
+"
do_install() {
install -d ${D}${datadir}/sounds/
install ${WORKDIR}/*.sid ${D}${datadir}/sounds/
+ install ${WORKDIR}/git/sounds/*.mp3 ${D}${datadir}/sounds/
}
FILES_${PN} = "${datadir}"
============================================================
--- packages/python/python-2.5-manifest.inc 13b67caca5703e8fb96a7cf8044439b362803e36
+++ packages/python/python-2.5-manifest.inc ad0640bf271aee3f9908624e53aac886402d641e
@@ -264,9 +264,9 @@ DESCRIPTION_python-shell="Python Shell-L
FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* "
DESCRIPTION_python-shell="Python Shell-Like Functionality"
-PR_python-shell="ml0"
+PR_python-shell="ml1"
RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* "
+FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shlex.* ${libdir}/python2.5/shutil.* "
DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
PR_python-bsddb="ml1"
============================================================
--- packages/python/python_2.5.2.bb 437e0240108d8f5b46ff45d7960aa2572d4526a2
+++ packages/python/python_2.5.2.bb 099c7ab1919b1355631502567db282c216a573d3
@@ -6,7 +6,7 @@ DEPENDS_sharprom = "python-native db rea
DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
# bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml9"
+PR = "ml10"
PYTHON_MAJMIN = "2.5"
#
# mt diff -rca29e1912671c0d9322d55bfb15de7d18a7379d6 -r6bbfda34b1293722716d998155092fd88a6e2529
#
#
#
# add_file "packages/bluez/bluez-cups-backend_3.36.bb"
# content [d79c76a1fd89302f16e82777189568239c1f5403]
#
# add_file "packages/bluez/bluez-gstreamer-plugin_3.36.bb"
# content [666c5e1acd745a41aed9c20e264b3bf8a5efe18b]
#
# add_file "packages/bluez/bluez-libs_3.36.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils-alsa_3.36.bb"
# content [32f5cb780bc5a28767debae1ec9ca65734d07454]
#
# add_file "packages/bluez/bluez-utils_3.36.bb"
# content [c954a045e1b683f324add0faafae8f2dacae0dba]
#
# patch "packages/vnc/x11vnc_0.9.3.bb"
# from [bb849990fcab1874e7cac9f59f3fd7133c0df9ab]
# to [93b8aca76f41968a645141daab1371bc3ce1b558]
#
============================================================
--- packages/bluez/bluez-cups-backend_3.36.bb d79c76a1fd89302f16e82777189568239c1f5403
+++ packages/bluez/bluez-cups-backend_3.36.bb d79c76a1fd89302f16e82777189568239c1f5403
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+
+DEPENDS += "cups"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+
+FILES_${PN} = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_${PN} = "cups"
============================================================
--- packages/bluez/bluez-gstreamer-plugin_3.36.bb 666c5e1acd745a41aed9c20e264b3bf8a5efe18b
+++ packages/bluez/bluez-gstreamer-plugin_3.36.bb 666c5e1acd745a41aed9c20e264b3bf8a5efe18b
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+
+DEPENDS += "gstreamer gst-plugins-base "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --enable-gstreamer \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
============================================================
--- packages/bluez/bluez-libs_3.36.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.36.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils-alsa_3.36.bb 32f5cb780bc5a28767debae1ec9ca65734d07454
+++ packages/bluez/bluez-utils-alsa_3.36.bb 32f5cb780bc5a28767debae1ec9ca65734d07454
@@ -0,0 +1,24 @@
+require bluez-utils3.inc
+
+
+DEPENDS += "alsa-lib"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --disable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+FILES_${PN} = "${libdir}/alsa-lib/libasound*"
============================================================
--- packages/bluez/bluez-utils_3.36.bb c954a045e1b683f324add0faafae8f2dacae0dba
+++ packages/bluez/bluez-utils_3.36.bb c954a045e1b683f324add0faafae8f2dacae0dba
@@ -0,0 +1,60 @@
+require bluez-utils3.inc
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+ "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-hidd \
+ --disable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+PACKAGES =+ "bluez-audio"
+
+FILES_${PN} = " \
+ ${base_sbindir}/hcid \
+ ${libdir}/bluetooth/plugins/*.so \
+ ${sysconfdir}/init.d/bluetooth \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default \
+ ${sysconfdir}/dbus-1 \
+ ${base_sbindir}/hciattach \
+ "
+
+FILES_bluez-audio = " \
+ ${libdir}/bluetooth/plugins/libaudio.so \
+ ${libdir}/gstreamer-0.10/*.so \
+ "
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/plugins/.debug \
+ ${libdir}/gstreamer-0.10/.debug \
+ "
+
+FILES_${PN}-dev += " \
+ ${libdir}/bluetooth/plugins/*.la \
+ ${libdir}/gstreamer-0.10/*.la \
+ "
============================================================
--- packages/vnc/x11vnc_0.9.3.bb bb849990fcab1874e7cac9f59f3fd7133c0df9ab
+++ packages/vnc/x11vnc_0.9.3.bb 93b8aca76f41968a645141daab1371bc3ce1b558
@@ -5,7 +5,7 @@ DEPENDS = "openssl virtual/libx11 libxts
LICENSE = "GPL"
DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib"
-SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
inherit autotools
More information about the Openembedded-commits
mailing list