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

2020-05-07 Thread Jan Steffens via arch-commits
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
===
--- PKGBUILD2020-05-07 17:03:27 UTC (rev 625452)
+++ PKGBUILD2020-05-07 17:38:49 UTC (rev 625453)
@@ -1,16 +1,15 @@
 # Maintainer: Florian Pritz 
 # Contributor: Jan de Groot 
 
-_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


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

2018-02-25 Thread Jan Steffens via arch-commits
Date: Sunday, February 25, 2018 @ 18:49:53
  Author: heftig
Revision: 298054

0.30+2+gc0620e4-1

Modified:
  lib32-libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   44 
 1 file changed, 28 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-25 18:32:13 UTC (rev 298053)
+++ PKGBUILD2018-02-25 18:49:53 UTC (rev 298054)
@@ -4,21 +4,27 @@
 
 _pkgbasename=libcanberra
 pkgbase=lib32-$_pkgbasename
-pkgname=(lib32-libcanberra lib32-libcanberra-pulse)
-pkgver=0.30
-pkgrel=4
+pkgname=(lib32-libcanberra lib32-libcanberra-pulse lib32-libcanberra-gstreamer)
+pkgver=0.30+2+gc0620e4
+pkgrel=1
 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-gtk2 git gcc-multilib 
libtool-multilib)
+makedepends=(gtk-doc lib32-libpulse lib32-gstreamer lib32-gtk2 lib32-gtk3 git 
gcc-multilib libtool-multilib)
 options=(!emptydirs libtool)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4")
+url="http://0pointer.de/lennart/projects/libcanberra";
+_commit=c0620e432650e81062c1967cc669829dbd29b310  # master
+source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit";)
 sha256sums=('SKIP')
 
-_plugindir=usr/lib32/$_pkgbasename-$pkgver
+_plugindir=usr/lib32/$_pkgbasename-0.30
 
+pkgver() {
+  cd $_pkgbasename
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
 prepare() {
   cd $_pkgbasename
   ./autogen.sh
@@ -31,14 +37,12 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
+  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var 
--libdir=/usr/lib32 \
   --disable-static --with-builtin=dso --enable-null --disable-oss \
-  --enable-alsa --disable-gstreamer --enable-pulse \
-  --disable-udev --libdir=/usr/lib32
+  --enable-alsa --enable-gstreamer --enable-pulse \
+  --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc
 
-  # Fight unused direct deps
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test 
"$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/  
func_append compile_command " -Wl,-O1,--as-needed"\n  func_append 
finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
@@ -49,15 +53,15 @@
 
   make -j1 DESTDIR="$pkgdir" install
   rm "$pkgdir"/usr/lib32/libcanberra-gtk*.la
-  rm "$pkgdir"/usr/lib32/gtk-2.0/modules/*.la
+  rm "$pkgdir"/usr/lib32/gtk-{2,3}.0/modules/*.la
 
   # Split plugins
-  for _p in pulse; do
+  for _p in pulse gstreamer; do
 mkdir ../$_p-plugin
 mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin
   done
 
-  rm -r "$pkgdir"/usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}
+  rm -r "$pkgdir"/usr/{include,share,bin,lib,lib32/gnome-settings-daemon-3.0}
   rm "$pkgdir"/usr/lib32/*.la
 }
 
@@ -68,3 +72,11 @@
   install -d "$pkgdir/$_plugindir"
   mv pulse-plugin/* "$pkgdir/$_plugindir"
 }
+
+package_lib32-libcanberra-gstreamer() {
+  pkgdesc="GStreamer plugin for libcanberra (32-bit)"
+  depends=("$pkgbase=$pkgver-$pkgrel" lib32-gstreamer)
+
+  install -d "$pkgdir/$_plugindir"
+  mv gstreamer-plugin/* "$pkgdir/$_plugindir"
+}


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

2013-10-20 Thread Jan Steffens
Date: Monday, October 21, 2013 @ 04:42:52
  Author: heftig
Revision: 98884

libtool

Modified:
  lib32-libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 02:39:46 UTC (rev 98883)
+++ PKGBUILD2013-10-21 02:42:52 UTC (rev 98884)
@@ -12,7 +12,7 @@
 license=(LGPL)
 depends=(lib32-libvorbis lib32-libltdl lib32-alsa-lib lib32-tdb $_pkgbasename)
 makedepends=(gtk-doc lib32-libpulse lib32-gtk2 git gcc-multilib 
libtool-multilib)
-options=(!emptydirs)
+options=(!emptydirs libtool)
 url=http://0pointer.de/lennart/projects/libcanberra
 source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4")
 sha256sums=('SKIP')
@@ -57,7 +57,8 @@
 mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin
   done
 
-  rm -r "${pkgdir}"/usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}
+  rm -r "$pkgdir"/usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}
+  rm "$pkgdir"/usr/lib32/*.la
 }
 
 package_lib32-libcanberra-pulse() {



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

2013-06-07 Thread Jan Steffens
Date: Friday, June 7, 2013 @ 20:13:48
  Author: heftig
Revision: 92534

bump to git

Modified:
  lib32-libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-07 17:52:43 UTC (rev 92533)
+++ PKGBUILD2013-06-07 18:13:48 UTC (rev 92534)
@@ -6,21 +6,26 @@
 pkgbase=lib32-$_pkgbasename
 pkgname=(lib32-libcanberra lib32-libcanberra-pulse)
 pkgver=0.30
-pkgrel=2
+pkgrel=4
 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-gtk2 gcc-multilib libtool-multilib)
+makedepends=(gtk-doc lib32-libpulse lib32-gtk2 git gcc-multilib 
libtool-multilib)
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
-source=("$url/$_pkgbasename-$pkgver.tar.xz")
-sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72')
+source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4")
+sha256sums=('SKIP')
 
 _plugindir=usr/lib32/$_pkgbasename-$pkgver
 
+prepare() {
+  cd $_pkgbasename
+  ./autogen.sh
+}
+
 build() {
-  cd $_pkgbasename-$pkgver
+  cd $_pkgbasename
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -40,7 +45,7 @@
 package_lib32-libcanberra() {
   optdepends=("$pkgbase-pulse: PulseAudio driver")
 
-  cd $_pkgbasename-$pkgver
+  cd $_pkgbasename
 
   make -j1 DESTDIR="$pkgdir" install
   rm "$pkgdir"/usr/lib32/libcanberra-gtk*.la