diff options
author | SpineEyE | 2020-10-21 20:23:21 +0200 |
---|---|---|
committer | SpineEyE | 2020-10-21 20:23:21 +0200 |
commit | 514c9f393cb29f3befd1b4dce80e3c9b3ff56f26 (patch) | |
tree | 3be8f9c7597101e9fac1558c0c83409a920a5cee /PKGBUILD | |
parent | d73b7dd6e970a7e67bd8e7cd024e37ffa6d2d7bf (diff) | |
download | aur-514c9f393cb29f3befd1b4dce80e3c9b3ff56f26.tar.gz |
Use pali's MR 288 again instead of MarijnS95's branch
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -4,8 +4,8 @@ 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=13.99.2+85+g95460f49e -pkgrel=2 +pkgver=13.99.2+96+gbb7408dfa +pkgrel=1 arch=(x86_64) url="https://www.freedesktop.org/wiki/Software/PulseAudio/" license=(GPL) @@ -25,13 +25,13 @@ pkgver() { prepare() { cd pulseaudio - git fetch "https://gitlab.freedesktop.org/MarijnS95/pulseaudio.git" "absolute-volume-on-hsphfpd" - git checkout -B "MarijnS95/pulseaudio-absolute-volume-on-hsphfpd" FETCH_HEAD - git checkout master - git merge --ff -m "Merge branch 'MarijnS95/pulseaudio-absolute-volume-on-hsphfpd' into master" "MarijnS95/pulseaudio-absolute-volume-on-hsphfpd" - # 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" } build() { |