Sun Oct 2 23:14:32 UTC 2011

3 files changed, 86 insertions, 10 deletions

diff --git a/multilib/lib32-json-c/PKGBUILD b/multilib/lib32-json-c/PKGBUILD
new file mode 100644
index 000000000..07670938e
--- /dev/null
+++ b/multilib/lib32-json-c/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# Contributor: congyiwu <congyiwu AT gmail DOT com>
+
+_pkgbasename=json-c
+pkgname=lib32-$_pkgbasename
+pkgver=0.9
+pkgrel=1
+pkgdesc="A JSON implementation in C (32-bit)"
+url="http://oss.metaparadigm.com/json-c/"
+license=("MIT")
+arch=('x86_64')
+depends=('lib32-glibc' $_pkgbasename)
+makedepends=('gcc-multilib' 'libtool-multilib')
+source=(http://oss.metaparadigm.com/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
+md5sums=('3a13d264528dcbaf3931b0cede24abae')
+options=(!libtool)
+build() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  export CC="gcc -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  rm -r "$pkgdir/usr/include"
+
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD
index 19c66f4e8..f28519744 100644
--- a/multilib/lib32-libpulse/PKGBUILD
+++ b/multilib/lib32-libpulse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50076 2011-06-23 23:49:52Z heftig $
+# $Id: PKGBUILD 56113 2011-10-01 19:03:08Z ibiru $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -7,13 +7,13 @@
 _pkgbasename=libpulse
 pkgname=lib32-$_pkgbasename
 pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)"
-pkgver=0.9.23
-pkgrel=1
+pkgver=1.0
+pkgrel=2
 arch=(x86_64)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
-depends=(lib32-{dbus-core,xcb-util}
-         lib32-lib{asyncns,cap,xtst,sm,sndfile}
+depends=(lib32-dbus-core lib32-xcb-util lib32-json-c 
+         lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsamplerate
          $_pkgbasename)
 makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex)
 optdepends=('lib32-alsa-plugins: ALSA support')
@@ -21,17 +21,17 @@ provides=("lib32-pulseaudio=$pkgver")
 conflicts=(lib32-pulseaudio)
 replaces=(lib32-pulseaudio)
 options=(!emptydirs !libtool !makeflags)
-source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.gz")
-md5sums=('7391205a337d1e04a9ff38025f684034')
+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"
 
-  # Don't break circular dependency between libpulse and libpulsecommon
-  LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-
+  patch -Np1 -i "$srcdir/version-number.patch"
 
   export CC="gcc -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
diff --git a/multilib/lib32-libpulse/version-number.patch b/multilib/lib32-libpulse/version-number.patch
new file mode 100644
index 000000000..473b252a9
--- /dev/null
+++ b/multilib/lib32-libpulse/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. */