|
[-]
[+]
|
Added |
kdemultimedia4-openSUSE_12.1.spec
|
|
|
|
[-]
[+]
|
Added |
kdemultimedia4-openSUSE_12.2.spec
^
|
|
|
|
[-]
[+]
|
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
^
|
