Date: Tuesday, February 13, 2018 @ 14:01:02 Author: heftig Revision: 316761
3.0+31+g1d4280a-1 Modified: pavucontrol/trunk/PKGBUILD Deleted: pavucontrol/trunk/unavail.patch ---------------+ PKGBUILD | 14 ++++++++----- unavail.patch | 60 -------------------------------------------------------- 2 files changed, 9 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-13 14:00:56 UTC (rev 316760) +++ PKGBUILD 2018-02-13 14:01:02 UTC (rev 316761) @@ -6,8 +6,8 @@ pkgname=pavucontrol pkgdesc="PulseAudio Volume Control" -pkgver=3.0 -pkgrel=4 +pkgver=3.0+31+g1d4280a +pkgrel=1 arch=(x86_64) url="http://freedesktop.org/software/pulseaudio/pavucontrol/"; license=(GPL) @@ -14,10 +14,15 @@ depends=(libcanberra-pulse gtkmm3 libsigc++) makedepends=(intltool lynx git) optdepends=("pulseaudio: Audio backend") -_commit=9b307dcfe2051caea7145c8ab48953bb4f57005c -source=("git://anongit.freedesktop.org/pulseaudio/pavucontrol#commit=$_commit") +_commit=1d4280a0d4435faebfbf3ad3dc14f346000a6d1d # master +source=("git+https://anongit.freedesktop.org/git/pulseaudio/pavucontrol#commit=$_commit";) sha256sums=('SKIP') +pkgver() { + cd $pkgname + git describe --long | sed 's/^v//;s/-/+/g' +} + prepare() { cd $pkgname NOCONFIGURE=1 ./bootstrap.sh @@ -25,7 +30,6 @@ build() { cd $pkgname - CXXFLAGS+=' -std=c++11' ./configure --prefix=/usr --enable-gtk3 make } Deleted: unavail.patch =================================================================== --- unavail.patch 2018-02-13 14:00:56 UTC (rev 316760) +++ unavail.patch 2018-02-13 14:01:02 UTC (rev 316761) @@ -1,60 +0,0 @@ -From c4fcb1c772bd695a1b820ba656bb4149ab595c6e Mon Sep 17 00:00:00 2001 -From: David Kreuter <[email protected]> -Date: Wed, 25 Mar 2015 20:48:24 +0100 -Subject: mainwindow: unavailable profiles are marked as such in their - description - - -diff --git a/src/mainwindow.cc b/src/mainwindow.cc -index b45ab59..d440e9e 100644 ---- a/src/mainwindow.cc -+++ b/src/mainwindow.cc -@@ -37,7 +37,7 @@ - - /* Used for profile sorting */ - struct profile_prio_compare { -- bool operator() (const pa_card_profile_info& lhs, const pa_card_profile_info& rhs) const { -+ bool operator() (const pa_card_profile_info2& lhs, const pa_card_profile_info2& rhs) const { - - if (lhs.priority == rhs.priority) - return strcmp(lhs.name, rhs.name) > 0; -@@ -333,7 +333,7 @@ void MainWindow::updateCard(const pa_card_info &info) { - CardWidget *w; - bool is_new = false; - const char *description, *icon; -- std::set<pa_card_profile_info,profile_prio_compare> profile_priorities; -+ std::set<pa_card_profile_info2,profile_prio_compare> profile_priorities; - - if (cardWidgets.count(info.index)) - w = cardWidgets[info.index]; -@@ -359,7 +359,7 @@ void MainWindow::updateCard(const pa_card_info &info) { - for (uint32_t i=0; i<info.n_profiles; ++i) { - w->hasSinks = w->hasSinks || (info.profiles[i].n_sinks > 0); - w->hasSources = w->hasSources || (info.profiles[i].n_sources > 0); -- profile_priorities.insert(info.profiles[i]); -+ profile_priorities.insert(*info.profiles2[i]); - } - - w->ports.clear(); -@@ -379,7 +379,7 @@ void MainWindow::updateCard(const pa_card_info &info) { - } - - w->profiles.clear(); -- for (std::set<pa_card_profile_info>::iterator profileIt = profile_priorities.begin(); profileIt != profile_priorities.end(); ++profileIt) { -+ for (std::set<pa_card_profile_info2>::iterator profileIt = profile_priorities.begin(); profileIt != profile_priorities.end(); ++profileIt) { - bool hasNo = false, hasOther = false; - std::map<Glib::ustring, PortInfo>::iterator portIt; - Glib::ustring desc = profileIt->description; -@@ -400,6 +400,9 @@ void MainWindow::updateCard(const pa_card_info &info) { - if (hasNo && !hasOther) - desc += _(" (unplugged)"); - -+ if (!profileIt->available) -+ desc += _(" (unavailable)"); -+ - w->profiles.push_back(std::pair<Glib::ustring,Glib::ustring>(profileIt->name, desc)); - } - --- -cgit v0.10.2 -
