Date: Saturday, December 26, 2015 @ 02:40:56
Author: heftig
Revision: 257278
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
pavucontrol/repos/extra-i686/PKGBUILD
(from rev 257277, pavucontrol/trunk/PKGBUILD)
pavucontrol/repos/extra-i686/unavail.patch
(from rev 257277, pavucontrol/trunk/unavail.patch)
pavucontrol/repos/extra-x86_64/PKGBUILD
(from rev 257277, pavucontrol/trunk/PKGBUILD)
pavucontrol/repos/extra-x86_64/unavail.patch
(from rev 257277, pavucontrol/trunk/unavail.patch)
Deleted:
pavucontrol/repos/extra-i686/PKGBUILD
pavucontrol/repos/extra-x86_64/PKGBUILD
----------------------------+
/PKGBUILD | 70 +++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 29 -----------------
extra-i686/unavail.patch | 60 ++++++++++++++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 29 -----------------
extra-x86_64/unavail.patch | 60 ++++++++++++++++++++++++++++++++++++
5 files changed, 190 insertions(+), 58 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-12-26 01:39:49 UTC (rev 257277)
+++ extra-i686/PKGBUILD 2015-12-26 01:40:56 UTC (rev 257278)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
-# Contributor: Corrado Primier <ba...@aur.archlinux.org>
-# Contributor: William Rea <sillywi...@gmail.com>
-
-pkgname=pavucontrol
-pkgdesc="A GTK volume control for PulseAudio"
-pkgver=3.0
-pkgrel=2
-arch=(i686 x86_64)
-url="http://freedesktop.org/software/pulseaudio/pavucontrol/";
-license=(GPL)
-depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
-makedepends=(intltool lynx)
-source=($url/$pkgname-$pkgver.tar.xz)
-sha256sums=('b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890')
-
-build() {
- cd $pkgname-$pkgver
- CXXFLAGS+=' -std=c++11'
- ./configure --prefix=/usr --enable-gtk3
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: pavucontrol/repos/extra-i686/PKGBUILD (from rev 257277,
pavucontrol/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-12-26 01:40:56 UTC (rev 257278)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
+# Contributor: Corrado Primier <ba...@aur.archlinux.org>
+# Contributor: William Rea <sillywi...@gmail.com>
+
+pkgname=pavucontrol
+pkgdesc="A GTK volume control for PulseAudio"
+pkgver=3.0
+pkgrel=3
+arch=(i686 x86_64)
+url="http://freedesktop.org/software/pulseaudio/pavucontrol/";
+license=(GPL)
+depends=(libcanberra-pulse gtkmm3 libsigc++)
+makedepends=(intltool lynx)
+source=($url/$pkgname-$pkgver.tar.xz unavail.patch)
+sha256sums=('b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890'
+ 'c184782275e90ff24b647a8d690b46e12bd9d52bdb263689e2469a2dbd164235')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../unavail.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ CXXFLAGS+=' -std=c++11'
+ ./configure --prefix=/usr --enable-gtk3
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: pavucontrol/repos/extra-i686/unavail.patch (from rev 257277,
pavucontrol/trunk/unavail.patch)
===================================================================
--- extra-i686/unavail.patch (rev 0)
+++ extra-i686/unavail.patch 2015-12-26 01:40:56 UTC (rev 257278)
@@ -0,0 +1,60 @@
+From c4fcb1c772bd695a1b820ba656bb4149ab595c6e Mon Sep 17 00:00:00 2001
+From: David Kreuter <dkreu...@gmail.com>
+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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-12-26 01:39:49 UTC (rev 257277)
+++ extra-x86_64/PKGBUILD 2015-12-26 01:40:56 UTC (rev 257278)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
-# Contributor: Corrado Primier <ba...@aur.archlinux.org>
-# Contributor: William Rea <sillywi...@gmail.com>
-
-pkgname=pavucontrol
-pkgdesc="A GTK volume control for PulseAudio"
-pkgver=3.0
-pkgrel=2
-arch=(i686 x86_64)
-url="http://freedesktop.org/software/pulseaudio/pavucontrol/";
-license=(GPL)
-depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
-makedepends=(intltool lynx)
-source=($url/$pkgname-$pkgver.tar.xz)
-sha256sums=('b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890')
-
-build() {
- cd $pkgname-$pkgver
- CXXFLAGS+=' -std=c++11'
- ./configure --prefix=/usr --enable-gtk3
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: pavucontrol/repos/extra-x86_64/PKGBUILD (from rev 257277,
pavucontrol/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-12-26 01:40:56 UTC (rev 257278)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
+# Contributor: Corrado Primier <ba...@aur.archlinux.org>
+# Contributor: William Rea <sillywi...@gmail.com>
+
+pkgname=pavucontrol
+pkgdesc="A GTK volume control for PulseAudio"
+pkgver=3.0
+pkgrel=3
+arch=(i686 x86_64)
+url="http://freedesktop.org/software/pulseaudio/pavucontrol/";
+license=(GPL)
+depends=(libcanberra-pulse gtkmm3 libsigc++)
+makedepends=(intltool lynx)
+source=($url/$pkgname-$pkgver.tar.xz unavail.patch)
+sha256sums=('b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890'
+ 'c184782275e90ff24b647a8d690b46e12bd9d52bdb263689e2469a2dbd164235')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../unavail.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ CXXFLAGS+=' -std=c++11'
+ ./configure --prefix=/usr --enable-gtk3
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: pavucontrol/repos/extra-x86_64/unavail.patch (from rev 257277,
pavucontrol/trunk/unavail.patch)
===================================================================
--- extra-x86_64/unavail.patch (rev 0)
+++ extra-x86_64/unavail.patch 2015-12-26 01:40:56 UTC (rev 257278)
@@ -0,0 +1,60 @@
+From c4fcb1c772bd695a1b820ba656bb4149ab595c6e Mon Sep 17 00:00:00 2001
+From: David Kreuter <dkreu...@gmail.com>
+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
+
