pulseaudio 1.0-4 retour du patch

4 files changed, 46 insertions, 3 deletions

diff --git a/extra/pulseaudio/.md5sum.i686 b/extra/pulseaudio/.md5sum.i686
index 89f2b3e50..8b2e9de0a 100644
--- a/extra/pulseaudio/.md5sum.i686
+++ b/extra/pulseaudio/.md5sum.i686
@@ -5,3 +5,4 @@ e29ab6a42d1e088d9c824f87695094cd  configuration_resample_tweak.patch
 440f9593a52eb7a42a55182df01ed153  pulseaudio.xinit
 db768937c2fe51bedf3fc9c91270bc82  sound.conf
 c459ed54f3155c44fc74ac2997ff625b  start_pulseaudio_earlier_with_Gnome.patch
+2c15058a61d6952353c1555ff90bb279  version-number.patch
diff --git a/extra/pulseaudio/.md5sum.x86_64 b/extra/pulseaudio/.md5sum.x86_64
index 89f2b3e50..8b2e9de0a 100644
--- a/extra/pulseaudio/.md5sum.x86_64
+++ b/extra/pulseaudio/.md5sum.x86_64
@@ -5,3 +5,4 @@ e29ab6a42d1e088d9c824f87695094cd  configuration_resample_tweak.patch
 440f9593a52eb7a42a55182df01ed153  pulseaudio.xinit
 db768937c2fe51bedf3fc9c91270bc82  sound.conf
 c459ed54f3155c44fc74ac2997ff625b  start_pulseaudio_earlier_with_Gnome.patch
+2c15058a61d6952353c1555ff90bb279  version-number.patch
diff --git a/extra/pulseaudio/Pkgfile b/extra/pulseaudio/Pkgfile
index 20543fa79..0cf447b67 100644
--- a/extra/pulseaudio/Pkgfile
+++ b/extra/pulseaudio/Pkgfile
@@ -7,18 +7,19 @@
 
 name=pulseaudio
 version=1.0
-release=3
+release=4
 source=(http://freedesktop.org/software/$name/releases/$name-$version.tar.xz
 	pulseaudio.xinit
 	pulseaudio.svg
 	sound.conf
 	configuration_resample_tweak.patch
 	start_pulseaudio_earlier_with_Gnome.patch
-	NuTyX_config.patch)
+	NuTyX_config.patch
+	version-number.patch)
 
 build() {
 	cd $name-$version
-	
+	patch -Np1 -i ../version-number.patch
 	patch -p1 < ../configuration_resample_tweak.patch
 	patch -p1 < ../start_pulseaudio_earlier_with_Gnome.patch
 	patch -p1 < ../NuTyX_config.patch
diff --git a/extra/pulseaudio/version-number.patch b/extra/pulseaudio/version-number.patch
new file mode 100644
index 000000000..78889073c
--- /dev/null
+++ b/extra/pulseaudio/version-number.patch
@@ -0,0 +1,40 @@
+commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c
+Author: Colin Guthrie <colin@mageia.org>
+Date:   Sat Oct 1 12:03:44 2011 +0100
+
+    libpulse: Always return a three part version number in API calls.
+
+    For both the headers and the library we should provide clean, three part
+    strings as this has been what we've previously done in the past
+    and some external systems apparently rely on this format. While it's not
+    something we've officially commented on before, there is no real advantage
+    to us to change it so let's not try to tidy things up too much
+    considering some third party apps (e.g. Skype) seem to dislike a two
+    part version string.
+
+diff --git a/src/pulse/context.c b/src/pulse/context.c
+index 25d04a1..af144aa 100644
+--- a/src/pulse/context.c
++++ b/src/pulse/context.c
+@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
+ }
+
+ const char* pa_get_library_version(void) {
+-    return PACKAGE_VERSION;
++    return pa_get_headers_version();
+ }
+
+ const char* pa_context_get_server(pa_context *c) {
+diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
+index 7e00c5e..1be4c75 100644
+--- a/src/pulse/version.h.in
++++ b/src/pulse/version.h.in
+@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
+ /** Return the version of the header files. Keep in mind that this is
+ a macro and not a function, so it is impossible to get the pointer of
+ it. */
+-#define pa_get_headers_version() ("@PACKAGE_VERSION@")
++#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0")
+
+ /** Return the version of the library the current application is
+  * linked to. */