From 14b8ab611aa64d36f78343b264818d004b364638 Mon Sep 17 00:00:00 2001
From: heftig <heftig@9fca08f4-af9d-4005-b8df-a31f2cc04f65>
Date: Sat, 1 Oct 2011 13:45:45 +0000
Subject: [PATCH] archrelease: copy trunk to multilib-testing-x86_64
git-svn-id: file:///srv/repos/svn-community/svn@56102 9fca08f4-af9d-4005-b8df-a31f2cc04f65
---
repos/multilib-testing-x86_64/PKGBUILD | 10 +++--
.../version-number.patch | 40 +++++++++++++++++++
2 files changed, 47 insertions(+), 3 deletions(-)
create mode 100644 repos/multilib-testing-x86_64/version-number.patch
diff --git a/repos/multilib-testing-x86_64/PKGBUILD b/repos/multilib-testing-x86_64/PKGBUILD
index 889cf69..53efeb8 100644
--- a/repos/multilib-testing-x86_64/PKGBUILD
+++ b/repos/multilib-testing-x86_64/PKGBUILD
@@ -8,7 +8,7 @@ _pkgbasename=libpulse
pkgname=lib32-$_pkgbasename
pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)"
pkgver=1.0
-pkgrel=1
+pkgrel=2
arch=(x86_64)
url="http://pulseaudio.org/"
license=(GPL LGPL)
@@ -21,14 +21,18 @@ provides=("lib32-pulseaudio=$pkgver")
conflicts=(lib32-pulseaudio)
replaces=(lib32-pulseaudio)
options=(!emptydirs !libtool !makeflags)
-source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz")
-sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be')
+source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz"
+ version-number.patch)
+sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be'
+ '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530')
_libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la"
build() {
cd "$srcdir/pulseaudio-$pkgver"
+ patch -Np1 -i "$srcdir/version-number.patch"
+
export CC="gcc -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
diff --git a/repos/multilib-testing-x86_64/version-number.patch b/repos/multilib-testing-x86_64/version-number.patch
new file mode 100644
index 0000000..473b252
--- /dev/null
+++ b/repos/multilib-testing-x86_64/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. */
--
GitLab