Changes of Revision 2
[-] | Added | kdemultimedia4-openSUSE_12.1.spec |
x 1
2 +# 3 +# spec file for package kdemultimedia4 4 +# 5 +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. 6 +# 7 +# All modifications and additions to the file contributed by third parties 8 +# remain the property of their copyright owners, unless otherwise agreed 9 +# upon. The license for this file, and modifications and additions to the 10 +# file, is the same license as for the pristine package itself (unless the 11 +# license for the pristine package is not an Open Source License, in which 12 +# case the license is the MIT License). An "Open Source License" is a 13 +# license that conforms to the Open Source Definition (Version 1.9) 14 +# published by the Open Source Initiative. 15 + 16 +# Please submit bugfixes or comments via http://bugs.opensuse.org/ 17 +# 18 + 19 + 20 +%bcond_with ffmpeg 21 + 22 +Name: kdemultimedia4 23 +BuildRequires: cdparanoia-devel 24 +BuildRequires: flac-devel 25 +BuildRequires: gstreamer010-devel 26 +BuildRequires: gstreamer010-plugins-base-devel 27 +BuildRequires: libao-devel 28 +%if %{with ffmpeg} 29 +BuildRequires: libffmpeg-devel 30 +%endif 31 +BuildRequires: libkde4-devel 32 +BuildRequires: libknotificationitem-devel 33 +BuildRequires: libmusicbrainz-devel 34 +BuildRequires: libmusicbrainz3-devel 35 +BuildRequires: libpulse-devel 36 +BuildRequires: libsamplerate-devel 37 +BuildRequires: libtheora-devel 38 +BuildRequires: libtunepimp-devel 39 +BuildRequires: libvorbis-devel 40 +BuildRequires: speex-devel 41 +BuildRequires: taglib-devel 42 +BuildRequires: xine-devel 43 +BuildRequires: xine-lib 44 +Version: 4.7.2 45 +Release: 3.1.6 46 +License: GPLv2+ 47 +Summary: Base package for KDE multimedia applications 48 +Url: http://www.kde.org 49 +Group: System/GUI/KDE 50 +Source: kdemultimedia-%{version}.tar.bz2 51 +Patch1: kmix-autostart.diff 52 +Suggests: juk 53 +Suggests: kio_audiocd 54 +Suggests: kmix 55 +Suggests: kscd 56 +BuildRoot: %{_tmppath}/%{name}-%{version}-build 57 +%if 0 58 +Suggests: phonon_gst 59 +Suggests: phonon_xine 60 +%endif 61 +%kde4_runtime_requires 62 + 63 +%description 64 +This package suggests the packages which are built from the 65 +kdemultimedia module. 66 + 67 +%prep 68 +%setup -q -n kdemultimedia-%{version} 69 +%patch1 70 +FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') 71 +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" libkcompactdisc/wmlib/wm_helpers.c 72 + 73 +%build 74 + %cmake_kde4 -d build 75 + %make_jobs 76 + 77 +%install 78 + cd build 79 + %make_install 80 + ls 81 + %create_subdir_filelist -d kioslave -v kioslave.devel 82 + %create_subdir_filelist -d kscd 83 + %create_subdir_filelist -d libkcompactdisc -v libkcompactdisc.devel 84 + %create_subdir_filelist -d juk 85 + %create_subdir_filelist -d kmix 86 + %create_subdir_filelist -d dragonplayer 87 + %create_subdir_filelist -d libkcddb -v libkcddb.devel 88 + cd .. 89 + %create_exclude_filelist 90 + %suse_update_desktop_file kmix AudioVideo Mixer 91 + %suse_update_desktop_file kscd AudioVideo Player CD 92 + %suse_update_desktop_file juk AudioVideo Player 93 + %suse_update_desktop_file dragonplayer Video 94 + %kde_post_install 95 + 96 +%post -p /sbin/ldconfig 97 + 98 +%postun -p /sbin/ldconfig 99 + 100 +%clean 101 + rm -rf %{buildroot} 102 + rm -rf filelists 103 + 104 +%package -n dragonplayer 105 +License: GPLv2+ 106 +Summary: Multimedia Player 107 +Url: http://dragonplayer.org/ 108 +Group: Productivity/Multimedia/Video/Players 109 +%kde4_runtime_requires 110 + 111 +%description -n dragonplayer 112 +Dragon Player is a simple KDE 4 video player. 113 + 114 +%post -n dragonplayer -p /sbin/ldconfig 115 + 116 +%postun -n dragonplayer -p /sbin/ldconfig 117 + 118 +%files -n dragonplayer -f filelists/dragonplayer 119 +%defattr(-,root,root) 120 +%doc COPYING COPYING.DOC README 121 +%dir %{_kde4_appsdir}/solid 122 +%dir %{_kde4_appsdir}/solid/actions 123 + 124 +%package -n juk 125 +License: GPLv2+ 126 +Summary: Jukebox 127 +Group: Productivity/Multimedia/Sound/Players 128 +Provides: kde4-juk = 4.3.0 129 +Obsoletes: kde4-juk < 4.3.0 130 +%kde4_runtime_requires 131 + 132 +%description -n juk 133 +Jukebox and music manager for KDE 134 + 135 +%post -n juk -p /sbin/ldconfig 136 + 137 +%postun -n juk -p /sbin/ldconfig 138 + 139 +%files -n juk -f filelists/juk 140 +%defattr(-,root,root) 141 +%doc COPYING COPYING.DOC README 142 + 143 +%package -n kmix 144 +License: GPLv2+ 145 +Summary: Sound Mixer 146 +Group: Productivity/Multimedia/Sound/Mixers 147 +Provides: kde4-kmix = 4.3.0 148 +Obsoletes: kde4-kmix < 4.3.0 149 +%kde4_runtime_requires 150 + 151 +%description -n kmix 152 +KDE's full featured mini mixer 153 + 154 +%post -n kmix -p /sbin/ldconfig 155 + 156 +%postun -n kmix -p /sbin/ldconfig 157 + 158 +%files -n kmix -f filelists/kmix 159 +%defattr(-,root,root) 160 +%doc COPYING COPYING.DOC README 161 + 162 +%package -n kscd 163 +License: GPLv2+ 164 +Summary: CD Player 165 +Group: Productivity/Multimedia/CD/Players 166 +Requires: libkcddb4 = %{version} 167 +Requires: libkcompactdisc4 = %{version} 168 +Provides: kde4-kscd = 4.3.0 169 +Obsoletes: kde4-kscd < 4.3.0 170 +%kde4_runtime_requires 171 +%requires_ge libqt4-x11 172 + 173 +%description -n kscd 174 +KDE's CD Player 175 + 176 +%post -n kscd -p /sbin/ldconfig 177 + 178 +%postun -n kscd -p /sbin/ldconfig 179 + 180 +%files -n kscd -f filelists/kscd 181 +%defattr(-,root,root) 182 +%doc COPYING COPYING.DOC README 183 +%dir %{_kde4_appsdir}/solid 184 +%dir %{_kde4_appsdir}/solid/actions 185 + 186 +%package -n kio_audiocd 187 +License: GPLv2+ 188 +Summary: KDE I/O Slave for Audio CDs 189 +Group: System/GUI/KDE 190 +Requires: libkcddb4 = %{version} 191 +Requires: libkcompactdisc4 = %{version} 192 +Provides: kde4-kio_audiocd = 4.3.0 193 +Obsoletes: kde4-kio_audiocd < 4.3.0 194 +%kde4_runtime_requires 195 + 196 +%description -n kio_audiocd 197 +This package contains an KIO slave to access audio CDs. 198 + 199 +%post -n kio_audiocd -p /sbin/ldconfig 200 + 201 |
||
[-] | Added | kdemultimedia4-openSUSE_12.2.spec ^ |
201 1
2 +# 3 +# spec file for package kdemultimedia4 4 +# 5 +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. 6 +# 7 +# All modifications and additions to the file contributed by third parties 8 +# remain the property of their copyright owners, unless otherwise agreed 9 +# upon. The license for this file, and modifications and additions to the 10 +# file, is the same license as for the pristine package itself (unless the 11 +# license for the pristine package is not an Open Source License, in which 12 +# case the license is the MIT License). An "Open Source License" is a 13 +# license that conforms to the Open Source Definition (Version 1.9) 14 +# published by the Open Source Initiative. 15 + 16 +# Please submit bugfixes or comments via http://bugs.opensuse.org/ 17 +# 18 + 19 + 20 +%bcond_with ffmpeg 21 + 22 +Name: kdemultimedia4 23 +%if %{with ffmpeg} 24 +BuildRequires: libffmpeg-devel 25 +%endif 26 +BuildRequires: libkde4-devel 27 +BuildRequires: libknotificationitem-devel 28 +%if %suse_version > 1200 29 +BuildRequires: pkgconfig(ao) 30 +BuildRequires: pkgconfig(flac) 31 +BuildRequires: pkgconfig(libcanberra) 32 +BuildRequires: pkgconfig(libmusicbrainz3) 33 +BuildRequires: pkgconfig(libpulse) 34 +BuildRequires: pkgconfig(samplerate) 35 +BuildRequires: pkgconfig(speex) 36 +BuildRequires: pkgconfig(taglib) 37 +BuildRequires: pkgconfig(theora) 38 +BuildRequires: pkgconfig(vorbis) 39 +%else 40 +BuildRequires: flac-devel 41 +BuildRequires: libao-devel 42 +BuildRequires: libcanberra-devel 43 +BuildRequires: libmusicbrainz3-devel 44 +BuildRequires: libpulse-devel 45 +BuildRequires: libtheora-devel 46 +BuildRequires: libtunepimp-devel 47 +BuildRequires: libvorbis-devel 48 +BuildRequires: speex-devel 49 +BuildRequires: taglib-devel 50 +BuildRequires: taglib-devel 51 +%endif 52 +BuildRequires: cdparanoia-devel 53 +BuildRequires: gstreamer010-devel 54 +BuildRequires: gstreamer010-plugins-base-devel 55 +BuildRequires: libsamplerate-devel 56 +BuildRequires: libtunepimp-devel 57 +BuildRequires: xz 58 +BuildRequires: pkgconfig(libxine) 59 +Version: 4.8.4 60 +Release: 3.2.2 61 +Summary: Base package for KDE multimedia applications 62 +License: GPL-2.0+ 63 +Group: System/GUI/KDE 64 +Url: http://www.kde.org 65 +Source: kdemultimedia-%{version}.tar.xz 66 +Patch1: kmix-autostart_122.diff 67 +Patch2: kdemultimedia4-4.8.3-ffmpeg_011.patch 68 +Suggests: juk 69 +Suggests: kio_audiocd 70 +Suggests: kmix 71 +Suggests: kscd 72 +BuildRoot: %{_tmppath}/%{name}-%{version}-build 73 +%if 0 74 +Suggests: phonon_gst 75 +Suggests: phonon_xine 76 +%endif 77 +%kde4_runtime_requires 78 + 79 +%description 80 +This package suggests the packages which are built from the 81 +kdemultimedia module. 82 + 83 +%prep 84 +%setup -q -n kdemultimedia-%{version} 85 +%patch1 86 +%patch2 87 + 88 +FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') 89 +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" libkcompactdisc/wmlib/wm_helpers.c 90 + 91 +%build 92 + %cmake_kde4 -d build 93 + %make_jobs 94 + 95 +%install 96 + cd build 97 + %make_install 98 + ls 99 + %create_subdir_filelist -d kioslave -v kioslave.devel 100 + %create_subdir_filelist -d kscd 101 + %create_subdir_filelist -d libkcompactdisc -v libkcompactdisc.devel 102 + %create_subdir_filelist -d juk 103 + %create_subdir_filelist -d kmix 104 + %create_subdir_filelist -d dragonplayer 105 + %create_subdir_filelist -d libkcddb -v libkcddb.devel 106 + cd .. 107 + %create_exclude_filelist 108 + %suse_update_desktop_file kmix AudioVideo Mixer 109 + %suse_update_desktop_file kscd AudioVideo Player CD 110 + %suse_update_desktop_file juk AudioVideo Player 111 + %suse_update_desktop_file dragonplayer Video 112 + %kde_post_install 113 + 114 +%post -p /sbin/ldconfig 115 + 116 +%postun -p /sbin/ldconfig 117 + 118 +%clean 119 + rm -rf %{buildroot} 120 + rm -rf filelists 121 + 122 +%package -n dragonplayer 123 +Summary: Multimedia Player 124 +Group: Productivity/Multimedia/Video/Players 125 +Url: http://dragonplayer.org/ 126 +%kde4_runtime_requires 127 + 128 +%description -n dragonplayer 129 +Dragon Player is a simple KDE 4 video player. 130 + 131 +%post -n dragonplayer -p /sbin/ldconfig 132 + 133 +%postun -n dragonplayer -p /sbin/ldconfig 134 + 135 +%files -n dragonplayer -f filelists/dragonplayer 136 +%defattr(-,root,root) 137 +%doc COPYING COPYING.DOC README 138 +%dir %{_kde4_appsdir}/solid 139 +%dir %{_kde4_appsdir}/solid/actions 140 + 141 +%package -n juk 142 +Summary: Jukebox 143 +Group: Productivity/Multimedia/Sound/Players 144 +Provides: kde4-juk = 4.3.0 145 +Obsoletes: kde4-juk < 4.3.0 146 +%kde4_runtime_requires 147 + 148 +%description -n juk 149 +Jukebox and music manager for KDE 150 + 151 +%post -n juk -p /sbin/ldconfig 152 + 153 +%postun -n juk -p /sbin/ldconfig 154 + 155 +%files -n juk -f filelists/juk 156 +%defattr(-,root,root) 157 +%doc COPYING COPYING.DOC README 158 + 159 +%package -n kmix 160 +Summary: Sound Mixer 161 +Group: Productivity/Multimedia/Sound/Mixers 162 +Provides: kde4-kmix = 4.3.0 163 +Obsoletes: kde4-kmix < 4.3.0 164 +%kde4_runtime_requires 165 + 166 +%description -n kmix 167 +KDE's full featured mini mixer 168 + 169 +%post -n kmix -p /sbin/ldconfig 170 + 171 +%postun -n kmix -p /sbin/ldconfig 172 + 173 +%files -n kmix -f filelists/kmix 174 +%defattr(-,root,root) 175 +%doc COPYING COPYING.DOC README 176 + 177 +%package -n kscd 178 +Summary: CD Player 179 +Group: Productivity/Multimedia/CD/Players 180 +Requires: libkcddb4 = %{version} 181 +Requires: libkcompactdisc4 = %{version} 182 +Provides: kde4-kscd = 4.3.0 183 +Obsoletes: kde4-kscd < 4.3.0 184 +%kde4_runtime_requires 185 +%requires_ge libqt4-x11 186 + 187 +%description -n kscd 188 +KDE's CD Player 189 + 190 +%post -n kscd -p /sbin/ldconfig 191 + 192 +%postun -n kscd -p /sbin/ldconfig 193 + 194 +%files -n kscd -f filelists/kscd 195 +%defattr(-,root,root) 196 +%doc COPYING COPYING.DOC README 197 +%dir %{_kde4_appsdir}/solid 198 +%dir %{_kde4_appsdir}/solid/actions 199 + 200 +%package -n kio_audiocd 201 |
||
[+] | Deleted | kdemultimedia4.spec ^ |
@@ -1,623 +0,0 @@ -# -# spec file for package kdemultimedia4 -# -# Copyright (c) 2011 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/ -# - - -%bcond_with ffmpeg - -Name: kdemultimedia4 -BuildRequires: cdparanoia-devel -BuildRequires: flac-devel -BuildRequires: gstreamer010-devel -BuildRequires: gstreamer010-plugins-base-devel -BuildRequires: libao-devel -%if %{with ffmpeg} -BuildRequires: libffmpeg-devel -%endif -BuildRequires: libkde4-devel -BuildRequires: libknotificationitem-devel -BuildRequires: libmusicbrainz-devel -BuildRequires: libmusicbrainz3-devel -BuildRequires: libpulse-devel -BuildRequires: libsamplerate-devel -BuildRequires: libtheora-devel -BuildRequires: libtunepimp-devel -BuildRequires: libvorbis-devel -BuildRequires: speex-devel -BuildRequires: taglib-devel -BuildRequires: xine-devel -BuildRequires: xine-lib -Version: 4.7.2 -Release: 3.1.6 -License: GPLv2+ -Summary: Base package for KDE multimedia applications -Url: http://www.kde.org -Group: System/GUI/KDE -Source: kdemultimedia-%{version}.tar.bz2 -Patch1: kmix-autostart.diff -Suggests: juk -Suggests: kio_audiocd -Suggests: kmix -Suggests: kscd -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0 -Suggests: phonon_gst -Suggests: phonon_xine -%endif -%kde4_runtime_requires - -%description -This package suggests the packages which are built from the -kdemultimedia module. - -%prep -%setup -q -n kdemultimedia-%{version} -%patch1 -FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" libkcompactdisc/wmlib/wm_helpers.c - -%build - %cmake_kde4 -d build - %make_jobs - -%install - cd build - %make_install - ls - %create_subdir_filelist -d kioslave -v kioslave.devel - %create_subdir_filelist -d kscd - %create_subdir_filelist -d libkcompactdisc -v libkcompactdisc.devel - %create_subdir_filelist -d juk - %create_subdir_filelist -d kmix - %create_subdir_filelist -d dragonplayer - %create_subdir_filelist -d libkcddb -v libkcddb.devel - cd .. - %create_exclude_filelist - %suse_update_desktop_file kmix AudioVideo Mixer - %suse_update_desktop_file kscd AudioVideo Player CD - %suse_update_desktop_file juk AudioVideo Player - %suse_update_desktop_file dragonplayer Video - %kde_post_install - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%clean - rm -rf %{buildroot} - rm -rf filelists - -%package -n dragonplayer -License: GPLv2+ -Summary: Multimedia Player -Url: http://dragonplayer.org/ -Group: Productivity/Multimedia/Video/Players -%kde4_runtime_requires - -%description -n dragonplayer -Dragon Player is a simple KDE 4 video player. - -%post -n dragonplayer -p /sbin/ldconfig - -%postun -n dragonplayer -p /sbin/ldconfig - -%files -n dragonplayer -f filelists/dragonplayer -%defattr(-,root,root) -%doc COPYING COPYING.DOC README -%dir %{_kde4_appsdir}/solid -%dir %{_kde4_appsdir}/solid/actions - -%package -n juk -License: GPLv2+ -Summary: Jukebox -Group: Productivity/Multimedia/Sound/Players -Provides: kde4-juk = 4.3.0 -Obsoletes: kde4-juk < 4.3.0 -%kde4_runtime_requires - -%description -n juk -Jukebox and music manager for KDE - -%post -n juk -p /sbin/ldconfig - -%postun -n juk -p /sbin/ldconfig - -%files -n juk -f filelists/juk -%defattr(-,root,root) -%doc COPYING COPYING.DOC README - -%package -n kmix -License: GPLv2+ -Summary: Sound Mixer -Group: Productivity/Multimedia/Sound/Mixers -Provides: kde4-kmix = 4.3.0 -Obsoletes: kde4-kmix < 4.3.0 -%kde4_runtime_requires - -%description -n kmix -KDE's full featured mini mixer - -%post -n kmix -p /sbin/ldconfig - -%postun -n kmix -p /sbin/ldconfig - -%files -n kmix -f filelists/kmix -%defattr(-,root,root) -%doc COPYING COPYING.DOC README - -%package -n kscd -License: GPLv2+ -Summary: CD Player -Group: Productivity/Multimedia/CD/Players -Requires: libkcddb4 = %{version} -Requires: libkcompactdisc4 = %{version} -Provides: kde4-kscd = 4.3.0 -Obsoletes: kde4-kscd < 4.3.0 -%kde4_runtime_requires -%requires_ge libqt4-x11 - -%description -n kscd -KDE's CD Player - -%post -n kscd -p /sbin/ldconfig - -%postun -n kscd -p /sbin/ldconfig - -%files -n kscd -f filelists/kscd -%defattr(-,root,root) -%doc COPYING COPYING.DOC README -%dir %{_kde4_appsdir}/solid -%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} -Requires: libkcompactdisc4 = %{version} -Provides: kde4-kio_audiocd = 4.3.0 -Obsoletes: kde4-kio_audiocd < 4.3.0 -%kde4_runtime_requires - -%description -n kio_audiocd -This package contains an KIO slave to access audio CDs. - -%post -n kio_audiocd -p /sbin/ldconfig - | ||
[+] | Added | kdemultimedia4-4.8.3-ffmpeg_011.patch ^ |
@@ -0,0 +1,18 @@ +Index: ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp +=================================================================== +--- ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp.orig ++++ ffmpegthumbs/ffmpegthumbnailer/moviedecoder.cpp +@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder() + void MovieDecoder::initialize(const QString& filename) + { + av_register_all(); +- avcodec_init(); + avcodec_register_all(); + + QFileInfo fileInfo(filename); + +- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) { ++ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, NULL) != 0) { + kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); + return; + } | ||
[+] | Added | kmix-autostart_122.diff ^ |
@@ -0,0 +1,172 @@ +--- kmix/apps/KMixApp.cpp 2011-01-02 16:53:28.000000000 +0100 ++++ kmix/apps/KMixApp.cpp 2011-08-01 14:27:20.864178849 +0200 +@@ -22,9 +22,11 @@ + #include "KMixApp.h" + #include "apps/kmix.h" + #include <kdebug.h> ++#include <kcmdlineargs.h> + + + bool KMixApp::_keepVisibility = false; ++bool KMixApp::_autoStart = false; + + KMixApp::KMixApp() + : KUniqueApplication(), m_kmix( 0 ) +@@ -51,6 +53,17 @@ + // There are 3 cases for a new instance + + //kDebug(67100) << "KMixApp::newInstance() isRestored()=" << isRestored() << "_keepVisibility=" << _keepVisibility; ++ ++ KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); ++ ++ if (args->isSet("autostart")) ++ { ++ kapp->disableSessionManagement(); ++ ++ if ( m_kmix ) ++ return 0; ++ } ++ + static bool first = true; + if ( !first ) + { // There already exists an instance/window +@@ -118,6 +131,11 @@ + _keepVisibility = val_keepVisibility; + } + ++void KMixApp::autoStart(bool val_autoStart) { ++ //kDebug(67100) << "KMixApp::autoStart()"; ++ _autoStart = val_autoStart; ++} ++ + /* + void + KMixApp::quitExtended() +--- kmix/apps/KMixApp.h 2010-09-01 23:37:58.000000000 +0200 ++++ kmix/apps/KMixApp.h 2011-08-01 14:27:20.865178847 +0200 +@@ -36,6 +36,7 @@ + public slots: + //void quitExtended(); // For a hack on visibility() + static void keepVisibility(bool); ++ static void autoStart(bool); + /* + signals: + void stopUpdatesOnVisibility(); +@@ -43,6 +44,7 @@ + private: + KMixWindow *m_kmix; + static bool _keepVisibility; ++ static bool _autoStart; + }; + + #endif +--- kmix/apps/kmix.cpp 2011-07-31 18:38:33.000000000 +0200 ++++ kmix/apps/kmix.cpp 2011-08-01 14:29:03.519183816 +0200 +@@ -29,9 +29,11 @@ + #include <qradiobutton.h> + #include <QCursor> + #include <QString> ++#include <QTimer> + + + // include files for KDE ++#include <kcmdlineargs.h> + #include <kcombobox.h> + #include <kiconloader.h> + #include <kmessagebox.h> +@@ -106,6 +108,9 @@ + fixConfigAfterRead(); + theKMixDeviceManager->initHotplug(); + connect(theKMixDeviceManager, SIGNAL(plugged(const char*,QString,QString&)), SLOT (plugged(const char*,QString,QString&)) ); ++ if (KCmdLineArgs::parsedArgs()->isSet("autostart") && ! Mixer::mixers().first()) ++ QTimer::singleShot(0, kapp, SLOT(quit())); ++ + connect(theKMixDeviceManager, SIGNAL(unplugged(QString)), SLOT (unplugged(QString)) ); + if ( m_startVisible && ! invisible) + show(); // Started visible +@@ -316,6 +321,7 @@ + config.writeEntry( "Tickmarks", m_showTicks ); + config.writeEntry( "Labels", m_showLabels ); + config.writeEntry( "startkdeRestore", m_onLogin ); ++ config.writeEntry( "AutoStart", m_autoStart ); + config.writeEntry( "DefaultCardOnStart", m_defaultCardOnStart ); + config.writeEntry( "ConfigVersion", KMIX_CONFIG_VERSION ); + config.writeEntry( "AutoUseMultimediaKeys", m_autouseMultimediaKeys ); +@@ -420,6 +426,7 @@ + m_showLabels = config.readEntry("Labels", true); + m_onLogin = config.readEntry("startkdeRestore", true ); + m_startVisible = config.readEntry("Visible", false); ++ m_autoStart = config.readEntry("AutoStart", true); + m_multiDriverMode = config.readEntry("MultiDriver", false); + const QString& orientationString = config.readEntry("Orientation", "Vertical"); + m_defaultCardOnStart = config.readEntry( "DefaultCardOnStart", "" ); +@@ -1030,6 +1037,7 @@ + m_prefDlg->m_volumeChk->setChecked(m_volumeWidget); + m_prefDlg->m_volumeChk->setEnabled( m_showDockWidget ); + m_prefDlg->m_onLogin->setChecked( m_onLogin ); ++ m_prefDlg->m_disableAutoStart->setChecked( !m_autoStart ); + + m_prefDlg->m_showTicks->setChecked( m_showTicks ); + m_prefDlg->m_showLabels->setChecked( m_showLabels ); +@@ -1071,6 +1079,7 @@ + m_showDockWidget = prefDlg->m_dockingChk->isChecked(); + m_volumeWidget = prefDlg->m_volumeChk->isChecked(); + m_onLogin = prefDlg->m_onLogin->isChecked(); ++ m_autoStart = !prefDlg->m_disableAutoStart->isChecked(); + if ( prefDlg->_rbVertical->isChecked() ) { + m_toplevelOrientation = Qt::Vertical; + } +--- kmix/apps/kmix.h 2011-07-22 01:15:32.000000000 +0200 ++++ kmix/apps/kmix.h 2011-08-01 14:27:20.867178846 +0200 +@@ -106,6 +106,7 @@ + + bool m_showDockWidget; + bool m_volumeWidget; ++ bool m_autoStart; + bool m_showTicks; + bool m_showLabels; + bool m_onLogin; +--- kmix/apps/main.cpp 2010-09-07 00:50:02.000000000 +0200 ++++ kmix/apps/main.cpp 2011-08-01 14:27:20.867178846 +0200 +@@ -58,6 +58,7 @@ + + KCmdLineOptions options; + options.add("keepvisibility", ki18n("Inhibits the unhiding of the KMix main window, if KMix is already running.")); ++ options.add("autostart", ki18n("Used by kmix_autostart.desktop")); + KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + KUniqueApplication::addCmdLineOptions(); + +@@ -65,6 +66,8 @@ + bool hasArgKeepvisibility = args->isSet("keepvisibility"); + //kDebug(67100) << "hasArgKeepvisibility=" << hasArgKeepvisibility; + KMixApp::keepVisibility(hasArgKeepvisibility); ++ bool hasAutoStart = args->isSet("autostart"); ++ KMixApp::autoStart(hasAutoStart); + + if (!KMixApp::start()) + return 0; +--- kmix/gui/kmixprefdlg.cpp 2010-09-01 23:37:58.000000000 +0200 ++++ kmix/gui/kmixprefdlg.cpp 2011-08-01 14:27:20.868178847 +0200 +@@ -78,6 +78,12 @@ + m_onLogin = new QCheckBox( i18n("Restore volumes on login"), m_generalTab ); + l->addWidget( m_onLogin ); + ++ l = new QHBoxLayout(); ++ layout->addItem( l ); ++ l->addSpacing(10); ++ m_disableAutoStart = new QCheckBox( i18n("Disable automatic startup on login"), m_generalTab ); ++ l->addWidget( m_disableAutoStart ); ++ + // ----------------------------------------------------------- + + label = new QLabel( i18n("Visual"), m_generalTab ); +--- kmix/gui/kmixprefdlg.h 2010-09-01 23:37:58.000000000 +0200 ++++ kmix/gui/kmixprefdlg.h 2011-08-01 14:27:20.868178847 +0200 +@@ -55,6 +55,7 @@ + QCheckBox *m_showTicks; + QCheckBox *m_showLabels; + QCheckBox *m_onLogin; ++ QCheckBox *m_disableAutoStart; + QRadioButton *_rbVertical; + QRadioButton *_rbHorizontal; + }; | ||
Added | kdemultimedia-4.8.4.tar.xz ^ |