diff --git a/pulseaudio-modules-bt/.SRCINFO b/pulseaudio-modules-bt/.SRCINFO index a9270d6..3abc170 100644 --- a/pulseaudio-modules-bt/.SRCINFO +++ b/pulseaudio-modules-bt/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = pulseaudio-modules-bt pkgdesc = PulseAudio Bluetooth modules with SBC, AAC, APTX, APTX-HD, Sony LDAC (A2DP codec) support - pkgver = 1.4_14.1 - pkgrel = 3 + pkgver = 1.4_14.2 + pkgrel = 8 url = https://github.com/EHfive/pulseaudio-modules-bt arch = i686 arch = x86_64 @@ -21,11 +21,10 @@ pkgbase = pulseaudio-modules-bt depends = libfdk-aac.so optdepends = libavcodec.so>=58: aptX Classic, aptX HD support optdepends = libldac: LDAC support - optdepends = pulseaudio=14.1: This package requires a specific PulseAudio version provides = pulseaudio-bluetooth conflicts = pulseaudio-bluetooth source = pulseaudio-modules-bt-1.4.zip::https://github.com/EHfive/pulseaudio-modules-bt/archive/v1.4.zip - source = pulseaudio-14.1.zip::https://github.com/pulseaudio/pulseaudio/archive/v14.1.zip + source = pulseaudio-14.2.zip::https://github.com/pulseaudio/pulseaudio/archive/v14.2.zip md5sums = 711a7f930321e56706acdb441de0e432 md5sums = SKIP sha512sums = 5c3ed59dec46a1a9cc2f359ac1d28a82a50a5dea47a268a10601b95a8e17a68dd00ba7628c429271349bae290f461abeb1a4a3715b1833c71d7f82f9a902fe2d diff --git a/pulseaudio-modules-bt/.gitignore b/pulseaudio-modules-bt/.gitignore index a28f6dd..a5cd469 100644 --- a/pulseaudio-modules-bt/.gitignore +++ b/pulseaudio-modules-bt/.gitignore @@ -2,3 +2,4 @@ *.pkg.tar.* src/ pkg/ +pulseaudio/ diff --git a/pulseaudio-modules-bt/.gitrepo b/pulseaudio-modules-bt/.gitrepo index 134de13..bd3513e 100644 --- a/pulseaudio-modules-bt/.gitrepo +++ b/pulseaudio-modules-bt/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://aur.archlinux.org/pulseaudio-modules-bt branch = master - commit = 904dc12671bb5eea007454e8f3561e41e315f24c - parent = c2bceeb87d82bf3da9423c459062a4c3620e9e47 + commit = 313a0a433a0014c4aebccfc926a43907bee06ecd + parent = 9f2cfb9fb528eeff8bc72ff8d0a828709f3455a8 method = merge cmdver = 0.4.3 diff --git a/pulseaudio-modules-bt/PKGBUILD b/pulseaudio-modules-bt/PKGBUILD index 6ab25dc..bc2afbb 100755 --- a/pulseaudio-modules-bt/PKGBUILD +++ b/pulseaudio-modules-bt/PKGBUILD @@ -1,27 +1,13 @@ # Maintainer : Yamada Hayao # Contributor: EHfive # Contributar: tleydxdy https://aur.archlinux.org/packages/pulseaudio-modules-bt/#comment-786420 - -#-- PulseAudio --# -pulseaudio_pkgname="pulseaudio" -if pacman -Qq "$(basename "${pulseaudio_pkgname}")" 2> "/dev/null" 1>&2; then - # If pulseaudio is installed, use the version of installed pulseaudio. - pulseaudio_ver="$(pacman -Q "$(basename "${pulseaudio_pkgname}")" | cut -d ' ' -f 2 | cut -d '-' -f 1)" -else - # If pulseaudio is not installed, use the version from offcial repository. - pulseaudio_ver="$(pacman -Sp --print-format '%v' "${pulseaudio_pkgname}" | cut -d '-' -f 1)" -fi - -# if it is failed to get the version of pulseaudio, use the hard coded one. -if [[ -z "${pulseaudio_ver}" ]]; then - pulseaudio_ver="14.1" -fi - +# Contributer: jonathon https://aur.archlinux.org/packages/pulseaudio-modules-bt/#comment-787490 pkgname="pulseaudio-modules-bt" +pulseaudio_ver="14.2" module_ver="1.4" +pkgrel="8" pkgver="${module_ver}_${pulseaudio_ver}" -pkgrel="3" pkgdesc="PulseAudio Bluetooth modules with SBC, AAC, APTX, APTX-HD, Sony LDAC (A2DP codec) support" arch=("i686" "x86_64" "arm" "armv6h" "armv7h" "aarch64") url="https://github.com/EHfive/pulseaudio-modules-bt" @@ -31,7 +17,7 @@ makedepends=("libpulse" "cmake>=3.0" "libavcodec.so>=58" "libldac") optdepends=( "libavcodec.so>=58: aptX Classic, aptX HD support" "libldac: LDAC support" - "pulseaudio=${pulseaudio_ver}: This package requires a specific PulseAudio version" +# "pulseaudio=${pulseaudio_ver}: This package requires a specific PulseAudio version" ) provides=("pulseaudio-bluetooth") conflicts=("pulseaudio-bluetooth") @@ -41,6 +27,7 @@ source=( "pulseaudio-${pulseaudio_ver}.zip::https://github.com/pulseaudio/pulseaudio/archive/v${pulseaudio_ver}.zip" ) + md5sums=( '711a7f930321e56706acdb441de0e432' 'SKIP' @@ -51,6 +38,7 @@ sha512sums=( "SKIP" ) + prepare() { cd "${srcdir}/pulseaudio-modules-bt-${module_ver}" rm -rf pa @@ -59,13 +47,18 @@ prepare() { build() { cd "${srcdir}/pulseaudio-modules-bt-${module_ver}" + rm -rf build + mkdir build + cd build cmake \ -DCMAKE_BUILD_TYPE=Release \ - . + -S .. \ + -B . \ + make } package() { - cd "$srcdir/pulseaudio-modules-bt-${module_ver}" + cd "${srcdir}/pulseaudio-modules-bt-${module_ver}/build" make DESTDIR="${pkgdir}" install }