Hello community, here is the log from the commit of package kde3-kaffeine for openSUSE:Factory checked in at Fri Sep 23 10:25:53 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde3-kaffeine/kde3-kaffeine.changes 2009-07-03 11:19:14.000000000 +0200 @@ -0,0 +1,545 @@ +------------------------------------------------------------------- +Thu May 28 12:42:23 CEST 2009 - [email protected] + +- update to 0.8.8: + * DVB: allow OSD on HD channels. + * DVB: PAT/PMT radios fixes. + * DVB: added live ringbuffer size option (in misc page) + * DVB: added tuner priority option. + * DVB: added mini-Diseqc option. + * DVB: added "Sending diseqc cmds twice" option. + * DVB: added "External positionner" option. + * DVB: option to disable MFE probing. + * DVB: add DVB-S2 support. + * DVB: port to S2API. + * DVB: fixed crash that sometimes occurred during ATSC scanning + * DVB: improve support for ATSC scanning on cable (QAM) + +------------------------------------------------------------------- +Tue Apr 21 08:56:08 CEST 2009 - [email protected] + +- rename to kde3-kaffeine + +------------------------------------------------------------------- +Wed Apr 8 18:06:14 CEST 2009 - [email protected] + +- fix build due to uint16_t + +------------------------------------------------------------------- +Mon Jul 7 12:58:01 CEST 2008 - [email protected] + +- update to 0.8.7: + * kaffeine: add MOD/STM mimetypes + * kaffeine: fullscreen fix, patch by Einars Lielmanis <[email protected]> + * DVB: updated libdvb, added CAM menu. + * DVB: added multiservices CAM support. + * DVB: added ATSC scanning, patch by "Devin Heitmueller" <[email protected]> + * DVB: added 7MHz autoscan. + * DVB: reworked CAM support. + +------------------------------------------------------------------- +Wed Apr 30 08:19:53 CEST 2008 - [email protected] + +- fix build + +------------------------------------------------------------------- +Mon Feb 4 22:04:26 CET 2008 - [email protected] + +- Fix use of temporary object. + +------------------------------------------------------------------- +Sun Jan 27 08:58:32 CET 2008 - [email protected] + +- update to 0.8.6: + * xine-part: added fastforward/slowmotion dcop calls, escape + special chars, improved seeking, added screen resolution + settings, added nextAudioChannel and nextSubtitleChannel to + player menu dcop calls, fix audio/sub selection + * several DVB fixes and improvements + * CDDA: fixed encoding crash + * kaffeine: requires xine-lib =>1.1.9 + +------------------------------------------------------------------- +Mon Aug 13 22:28:35 CEST 2007 - [email protected] + +- don't duplicate the docs between -lang and base pack + +------------------------------------------------------------------- +Fri Aug 10 09:16:01 CEST 2007 - [email protected] + +- remove private __u64 declaration, asm/types.h was fixed for -ansi + +------------------------------------------------------------------- +Mon Aug 6 13:34:04 CEST 2007 - [email protected] + +- fix build + +------------------------------------------------------------------- +Sun Jul 29 10:40:02 CEST 2007 - [email protected] + +- update to 0.8.5: several DVB related fixes and enhancements like + * DVB: save/load epg data + * DVB: add a "recall" button, that zap to previous played channel + * DVB: make channel visible and selected after editing. + * DVB: added a search field in channels list + +------------------------------------------------------------------- +Wed Jun 6 15:18:46 CEST 2007 - [email protected] + +- replace playback hint URL also in to be translated text + +------------------------------------------------------------------- +Mon Jun 4 10:40:05 CEST 2007 - [email protected] + +- fix build on older distributions + +------------------------------------------------------------------- +Fri Jun 1 08:20:30 CEST 2007 - [email protected] + +- move kde_post_install + +------------------------------------------------------------------- +Mon May 14 15:18:55 CEST 2007 - [email protected] + +- seperate translations into special package + +------------------------------------------------------------------- +Sun Apr 29 14:31:39 CEST 2007 - [email protected] + +- fix build on 10.0 + +------------------------------------------------------------------- +Thu Apr 26 16:07:15 CEST 2007 - [email protected] + +- update dvb data + +------------------------------------------------------------------- +Sat Apr 14 07:51:37 CEST 2007 - [email protected] + +- update to version 0.8.4: + * Playlist: menu option to not auto switch to player window + * DVB: added osd browsing dcop calls + * xine-part: dragndrop subtitles files + * fixed: removed readonly parts support + * fixed: improve screensaver disabling method again + (old behaviour for non-kde environments) + * DVB: added a "source" column in channels list. + * Playlist: fix opening playlists + * DVB: rotors support (usals and mem_pos) + * DVB: fixed multi devices usage. + * DVB: fixed devices probing + * DVB: added tuning timeout options + * DVB: fixed OSD epg bug with diseqc settings + * DVB: use klocale for datetime format + * Playlist: fix google fetcher + * xine-part: support for xcb. Requires libxcb 1.0 and xine-lib + 1.1.5. Fixes several issues. + * gstreamer-part: port to gst 0.10 + * fixed: allow small window size in minimal mode + * added: allow toggling (show / hide) panels by clicking tabs + * xine-part: reduced audio/sub combos sizes + * xine-part: add volume+/- to embedded context menu. + * Playlist: don't cut bottom font in rollingtitle. + * xine-part: better "Track infos" box layout. + * xine-part: don't restore video settings if not previously saved + +------------------------------------------------------------------- +Mon Dec 4 16:33:29 CET 2006 - [email protected] + +- update to version 0.8.3: + * DVB: selectAll button in scandialog + * DVB: save channels list sort order + * DVB: added "Current channel" button in epg window + * xine-part: shortcuts for delay/advance subtitles (ctrl+alt+right/left) + * xine-part: fixed wmv seeking. + * xine-part: save and restore video settings (hue,saturation,contrast,brightness) + * DVB: OSD warning when timeshift hd<300MB + * added: option to start in minimal mode + dcop call. + * added: "Open Dir" starts playing dvd from dir if dir points to a dvd image. + * added: playing dvd iso files. + * DVB: auto rename channels when adding to list + * Disc: fixed crash trying to play while encoding + * Disc: Ask user for cddb close matches + * fixed: session issue. + * fixed: better screensaver disabling method (no interfering key presses anymore). + * DVB: fixed scanning services sharing same pmt. + * DVB: added H/V (C band mutipoint) lnb settings. + * DVB: improved device detection. + * DVB: added : "int dvbSNR( int device )" dcop call. + * fixed: crash when quit from systray. + +------------------------------------------------------------------- +Mon Nov 27 11:36:05 CET 2006 - [email protected] + +- fix one faulty German translation + +------------------------------------------------------------------- +Sat Nov 25 14:00:25 CET 2006 - [email protected] + +- fix autoconf setup for translations (#223736) + +------------------------------------------------------------------- +Mon Nov 13 15:53:35 CET 2006 - [email protected] + +- fix DVD playback warning dialog logic + +------------------------------------------------------------------- +Mon Nov 13 13:29:42 CET 2006 - [email protected] + +- fix DVD playback warning URL + +------------------------------------------------------------------- +Thu Nov 9 15:11:36 CET 2006 - [email protected] + +- fix array subscript out of range (#212476) + +------------------------------------------------------------------- +Sat Sep 9 19:24:25 CEST 2006 - [email protected] ++++ 348 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kde3-kaffeine/kde3-kaffeine.changes calling whatdependson for head-i586 New: ---- adjust-mimetypes.diff cs.po dvbaudio-fix-build.patch dvbdata.tar.gz kaffeine-0.8.8.tar.bz2 kaffeine-link.diff kaffeine-media.diff kaffeine-quote-subs.patch kaffeine-tmpobject.diff kaffeine.diff kde3-kaffeine.changes kde3-kaffeine.spec logo.ogg messagebox-dvd.diff mutex.diff old-paranoia.diff pedantic.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-kaffeine.spec ++++++ # # spec file for package kde3-kaffeine (Version 0.8.8) # # Copyright (c) 2009 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/ # # norootforbuild Name: kde3-kaffeine BuildRequires: kdelibs3-devel xine-devel xine-lib %if %suse_version > 1001 BuildRequires: gstreamer010-plugins-base-devel %else BuildRequires: gstreamer-plugins-devel %endif %if %suse_version > 1110 BuildRequires: cdparanoia-devel %else BuildRequires: cdparanoia %endif Url: http://kaffeine.sourceforge.net/ License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player Version: 0.8.8 Release: 47 %define rversion %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) %if %suse_version > 1020 Requires: %{name}-lang = %{version} %endif Provides: kaxtv Obsoletes: kaxtv Source0: kaffeine-%rversion.tar.bz2 Source4: logo.ogg Source5: cs.po Source6: dvbdata.tar.gz Patch0: kaffeine.diff Patch1: adjust-mimetypes.diff Patch2: messagebox-dvd.diff Patch4: mutex.diff Patch5: kaffeine-media.diff Patch6: kaffeine-link.diff Patch8: kaffeine-quote-subs.patch Patch9: pedantic.diff Patch10: kaffeine-tmpobject.diff Patch11: dvbaudio-fix-build.patch Patch12: old-paranoia.diff Provides: kaffeine = 0.8.7 Obsoletes: kaffeine <= 0.8.7 Obsoletes: kaffeine-lang <= 0.8.7 %description Kaffeine plays all files and devices supported by Xine. For example, MPEG files, AVI (if the codec being used is supported by Xine), MP3, and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards. Authors: -------- J�rgen Kofler <[email protected]> %package gstreamer License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players Summary: Multimedia Player using Gstreamer Provides: kaffeine-gstreamer = 0.8.7 Obsoletes: kaffeine-gstreamer <= 0.8.7 %description gstreamer This plugin enables Kaffeine to play via the Gstreamer framework instead of Xine. The gstreamer backend can only get used for the visualization of audio sources. Authors: -------- J�rgen Kofler <[email protected]> %lang_package %prep %setup -q -n kaffeine-%rversion %patch0 %patch1 %patch2 %patch4 #%patch5 %patch6 %patch8 %patch9 %patch10 %patch11 %patch12 cp %SOURCE5 po/ . /etc/opt/kde3/common_options update_admin %build . /etc/opt/kde3/common_options ./configure $configkde --disable-final make %{?jobs:-j%jobs} cp %{SOURCE6} images %install . /etc/opt/kde3/common_options make DESTDIR=${RPM_BUILD_ROOT} $INSTALL_TARGET # install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/opt/kde3/share/apps/kaffeine/logo.avi # -r to get rid of Music %suse_update_desktop_file -r kaffeine KDE AudioVideo Player Video rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx rm $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/x-mplayer2.desktop kde_post_install %find_lang kaffeine %post %run_ldconfig %postun %run_ldconfig %if %suse_version > 1020 %files lang -f kaffeine.lang %defattr(-,root,root) %dir /opt/kde3/share/locale/br %dir /opt/kde3/share/locale/br/LC_MESSAGES %dir /opt/kde3/share/locale/ka %dir /opt/kde3/share/locale/ka/LC_MESSAGES %dir /opt/kde3/share/locale/mk %dir /opt/kde3/share/locale/mk/LC_MESSAGES %dir /opt/kde3/share/locale/se %dir /opt/kde3/share/locale/se/LC_MESSAGES %dir /opt/kde3/share/locale/uz %dir /opt/kde3/share/locale/uz/LC_MESSAGES %files %else %files -f kaffeine.lang %endif %defattr(-,root,root) /opt/kde3/bin/* /opt/kde3/include/kaffeine /opt/kde3/%_lib/lib* /opt/kde3/%_lib/kde3/libxinepart.* /opt/kde3/%_lib/kde3/libkaffeineoggvorbis.* /opt/kde3/share/appl*/*/* /opt/kde3/share/apps/kaffeine /opt/kde3/share/apps/konqueror /opt/kde3/share/apps/profiles /opt/kde3/share/icons/* /opt/kde3/share/mimelnk/*/*.desktop /opt/kde3/share/services/xine_part.desktop /opt/kde3/share/services/kaffeineoggvorbis.desktop /opt/kde3/share/servicetypes/kaffeineaudioencoder.desktop /opt/kde3/share/servicetypes/kaffeinedvbplugin.desktop /opt/kde3/share/servicetypes/kaffeineepgplugin.desktop %dir /opt/kde3/share/locale/bn %dir /opt/kde3/share/locale/bn/LC_MESSAGES %dir /opt/kde3/share/locale/ga %dir /opt/kde3/share/locale/ga/LC_MESSAGES %dir /opt/kde3/share/locale/km %dir /opt/kde3/share/locale/km/LC_MESSAGES %dir /opt/kde3/share/locale/tg %dir /opt/kde3/share/locale/tg/LC_MESSAGES %files gstreamer %defattr(-,root,root) %if %suse_version > 1000 /opt/kde3/%_lib/kde3/libgstreamerpart.* /opt/kde3/share/apps/gstreamerpart /opt/kde3/share/services/gstreamer_part.desktop %endif %changelog * Wed Apr 08 2009 [email protected] - fix build due to uint16_t * Mon Jul 07 2008 [email protected] - update to 0.8.7: * kaffeine: add MOD/STM mimetypes * kaffeine: fullscreen fix, patch by Einars Lielmanis <[email protected]> * DVB: updated libdvb, added CAM menu. * DVB: added multiservices CAM support. * DVB: added ATSC scanning, patch by "Devin Heitmueller" <[email protected]> * DVB: added 7MHz autoscan. * DVB: reworked CAM support. * Wed Apr 30 2008 [email protected] - fix build * Mon Feb 04 2008 [email protected] - Fix use of temporary object. * Sun Jan 27 2008 [email protected] - update to 0.8.6: * xine-part: added fastforward/slowmotion dcop calls, escape special chars, improved seeking, added screen resolution settings, added nextAudioChannel and nextSubtitleChannel to player menu dcop calls, fix audio/sub selection * several DVB fixes and improvements * CDDA: fixed encoding crash * kaffeine: requires xine-lib =>1.1.9 * Mon Aug 13 2007 [email protected] - don't duplicate the docs between -lang and base pack * Fri Aug 10 2007 [email protected] - remove private __u64 declaration, asm/types.h was fixed for -ansi * Mon Aug 06 2007 [email protected] - fix build * Sun Jul 29 2007 [email protected] - update to 0.8.5: several DVB related fixes and enhancements like * DVB: save/load epg data * DVB: add a "recall" button, that zap to previous played channel * DVB: make channel visible and selected after editing. * DVB: added a search field in channels list * Wed Jun 06 2007 [email protected] - replace playback hint URL also in to be translated text * Mon Jun 04 2007 [email protected] - fix build on older distributions * Fri Jun 01 2007 [email protected] - move kde_post_install * Mon May 14 2007 [email protected] - seperate translations into special package * Sun Apr 29 2007 [email protected] - fix build on 10.0 * Thu Apr 26 2007 [email protected] - update dvb data * Sat Apr 14 2007 [email protected] - update to version 0.8.4: * Playlist: menu option to not auto switch to player window * DVB: added osd browsing dcop calls * xine-part: dragndrop subtitles files * fixed: removed readonly parts support * fixed: improve screensaver disabling method again (old behaviour for non-kde environments) * DVB: added a "source" column in channels list. * Playlist: fix opening playlists * DVB: rotors support (usals and mem_pos) * DVB: fixed multi devices usage. * DVB: fixed devices probing * DVB: added tuning timeout options * DVB: fixed OSD epg bug with diseqc settings * DVB: use klocale for datetime format * Playlist: fix google fetcher * xine-part: support for xcb. Requires libxcb 1.0 and xine-lib 1.1.5. Fixes several issues. * gstreamer-part: port to gst 0.10 * fixed: allow small window size in minimal mode * added: allow toggling (show / hide) panels by clicking tabs * xine-part: reduced audio/sub combos sizes * xine-part: add volume+/- to embedded context menu. * Playlist: don't cut bottom font in rollingtitle. * xine-part: better "Track infos" box layout. * xine-part: don't restore video settings if not previously saved * Mon Dec 04 2006 [email protected] - update to version 0.8.3: * DVB: selectAll button in scandialog * DVB: save channels list sort order * DVB: added "Current channel" button in epg window * xine-part: shortcuts for delay/advance subtitles (ctrl+alt+right/left) * xine-part: fixed wmv seeking. * xine-part: save and restore video settings (hue,saturation,contrast,brightness) * DVB: OSD warning when timeshift hd<300MB * added: option to start in minimal mode + dcop call. * added: "Open Dir" starts playing dvd from dir if dir points to a dvd image. * added: playing dvd iso files. * DVB: auto rename channels when adding to list * Disc: fixed crash trying to play while encoding * Disc: Ask user for cddb close matches * fixed: session issue. * fixed: better screensaver disabling method (no interfering key presses anymore). * DVB: fixed scanning services sharing same pmt. * DVB: added H/V (C band mutipoint) lnb settings. * DVB: improved device detection. * DVB: added : "int dvbSNR( int device )" dcop call. * fixed: crash when quit from systray. * Mon Nov 27 2006 [email protected] - fix one faulty German translation * Sat Nov 25 2006 [email protected] - fix autoconf setup for translations (#223736) * Mon Nov 13 2006 [email protected] - fix DVD playback warning dialog logic * Mon Nov 13 2006 [email protected] - fix DVD playback warning URL * Thu Nov 09 2006 [email protected] - fix array subscript out of range (#212476) * Sat Sep 09 2006 [email protected] - update to version 0.8.2: * fixed: removed statusBar. * Disc: bigendian fix. * DVB: added current programm OSD progress bar * DVB: speed up OSD * DVB: fixed timer edit bug * DVB: added dvbNewTimer dcop func. * DVB: allow overlapping timers to start. * fixed: make sure to load xine_part instead of old kaffeine_part. * xine_part: removed empty audio/subtitles channels. * Kaffeine_part(s): added an entry in context menu to toggle minimal mode. * Playlist: added a "Clear Current Playlist" menu entry. * Playlist: autodownload cover now optional. * fixed: update google fetcher. * fixed: allow toggling from/to player/playlist even in fullscreen. * DVB: show SNR value for scanned channels, so a dvb-t user can choose the best one. * DVB: selectable channels icons (rigth click on a channel name in the list) * DVB: added "Scheduled" button in EPG window. * DVB: add dvb-t 8mhz autoscan mode for devices that support it. * fixed: switch to player window if mime does not contain "audio" * xine_part: block messages when filename contains "#" * DVB: cicam support, by Christoph Pfister * Systray: reversed mouse wheel behaviour. * Playlist: added a KURLComboBox to file browser. * DVB: fixed fast zap lock. * fixed: reduced minimum window size. * Playlist: autoselect subtitle when unique. * Thu Aug 24 2006 [email protected] - fix ability to switch back to kaffeine player engine (#159367) * Thu Aug 17 2006 [email protected] - fix x-mplayer2.desktop file conflict with kdelibs3 * Fri Jul 21 2006 [email protected] - Quote '&' in subtitle names in playlist [KDE#131180]. * Sun Jun 04 2006 [email protected] - allow Novell translations * Mon May 15 2006 [email protected] - update to version 0.8.1 * fixed: configure check for cdparanoia. * Disc: force playing dvd/vcd with engine's default drive if kded_mediamanager fails to identify it. * kaffeine-part: plug dvd nav actions * DVB: write to fifo from a thread to circumvent deadlocks when xine stops (or fails) reading. * kaffeine-part: set skip forward/backward to 20s (to avoid "skating" when seeking in divx) * DVB: avoid negative freq value. * fixed: system:/media urls * fixed: include qapplication.h instead of qapp.h * fixed: use memcpy instead of mempcpy(gnu only) in ogg encoder. * fixed: ogg encoder makefile. * Mon Apr 10 2006 [email protected] - Improve gstreamer 0.10 by getting visualization to work * Sun Apr 09 2006 [email protected] - Move gstreamer part to 0.10 * Fri Mar 24 2006 [email protected] - fix buffer overflow (#156952, CVE-2006-0051) * Sat Mar 18 2006 [email protected] - fixed another case of system:/ problem (playing mp3s from CD would "download" the file first) * Thu Feb 16 2006 [email protected] - backported SVN fix for system:/ URLs (#150527) * Wed Jan 25 2006 [email protected] - converted neededforbuild to BuildRequires * Thu Jan 12 2006 [email protected] - Update URL in "DVDs cannot be played" messagebox to working one - Better check if xine-lib packaged by SUSE is installed * Sat Oct 22 2005 [email protected] - More finegraned locking. * Sat Sep 17 2005 [email protected] - Fix missing mutex [#106044]. * Wed Sep 07 2005 [email protected] - Fix undefined operation. * Tue Sep 06 2005 [email protected] - update to version 0.7.1 * new translations * crash fix with empty DVB lists in EPG handler * Mon Sep 05 2005 [email protected] - enable kaffeine kpart again, but do not associate any mimetypes (#115242) * Tue Aug 30 2005 [email protected] - disable kaffeine kpart (#11406) - disable some possible illegal links - do not create system tray icon by default * Sun Aug 07 2005 [email protected] - update to version 0.7 * improved DVB support * optional Gstreamer support via kaffeine-gstreamer package * media:/ slave support - remove xine-mad dependency * Fri Aug 05 2005 [email protected] - some proofreading for our patches * Wed Mar 30 2005 [email protected] - add czech translation from Klara * Thu Mar 24 2005 [email protected] - update to version 0.6 * DVB support merged from kaxtv * Fri Mar 11 2005 [email protected] - remove too late XInitThread() call in kpart, which can cause a crash (#72072) * Wed Mar 02 2005 [email protected] - add DVD warning dialog again * Thu Feb 17 2005 [email protected] - menu entry moved to xdg dir * Mon Jan 03 2005 [email protected] - fix installation of german man page * Mon Jan 03 2005 [email protected] - update to version 0.5 final * Wed Dec 22 2004 [email protected] - only package english manpage for now * Wed Nov 10 2004 [email protected] - update to version 0.5rc2 * Wed Oct 06 2004 [email protected] - update to version 0.5rc1 * Wed Sep 29 2004 [email protected] - fix broken desktop file syntax * Wed Sep 29 2004 [email protected] - fix handling from streams * Sun Sep 26 2004 [email protected] - adjust mimetypes to KDE 3.3 mimetypes - remove realplayer support, the Helix plugin is not supported atm. * Thu Aug 19 2004 [email protected] - use the logo codec file in theora format on SuSE 9.2 and later * Wed Jun 02 2004 [email protected] - update to version 0.4.3b * Mon May 03 2004 [email protected] - update to version 0.4.3 * obsoletes XInitThread patch * Fri Apr 16 2004 [email protected] - apply crash fix from Helio * Tue Apr 13 2004 [email protected] - update to version 0.4.2 * Mon Apr 05 2004 [email protected] - update czech translations * Tue Mar 16 2004 [email protected] - replace logo video. DivX4 won't work with our xine. * Sat Feb 21 2004 [email protected] - remove Music from Categories * Mon Jan 19 2004 [email protected] - update to version 0.4.1 * Sun Nov 16 2003 [email protected] - update to final 0.4 version * Fri Nov 07 2003 [email protected] - fix build - update to pre-0.4 snapshot * Wed Oct 01 2003 [email protected] - use --nofork in desktop file or temporary files are get removed to early * Sun Sep 21 2003 [email protected] - implement the message box different. It can get translated now and it solves also a crash in some cases. (#30224) * Fri Sep 19 2003 [email protected] - from #31052 * fix possible crash on quit * ask explizit for the "none" audio driver, if "auto" fails. * Fri Sep 19 2003 [email protected] - add czech translation * Thu Sep 18 2003 [email protected] - add hungarian translation * Sat Sep 06 2003 [email protected] - higher priority - fix position change on pause * Fri Sep 05 2003 [email protected] - justify Categories * Mon Aug 25 2003 [email protected] - fix configure script to detect libXtest -> no DPMS anymore during playing * Sat Aug 23 2003 [email protected] - drop some delete calls, which are reported as invalid by valgrind seems that fixes the crashes * Mon Jul 28 2003 [email protected] - use new macro name for %%suse_update_desktop_file * Mon Jul 28 2003 [email protected] - add Categories * Wed Jul 16 2003 [email protected] - initial package of version 0.3.2 ++++++ adjust-mimetypes.diff ++++++ --- kaffeine/src/kaffeine.desktop +++ kaffeine/src/kaffeine.desktop @@ -47,7 +47,8 @@ GenericName[xx]=xxMedia Playerxx GenericName[zh_CN]=媒体播放器 GenericName[zh_TW]=媒體播放程式 Icon=kaffeine -MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;audio/x-mod;audio/x-stm; +# removed on SUSE: audio/vnd.rn-realaudio; audio/x-pn-realaudio;audio/x-pn-realaudio-plugin; video/vnd.rn-realvideo; +MimeType=application/x-ogg;audio/basic;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;audio/x-mod;audio/x-stm; Name=Kaffeine Name[bn]=ক্যাফিন Name[pa]=ਕੈਫ਼ੀਨ --- kaffeine/src/player-parts/xine-part/xine_part.desktop +++ kaffeine/src/player-parts/xine-part/xine_part.desktop @@ -1,7 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Icon=kaffeine -MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; +#removed on SUSE: audio/vnd.rn-realaudio; audio/x-pn-realaudio;audio/x-pn-realaudio-plugin; video/vnd.rn-realvideo; +MimeType=application/x-ogg;audio/basic;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack; Name=Kaffeine-Xine Name[nb]=Kaffeine Xine Name[pa]=ਕੈਫੀਨ-ਜ਼ਾਇਨ ++++++ cs.po ++++++ ++++ 2129 lines (skipped) ++++++ dvbaudio-fix-build.patch ++++++ Subject: Fix build due to uint16_t From: Lubos Lunak Patch-upstream: no Build fails with /usr/include/linux/dvb/audio.h:79: error: expected '=’, ',’, ';’, 'asm’ or '__attribute__’ before 'audio_attributes_t’ Since it's a kernel header, it should be rather the kernel uint16_t then the stdint.h one, but they should be the same anyway :). --- kaffeine/src/input/dvb/lib/libdvbapi/dvbaudio.c.sav 2008-07-01 15:35:02.000000000 +0200 +++ kaffeine/src/input/dvb/lib/libdvbapi/dvbaudio.c 2009-04-08 17:47:35.000000000 +0200 @@ -25,6 +25,7 @@ #include <fcntl.h> #include <unistd.h> #include <sys/ioctl.h> +#include <stdint.h> #include <linux/dvb/audio.h> #include <errno.h> #include "dvbaudio.h" ++++++ kaffeine-link.diff ++++++ --- kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am.orig 2008-04-30 07:55:58.000000000 +0200 +++ kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am 2008-04-30 08:02:54.000000000 +0200 @@ -9,7 +9,7 @@ kaffeineincludedir = $(includedir)/kaffe noinst_HEADERS = koggenc.h libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui -libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS) +libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS) -lvorbis -logg libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined # this is where the desktop file will go ++++++ kaffeine-media.diff ++++++ Index: kaffeine/kaffeineapp.cpp =================================================================== --- kaffeine/src/kaffeineapp.cpp.orig +++ kaffeine/src/kaffeineapp.cpp @@ -61,19 +62,42 @@ int KaffeineApp::newInstance() if (args->count()) for (int i = 0; i < args->count(); i++ ) { - url = QFile::decodeName(args->arg(i)); - // relative file names - if ((url.left(1) != "/") && (!url.contains(":/")) && (url.lower() != "dvd") && (url.lower() != "vcd") - && (url.lower() != "audiocd") && (url.lower() != "cdda")) - url = path.absFilePath(url); + KURL u = KIO::NetAccess::mostLocalURL(args->url(i), 0); + if (u.isLocalFile()) + url = path.absFilePath(u.path()); + else + url = u.url(); urls.append(url); } + QString device = args->getOption("device"); + if (device == "default") + device = QString::null; + else if (device.startsWith("media:/") || device.startsWith("system:/media/")) + { + if (device.startsWith("system:/media/")) + { + device = device.mid(14); + device = device.prepend("media:/"); + } + KURL devicePath(device); + DCOPRef mediamanager("kded","mediamanager"); + DCOPReply reply = mediamanager.call("properties(QString)",devicePath.path(-1).mid(1)); + if (reply.isValid()) + { + QStringList properties = reply; + device = properties[5]; + } + else + device = QString::null; + } + if (m_kaffeine) /* still running */ { kdDebug() << "KaffeineApp: Kaffeine is still running..." << endl; if (urls.count() > 0) /* send urls to running instance */ { + m_kaffeine->setDevice(device); m_kaffeine->loadTMP(urls); QTimer::singleShot(300, m_kaffeine, SLOT(slotSwitchToPlayerWindow())); // delay for feeling only } @@ -92,23 +116,6 @@ int KaffeineApp::newInstance() if (args->isSet("verbose")) engineParameters.append("verbose=\"True\""); - QString device = args->getOption("device"); - if (device == "default") - device = QString::null; - else if (device.startsWith("media:/")) - { - KURL devicePath(device); - DCOPRef mediamanager("kded","mediamanager"); - DCOPReply reply = mediamanager.call("properties(QString)",devicePath.path(-1).mid(1)); - if (reply.isValid()) - { - QStringList properties = reply; - device = properties[5]; - } - else - device = QString::null; - } - m_kaffeine = new Kaffeine(urls, engineParameters, device, args->isSet("play"), args->isSet("fullscreen"), args->isSet("wizard"), 0, "kaffeine_mainview"); m_kaffeine->show(); ++++++ kaffeine-quote-subs.patch ++++++ --- kaffeine/src/input/audiobrowser/playlist.cpp +++ kaffeine/src/input/audiobrowser/playlist.cpp @@ -1895,7 +1895,12 @@ { QString subList; for(unsigned int i=0; i<tmp->subtitles().count(); i++) - subList += tmp->subtitles()[i] + "&"; + { + QString sub = tmp->subtitles()[i]; + sub.replace('%', "%25"); + sub.replace('&', "%26"); + subList += sub + "&"; + } entry.setAttribute("subs", subList); } --- kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp +++ kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp @@ -69,7 +69,11 @@ int currentSub = -1; if ((!att.value("subs").isNull()) && (!att.value("subs").isEmpty())) + { subs = QStringList::split("&",att.value("subs"),false); + subs.gres("%26", "&"); + subs.gres("%25", "%"); + } if ((!att.value("subs").isNull()) && (!att.value("subs").isEmpty())) { bool ok; ++++++ kaffeine-tmpobject.diff ++++++ --- kaffeine/src/player-parts/xine-part/kxinewidget.cpp +++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp @@ -2970,7 +2970,8 @@ void KXineWidget::setStreamSaveDir(const if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */ debugOut(QString("Set misc.save_dir to: %1").arg(dir)); - config.str_value = QFile::encodeName(dir).data(); + QCString edir = QFile::encodeName(dir); + config.str_value = edir.data(); xine_config_update_entry (m_xineEngine, &config); } ++++++ kaffeine.diff ++++++ --- kaffeine/src/kaffeine.desktop +++ kaffeine/src/kaffeine.desktop 2005/09/06 09:01:52 @@ -19,3 +19,4 @@ Terminal=false Type=Application X-KDE-HasTempFileOption=true +InitialPreference=4 --- kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2007/04/14 05:59:48 1.1 +++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2007/04/14 06:01:37 @@ -1115,7 +1115,8 @@ bool KXineWidget::initXine() /**** INIT XINE DISPLAY ****/ #ifndef HAVE_XCB - XInitThreads(); + // too late, it will crash for sure + //XInitThreads(); connection = XOpenDisplay(NULL); #else --- kaffeine/src/instwizard.cpp +++ kaffeine/src/instwizard.cpp 2005/09/06 09:01:52 @@ -106,8 +106,7 @@ if (entries.count()) info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>"; else - info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:") - << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\";>http://www.mplayerhq.hu</a>.</font>"; + info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats."); //LIBDVDCSS info << "<br><hr><b>" << "libdvdcss" << "...</b><br>"; @@ -131,8 +130,7 @@ } } if (!dvdcss) - info << "<font color=\"DarkRed\">" << i18n("libdvdcss not found. You're not able to play encrypted (most commercial) DVD's. You can get the library here (but using it may violate copyright regulations of your country!):") - << " <a href=\"http://developers.videolan.org/libdvdcss/\";>http://developers.videolan.org/libdvdcss</a>.</font>"; + info << "<font color=\"DarkRed\">" << i18n("libdvdcss not found. You're not able to play encrypted (most commercial) DVD's."); else info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>"; @@ -172,8 +170,7 @@ file.open(IO_ReadOnly); QTextStream stream(&file); info << "<font color=\"DarkBlue\">" << i18n("Found") << ": " << stream.readLine() << ". </font>" - << i18n("The xine-lib shipped by SuSE \"may lack certain features because of legal requirements (potential patent violation)\". You should use the packages from here:") - << " <a href=\"http://packman.links2linux.de/?action=124\";>http://packman.links2linux.de</a>."; + << i18n("The xine-lib shipped by SuSE \"may lack certain features because of legal requirements (potential patent violation)\"."); file.close(); } else --- configure.in.in.orig 2006-11-25 13:52:25.000000000 +0100 +++ configure.in.in 2006-11-25 13:52:42.000000000 +0100 @@ -1,4 +1,5 @@ #MIN_CONFIG(3.3) +AM_INIT_AUTOMAKE(kaffeine, "0.8.2") CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" if test "$build_arts" = "yes"; then ++++++ messagebox-dvd.diff ++++++ --- kaffeine/src/input/disc/disc.cpp 2006/03/28 11:51:04 1.1 +++ kaffeine/src/input/disc/disc.cpp 2006/03/28 11:57:23 @@ -583,6 +583,12 @@ if ( !device.isEmpty() ) mrl.setURL( QString("dvd://%1").arg(device) ); else { + + if ( !QFile::exists("/usr/share/xine/mad") && QFile::exists("/usr/share/doc/packages/xine/README.SuSE") ) { + KMessageBox::sorry(0, i18n("This version of Xine (used by Kaffeine) has only a reduced\nset of supported codecs. It is not able to play DVDs.\nRead http://en.opensuse.org/XINE for further details."), QString::null, KMessageBox::AllowLink); + return; + } + DCOPRef mediamanager("kded","mediamanager"); DCOPReply reply = mediamanager.call("fullList()"); if ( reply.isValid() ) { --- po/de.po 2006/12/05 09:33:47 1.15 +++ po/de.po 2006/12/05 09:34:21 @@ -3210,2 +3210,6 @@ msgid "DummyPart" msgstr "DummyPart" + +msgid "This version of Xine (used by Kaffeine) has only a reduced\nset of supported codecs. It is not able to play DVDs.\nPlease read http://en.opensuse.org/XINE for further details." +msgstr "Diese Version von Xine (wird von Kaffeine benutzt) hat nur\neine limitierte Anzahl von Codecs. Daher ist es nicht möglich eine DVD anzusehen.\nBitte lesen Sie diese Seite http://en.opensuse.org/XINE für weitere Informationen." + ++++++ mutex.diff ++++++ --- kaffeine/src/player-parts/xine-part/kxinewidget.cpp +++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp @@ -380,12 +380,13 @@ { debugOut("xine event: channels changed"); int i,channels; - char* lang = new char[128]; + char lang[128]; QString slang; int num; QStringList tmp; bool update=false, sk; + vw->m_mutex.lock(); /*** get audio channels ***/ tmp.append(i18n("auto")); channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL); @@ -433,8 +434,6 @@ vw->m_currentSub = num; } - delete [] lang; - //check if stream is seekable sk = (bool)xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_SEEKABLE); if ( vw->m_trackIsSeekable!=sk ) { @@ -442,6 +441,7 @@ vw->m_trackIsSeekable = sk; } + vw->m_mutex.unlock(); if ( update ) QApplication::postEvent(vw, new QTimerEvent(TIMER_EVENT_NEW_CHANNELS)); break; @@ -705,7 +705,9 @@ } case TIMER_EVENT_NEW_CHANNELS: { + m_mutex.lock(); emit signalNewChannels(m_audioCh, m_subCh, m_currentAudio, m_currentSub); + m_mutex.unlock(); break; } case TIMER_EVENT_NEW_TITLE: --- kaffeine/src/player-parts/xine-part/kxinewidget.h +++ kaffeine/src/player-parts/xine-part/kxinewidget.h @@ -47,6 +47,7 @@ class QTime; #include <qtimer.h> +#include <qmutex.h> #include <qptrlist.h> #include <qthread.h> #include <X11/Xlib.h> @@ -485,6 +486,7 @@ bool m_trackHasAudio; bool m_trackHasChapters; bool m_trackIsSeekable; + QMutex m_mutex; /* dvb */ signals: ++++++ old-paranoia.diff ++++++ Index: kaffeine/src/input/disc/paranoia.h =================================================================== --- kaffeine/src/input/disc/paranoia.h (revision 970525) +++ kaffeine/src/input/disc/paranoia.h (revision 970524) @@ -32,8 +32,8 @@ extern "C" { -#include <cdio/cdda.h> -#include <cdio/paranoia.h> +#include <cdda_interface.h> +#include <cdda_paranoia.h> } class KiloConfig : public ParanoiaSettings @@ -91,8 +91,8 @@ bool setPath( QString &path, const QString &artist, const QString &album ); long nTracks; - cdrom_drive_t *d; - cdrom_paranoia_t *p; + cdrom_drive *d; + cdrom_paranoia *p; long currentSector, endOfTrack; bool isRunning; QStringList encodingList; Index: kaffeine/src/input/disc/Makefile.am =================================================================== --- kaffeine/src/input/disc/Makefile.am (revision 970525) +++ kaffeine/src/input/disc/Makefile.am (revision 970524) @@ -28,7 +28,7 @@ libkaffeinedisc_la_LIBADD = $(top_builddir)/kaffeine/src/input/libkaffeineinput.la \ $(top_builddir)/kaffeine/src/player-parts/kaffeine-part/libkaffeinepart.la \ $(top_builddir)/kaffeine/src/input/disc/plugins/libkaffeineaudioencoder.la \ - -lcdio_cdda -lcdio_paranoia + -lcdda_interface -lcdda_paranoia # this is where the XML-GUI resource file goes shellrcdir = $(kde_datadir)/kaffeine Index: kaffeine/src/input/disc/paranoia.cpp =================================================================== --- kaffeine/src/input/disc/paranoia.cpp (revision 970525) +++ kaffeine/src/input/disc/paranoia.cpp (revision 970524) @@ -120,7 +120,7 @@ { } -void paranoiaCallback( long int, paranoia_cb_mode_t ) +void paranoiaCallback( long, int ) { } @@ -396,7 +396,7 @@ curpos = currentSector; endpos = endOfTrack; if ( normalize ) { - len = CDIO_CD_FRAMESIZE_RAW; + len = CD_FRAMESIZE_RAW; fn.open( IO_ReadWrite | IO_Truncate ); do { buf = paranoia_read_limited( p, paranoiaCallback, 3 ); @@ -419,7 +419,7 @@ while ( curpos<endpos && len!=0 ); factor = 32767.0/max; - buf = new signed short[CDIO_CD_FRAMESIZE_RAW]; + buf = new signed short[CD_FRAMESIZE_RAW]; fn.at( 0 ); f.open( IO_ReadWrite | IO_Truncate ); currentEncoder->start( encodingList[i].remove(0,3), encodingList[0], encodingList[1], encodingList[i].left(2) ); @@ -428,7 +428,7 @@ f.writeBlock( encoded, len ); do { - len = fn.readBlock( (char*)buf, CDIO_CD_FRAMESIZE_RAW ); + len = fn.readBlock( (char*)buf, CD_FRAMESIZE_RAW ); if ( len>0 ) { if ( max<32760 ) for ( n=0; n<len/2; ++n ) @@ -455,7 +455,7 @@ encoded = currentEncoder->getHeader( len ); if ( encoded ) f.writeBlock( encoded, len ); - len = CDIO_CD_FRAMESIZE_RAW; + len = CD_FRAMESIZE_RAW; do { buf = paranoia_read_limited( p, paranoiaCallback, 3 ); if ( Q_BYTE_ORDER == Q_BIG_ENDIAN ) { @@ -514,7 +514,7 @@ QString s, c; long total; - total = CDIO_CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) ); + total = CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) ); if ( total>(1048576 ) ) s = c.setNum(total/1048576.0, 'f', 2)+" "+i18n("MB"); else if ( total>1024 ) s = c.setNum(total/1024.0, 'f', 2)+" "+i18n("KB"); else s = c.setNum(total*1.0, 'f', 2)+" "+i18n("Bytes"); @@ -532,8 +532,8 @@ long total, time; int m, s; - if ( t<0 ) total = CDIO_CD_FRAMESIZE_RAW * (cdda_disc_lastsector( d )-cdda_disc_firstsector( d ) ); - else total = CDIO_CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) ); + if ( t<0 ) total = CD_FRAMESIZE_RAW * (cdda_disc_lastsector( d )-cdda_disc_firstsector( d ) ); + else total = CD_FRAMESIZE_RAW * (cdda_track_lastsector( d, t+1 )-cdda_track_firstsector( d, t+1 ) ); time = (8 * total) / (44100 * 2 * 16); m = time/60; s = time%60; Index: kaffeine/configure.in.in =================================================================== --- kaffeine/configure.in.in (revision 970525) +++ kaffeine/configure.in.in (revision 970524) @@ -220,7 +220,7 @@ dnl check for cdparanoia dnl -------------------- -KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes], [with_cdparanoia=no]) +KDE_CHECK_HEADER([cdda_interface.h], [with_cdparanoia=yes], [with_cdparanoia=no]) if test "$with_cdparanoia" != "yes" ; then echo "" ++++++ pedantic.diff ++++++ --- kaffeine/src/input/dvb/dvbstream.cpp +++ kaffeine/src/input/dvb/dvbstream.cpp @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dvbsection.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
