use mirror/fork from kapiwko

2 files changed, 25 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffcc3b2371f5..9e962c7fbe45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pulseaudio-hsphfpd
 	pkgdesc = A fork of pulseaudio providing superior bluetooth headset functionality
-	pkgver = 14.0+116+gd2ea10877
+	pkgver = 14.0+137+gd3802d928
 	pkgrel = 1
 	url = https://www.freedesktop.org/wiki/Software/PulseAudio/
 	arch = x86_64
@@ -35,11 +35,13 @@ pkgbase = pulseaudio-hsphfpd
 	makedepends = gst-plugins-base-libs
 	makedepends = libopenaptx
 	source = git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=d1e0594e939e3309435c966d994b0207b10f5175
+	source = pa_hsphfpd::git+https://gitlab.freedesktop.org/kapiwko/pulseaudio.git#branch=hsphfpd
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = pulseaudio-hsphfpd
 	install = pulseaudio.install
-	depends = libpulse-hsphfpd=14.0+116+gd2ea10877-1
+	depends = libpulse-hsphfpd=14.0+137+gd3802d928-1
 	depends = alsa-card-profiles
 	depends = rtkit
 	depends = libltdl
@@ -56,7 +58,7 @@ pkgname = pulseaudio-hsphfpd
 	optdepends = pulseaudio-bluetooth-hsphfpd: Bluetooth support
 	optdepends = pulseaudio-equalizer-hsphfpd: Graphical equalizer
 	optdepends = pulseaudio-rtp-hsphfpd: RTP and RAOP support
-	provides = pulseaudio=14.0+116+gd2ea10877-1
+	provides = pulseaudio=14.0+137+gd3802d928-1
 	conflicts = pulseaudio
 	replaces = pulseaudio-xen<=9.0
 	replaces = pulseaudio-gconf<=11.1
@@ -78,57 +80,56 @@ pkgname = libpulse-hsphfpd
 	provides = libpulse.so
 	provides = libpulse-simple.so
 	provides = libpulse-mainloop-glib.so
-	provides = libpulse=14.0+116+gd2ea10877-1
+	provides = libpulse=14.0+137+gd3802d928-1
 	conflicts = libpulse
 	backup = etc/pulse/client.conf
 
 pkgname = alsa-card-profiles-hsphfpd
 	pkgdesc = ALSA card profiles shared by PulseAudio
 	license = LGPL
-	provides = alsa-card-profiles=14.0+116+gd2ea10877-1
+	provides = alsa-card-profiles=14.0+137+gd3802d928-1
 	conflicts = alsa-card-profiles
 
 pkgname = pulseaudio-zeroconf-hsphfpd
 	pkgdesc = Zeroconf support for PulseAudio
-	depends = pulseaudio-hsphfpd=14.0+116+gd2ea10877-1
+	depends = pulseaudio-hsphfpd=14.0+137+gd3802d928-1
 	depends = avahi
 	depends = openssl
-	provides = pulseaudio-zeroconf=14.0+116+gd2ea10877-1
+	provides = pulseaudio-zeroconf=14.0+137+gd3802d928-1
 	conflicts = pulseaudio-zeroconf
 
 pkgname = pulseaudio-lirc-hsphfpd
 	pkgdesc = IR (lirc) support for PulseAudio
-	depends = pulseaudio-hsphfpd=14.0+116+gd2ea10877-1
+	depends = pulseaudio-hsphfpd=14.0+137+gd3802d928-1
 	depends = lirc
-	provides = pulseaudio-lirc=14.0+116+gd2ea10877-1
+	provides = pulseaudio-lirc=14.0+137+gd3802d928-1
 	conflicts = pulseaudio-lirc
 
 pkgname = pulseaudio-jack-hsphfpd
 	pkgdesc = Jack support for PulseAudio
-	depends = pulseaudio-hsphfpd=14.0+116+gd2ea10877-1
+	depends = pulseaudio-hsphfpd=14.0+137+gd3802d928-1
 	depends = jack
-	provides = pulseaudio-jack=14.0+116+gd2ea10877-1
+	provides = pulseaudio-jack=14.0+137+gd3802d928-1
 	conflicts = pulseaudio-jack
 
 pkgname = pulseaudio-bluetooth-hsphfpd
 	pkgdesc = Bluetooth support for PulseAudio
-	depends = pulseaudio-hsphfpd=14.0+116+gd2ea10877-1
+	depends = pulseaudio-hsphfpd=14.0+137+gd3802d928-1
 	depends = bluez
 	depends = bluez-libs
 	depends = sbc
-	provides = pulseaudio-bluetooth=14.0+116+gd2ea10877-1
+	provides = pulseaudio-bluetooth=14.0+137+gd3802d928-1
 	conflicts = pulseaudio-bluetooth
 
 pkgname = pulseaudio-equalizer-hsphfpd
 	pkgdesc = Graphical equalizer for PulseAudio
-	depends = pulseaudio-hsphfpd=14.0+116+gd2ea10877-1
+	depends = pulseaudio-hsphfpd=14.0+137+gd3802d928-1
 	depends = python-pyqt5
 	depends = python-dbus
 	depends = fftw
-	provides = pulseaudio-equalizer=14.0+116+gd2ea10877-1
+	provides = pulseaudio-equalizer=14.0+137+gd3802d928-1
 	conflicts = pulseaudio-equalizer
 
 pkgname = pulseaudio-rtp-hsphfpd
 	pkgdesc = RTP and RAOP support for PulseAudio
-	depends = pulseaudio=14.0+116+gd2ea10877-1
-
+	depends = pulseaudio=14.0+137+gd3802d928-1
diff --git a/PKGBUILD b/PKGBUILD
index 7933e8f79350..9a4555ffd319 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=pulseaudio-hsphfpd
 pkgname=(pulseaudio-hsphfpd libpulse-hsphfpd alsa-card-profiles-hsphfpd pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp}-hsphfpd)
 pkgdesc="A fork of pulseaudio providing superior bluetooth headset functionality"
-pkgver=14.0+116+gd2ea10877
+pkgver=14.0+137+gd3802d928
 pkgrel=1
 arch=(x86_64)
 url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -14,8 +14,9 @@ makedepends=(libasyncns libcap attr libxtst libsm libsndfile rtkit libsoxr
              lirc openssl fftw orc gtk3 webrtc-audio-processing check git meson
              xmltoman gst-plugins-base-libs libopenaptx)
 _commit=d1e0594e939e3309435c966d994b0207b10f5175  # tags/v14.0^0
-source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit"
+        "pa_hsphfpd::git+https://gitlab.freedesktop.org/kapiwko/pulseaudio.git#branch=hsphfpd")
+sha256sums=('SKIP' 'SKIP')
 
 pkgver() {
   cd pulseaudio
@@ -27,11 +28,9 @@ prepare() {
 
   # Freeze version before patching
   ./git-version-gen doesnt-exist >.tarball-version
-
-  git fetch "https://gitlab.freedesktop.org/pali/pulseaudio.git" "hsphfpd"
-  git checkout -B "pali/hsphfpd" FETCH_HEAD
-  git checkout master
-  git merge --ff -m "Merge branch 'pali/hsphfpd' into master" "pali/hsphfpd"
+ 
+  # Merge from pali
+  git pull --strategy=recursive --no-edit ../pa_hsphfpd
 }
 
 build() {