| Submitter | Ross Burton |
|---|---|
| Date | Sept. 6, 2012, 3:42 p.m. |
| Message ID | <1346946168-7482-1-git-send-email-ross.burton@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/36063/ |
| State | Accepted |
| Commit | 3e05e52821e6042708a37421423601e9fe59116e |
| Headers | show |
Comments
On 09/06/2012 08:42 AM, Ross Burton wrote: > ConsoleKit is a runtime dependency for the ConsoleKit module, but there isn't a > build-time dependency. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- > meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc > index 315d4dc..14e90a2 100644 > --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc > +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc > @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ > DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ > ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" > # optional > -DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \ > +DEPENDS += "udev alsa-lib glib-2.0 dbus \ > ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" > > SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ > diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb > index 97bd4d3..e39b69e 100644 > --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb > +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb > @@ -1,6 +1,6 @@ > require pulseaudio.inc > > -PR = "r2" > +PR = "r3" > > DEPENDS += "libjson gdbm speex libxml-parser-perl-native" > > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 315d4dc..14e90a2 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" # optional -DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \ +DEPENDS += "udev alsa-lib glib-2.0 dbus \ ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb index 97bd4d3..e39b69e 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb @@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r2" +PR = "r3" DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
ConsoleKit is a runtime dependency for the ConsoleKit module, but there isn't a build-time dependency. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)