Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at 2011-12-08 12:01:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdemultimedia4 (Old) and /work/SRC/openSUSE:Factory/.kdemultimedia4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdemultimedia4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdemultimedia4/kdemultimedia4.changes 2011-11-14 14:09:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdemultimedia4.new/kdemultimedia4.changes 2011-12-08 12:01:40.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Dec 7 11:30:32 UTC 2011 - [email protected] + +- fix license to be in spdx.org format + +------------------------------------------------------------------- +Fri Dec 2 01:58:35 CET 2011 - [email protected] + +- update to 4.7.4 + * see http://kde.org/announcements/changelogs/changelog4_7_3to4_7_4.php for details + +------------------------------------------------------------------- Old: ---- kdemultimedia-4.7.3.tar.bz2 New: ---- kdemultimedia-4.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.hXlHF2/_old 2011-12-08 12:01:41.000000000 +0100 +++ /var/tmp/diff_new_pack.hXlHF2/_new 2011-12-08 12:01:41.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %bcond_with ffmpeg Name: kdemultimedia4 @@ -40,12 +39,12 @@ BuildRequires: taglib-devel BuildRequires: xine-devel BuildRequires: xine-lib -Version: 4.7.3 -Release: 1 -License: GPLv2+ +Version: 4.7.4 +Release: 0 Summary: Base package for KDE multimedia applications -Url: http://www.kde.org +License: GPL-2.0+ Group: System/GUI/KDE +Url: http://www.kde.org Source: kdemultimedia-%{version}.tar.bz2 Patch1: kmix-autostart.diff Suggests: juk @@ -101,10 +100,9 @@ rm -rf filelists %package -n dragonplayer -License: GPLv2+ Summary: Multimedia Player -Url: http://dragonplayer.org/ Group: Productivity/Multimedia/Video/Players +Url: http://dragonplayer.org/ %kde4_runtime_requires %description -n dragonplayer @@ -121,7 +119,6 @@ %dir %{_kde4_appsdir}/solid/actions %package -n juk -License: GPLv2+ Summary: Jukebox Group: Productivity/Multimedia/Sound/Players Provides: kde4-juk = 4.3.0 @@ -140,7 +137,6 @@ %doc COPYING COPYING.DOC README %package -n kmix -License: GPLv2+ Summary: Sound Mixer Group: Productivity/Multimedia/Sound/Mixers Provides: kde4-kmix = 4.3.0 @@ -159,7 +155,6 @@ %doc COPYING COPYING.DOC README %package -n kscd -License: GPLv2+ Summary: CD Player Group: Productivity/Multimedia/CD/Players Requires: libkcddb4 = %{version} @@ -183,7 +178,6 @@ %dir %{_kde4_appsdir}/solid/actions %package -n kio_audiocd -License: GPLv2+ Summary: KDE I/O Slave for Audio CDs Group: System/GUI/KDE Requires: libkcddb4 = %{version} @@ -204,7 +198,6 @@ %doc COPYING COPYING.DOC README %package -n kio_audiocd-devel -License: GPLv2+ Summary: KDE I/O Slave for Audio CDs: Build Environment Group: Development/Libraries/KDE Requires: kio_audiocd = %{version} @@ -218,7 +211,6 @@ %doc COPYING COPYING.DOC README %package -n libkcddb4 -License: GPLv2+ Summary: KDE CDDB Library Group: System/GUI/KDE @@ -235,7 +227,6 @@ %doc %lang(en) %{_kde4_htmldir}/en/kcontrol/cddbretrieval %package -n libkcddb4-devel -License: GPLv2+ Summary: KDE CDDB Library: Build Environment Group: Development/Libraries/KDE Requires: libkcddb4 = %{version} @@ -250,7 +241,6 @@ %dir %{_includedir}/libkcddb %package -n libkcompactdisc4 -License: GPLv2+ Summary: KDE CD Library Group: System/GUI/KDE %requires_ge libqt4-x11 @@ -268,7 +258,6 @@ %doc COPYING COPYING.DOC README %package -n libkcompactdisc4-devel -License: GPLv2+ Summary: KDE CD Library: Build Environment Group: Development/Libraries/KDE Requires: libkcompactdisc4 = %{version} @@ -283,7 +272,6 @@ %dir %{_includedir}/libkcompactdisc %package thumbnailers -License: GPLv2+ Summary: KDE thumbnails for multimedia files Group: System/GUI/KDE Obsoletes: kdemultimedia4 < %{version} ++++++ kdemultimedia-4.7.3.tar.bz2 -> kdemultimedia-4.7.4.tar.bz2 ++++++ Files old/kdemultimedia-4.7.3/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.7.4/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.7.3/doc/juk/index.cache.bz2 and new/kdemultimedia-4.7.4/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-4.7.3/doc/kcontrol/cddbretrieval/index.cache.bz2 and new/kdemultimedia-4.7.4/doc/kcontrol/cddbretrieval/index.cache.bz2 differ Files old/kdemultimedia-4.7.3/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.7.4/doc/kioslave/audiocd/index.cache.bz2 differ Files old/kdemultimedia-4.7.3/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.7.4/doc/kmix/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.7.3/kmix/backends/mixer_pulse.cpp new/kdemultimedia-4.7.4/kmix/backends/mixer_pulse.cpp --- old/kdemultimedia-4.7.3/kmix/backends/mixer_pulse.cpp 2011-07-20 00:16:14.000000000 +0200 +++ new/kdemultimedia-4.7.4/kmix/backends/mixer_pulse.cpp 2011-12-02 00:56:21.000000000 +0100 @@ -29,6 +29,7 @@ #include <pulse/glib-mainloop.h> #include <pulse/ext-stream-restore.h> +#define HAVE_SOURCE_OUTPUT_VOLUMES PA_CHECK_VERSION(1,0,0) #define KMIXPA_PLAYBACK 0 #define KMIXPA_CAPTURE 1 @@ -327,8 +328,8 @@ s.description = prefix + QString::fromUtf8(i->name); s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower(); s.icon_name = getIconNameFromProplist(i->proplist); - s.volume = i->volume; s.channel_map = i->channel_map; + s.volume = i->volume; s.mute = !!i->mute; s.stream_restore_rule = QString::fromUtf8(t); @@ -386,11 +387,14 @@ s.description = prefix + QString::fromUtf8(i->name); s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower(); s.icon_name = getIconNameFromProplist(i->proplist); - //s.volume = i->volume; - s.volume = captureDevices[i->source].volume; s.channel_map = i->channel_map; - //s.mute = !!i->mute; +#if HAVE_SOURCE_OUTPUT_VOLUMES + s.volume = i->volume; + s.mute = !!i->mute; +#else + s.volume = captureDevices[i->source].volume; s.mute = captureDevices[i->source].mute; +#endif s.stream_restore_rule = QString::fromUtf8(pa_proplist_gets(i->proplist, "module-stream-restore.id")); translateMasksAndMaps(s); @@ -1161,6 +1165,20 @@ { pa_operation *o; +#if HAVE_SOURCE_OUTPUT_VOLUMES + pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume()); + if (!(o = pa_context_set_source_output_volume(s_context, iter->index, &volume, NULL, NULL))) { + kWarning(67100) << "pa_context_set_source_output_volume_by_index() failed"; + return Mixer::ERR_READ; + } + pa_operation_unref(o); + + if (!(o = pa_context_set_source_output_mute(s_context, iter->index, (md->isMuted() ? 1 : 0), NULL, NULL))) { + kWarning(67100) << "pa_context_set_source_output_mute_by_index() failed"; + return Mixer::ERR_READ; + } + pa_operation_unref(o); +#else // NB Note that this is different from APP_PLAYBACK in that we set the volume on the source itself. pa_cvolume volume = genVolumeForPulse(*iter, md->playbackVolume()); if (!(o = pa_context_set_source_volume_by_index(s_context, iter->device_index, &volume, NULL, NULL))) { @@ -1174,6 +1192,7 @@ return Mixer::ERR_READ; } pa_operation_unref(o); +#endif return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.7.3/kmix/gui/kmixdockwidget.cpp new/kdemultimedia-4.7.4/kmix/gui/kmixdockwidget.cpp --- old/kdemultimedia-4.7.3/kmix/gui/kmixdockwidget.cpp 2011-06-22 22:40:31.000000000 +0200 +++ new/kdemultimedia-4.7.4/kmix/gui/kmixdockwidget.cpp 2011-12-02 00:56:20.000000000 +0100 @@ -302,7 +302,8 @@ // Use default KStatusNotifierItem behavior if we are not using the dockAreaPopup kDebug() << "Use default KStatusNotifierItem behavior"; setAssociatedWidget(_kmixMainWindow); - KStatusNotifierItem::activate(pos); +// KStatusNotifierItem::activate(pos); + KStatusNotifierItem::activate(); return; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
