rpm/kmix
SHA256
1
0
Fork 0
forked from pool/kmix
Code Pull Requests Activity

Accepting request 307054 from KDE:Applications

Browse Source 
Update to KDE Applications 15.04.1 bugfix release

OBS-URL: https://build.opensuse.org/request/show/307054
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmix?expand=0&rev=42
This commit is contained in:
Stephan Kulow 2015-05-15 08:05:57 +00:00 committed by Git OBS Bridge
parent e424764eab
commit a549c7197f
8 changed files with 81 additions and 2458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Who-needs-event-slider.patch
View File

@ -1,80 +0,0 @@
From f00539732399bb5c285b159a79c2d42869affd75 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Wed, 18 Sep 2013 22:17:31 +0200
Subject: [PATCH 1/1] Who needs event slider?
Related: kdebase4-runtime/Remove-volume-control-from-KNotify.patch
---
backends/mixer_pulse.cpp | 37 ++-----------------------------------
1 file changed, 2 insertions(+), 35 deletions(-)
diff --git a/backends/mixer_pulse.cpp b/backends/mixer_pulse.cpp
index 603debe..b5cd751 100644
--- a/backends/mixer_pulse.cpp
+++ b/backends/mixer_pulse.cpp
@@ -51,7 +51,7 @@
#define KMIXPA_APP_CAPTURE 3
#define KMIXPA_WIDGET_MAX KMIXPA_APP_CAPTURE
-#define KMIXPA_EVENT_KEY "sink-input-by-media-role:event"
+#define KMIXPA_EVENT_KEY "0"
static unsigned int refcount = 0;
static pa_glib_mainloop *s_mainloop = NULL;
@@ -465,31 +465,7 @@ void ext_stream_restore_read_cb(pa_context *c, const pa_ext_stream_restore_info
if (eol > 0) {
dec_outstanding(c);
- // Special case: ensure that our media events exists.
- // On first login by a new users, this wont be in our database so we should create it.
- if (!s_RestoreRules.contains(KMIXPA_EVENT_KEY)) {
- // Create a fake rule
- restoreRule rule;
- rule.channel_map.channels = 1;
- rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
- rule.volume.channels = 1;
- rule.volume.values[0] = PA_VOLUME_NORM;
- rule.mute = false;
- rule.device = "";
- s_RestoreRules[KMIXPA_EVENT_KEY] = rule;
- kDebug(67100) << "Initialising restore rule for new user: " << i18n("Event Sounds");
- }
-
if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
- // If we have rules, it will be created below... but if no rules
- // then we add it here.
- if (!outputRoles.contains(PA_INVALID_INDEX)) {
- devinfo s = create_role_devinfo(KMIXPA_EVENT_KEY);
- outputRoles[s.index] = s;
-
- s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index);
- }
-
s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate();
}
@@ -505,20 +481,11 @@ void ext_stream_restore_read_cb(pa_context *c, const pa_ext_stream_restore_info
rule.mute = !!i->mute;
rule.device = i->device;
- if (rule.channel_map.channels < 1 && name == KMIXPA_EVENT_KEY) {
- // Stream restore rules may not have valid volumes/channel maps (as these are optional)
- // but we need a valid volume+channelmap for our events sounds so fix it up.
- rule.channel_map.channels = 1;
- rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO;
- rule.volume.channels = 1;
- rule.volume.values[0] = PA_VOLUME_NORM;
- }
-
s_RestoreRules[name] = rule;
if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) {
// We only want to know about Sound Events for now...
- if (name == KMIXPA_EVENT_KEY) {
+ if (0) {
devinfo s = create_role_devinfo(name);
bool is_new = !outputRoles.contains(s.index);
outputRoles[s.index] = s;
--
1.8.4

3
kmix-14.12.3.tar.xz
View File

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

3
kmix-15.04.1.tar.xz Normal file
View File

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

39
kmix-4.14.3-fix-bashisms.patch
View File

@ -1,39 +0,0 @@
diff -Ndur kmix-4.14.3/apps/kmixremote kmix-4.14.3-fix-bashisms/apps/kmixremote
--- kmix-4.14.3/apps/kmixremote 2014-07-16 11:24:17.000000000 +0300
+++ kmix-4.14.3-fix-bashisms/apps/kmixremote 2014-11-23 06:46:36.616308340 +0200
@@ -7,7 +7,7 @@
# Mute
#################################################################################
-function usage
+usage()
{
echo "Usage:"
echo "List mixers # $0 list"
@@ -18,7 +18,7 @@
echo
}
-function exit_with_error
+exit_with_error()
{
echo "Error: $1"
echo
@@ -27,7 +27,7 @@
}
# Prints the mixer DBUS ID's on the console. leaving out the "/Mixers/" prefix
-function listMixers
+listMixers()
{
qdbus org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
errorCode=$?
@@ -37,7 +37,7 @@
}
# Prints the mixer control DBUS ID's of the given mixer on the console. leaving out the "/Mixers/" prefix
-function listControls
+listControls()
{
qdbus org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls | cut -f4 -d/
errorCode=$?

2227
kmix.changes
View File

File diff suppressed because it is too large Load Diff

83
kmix.spec
View File

@ -17,66 +17,69 @@
Name: kmix Name: kmix
BuildRequires: alsa-devel Version: 15.04.1
BuildRequires: glib2-devel Release: 0
BuildRequires: libcanberra-devel
BuildRequires: libkde4-devel
BuildRequires: libpulse-devel
BuildRequires: xz
Summary: Sound Mixer Summary: Sound Mixer
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Mixers Group: Productivity/Multimedia/Sound/Mixers
Url: http://www.kde.org Url: http://www.kde.org
Version: 14.12.3 Source: %{name}-%{version}.tar.xz
Release: 0 BuildRequires: alsa-devel
Source0: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules
# PATCH-FIX-OPENSUSE Who-needs-event-slider.patch -- since KNotify will no longer be able pretending it can BuildRequires: glib2-devel
# control volume, also remove the Event slider within KMix BuildRequires: kcmutils-devel
Patch0: Who-needs-event-slider.patch BuildRequires: kconfigwidgets-devel
Patch1: kmix-4.14.3-fix-bashisms.patch BuildRequires: kdbusaddons-devel
BuildRequires: kdelibs4support-devel
BuildRequires: kf5-filesystem
BuildRequires: kglobalaccel-devel
BuildRequires: ki18n-devel
BuildRequires: kiconthemes-devel
BuildRequires: kxmlgui-devel
BuildRequires: libcanberra-devel
BuildRequires: libpulse-devel
BuildRequires: phonon4qt5-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
Obsoletes: kmix5 < %{version}
Obsoletes: %{name}5 < %{version}
Provides: %{name}5 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%description %description
KDE's full featured mini mixer KDE's full featured mini mixer
%prep %prep
%setup -q %setup -q
%if 0%{?suse_version} >= 1310
%patch0 -p1
%endif
%patch1 -p1
%build %build
%cmake_kde4 -d build %cmake_kf5 -d build -- -DKMIX_KF5_BUILD=ON
%make_jobs %make_jobs
%install %install
pushd build %kf5_makeinstall -C build
%kde4_makeinstall
popd %suse_update_desktop_file kmix AudioVideo Mixer
%suse_update_desktop_file kmix AudioVideo Mixer
%kde_post_install %post -p /sbin/ldconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_kde4_applicationsdir}/kmix.desktop %doc COPYING*
%{_kde4_appsdir}/kmix/ %{_kf5_bindir}/kmix*
%{_kde4_bindir}/kmix %{_kf5_libdir}/libkdeinit5_kmix.so
%{_kde4_bindir}/kmixctrl %{_kf5_libdir}/libkdeinit5_kmixctrl.so
%{_kde4_bindir}/kmixremote %{_kf5_applicationsdir}/*kmix*.desktop
%{_kde4_datadir}/autostart/kmix_autostart.desktop %{_kf5_plugindir}/
%{_kde4_datadir}/autostart/restore_kmix_volumes.desktop %{_kf5_configdir}/autostart/*kmix*.desktop
%{_kde4_datadir}/dbus-1/interfaces/org.kde.kmix.* %{_kf5_sharedir}/dbus-1/interfaces/org.kde.kmix.*
%{_kde4_htmldir}/en/kmix/ %{_kf5_servicesdir}/
%{_kde4_iconsdir}/hicolor/*/apps/kmix.* %{_kf5_iconsdir}/hicolor/*/*/*
%{_kde4_libdir}/libkdeinit4_kmix.so %{_kf5_sharedir}/kmix/
%{_kde4_libdir}/libkdeinit4_kmixctrl.so
%{_kde4_modulesdir}/kded_kmixd.so
%{_kde4_servicesdir}/kded/kmixd.desktop
%{_kde4_servicesdir}/kmixctrl_restore.desktop
%changelog %changelog

19
kmix5.changes
View File

@ -1,19 +0,0 @@
-------------------------------------------------------------------
Tue Mar 3 10:40:40 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 14.12.3
* KDE Applications 14.12.3
* See https://www.kde.org/announcements/announce-applications-14.12.3.php
-------------------------------------------------------------------
Fri Feb 6 08:47:45 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 14.12.2
* KDE Applications 14.12.2
* See https://www.kde.org/announcements/announce-applications-14.12.2.php
-------------------------------------------------------------------
Wed Dec 17 20:46:47 UTC 2014 - tittiatcoke@gmail.com
- Initial package for KDE Frameworks

85
kmix5.spec
View File

@ -1,85 +0,0 @@
#
# spec file for package kmix5
#
# Copyright (c) 2015 SUSE LINUX 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: kmix5
Version: 14.12.3
Release: 0
Summary: Sound Mixer
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Mixers
Url: http://www.kde.org
Source: kmix-%{version}.tar.xz
Patch1: kmix-4.14.3-fix-bashisms.patch
BuildRequires: alsa-devel
BuildRequires: extra-cmake-modules
BuildRequires: glib2-devel
BuildRequires: kcmutils-devel
BuildRequires: kconfigwidgets-devel
BuildRequires: kdbusaddons-devel
BuildRequires: kdelibs4support-devel
BuildRequires: kf5-filesystem
BuildRequires: kglobalaccel-devel
BuildRequires: ki18n-devel
BuildRequires: kiconthemes-devel
BuildRequires: kxmlgui-devel
BuildRequires: libcanberra-devel
BuildRequires: libpulse-devel
BuildRequires: phonon4qt5-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
Conflicts: kmix
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
KDE's full featured mini mixer
%prep
%setup -q -n kmix-%{version}
%patch1 -p1
%build
%cmake_kf5 -d build -- -DKMIX_KF5_BUILD=ON
%make_jobs
%install
%kf5_makeinstall -C build
%suse_update_desktop_file kmix AudioVideo Mixer
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING*
%{_kf5_bindir}/kmix*
%{_kf5_libdir}/libkdeinit5_kmix.so
%{_kf5_libdir}/libkdeinit5_kmixctrl.so
%{_kf5_applicationsdir}/*kmix*.desktop
%{_kf5_plugindir}/
%{_kf5_configdir}/autostart/*kmix*.desktop
%{_kf5_sharedir}/dbus-1/interfaces/org.kde.kmix.*
%{_kf5_servicesdir}/
%{_kf5_iconsdir}/hicolor/*/*/*
%{_kf5_sharedir}/kmix/
%changelog