[oe-commits] org.oe.dev merge of '2d845d0c3ff5c2927314d27ea9825e38bb773f6f'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Aug 19 18:26:06 UTC 2007
merge of '2d845d0c3ff5c2927314d27ea9825e38bb773f6f'
and '94f444b248e2cbc069ea3e5f2d467b3632db5d8c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: fa96212e057350f0665365f4fca19faefdbde9c4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fa96212e057350f0665365f4fca19faefdbde9c4
Files:
1
packages/alsa/alsa-plugins_1.0.14.bb
packages/gstreamer/gst-plugin-pulse_0.9.4.bb
conf/distro/openmoko.conf
packages/alsa/alsa-lib_1.0.13.bb
packages/gstreamer/gst-meta-base_0.10.bb
packages/alsa/alsa-state.bb
Diffs:
#
# mt diff -r2d845d0c3ff5c2927314d27ea9825e38bb773f6f -rfa96212e057350f0665365f4fca19faefdbde9c4
#
#
#
# add_file "packages/alsa/alsa-plugins_1.0.14.bb"
# content [8f085bb2de8e8094c4500114a767eee8ce9b5612]
#
# add_file "packages/gstreamer/gst-plugin-pulse_0.9.4.bb"
# content [1b6faaf0116a44c36595879d1ac3c0cecc52b771]
#
# patch "conf/distro/openmoko.conf"
# from [c4f3798201c6d84f8635797befd0b9d72551dbef]
# to [5b99fc5b452bb657f557a90785c784cfc29115e4]
#
# patch "packages/alsa/alsa-lib_1.0.13.bb"
# from [1cc7fb5837d3675969799d8e715b42605d72758c]
# to [a683702c03094e9186bfd192d9bbac123c925bee]
#
# patch "packages/gstreamer/gst-meta-base_0.10.bb"
# from [1bf0c039007ac37d76a8902fecda3ef829830212]
# to [b02e534fa5fcf08c8b48645d99f69a076d0ad955]
#
============================================================
--- packages/alsa/alsa-plugins_1.0.14.bb 8f085bb2de8e8094c4500114a767eee8ce9b5612
+++ packages/alsa/alsa-plugins_1.0.14.bb 8f085bb2de8e8094c4500114a767eee8ce9b5612
@@ -0,0 +1,20 @@
+DESCRIPTION = "ALSA Plugins"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "multimedia/alsa/plugins"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib pulseaudio"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2"
+
+inherit autotools
+
+PACKAGES_DYNAMIC = "libasound-module*"
+
+python populate_packages_prepend() {
+ plugindir = bb.data.expand('${libdir}/alsa-lib/', d)
+ do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' )
+}
+
+FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug"
============================================================
--- packages/gstreamer/gst-plugin-pulse_0.9.4.bb 1b6faaf0116a44c36595879d1ac3c0cecc52b771
+++ packages/gstreamer/gst-plugin-pulse_0.9.4.bb 1b6faaf0116a44c36595879d1ac3c0cecc52b771
@@ -0,0 +1,28 @@
+DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source"
+HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/"
+LICENSE = "GPL"
+DEPENDS = "gstreamer pulseaudio"
+PR = "r1"
+
+SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz"
+S = "${WORKDIR}/gst-pulse-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-lynx"
+GST_LIBV = 0.10
+
+do_install() {
+ install -d ${D}${libdir}/gstreamer-${GST_LIBV}/
+ install -m 0755 src/.libs/libgstpulse.so ${D}${libdir}/gstreamer-${GST_LIBV}
+}
+
+export GST_MODDIR=${libdir}/gstreamer-0.10
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstpulse.so"
+FILES_${PN}-dev = "\
+ ${libdir}/gstreamer-0.10/libgstpulse.a \
+ ${libdir}/gstreamer-0.10/libgstpulse.la \
+ ${libdir}/gstreamer-0.10/libgstpulse.so*"
+FILES_${PN}-dbg = "${libdir}/gstreamer-0.10/.debug"
+
============================================================
--- conf/distro/openmoko.conf c4f3798201c6d84f8635797befd0b9d72551dbef
+++ conf/distro/openmoko.conf 5b99fc5b452bb657f557a90785c784cfc29115e4
@@ -12,7 +12,7 @@ DISTRO_NAME = "OpenMoko"
#
DISTRO = "openmoko"
DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
+DISTRO_VERSION = "P1-August-Snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
@@ -23,7 +23,10 @@ FEED_URIS = "\
PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/"
FEED_URIS = "\
+ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
+ snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \
+ snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \
+ \
+ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
+ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \
+ updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/fic-gta01 "
- all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \
- armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \
- fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01"
-
============================================================
--- packages/alsa/alsa-lib_1.0.13.bb 1cc7fb5837d3675969799d8e715b42605d72758c
+++ packages/alsa/alsa-lib_1.0.13.bb a683702c03094e9186bfd192d9bbac123c925bee
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Alsa sound library"
HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
# configure.in sets -D__arm__ on the command line for any arm system
# (not just those with the ARM instruction set), this should be removed,
============================================================
--- packages/gstreamer/gst-meta-base_0.10.bb 1bf0c039007ac37d76a8902fecda3ef829830212
+++ packages/gstreamer/gst-meta-base_0.10.bb b02e534fa5fcf08c8b48645d99f69a076d0ad955
@@ -1,8 +1,8 @@
-# Copyright (C) 2006,2007 OpenedHand LTD
+# Based on its sibling on Poky which is copyright (C) 2006,2007 OpenedHand LTD
DESCRIPTION = "Gstreamer package groups"
DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly"
-PR = "r4"
+PR = "r5"
PACKAGES = "\
gst-meta-base \
@@ -32,7 +32,8 @@ RDEPENDS_gst-meta-audio = "\
gst-meta-base \
gst-plugin-ivorbis \
gst-plugin-ogg \
- gst-plugin-mad"
+ gst-plugin-mad \
+ gst-plugin-id3demux"
RDEPENDS_gst-meta-debug = "\
#
# mt diff -r94f444b248e2cbc069ea3e5f2d467b3632db5d8c -rfa96212e057350f0665365f4fca19faefdbde9c4
#
#
#
# patch "packages/alsa/alsa-state.bb"
# from [481e31f5bed1ac2d402c743d5464c9a931503c91]
# to [fccf05313122b3efcff06e12d6028c79070b3f7b]
#
============================================================
--- packages/alsa/alsa-state.bb 481e31f5bed1ac2d402c743d5464c9a931503c91
+++ packages/alsa/alsa-state.bb fccf05313122b3efcff06e12d6028c79070b3f7b
@@ -1,7 +1,7 @@
#! /bin/sh
#
# Copyright Matthias Hentges <devel at hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php
# for a copy of the license)
#
# Filename: alsa-state.bb
@@ -11,7 +11,7 @@ PV = "0.0.4"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
PV = "0.0.4"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://asound.state \
file://alsa-state "
@@ -32,7 +32,7 @@ do_install() {
do_install() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
-
+
install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
}
@@ -48,7 +48,7 @@ pkg_postinst_${PN}() {
if test -x /usr/sbin/alsactl
then
/usr/sbin/alsactl -f ${sysconfdir}/asound.state restore
- fi
+ fi
fi
}
More information about the Openembedded-commits
mailing list