Date: Wednesday, June 23, 2021 @ 19:49:16 Author: heftig Revision: 967129
archrelease: copy trunk to multilib-x86_64 Added: lib32-libcanberra/repos/multilib-x86_64/PKGBUILD (from rev 967128, lib32-libcanberra/trunk/PKGBUILD) lib32-libcanberra/repos/multilib-x86_64/libcanberra-multi-backend.patch (from rev 967128, lib32-libcanberra/trunk/libcanberra-multi-backend.patch) Deleted: lib32-libcanberra/repos/multilib-x86_64/PKGBUILD ---------------------------------+ PKGBUILD | 123 ++++++++++++++++++++------------------ libcanberra-multi-backend.patch | 26 ++++++++ 2 files changed, 91 insertions(+), 58 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-06-23 19:48:37 UTC (rev 967128) +++ PKGBUILD 2021-06-23 19:49:16 UTC (rev 967129) @@ -1,58 +0,0 @@ -# Maintainer: Florian Pritz <f...@xssn.at> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=lib32-libcanberra -pkgver=0.30+2+gc0620e4 -pkgrel=4 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)" -url="http://0pointer.de/lennart/projects/libcanberra" -arch=(x86_64) -license=(LGPL) -depends=(lib32-libvorbis lib32-libltdl lib32-alsa-lib lib32-libpulse lib32-tdb - libcanberra) -makedepends=(gtk-doc lib32-gtk2 lib32-gtk3 git) -provides=("lib32-libcanberra-pulse=$pkgver-$pkgrel" libcanberra{,-gtk,-gtk3}.so) -replaces=("lib32-libcanberra-pulse<0.30+2+gc0620e4-4") -options=(libtool) -_commit=c0620e432650e81062c1967cc669829dbd29b310 # master -source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit") -sha256sums=('SKIP') - -pkgver() { - cd libcanberra - git describe --tags | sed 's/^v//;s/-/+/g' -} - -prepare() { - cd libcanberra - ./autogen.sh -} - -build() { - cd libcanberra - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG=i686-pc-linux-gnu-pkg-config - - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ - --libdir=/usr/lib32 \ - --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package_lib32-libcanberra() { - cd libcanberra - - make -j1 DESTDIR="$pkgdir" install - - rm "$pkgdir"/usr/lib32/*.la - rm "$pkgdir"/usr/lib32/gtk-{2,3}.0/modules/*.la - - rm -r "$pkgdir"/usr/{include,share,bin,lib,lib32/gnome-settings-daemon-3.0} -} - -# vim:set sw=2 et: Copied: lib32-libcanberra/repos/multilib-x86_64/PKGBUILD (from rev 967128, lib32-libcanberra/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-06-23 19:49:16 UTC (rev 967129) @@ -0,0 +1,65 @@ +# Maintainer: Florian Pritz <f...@xssn.at> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=lib32-libcanberra +pkgver=0.30+2+gc0620e4 +pkgrel=5 +pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)" +url="http://0pointer.de/lennart/projects/libcanberra" +arch=(x86_64) +license=(LGPL) +depends=(lib32-libvorbis lib32-libltdl lib32-alsa-lib lib32-libpulse lib32-tdb + libcanberra) +makedepends=(gtk-doc lib32-gtk2 lib32-gtk3 git) +provides=("lib32-libcanberra-pulse=$pkgver-$pkgrel" libcanberra{,-gtk,-gtk3}.so) +replaces=("lib32-libcanberra-pulse<0.30+2+gc0620e4-4") +options=(libtool) +_commit=c0620e432650e81062c1967cc669829dbd29b310 # master +source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit" + libcanberra-multi-backend.patch) +sha256sums=('SKIP' + 'de146cae3e40a16b38c8edb4f1a3a423c64eb9c5000e36c316b677e9909c9b06') + +pkgver() { + cd libcanberra + git describe --tags | sed 's/^v//;s/-/+/g' +} + +prepare() { + cd libcanberra + + # https://bugs.archlinux.org/task/71341 + # https://bugs.freedesktop.org/show_bug.cgi?id=51662 + patch -Np1 -i ../libcanberra-multi-backend.patch + + ./autogen.sh +} + +build() { + cd libcanberra + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG=i686-pc-linux-gnu-pkg-config + + ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ + --libdir=/usr/lib32 \ + --disable-static --with-builtin=dso --enable-null --disable-oss \ + --enable-alsa --enable-pulse \ + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package_lib32-libcanberra() { + cd libcanberra + + make -j1 DESTDIR="$pkgdir" install + + rm "$pkgdir"/usr/lib32/*.la + rm "$pkgdir"/usr/lib32/gtk-{2,3}.0/modules/*.la + + rm -r "$pkgdir"/usr/{include,share,bin,lib,lib32/gnome-settings-daemon-3.0} +} + +# vim:set sw=2 et: Copied: lib32-libcanberra/repos/multilib-x86_64/libcanberra-multi-backend.patch (from rev 967128, lib32-libcanberra/trunk/libcanberra-multi-backend.patch) =================================================================== --- libcanberra-multi-backend.patch (rev 0) +++ libcanberra-multi-backend.patch 2021-06-23 19:49:16 UTC (rev 967129) @@ -0,0 +1,26 @@ +Index: libcanberra-0.29/src/driver-order.c +=================================================================== +--- libcanberra-0.29.orig/src/driver-order.c ++++ libcanberra-0.29/src/driver-order.c +@@ -30,6 +30,7 @@ + #include "driver-order.h" + + const char* const ca_driver_order[] = { ++ "multi", + #ifdef HAVE_PULSE + "pulse", + #endif +Index: libcanberra-0.29/src/multi.c +=================================================================== +--- libcanberra-0.29.orig/src/multi.c ++++ libcanberra-0.29/src/multi.c +@@ -107,8 +107,7 @@ int driver_open(ca_context *c) { + int ret = CA_SUCCESS; + + ca_return_val_if_fail(c, CA_ERROR_INVALID); +- ca_return_val_if_fail(c->driver, CA_ERROR_NODRIVER); +- ca_return_val_if_fail(!strncmp(c->driver, "multi", 5), CA_ERROR_NODRIVER); ++ ca_return_val_if_fail(!c->driver || strncmp(c->driver, "multi", 5) == 0, CA_ERROR_NODRIVER); + ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE); + + if (!(c->private = p = ca_new0(struct private, 1)))