[arch-commits] Commit in lib32-libcanberra/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, May 7, 2020 @ 17:38:49
  Author: heftig
Revision: 625453

0.30+2+gc0620e4-3

Modified:
  lib32-libcanberra/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-07 17:03:27 UTC (rev 625452)
+++ PKGBUILD	2020-05-07 17:38:49 UTC (rev 625453)
@@ -1,16 +1,15 @@
 # Maintainer: Florian Pritz <flo at xssn.at>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
-_pkgbasename=libcanberra
-pkgbase=lib32-$_pkgbasename
+pkgbase=lib32-libcanberra
 pkgname=(lib32-libcanberra lib32-libcanberra-pulse lib32-libcanberra-gstreamer)
 pkgver=0.30+2+gc0620e4
-pkgrel=1
+pkgrel=3
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)"
 arch=(x86_64)
 license=(LGPL)
-depends=(lib32-libvorbis lib32-libltdl lib32-alsa-lib lib32-tdb $_pkgbasename)
-makedepends=(gtk-doc lib32-libpulse lib32-gstreamer lib32-gtk2 lib32-gtk3 git gcc-multilib libtool-multilib)
+depends=(lib32-libvorbis lib32-libltdl lib32-alsa-lib lib32-tdb libcanberra)
+makedepends=(gtk-doc lib32-libpulse lib32-gstreamer lib32-gtk2 lib32-gtk3 git)
 options=(!emptydirs libtool)
 url="http://0pointer.de/lennart/projects/libcanberra"
 _commit=c0620e432650e81062c1967cc669829dbd29b310  # master
@@ -17,26 +16,27 @@
 source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit")
 sha256sums=('SKIP')
 
-_plugindir=usr/lib32/$_pkgbasename-0.30
+_plugindir=usr/lib32/libcanberra-0.30
 
 pkgver() {
-  cd $_pkgbasename
+  cd libcanberra
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
 prepare() {
-  cd $_pkgbasename
+  cd libcanberra
   ./autogen.sh
 }
 
 build() {
-  cd $_pkgbasename
+  cd libcanberra
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var --libdir=/usr/lib32 \
+  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
+      --libdir=/usr/lib32 \
       --disable-static --with-builtin=dso --enable-null --disable-oss \
       --enable-alsa --enable-gstreamer --enable-pulse \
       --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc
@@ -46,9 +46,11 @@
 }
 
 package_lib32-libcanberra() {
-  optdepends=("$pkgbase-pulse: PulseAudio driver")
+  optdepends=("$pkgbase-pulse: PulseAudio driver"
+              "$pkgbase-gstreamer: GStreamer driver")
+  provides=(libcanberra{,-gtk,-gtk3}.so)
 
-  cd $_pkgbasename
+  cd libcanberra
 
   make -j1 DESTDIR="$pkgdir" install
   rm "$pkgdir"/usr/lib32/libcanberra-gtk*.la