Skip to content
Snippets Groups Projects
Commit 203a0418 authored by heftig's avatar heftig
Browse files

archrelease: copy trunk to multilib-x86_64

git-svn-id: file:///srv/repos/svn-community/svn@57069 9fca08f4-af9d-4005-b8df-a31f2cc04f65
parent fd101c99
No related branches found
No related tags found
No related merge requests found
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
_pkgbasename=libpulse _pkgbasename=libpulse
pkgname=lib32-$_pkgbasename pkgname=lib32-$_pkgbasename
pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)" pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)"
pkgver=1.0 pkgver=1.1
pkgrel=2 pkgrel=1
arch=(x86_64) arch=(x86_64)
url="http://pulseaudio.org/" url="http://pulseaudio.org/"
license=(GPL LGPL) license=(GPL LGPL)
depends=(lib32-dbus-core lib32-xcb-util lib32-json-c depends=(lib32-dbus-core lib32-xcb-util lib32-json-c
lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsamplerate lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsndfile
$_pkgbasename) $_pkgbasename)
makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex) makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex)
optdepends=('lib32-alsa-plugins: ALSA support') optdepends=('lib32-alsa-plugins: ALSA support')
...@@ -21,19 +21,16 @@ provides=("lib32-pulseaudio=$pkgver") ...@@ -21,19 +21,16 @@ provides=("lib32-pulseaudio=$pkgver")
conflicts=(lib32-pulseaudio) conflicts=(lib32-pulseaudio)
replaces=(lib32-pulseaudio) replaces=(lib32-pulseaudio)
options=(!emptydirs !libtool !makeflags) options=(!emptydirs !libtool !makeflags)
source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz" source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz")
version-number.patch) sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee')
sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be'
'6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530')
_libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la" _libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la"
build() { build() {
cd "$srcdir/pulseaudio-$pkgver" cd "$srcdir/pulseaudio-$pkgver"
patch -Np1 -i "$srcdir/version-number.patch"
export CC="gcc -m32" export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
./configure --prefix=/usr \ ./configure --prefix=/usr \
......
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. */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment