pulseaudio: Switch to INC_PR, add openssl to DEPENDS.

Also remove dbus from the version specific DEPENDS lines as it's in the inc file

diff --git a/recipes/pulseaudio/pulseaudio.inc b/recipes/pulseaudio/pulseaudio.inc
index f2f54dd..912d5b9 100644 (file)
--- a/recipes/pulseaudio/pulseaudio.inc
+++ b/recipes/pulseaudio/pulseaudio.inc
@@ -5,7 +5,8 @@ SECTION = "libs/multimedia"
 LICENSE = "LGPL"
 DEPENDS = "bluez4 libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool hal virtual/libx11"
 # optional
-DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal"
+DEPENDS += "alsa-lib glib-2.0 dbus consolekit hal openssl"
+INC_PR = "r8"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
            file://gcc4-compile-fix.patch;patch=1 \

diff --git a/recipes/pulseaudio/pulseaudio_0.9.10.bb b/recipes/pulseaudio/pulseaudio_0.9.10.bb
index f26d583..ec190fa 100644 (file)
--- a/recipes/pulseaudio/pulseaudio_0.9.10.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.10.bb
@@ -1,7 +1,6 @@
 require pulseaudio.inc
 
-DEPENDS += "dbus"
-PR = "r5"
+PR = "${INC_PR}.1"
 
 SRC_URI += "\
   file://disable-using-glibc-tls.patch;patch=1 \

diff --git a/recipes/pulseaudio/pulseaudio_0.9.11.bb b/recipes/pulseaudio/pulseaudio_0.9.11.bb
index b0b5541..9f91912 100644 (file)
--- a/recipes/pulseaudio/pulseaudio_0.9.11.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.11.bb
@@ -1,7 +1,7 @@
 require pulseaudio.inc
 
-DEPENDS += "dbus gdbm speex"
-PR = "r1"
+DEPENDS += "gdbm speex"
+PR = "${INC_PR}.1"
 
 # work in progress
 DEFAULT_PREFERENCE = "-1"

diff --git a/recipes/pulseaudio/pulseaudio_0.9.15.bb b/recipes/pulseaudio/pulseaudio_0.9.15.bb
index 4358454..4b16b47 100644 (file)
--- a/recipes/pulseaudio/pulseaudio_0.9.15.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.15.bb
@@ -1,6 +1,7 @@
 require pulseaudio.inc
 
-DEPENDS += "dbus gdbm speex"
+DEPENDS += "gdbm speex"
+PR = "${INC_PR}.1"
 
 SRC_URI += "\
   file://buildfix.patch;patch=1 \

diff --git a/recipes/pulseaudio/pulseaudio_0.9.6.bb b/recipes/pulseaudio/pulseaudio_0.9.6.bb
index 8944b66..4d10af5 100644 (file)
--- a/recipes/pulseaudio/pulseaudio_0.9.6.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.6.bb
@@ -1,4 +1,3 @@
 require pulseaudio.inc
 
-PR = "r8"
-
+PR = "${INC_PR}.1"

diff --git a/recipes/pulseaudio/pulseaudio_0.9.9.bb b/recipes/pulseaudio/pulseaudio_0.9.9.bb
index 764f891..0c36cd4 100644 (file)
--- a/recipes/pulseaudio/pulseaudio_0.9.9.bb
+++ b/recipes/pulseaudio/pulseaudio_0.9.9.bb
@@ -1,7 +1,6 @@
 require pulseaudio.inc
 
-DEPENDS += "dbus"
-PR = "r5"
+PR = "${INC_PR}.1"
 
 # this is not correct (see below)
 SRC_URI += "\