[pulseaudio-equalizer/f13/master] Remove preamp, fixes rhbz #639604
Hicham HAOUARI
hicham at fedoraproject.org
Tue Jan 4 00:03:54 UTC 2011
commit 9611e09697ea3c4e539a2aab5fc6bd95815585b1
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date: Tue Jan 4 00:03:15 2011 +0000
Remove preamp, fixes rhbz #639604
pulseaudio-equalizer-2.7-remove-preamp.patch | 48 ++++++++++++++++++++
pulseaudio-equalizer-gtk.1 | 32 +++++++++++++
pulseaudio-equalizer.1 | 62 ++++++++++++++++++++++++++
pulseaudio-equalizer.spec | 16 ++++++-
4 files changed, 156 insertions(+), 2 deletions(-)
---
diff --git a/pulseaudio-equalizer-2.7-remove-preamp.patch b/pulseaudio-equalizer-2.7-remove-preamp.patch
new file mode 100644
index 0000000..86053ae
--- /dev/null
+++ b/pulseaudio-equalizer-2.7-remove-preamp.patch
@@ -0,0 +1,48 @@
+--- pulseaudio-equalizer-2.7/usr/bin/pulseaudio-equalizer.old 2011-01-03 22:56:01.000000000 +0000
++++ pulseaudio-equalizer-2.7/usr/bin/pulseaudio-equalizer 2011-01-03 22:56:19.000000000 +0000
+@@ -380,7 +380,7 @@ if [ "$1" = "enable" ]; then
+
+ # Unmute & set preamp level on ALSA sink (as LADSPA sink will act as primary volume control)
+ echo "Setting ALSA sink ($PA_MASTER_SINK) preamp ("$PA_PREAMP"x)..."
+- echo >>/tmp/eqcommands.sh "set-sink-volume $PA_MASTER_SINK $PA_REAL_PREAMP"
++ #echo >>/tmp/eqcommands.sh "set-sink-volume $PA_MASTER_SINK $PA_REAL_PREAMP"
+ echo >>/tmp/eqcommands.sh "set-sink-mute $PA_MASTER_SINK 0"
+
+ # Set the LADSPA sink as the default
+--- pulseaudio-equalizer-2.7/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py.old 2011-01-03 22:58:45.000000000 +0000
++++ pulseaudio-equalizer-2.7/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py 2011-01-03 22:59:39.000000000 +0000
+@@ -392,34 +392,6 @@ class Equalizer:
+ table.set_border_width(5)
+ hbox1.add(table)
+
+- # Preamp widget
+- global preampscale
+- global preampscalevalue
+- preampscale = gtk.VScale()
+- preampscale.set_draw_value(0)
+- preampscale.set_inverted(1)
+- preampscale.set_value_pos(gtk.POS_BOTTOM)
+- preampscale.set_range(0.0,2.0)
+- preampscale.set_increments(1, 0.1)
+- preampscale.set_digits(1)
+- preampscale.set_size_request(35,200)
+- preampscale.set_value(float(preamp))
+- preampscale.connect("value-changed", self.on_preampscale)
+- label = gtk.Label()
+- label.set_markup("<small>Preamp</small>")
+- preampscalevalue = gtk.Label()
+- preampscalevalue.set_markup(str(preampscale.get_value()) + "x")
+- table.attach(label, 1, 2, 0, 1)
+- table.attach(preampscale, 1, 2, 1, 2)
+- table.attach(preampscalevalue, 1, 2, 2, 3)
+- label.show()
+- preampscale.show()
+- preampscalevalue.show()
+-
+- # Separator between preamp and bands
+- separator = gtk.VSeparator()
+- table.attach(separator, 2, 3, 1, 2)
+- separator.show()
+
+ # Equalizer bands
+ global scale
diff --git a/pulseaudio-equalizer-gtk.1 b/pulseaudio-equalizer-gtk.1
new file mode 100644
index 0000000..5951b31
--- /dev/null
+++ b/pulseaudio-equalizer-gtk.1
@@ -0,0 +1,32 @@
+.\" Copyright (C) 2010 Hicham HAOUARI <hicham at fedoraproject.org>
+.\"
+.\" This package is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This package is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this package; if not, write to the Free Software
+.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+.TH pulseaudio-equalizer-gtk 1 "January 03, 2011"
+.SH NAME
+pulseaudio-equalizer-gtk \- GTK interface to pulseaudio-equalizer
+.SH SYNOPSIS
+.B pulseaudio-equalizer-gtk
+.SH DESCRIPTION
+A 15 Bands Equalizer for PulseAudio
+.SH AUTHOR
+Conn O'Griofa <connogriofa AT gmail DOT com>
+
+This manual page was written by Hicham HAOUARI <hicham at fedoraproject.org>,
+for the Fedora project (but may be used by others).
+.SH BUGS
+Please report bugs to https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=pulseaudio-equalizer
+.SH SEE ALSO
+.B
+pulseaudio-equalizer(1)
diff --git a/pulseaudio-equalizer.1 b/pulseaudio-equalizer.1
new file mode 100644
index 0000000..6f7986e
--- /dev/null
+++ b/pulseaudio-equalizer.1
@@ -0,0 +1,62 @@
+.\" Copyright (C) 2010 Hicham HAOUARI <hicham at fedoraproject.org>
+.\"
+.\" This package is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This package is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this package; if not, write to the Free Software
+.\" Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+.TH pulseaudio-equalizer 1 "January 03, 2011"
+.SH NAME
+pulseaudio-equalizer \- commandline interface to pulseaudio-equalizer-gtk
+.SH SYNOPSIS
+.B pulseaudio-equalizer
+[option]
+.SH DESCRIPTION
+.B WARNING :
+This is for internal use by the pulseaudio-equalizer-gtk interface.
+Use for debugging/troubleshooting purposes only.
+.SH OPTIONS (current session):
+.TP
+enable
+enable the equalizer
+.TP
+disable
+disable the equalizer
+.TP
+toggle
+enable/disable the equalizer
+.SH OPTIONS (persistent):
+.TP
+enable-config
+enable the equalizer configuration
+.TP
+disable-config
+disable the equalizer configuration
+.SH OPTIONS (all):
+.TP
+debug
+run equalizer diagnostics
+.TP
+log
+show current equalizer log
+.TP
+status
+show current equalizer status
+.SH AUTHOR
+Conn O'Griofa <connogriofa AT gmail DOT com>
+
+This manual page was written by Hicham HAOUARI <hicham at fedoraproject.org>,
+for the Fedora project (but may be used by others).
+.SH BUGS
+Please report bugs to https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=pulseaudio-equalizer
+.SH SEE ALSO
+.B
+pulseaudio-equalizer-gtk(1)
diff --git a/pulseaudio-equalizer.spec b/pulseaudio-equalizer.spec
index b60f63e..322ae8b 100644
--- a/pulseaudio-equalizer.spec
+++ b/pulseaudio-equalizer.spec
@@ -2,7 +2,7 @@
Name: pulseaudio-equalizer
Version: 2.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A 15 Bands Equalizer for PulseAudio
Group: Applications/Multimedia
@@ -13,6 +13,8 @@ URL: https://code.launchpad.net/~psyke83/+junk/%{name}
# mv %%{name} %%{name}-%%{version}
# tar cjf %%{name}-%%{version}.tar.bz2 %%{name}-%%{version}
Source0: %{name}-%{version}.tar.bz2
+Source1: %{name}.1
+Source2: %{name}-gtk.1
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -23,6 +25,8 @@ Requires: pulseaudio-utils >= 0.9.19
# Force default equalizer persistence value, fixes rhbz #635400
Patch0: %{name}-%{version}-force-default-persistence-value.patch
+# Remove preamp per discussion with upstrem, fixes rhbz #639604
+Patch1: %{name}-%{version}-remove-preamp.patch
%description
PulseAudio Equalizer is a 15 bands system wide equalizer, that means
@@ -38,6 +42,7 @@ sed -i 's|gnome-volume-control|multimedia-volume-control|g' usr/share/{applicati
%endif
%patch0 -p1
+%patch1 -p1
%build
@@ -46,6 +51,8 @@ sed -i 's|gnome-volume-control|multimedia-volume-control|g' usr/share/{applicati
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr
cp -rfp usr $RPM_BUILD_ROOT
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mandir}/man1/%{name}.1
+install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mandir}/man1/%{name}-gtk.1
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
@@ -59,9 +66,14 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/%{name}-gtk
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
-
+%{_mandir}/man1/%{name}.1.*
+%{_mandir}/man1/%{name}-gtk.1.*
%changelog
+* Mon Jan 03 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.7-4
+- Remove preamp per discussion with upstream, fixes rhbz #639604
+- Add man pages
+
* Mon Sep 20 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 2.7-3
- Force default equalizer persistence value, fixes rhbz #635400
More information about the scm-commits
mailing list