From 09433d715e727491e4aaea88546c960e339b0419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 9 May 2021 19:18:29 -0300 Subject: [PATCH] pipewire: use >= for version constraints. Using ${pkgname}-${version}_${revision} can be ambiguous, since it can be interpreted as the package's actual name. Using ${pkgname}>=${version}_${revision} is preferred. Since we are here, make depends for pipewire itself also require specific versions of the libspa-* packages. --- srcpkgs/pipewire/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 7ed96573fbb..fb5c149e8a4 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire version=0.3.26 -revision=1 +revision=2 build_style=meson configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled @@ -10,7 +10,8 @@ hostmakedepends="doxygen graphviz pkg-config xmltoman gettext" makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)" -depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control" +depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision} + libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision}" short_desc="Server and user space API to deal with multimedia pipelines" maintainer="Kridsada Thanabulpong " license="MIT" @@ -47,7 +48,7 @@ libpipewire_package() { } pipewire-devel_package() { - depends="libpipewire-${version}_${revision}" + depends="libpipewire>=${version}_${revision}" short_desc+=" - pipewire and libspa development files" pkg_install() { vmove usr/include/pipewire-0.3 @@ -136,7 +137,7 @@ gstreamer1-pipewire_package() { } alsa-pipewire_package() { - depends="libpipewire-${version}_${revision}" + depends="libpipewire>=${version}_${revision}" short_desc+=" - ALSA client library" pkg_install() { vmove usr/lib/alsa-lib @@ -145,7 +146,7 @@ alsa-pipewire_package() { } libjack-pipewire_package() { - depends="libpipewire-${version}_${revision}" + depends="libpipewire>=${version}_${revision}" short_desc+=" - JACK client library" pkg_install() { vmove usr/lib/pipewire-0.3/jack