Takashi Iwai 2014-08-04 11:34:01 +00:00 committed by Git OBS Bridge
commit 179908b235
10 changed files with 371 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

161
0001-pulse-path.patch Normal file
View File

@ -0,0 +1,161 @@
--- pulseaudio-equalizer.orig/usr/bin/pulseaudio-equalizer 2013-10-24 10:23:27.000000000 +0000
+++ pulseaudio-equalizer/usr/bin/pulseaudio-equalizer 2013-10-24 10:53:48.000000000 +0000
@@ -18,11 +18,11 @@
PA_PREAMP="1.0"
PA_CURRENT_PRESET=""
-PRESET_DIR1=$HOME/.pulse/presets
+PRESET_DIR1=$HOME/.config/pulse/presets
PRESET_DIR2=/usr/share/pulseaudio-equalizer/presets
SCRIPT_NAME=pulseaudio-equalizer
SCRIPT_VERSION="2.7 (05/02/2010)"
-CONFIG_NAME=$HOME/.pulse/equalizerrc
+CONFIG_NAME=$HOME/.config/pulse/equalizerrc
LOG_NAME=$HOME/Desktop/pulseaudio-equalizer.log
# Don't execute the script with elevated privileges
@@ -125,8 +125,8 @@
fi
# Check if equalizer is set as persistent
-if [ -f $HOME/.pulse/default.pa ]; then
- if [ "$(cat $HOME/.pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
+if [ -f $HOME/.config/pulse/default.pa ]; then
+ if [ "$(cat $HOME/.config/pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
PA_EQUALIZER_PERSISTENCE=1
fi
else
@@ -204,8 +204,8 @@
echo PA_PREAMP=$PA_PREAMP
echo PA_REAL_PREAMP=$PA_REAL_PREAMP
- if [ -f $HOME/.pulse/default.pa ]; then
- tail -n7 $HOME/.pulse/default.pa
+ if [ -f $HOME/.config/pulse/default.pa ]; then
+ tail -n7 $HOME/.config/pulse/default.pa
fi
echo "---"
@@ -253,24 +253,24 @@
echo "-------------------------------------"
# If equalizer configuration is already set, delete file
- if [ -f $HOME/.pulse/default.pa ]; then
- if [ "$(cat $HOME/.pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
- echo "Equalizer definition detected in file '$HOME/.pulse/default.pa', deleting..."
- rm $HOME/.pulse/default.pa
+ if [ -f $HOME/.config/pulse/default.pa ]; then
+ if [ "$(cat $HOME/.config/pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
+ echo "Equalizer definition detected in file '$HOME/.config/pulse/default.pa', deleting..."
+ rm $HOME/.config/pulse/default.pa
fi
fi
# Make a backup of configuration if necessary
- if [ -f $HOME/.pulse/default.pa ]; then
- echo "Found '$HOME/.pulse/default.pa', making a copy..."
- cp $HOME/.pulse/default.pa $HOME/.pulse/default.pa.noeq
- CFG_SOURCE_FILE="$HOME/.pulse/default.pa.noeq"
+ if [ -f $HOME/.config/pulse/default.pa ]; then
+ echo "Found '$HOME/.config/pulse/default.pa', making a copy..."
+ cp $HOME/.config/pulse/default.pa $HOME/.config/pulse/default.pa.noeq
+ CFG_SOURCE_FILE="$HOME/.config/pulse/default.pa.noeq"
fi
# Decide which file to use as the configuration source
- if [ -f $HOME/.pulse/default.pa.noeq ]; then
- echo "Found '$HOME/.pulse/default.pa.noeq'..."
- CFG_SOURCE_FILE="$HOME/.pulse/default.pa.noeq"
+ if [ -f $HOME/.config/pulse/default.pa.noeq ]; then
+ echo "Found '$HOME/.config/pulse/default.pa.noeq'..."
+ CFG_SOURCE_FILE="$HOME/.config/pulse/default.pa.noeq"
else
CFG_SOURCE_FILE="/etc/pulse/default.pa"
fi
@@ -278,19 +278,19 @@
echo "Using configuration file '$CFG_SOURCE_FILE' as source..."
# Modify module-stream-restore line to disable cached sinks
- cat $CFG_SOURCE_FILE | sed 's/load-module module-stream-restore/load-module module-stream-restore restore_device=false/g' >$HOME/.pulse/default.pa
+ cat $CFG_SOURCE_FILE | sed 's/load-module module-stream-restore/load-module module-stream-restore restore_device=false/g' >$HOME/.config/pulse/default.pa
# Add module-ladspa-sink definition
- echo "" >>$HOME/.pulse/default.pa
- echo "### BEGIN: Equalized audio configuration" >>$HOME/.pulse/default.pa
- echo "### Generated from: $SCRIPT_NAME" >>$HOME/.pulse/default.pa
- echo "load-module module-ladspa-sink sink_name=$PA_LADSPA_SINK master=$PA_MASTER_SINK plugin=$PA_LADSPA_PLUGIN label=$PA_LADSPA_LABEL control=$PA_LADSPA_CONTROLS" >>$HOME/.pulse/default.pa
+ echo "" >>$HOME/.config/pulse/default.pa
+ echo "### BEGIN: Equalized audio configuration" >>$HOME/.config/pulse/default.pa
+ echo "### Generated from: $SCRIPT_NAME" >>$HOME/.config/pulse/default.pa
+ echo "load-module module-ladspa-sink sink_name=$PA_LADSPA_SINK master=$PA_MASTER_SINK plugin=$PA_LADSPA_PLUGIN label=$PA_LADSPA_LABEL control=$PA_LADSPA_CONTROLS" >>$HOME/.config/pulse/default.pa
# Set LADSPA sink as default sink & set appropriate master sink (preamp) volume
- echo "set-default-sink $PA_LADSPA_SINK" >>$HOME/.pulse/default.pa
- echo "set-sink-volume $PA_MASTER_SINK $PA_REAL_PREAMP" >>$HOME/.pulse/default.pa
- echo "set-sink-mute $PA_MASTER_SINK 0" >>$HOME/.pulse/default.pa
- echo "### END: Equalized audio configuration" >>$HOME/.pulse/default.pa
+ echo "set-default-sink $PA_LADSPA_SINK" >>$HOME/.config/pulse/default.pa
+ echo "set-sink-volume $PA_MASTER_SINK $PA_REAL_PREAMP" >>$HOME/.config/pulse/default.pa
+ echo "set-sink-mute $PA_MASTER_SINK 0" >>$HOME/.config/pulse/default.pa
+ echo "### END: Equalized audio configuration" >>$HOME/.config/pulse/default.pa
echo "Equalizer setting saved (enable-config)."
echo "-------------------------------------"
@@ -306,16 +306,16 @@
echo "-------------------------------------"
# Move .noeq configuration file if it exists
- if [ -f $HOME/.pulse/default.pa.noeq ]; then
- echo "Found '$HOME/.pulse/default.pa.noeq', moving..."
- mv $HOME/.pulse/default.pa.noeq $HOME/.pulse/default.pa
+ if [ -f $HOME/.config/pulse/default.pa.noeq ]; then
+ echo "Found '$HOME/.config/pulse/default.pa.noeq', moving..."
+ mv $HOME/.config/pulse/default.pa.noeq $HOME/.config/pulse/default.pa
fi
# If equalizer configuration is present, delete file
- if [ -f $HOME/.pulse/default.pa ]; then
- if [ "$(cat $HOME/.pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
- echo "Equalizer definition detected, deleting '$HOME/.pulse/default.pa'..."
- rm $HOME/.pulse/default.pa
+ if [ -f $HOME/.config/pulse/default.pa ]; then
+ if [ "$(cat $HOME/.config/pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
+ echo "Equalizer definition detected, deleting '$HOME/.config/pulse/default.pa'..."
+ rm $HOME/.config/pulse/default.pa
fi
fi
@@ -426,8 +426,8 @@
echo "-------------------------------------"
echo "Equalizer status: [enabled]"
- if [ -f $HOME/.pulse/default.pa ]; then
- if [ "$(cat $HOME/.pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
+ if [ -f $HOME/.config/pulse/default.pa ]; then
+ if [ "$(cat $HOME/.config/pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
echo "Equalizer configuration status: [enabled]"
else
echo "Equalizer configuration status: [disabled]"
@@ -448,8 +448,8 @@
echo "-------------------------------------"
echo "Equalizer status: [disabled]"
- if [ -f $HOME/.pulse/default.pa ]; then
- if [ "$(cat $HOME/.pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
+ if [ -f $HOME/.config/pulse/default.pa ]; then
+ if [ "$(cat $HOME/.config/pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
echo "Equalizer configuration status: [enabled]"
echo "Equalizer plugin: [$PA_LADSPA_PLUGIN/$PA_LADSPA_LABEL]"
echo "Equalizer control: [$PA_LADSPA_CONTROLS]"
--- pulseaudio-equalizer.orig/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py 2013-10-24 10:23:27.000000000 +0000
+++ pulseaudio-equalizer/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py 2013-10-24 10:53:48.000000000 +0000
@@ -13,7 +13,7 @@
import gtk, gobject
import os
-configdir = os.getenv('HOME') + "/.pulse"
+configdir = os.getenv('HOME') + "/.config/pulse"
eqconfig = configdir + "/equalizerrc"
eqconfig2 = configdir + "/equalizerrc.test"
eqpresets = eqconfig + ".availablepresets"

32
0002-remove-preamp.patch Normal file
View File

@ -0,0 +1,32 @@
--- pulseaudio-equalizer.orig/usr/bin/pulseaudio-equalizer
+++ pulseaudio-equalizer/usr/bin/pulseaudio-equalizer
@@ -378,7 +378,7 @@
# 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.orig/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py
+++ pulseaudio-equalizer/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py
@@ -412,14 +412,14 @@
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()
+ #label.show()
+ #preampscale.show()
+ #preampscalevalue.show()
# Separator between preamp and bands
separator = gtk.VSeparator()
table.attach(separator, 2, 3, 1, 2)
- separator.show()
+ #separator.show()
# Equalizer bands
global scale

View File

@ -0,0 +1,14 @@
--- pulseaudio-equalizer.orig/usr/bin/pulseaudio-equalizer
+++ pulseaudio-equalizer/usr/bin/pulseaudio-equalizer
@@ -128,7 +128,9 @@
if [ -f $HOME/.config/pulse/default.pa ]; then
if [ "$(cat $HOME/.config/pulse/default.pa | grep -m1 "### BEGIN: Equalized audio configuration")" = "### BEGIN: Equalized audio configuration" ]; then
PA_EQUALIZER_PERSISTENCE=1
- fi
+ else
+ PA_EQUALIZER_PERSISTENCE=0
+ fi
else
PA_EQUALIZER_PERSISTENCE=0
fi

View File

@ -0,0 +1,17 @@
--- pulseaudio-equalizer.orig/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py 2011-03-17 10:53:48.000000000 +0000
+++ pulseaudio-equalizer/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py 2011-03-17 11:18:04.000000000 +0000
@@ -180,10 +180,13 @@ class Equalizer:
if os.path.isfile(presetdir1 + "/" + preset + ".preset"):
f = open(presetdir1 + "/" + preset + ".preset", "r")
rawdata=f.read().split('\n')
- else:
+ f.close
+ elif os.path.isfile(presetdir2 + "/" + preset + ".preset"):
f = open(presetdir2 + "/" + preset + ".preset", "r")
rawdata=f.read().split('\n')
f.close
+ else:
+ print "Can't find %s preset" % preset
ladspa_filename = str(rawdata[0])
ladspa_name = str(rawdata[1])

24
0005-window-icon.patch Normal file
View File

@ -0,0 +1,24 @@
--- pulseaudio-equalizer.orig/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py 2011-03-17 10:23:27.000000000 +0000
+++ pulseaudio-equalizer/usr/share/pulseaudio-equalizer/pulseaudio-equalizer.py 2011-03-17 10:53:48.000000000 +0000
@@ -359,7 +359,20 @@ class Equalizer:
self.window.connect("destroy", self.destroy_equalizer)
self.window.set_title(windowtitle + " [" + realstatus + "]")
self.window.set_border_width(0)
- icon = self.window.set_icon_from_file("/usr/share/icons/hicolor/scalable/apps/multimedia-volume-control.svg")
+
+ icon_theme = gtk.icon_theme_get_default()
+ icon_theme = gtk.icon_theme_get_default()
+ if icon_theme.has_icon("multimedia-volume-control"):
+ icon = icon_theme.load_icon("multimedia-volume-control", 16, 0)
+ self.window.set_icon(icon)
+ elif icon_theme.has_icon("gnome-volume-control"):
+ icon = icon_theme.load_icon("gnome-volume-control",16,0)
+ self.window.set_icon(icon)
+ elif icon_theme.has_icon("stock_volume"):
+ icon = icon_theme.load_icon("stock_volume",16,0)
+ self.window.set_icon(icon)
+ else:
+ print ("No icon found, window will be iconless")
menu = gtk.Menu()

12
0006-fix-desktop.patch Normal file
View File

@ -0,0 +1,12 @@
--- usr/share/applications/pulseaudio-equalizer.desktop 2011-08-18 14:07:30.000000000 -0500
+++ usr/share/applications/pulseaudio-equalizer.desktop.orig 2011-08-18 20:33:49.000000000 -0500
@@ -5,7 +5,7 @@
GenericName=Equalizer
Comment=PulseAudio LADSPA interface using MBEQ Multiband EQ plugin
Exec=pulseaudio-equalizer-gtk
-Icon=gnome-volume-control
+Icon=multimedia-volume-control
StartupNotify=true
Type=Application
-Categories=AudioVideo;Audio;Mixer;GTK;
+Categories=AudioVideo;Mixer;GTK;

View File

@ -0,0 +1,4 @@
-------------------------------------------------------------------
Thu Jul 17 16:32:54 UTC 2014 - sor.alexei@meowr.ru
- Initial build.

81
pulseaudio-equalizer.spec Normal file
View File

@ -0,0 +1,81 @@
#
# spec file for package pulseaudio-equalizer
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: pulseaudio-equalizer
Version: 2.7.0.2
Release: 0
Summary: PulseAudio's LADSPA plugin graphical user interface
License: GPL-3.0+
Group: Productivity/Multimedia/Sound/Mixers
Url: http://ubuntuforums.org/showthread.php?t=1308838
Source: http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu/pool/main/p/%{name}/%{name}_%{version}.orig.tar.gz
# PATCH-FIX-UPSTREAM 0001-pulse-path.patch webupd8@gmail.com -- Update path to PulseAudio files to a new one
Patch0: 0001-pulse-path.patch
# PATCH-FIX-UPSTREAM 0002-remove-preamp.patch webupd8@gmail.com -- Remove preamp
Patch1: 0002-remove-preamp.patch
# PATCH-FIX-UPSTREAM 0003-force-default-persistence-value.patch webupd8@gmail.com -- Force default persistence value
Patch2: 0003-force-default-persistence-value.patch
# PATCH-FIX-UPSTREAM 0004-do-not-crash-on-missing-preset.patch webupd8@gmail.com -- Do not crash on missing preset
Patch3: 0004-do-not-crash-on-missing-preset.patch
# PATCH-FIX-UPSTREAM 0005-window-icon.patch webupd8@gmail.com -- Correct way of setting window icon
Patch4: 0005-window-icon.patch
# PATCH-FIX-UPSTREAM 0006-fix-desktop.patch malcolmlewis@opensuse.org -- Fix .desktop file
Patch5: 0006-fix-desktop.patch
BuildRequires: update-desktop-files
Requires: ladspa-swh-plugins
Requires: python
Requires: python-gtk
Requires: python-gnome
Requires: pulseaudio-utils >= 4.0
Requires: pulseaudio >= 4.0
BuildArch: noarch
%description
GUI for PulseAudio's LADSPA interface using Steve Harris' Multiband EQ
(mbeq_1197) plugin
%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5
%build
# Nothing to build.
%install
mkdir -p %{buildroot}%{_bindir}/ %{buildroot}%{_datadir}/%{name}/presets/
install -Dm 0755 .%{_bindir}/%{name}* %{buildroot}%{_bindir}/
install -Dm 0644 .%{_datadir}/%{name}/%{name}.py %{buildroot}%{_datadir}/%{name}/%{name}.py
install -Dm 0644 .%{_datadir}/%{name}/presets/* %{buildroot}%{_datadir}/%{name}/presets/
install -Dm 0644 .%{_datadir}/applications/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
%suse_update_desktop_file %{name}
%files
%defattr(-,root,root)
%{_bindir}/%{name}*
%{_datadir}/%{name}/%{name}.py
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%changelog

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e69fa0f0d820dad4b9333287a0ef94825998c76464182b8bbcea31dc97db3095
size 9135