Add libpulse to provides & conflicts; additionally depend on libsndfile

2 files changed, 20 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4051ee754c7..b4d560b85f8c 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pulseaudio-git
 	pkgdesc = A featureful, general-purpose sound server (development version)
-	pkgver = v12.0.309.geadd987a6
-	pkgrel = 2
+	pkgver = v13.99.1.35.g1778f76c7
+	pkgrel = 1
 	url = http://pulseaudio.org/
 	arch = i686
 	arch = x86_64
@@ -10,26 +10,20 @@ pkgbase = pulseaudio-git
 	license = LGPL
 	makedepends = git
 	makedepends = libasyncns
-	makedepends = libcap
 	makedepends = libxtst
-	makedepends = libsm
-	makedepends = libsndfile
 	makedepends = libtool
 	makedepends = libsoxr
+	makedepends = libsndfile
 	makedepends = attr
 	makedepends = rtkit
 	makedepends = speexdsp
 	makedepends = tdb
-	makedepends = systemd
 	makedepends = jack2
-	makedepends = dbus
-	makedepends = avahi
 	makedepends = bluez
 	makedepends = bluez-libs
 	makedepends = intltool
 	makedepends = sbc
 	makedepends = lirc
-	makedepends = openssl
 	makedepends = fftw
 	makedepends = orc
 	makedepends = gtk3
@@ -39,9 +33,7 @@ pkgbase = pulseaudio-git
 	depends = libltdl
 	depends = libsoxr
 	depends = libasyncns
-	depends = libcap
 	depends = libxtst
-	depends = libsm
 	depends = libsndfile
 	depends = rtkit
 	depends = speexdsp
@@ -49,10 +41,6 @@ pkgbase = pulseaudio-git
 	depends = orc
 	depends = webrtc-audio-processing
 	depends = jack2
-	depends = dbus
-	depends = systemd
-	depends = avahi
-	depends = openssl
 	depends = lirc
 	depends = bluez
 	depends = bluez-libs
@@ -61,6 +49,7 @@ pkgbase = pulseaudio-git
 	depends = python-dbus
 	depends = python-sip
 	depends = fftw
+	depends = dconf
 	optdepends = alsa-plugins: ALSA support
 	optdepends = pulseaudio-alsa: ALSA configuration (recommended)
 	optdepends = lirc-utils: infra-red support
@@ -71,6 +60,9 @@ pkgbase = pulseaudio-git
 	provides = pulseaudio-bluetooth
 	provides = pulseaudio-equalizer
 	provides = libpulse
+	provides = libpulse.so
+	provides = libpulse-simple.so
+	provides = libpulse-mainloop-glib.so
 	conflicts = pulseaudio
 	conflicts = pulseaudio-zeroconf
 	conflicts = pulseaudio-lirc
@@ -78,6 +70,9 @@ pkgbase = pulseaudio-git
 	conflicts = pulseaudio-bluetooth
 	conflicts = pulseaudio-equalizer
 	conflicts = libpulse
+	conflicts = libpulse.so
+	conflicts = libpulse-simple.so
+	conflicts = libpulse-mainloop-glib.so
 	options = !emptydirs
 	backup = etc/pulse/daemon.conf
 	backup = etc/pulse/default.pa
diff --git a/PKGBUILD b/PKGBUILD
index d3583251c778..6acd6c347ea3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,24 +10,23 @@
 _pkgname="pulseaudio"
 pkgname="$_pkgname-git"
 pkgdesc="A featureful, general-purpose sound server (development version)"
-pkgver=v12.0.309.geadd987a6
-pkgrel=2
+pkgver=v13.99.1.35.g1778f76c7
+pkgrel=1
 arch=("i686" "x86_64" "armv7h")
 url="http://pulseaudio.org/"
 license=("GPL" "LGPL")
-depends=(lib{ltdl,soxr,asyncns,cap,xtst,sm,sndfile} "rtkit" "speexdsp" "tdb"
-         "orc" "webrtc-audio-processing" jack2 dbus "systemd" "avahi" "openssl"
-         "lirc" bluez{,-libs} "sbc" python-{pyqt5,dbus,sip} "fftw") #json-c
-makedepends=("git" lib{asyncns,cap,xtst,sm,sndfile,tool,soxr} "attr" "rtkit"
-             "speexdsp" "tdb" "systemd" jack2 dbus "avahi" bluez{,-libs}
-             "intltool"  "sbc" "lirc" "openssl" "fftw" "orc" "gtk3"
-             "webrtc-audio-processing" "check" "autoconf-archive") #gconf
+depends=(lib{ltdl,soxr,asyncns,xtst,sndfile} "rtkit" "speexdsp" "tdb" "orc"
+         "webrtc-audio-processing" jack2 "lirc" bluez{,-libs} "sbc"
+         python-{pyqt5,dbus,sip} "fftw" dconf)
+makedepends=("git" lib{asyncns,xtst,tool,soxr,sndfile} "attr" "rtkit" "speexdsp"
+             "tdb" jack2 bluez{,-libs} "intltool"  "sbc" "lirc" "fftw"
+             "orc" "gtk3" "webrtc-audio-processing" "check" "autoconf-archive")
 optdepends=("alsa-plugins: ALSA support"
             "pulseaudio-alsa: ALSA configuration (recommended)"
             "lirc-utils: infra-red support")
 backup=(etc/pulse/{daemon.conf,default.pa,system.pa,client.conf})
-provides=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse") #"pulseaudio-xen" "pulseaudio-gconf"
-conflicts=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse") #"pulseaudio-xen" "pulseaudio-gconf"
+provides=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse" libpulse{,-{simple,mainloop-glib}}.so)
+conflicts=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse" libpulse{,-{simple,mainloop-glib}}.so)
 options=(!emptydirs)
 source=("git+git://anongit.freedesktop.org/pulseaudio/pulseaudio")
 sha256sums=('SKIP')