Mailinglist Archive: opensuse-commit (858 mails)
| < Previous | Next > |
commit kdemultimedia4
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 02 Nov 2007 01:26:29 +0100
- Message-id: <20071102002629.EDA8D6781B8@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdemultimedia4
checked in at Fri Nov 2 01:26:29 CET 2007.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2007-10-20 17:41:02.000000000
+0200
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes
2007-10-26 13:34:05.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 26 13:34:00 CEST 2007 - dmueller@xxxxxxx
+
+- update to KDE 4.0 beta4
+
+-------------------------------------------------------------------
Old:
----
kdemultimedia-3.94.1.tar.bz2
New:
----
kdemultimedia-3.95.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.C19857/_old 2007-11-02 01:24:20.000000000 +0100
+++ /var/tmp/diff_new_pack.C19857/_new 2007-11-02 01:24:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 3.94.1)
+# spec file for package kdemultimedia4 (Version 3.95.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,9 +17,9 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 3.94.1
+Version: 3.95.0
Release: 1
-%define rversion 3.94.1
+%define rversion 3.95.0
Source0: kdemultimedia-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -389,6 +389,8 @@
%_kde_share_dir/config.kcfg/libkcddb.kcfg
%_kde_share_dir/services/libkcddb.desktop
%changelog
+* Fri Oct 26 2007 - dmueller@xxxxxxx
+- update to KDE 4.0 beta4
* Sat Oct 20 2007 - dmueller@xxxxxxx
- update to 3.94.1
* Tue Oct 09 2007 - dmueller@xxxxxxx
++++++ kdemultimedia-3.94.1.tar.bz2 -> kdemultimedia-3.95.0.tar.bz2 ++++++
Files old/kdemultimedia-3.94.1/doc/juk/index.cache.bz2 and
new/kdemultimedia-3.95.0/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-3.94.1/doc/kmix/index.cache.bz2 and
new/kdemultimedia-3.95.0/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-3.94.1/doc/kscd/index.cache.bz2 and
new/kdemultimedia-3.95.0/doc/kscd/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/juk/CMakeLists.txt
new/kdemultimedia-3.95.0/juk/CMakeLists.txt
--- old/kdemultimedia-3.94.1/juk/CMakeLists.txt 2007-08-29 11:56:43.000000000
+0200
+++ new/kdemultimedia-3.95.0/juk/CMakeLists.txt 2007-10-24 14:17:57.000000000
+0200
@@ -101,8 +101,7 @@
# Add gstreamer here too...
-target_link_libraries(juk m ${KDE4_KHTML_LIBS} ${TAGLIB_LIBRARIES}
- ${KDE4_PHONON_LIBS})
+target_link_libraries(juk m ${KDE4_KHTML_LIBS} ${TAGLIB_LIBRARIES}
${KDE4_KDE3SUPPORT_LIBS} ${KDE4_PHONON_LIBS})
if(TUNEPIMP_FOUND)
target_link_libraries(juk ${TUNEPIMP_LIBRARIES})
endif(TUNEPIMP_FOUND)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/juk/jukservicemenu.desktop
new/kdemultimedia-3.95.0/juk/jukservicemenu.desktop
--- old/kdemultimedia-3.94.1/juk/jukservicemenu.desktop 2007-10-03
13:47:40.000000000 +0200
+++ new/kdemultimedia-3.95.0/juk/jukservicemenu.desktop 2007-10-23
10:39:36.000000000 +0200
@@ -1,6 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
ServiceTypes=application/ogg,audio/x-vorbis+ogg,audio/mpeg,audio/x-flac,audio/x-flac+ogg,audio/x-musepack
+Type=Service
Actions=addToCollection;
[Desktop Action addToCollection]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/juk/playlistbox.cpp
new/kdemultimedia-3.95.0/juk/playlistbox.cpp
--- old/kdemultimedia-3.94.1/juk/playlistbox.cpp 2007-06-27
12:59:16.000000000 +0200
+++ new/kdemultimedia-3.95.0/juk/playlistbox.cpp 2007-10-23
10:39:36.000000000 +0200
@@ -331,7 +331,7 @@
"playlists from your
collection?"),
names,
i18n("Remove Items?"),
- KGuiItem(i18n("&Remove"),
"edit-trash")) == KMessageBox::Cancel)
+ KGuiItem(i18n("&Remove"),
"user-trash")) == KMessageBox::Cancel)
{
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/juk/playlistcollection.cpp
new/kdemultimedia-3.95.0/juk/playlistcollection.cpp
--- old/kdemultimedia-3.94.1/juk/playlistcollection.cpp 2007-10-08
09:42:17.000000000 +0200
+++ new/kdemultimedia-3.95.0/juk/playlistcollection.cpp 2007-10-23
10:39:36.000000000 +0200
@@ -882,7 +882,7 @@
createAction(i18n("Play First Track"),SLOT(slotPlayFirst()),
"playFirst");
- createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()),
"forwardAlbum", "find-next");
+ createAction(i18n("Play Next Album"), SLOT(slotPlayNextAlbum()),
"forwardAlbum", "edit-find-next");
createAction(i18n("Open..."), SLOT(slotOpen()),
"file_open", "document-open", KShortcut(Qt::CTRL + Qt::Key_O));
createAction(i18n("Add &Folder..."), SLOT(slotAddFolder()),
"openDirectory", "document-open");
@@ -890,7 +890,7 @@
createAction(i18n("D&uplicate..."), SLOT(slotDuplicate()),
"duplicatePlaylist", "edit-copy");
createAction(i18n("Save"), SLOT(slotSave()),
"file_save", "document-save", KShortcut(Qt::CTRL + Qt::Key_S));
createAction(i18n("Save As..."), SLOT(slotSaveAs()),
"file_save_as", "document-save-as");
- createAction(i18n("R&emove"), SLOT(slotRemove()),
"deleteItemPlaylist", "edit-trash");
+ createAction(i18n("R&emove"), SLOT(slotRemove()),
"deleteItemPlaylist", "user-trash");
createAction(i18n("Reload"), SLOT(slotReload()),
"reloadPlaylist", "view-refresh");
createAction(i18n("Edit Search..."), SLOT(slotEditSearch()),
"editSearch", "edit-clear");
@@ -918,7 +918,7 @@
historyAction->setCheckedState(KGuiItem(i18n("Hide &History")));
KToggleAction *upcomingAction =
- new KToggleAction(KIcon("calendar-today"), i18n("Show &Play Queue"),
actions());
+ new KToggleAction(KIcon("go-jump-today"), i18n("Show &Play Queue"),
actions());
actions()->addAction("showUpcoming", upcomingAction);
upcomingAction->setCheckedState(KGuiItem(i18n("Hide &Play Queue")));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/juk/playlist.cpp
new/kdemultimedia-3.95.0/juk/playlist.cpp
--- old/kdemultimedia-3.94.1/juk/playlist.cpp 2007-10-03 13:47:40.000000000
+0200
+++ new/kdemultimedia-3.95.0/juk/playlist.cpp 2007-10-23 10:39:36.000000000
+0200
@@ -2096,7 +2096,7 @@
m_rmbMenu = new KMenu(this);
- m_rmbMenu->addAction(SmallIcon("calendar-today"),
+ m_rmbMenu->addAction(SmallIcon("go-jump-today"),
i18n("Add to Play Queue"), this, SLOT(slotAddToUpcoming()));
m_rmbMenu->addSeparator();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdemultimedia-3.94.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop
new/kdemultimedia-3.95.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop
--- old/kdemultimedia-3.94.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop
2007-10-16 16:50:29.000000000 +0200
+++ new/kdemultimedia-3.95.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop
2007-10-23 10:39:36.000000000 +0200
@@ -81,6 +81,7 @@
Comment[fa]=پیکربندی پیرو IO دیسک فشردۀ صوتی
Comment[fi]=Audiocd-siirräntätyöskentelijän asetukset
Comment[fr]=Configuration du module pour CD audio
+Comment[ga]=Cumraíocht ioslave Audiocd
Comment[gl]=Configuración do escravo IO de audiocd
Comment[he]=שינוי הגדרות פרוטוקול תקליטורי השמע
Comment[hr]=Postava Audiocd IO poslužnika
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixapplet.desktop
new/kdemultimedia-3.95.0/kmix/kmixapplet.desktop
--- old/kdemultimedia-3.94.1/kmix/kmixapplet.desktop 2007-10-16
16:50:29.000000000 +0200
+++ new/kdemultimedia-3.95.0/kmix/kmixapplet.desktop 2007-10-23
10:39:36.000000000 +0200
@@ -64,10 +64,12 @@
Comment[el]=Εμφανίζει και σας επιτρέπει να αλλάξετε την ένταση του ήχου
Comment[es]=Muestra y le deja controlar el volumen del sonido
Comment[fr]=Montre et vous permet de contrôler les volumes sonores
+Comment[ga]=Taispeáin agus rialaigh airde na fuaime
Comment[gl]=Mostra e permítelle controlar os volumes do son
Comment[ja]=音量の表示とコントロール
Comment[ko]=소리 음량을 보여 주고 조정합니다
Comment[nb]=Lar deg vise og kontrollere lydstyrke
+Comment[nds]=Wiest de Luutstärk-Kuntrull
Comment[ne]=देखाउँछ र तपाईँलाई ध्वनि भोल्युम नियन्त्रण गर्न अनुमति दिन्छ
Comment[nl]=Hiermee kunt u het geluidsvolume instellen
Comment[nn]=Viser og let deg endra lydstyrke
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixctrl_restore.desktop
new/kdemultimedia-3.95.0/kmix/kmixctrl_restore.desktop
--- old/kdemultimedia-3.94.1/kmix/kmixctrl_restore.desktop 2007-10-03
13:47:41.000000000 +0200
+++ new/kdemultimedia-3.95.0/kmix/kmixctrl_restore.desktop 2007-10-23
10:39:36.000000000 +0200
@@ -18,6 +18,7 @@
Name[fa]=بازگردانی تنظیمات مخلوطکن
Name[fi]=Palauta mikserin asetukset
Name[fr]=Restaurer la configuration du mixage
+Name[ga]=Athchóirigh Socruithe an Mheascthóra
Name[gl]=Restaura-los Parámetros do Mesturador
Name[he]=שיחזור הגדרות המערבל
Name[hr]=Vrati postavke miksera
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixdockwidget.cpp
new/kdemultimedia-3.95.0/kmix/kmixdockwidget.cpp
--- old/kdemultimedia-3.94.1/kmix/kmixdockwidget.cpp 2007-08-29
11:56:50.000000000 +0200
+++ new/kdemultimedia-3.95.0/kmix/kmixdockwidget.cpp 2007-10-26
11:05:41.000000000 +0200
@@ -235,7 +235,7 @@
case 'm': setIcon( loadIcon( "kmixdocked_mute" ) ); break;
case '1': setIcon( loadIcon( "kmixdocked_mute" ) ); break; // @todo
case '2': setIcon( loadIcon( "kmixdocked_error" ) ); break; // @todo
- case '3': setIcon( loadIcon( "kmixdocked" ) ); break;
+ case '3': setIcon( loadIcon( "audio-volume-high" ) ); break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kmix/kmixerwidget.cpp
new/kdemultimedia-3.95.0/kmix/kmixerwidget.cpp
--- old/kdemultimedia-3.94.1/kmix/kmixerwidget.cpp 2007-10-08
09:42:18.000000000 +0200
+++ new/kdemultimedia-3.95.0/kmix/kmixerwidget.cpp 2007-10-25
11:35:04.000000000 +0200
@@ -264,7 +264,10 @@
*/
void KMixerWidget::loadConfig( KConfig *config, const QString &grp )
{
- config->setGroup( grp );
+#ifdef __GNUC__
+#warning port to KConfigGroup. see also comments in KMixToolBox --ossi
+#endif
+// config->setGroup( grp );
const std::vector<ViewBase*>::const_iterator viewsEnd = _views.end();
for ( std::vector<ViewBase*>::const_iterator it = _views.begin(); it !=
viewsEnd; ++it) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kmix/mixer_oss.cpp
new/kdemultimedia-3.95.0/kmix/mixer_oss.cpp
--- old/kdemultimedia-3.94.1/kmix/mixer_oss.cpp 2007-06-27 12:59:22.000000000
+0200
+++ new/kdemultimedia-3.95.0/kmix/mixer_oss.cpp 2007-10-26 11:05:41.000000000
+0200
@@ -263,22 +263,44 @@
{
errormsg (Mixer::ERR_WRITE);
}
- else {
- // Re-read status of record source(s). Just in case the
hardware/driver has
- // some limitaton (like exclusive switches)
- int recsrcMask;
- if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1)
- errormsg(Mixer::ERR_READ);
- else
- {
- for(int i=0; i< m_mixDevices.count() ; i++ )
- {
- MixDevice *md = m_mixDevices[i];
- bool isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 );
- md->setRecSource(isRecsrc);
- } // for all controls
- } // reading newrecsrcmask is OK
+ /* The following if {} patch was submitted by Tim McCormick
<tim@xxxxxxxxx>. */
+ /* Comment (cesken): This patch fixes an issue with mutual exclusive
recording sources.
+ Actually the kernel soundcard driver *could* "do the right thing" by
examining the change
+ (old-recsrc XOR new-recsrc), and knowing which sources are mutual
exclusive.
+ The OSS v3 API docs indicate that the behaviour is undefined for this
case, and it is not
+ clearly documented how and whether SOUND_MIXER_CAP_EXCL_INPUT is
evaluated in the OSS driver.
+ Evaluating that in the application (KMix) could help, but the patch
will work independent
+ on whether SOUND_MIXER_CAP_EXCL_INPUT ist set or not.
+
+ In any case this patch is a superb workaround for a shortcoming of
the OSS v3 API.
+ */
+ // If the record source is supposed to be on, but wasn't set, explicitly
+ // set the record source. Not all cards support multiple record sources.
+ // As a result, we also need to do the read & write again.
+ if (((i_recsrc & ( 1<<devnum)) == 0) && on)
+ {
+ // Setting the new device failed => Try to enable it *exclusively*
+ oldrecsrc = i_recsrc = 1 << devnum;
+ if (ioctl(m_fd, SOUND_MIXER_WRITE_RECSRC, &i_recsrc) == -1)
+ errormsg (Mixer::ERR_WRITE);
+ if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1)
+ errormsg(Mixer::ERR_READ);
}
+
+ // Re-read status of record source(s). Just in case the hardware/driver has
+ // some limitaton (like exclusive switches)
+ int recsrcMask;
+ if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1)
+ errormsg(Mixer::ERR_READ);
+ else
+ {
+ for(int i=0; i< m_mixDevices.count() ; i++ )
+ {
+ MixDevice *md = m_mixDevices[i];
+ bool isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 );
+ md->setRecSource(isRecsrc);
+ } // for all controls
+ } // reading newrecsrcmask is OK
}
Files old/kdemultimedia-3.94.1/kmix/pics/audio-volume-high.png and
new/kdemultimedia-3.95.0/kmix/pics/audio-volume-high.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kmix/pics/CMakeLists.txt
new/kdemultimedia-3.95.0/kmix/pics/CMakeLists.txt
--- old/kdemultimedia-3.94.1/kmix/pics/CMakeLists.txt 2006-10-26
04:29:29.000000000 +0200
+++ new/kdemultimedia-3.95.0/kmix/pics/CMakeLists.txt 2007-10-26
11:05:41.000000000 +0200
@@ -4,6 +4,6 @@
########### install files ###############
-install( FILES mix_audio.png mix_bass.png mix_cd.png mix_ext.png
mix_microphone.png mix_midi.png mix_recmon.png mix_treble.png mix_unknown.png
mix_volume.png mix_surround.png mix_video.png mix_headphone.png
mix_digital.png mix_ac97.png kmixdocked.png kmixdocked_mute.png
kmixdocked_error.png mix_record.png SpeakerFrontLeft.png
SpeakerRearLeft.png SpeakerFrontRight.png SpeakerRearRight.png Listener.png
DESTINATION ${DATA_INSTALL_DIR}/kmix/pics )
+install( FILES mix_audio.png mix_bass.png mix_cd.png mix_ext.png
mix_microphone.png mix_midi.png mix_recmon.png mix_treble.png mix_unknown.png
mix_volume.png mix_surround.png mix_video.png mix_headphone.png
mix_digital.png mix_ac97.png kmixdocked.png kmixdocked_mute.png
kmixdocked_error.png mix_record.png SpeakerFrontLeft.png
SpeakerRearLeft.png SpeakerFrontRight.png SpeakerRearRight.png Listener.png
audio-volume-high.png DESTINATION ${DATA_INSTALL_DIR}/kmix/pics )
kde4_install_icons( ${ICON_INSTALL_DIR} )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kmix/restore_kmix_volumes.desktop
new/kdemultimedia-3.95.0/kmix/restore_kmix_volumes.desktop
--- old/kdemultimedia-3.94.1/kmix/restore_kmix_volumes.desktop 2007-10-03
13:47:41.000000000 +0200
+++ new/kdemultimedia-3.95.0/kmix/restore_kmix_volumes.desktop 2007-10-23
10:39:36.000000000 +0200
@@ -20,6 +20,7 @@
Name[fa]=بازگردانی حجم صداهای مخلوطکن
Name[fi]=Palauta mikserin äänivoimakkuudet
Name[fr]=Restaurer les volumes du mixage
+Name[ga]=Athchóirigh Airdí an Mheascthóra
Name[gl]=Restaurar os Volumes do Mesturador
Name[he]=שיחזור עוצמות הקול של המערבל
Name[hu]=A hangkeverő hangerőinek visszaállítása
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdemultimedia-3.94.1/kscd/audiocd_play.desktop
new/kdemultimedia-3.95.0/kscd/audiocd_play.desktop
--- old/kdemultimedia-3.94.1/kscd/audiocd_play.desktop 2007-10-03
13:47:39.000000000 +0200
+++ new/kdemultimedia-3.95.0/kscd/audiocd_play.desktop 2007-10-24
14:17:57.000000000 +0200
@@ -1,6 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
ServiceTypes=media/audiocd
+Type=Service
Actions=Play;
X-KDE-Priority=TopLevel
@@ -36,6 +37,7 @@
Name[ne]=प्ले
Name[nl]=Afspelen
Name[nn]=Spel
+Name[oc]=Legir
Name[pa]=ਚਲਾਓ
Name[pl]=Odtwarzaj
Name[pt]=Tocar
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |