Changes of Revision 6
[-] | Changed | kaffeine.spec |
x 1
2 +# 3 +# Kaffeine spec file 4 +# 5 + 6 # norootforbuild 7 8 %define major 1 9 %define libname libxine%{major} 10 -%define libvers 1.1.10 11 +%define libvers 1.1.12 12 %define _kde_prefix %(. /etc/opt/kde3/common_options; echo $prefix) 13 %define _kde_mimedir %(. /etc/opt/kde3/common_options; echo $kde_mimedir) 14 %define _mimetypebase %(if [ "release" = "release" ] ; then echo "kaffeine/mimetypes/application/"; else echo "mimetypes/application/"; fi) 15
16 Summary: A xine-based Media Player for KDE3 17 Summary(de): Ein xine-basierender Media Player für KDE3 18 Version: 0.8.6 19 -Release: 0.pm.1 20 -License: GPL 21 +Release: 54 22 +License: GPL v2 or later 23 Group: Productivity/Multimedia/Video/Players 24 Url: http://kaffeine.sourceforge.net 25 26 Source0: kaffeine-0.8.6.tar.bz2 27 +Source1: cs.po 28 29 Patch0: kaffeine_configure.patch 30 +Patch1: mutex.diff 31 +Patch2: kaffeine-link.diff 32 +Patch3: kaffeine-quote-subs.patch 33 +Patch4: pedantic.diff 34 +Patch5: kaffeine-tmpobject.diff 35 BuildRoot: %{_tmppath}/%{name}-%{version}-build 36 Requires: %{libname} >= %{libvers} 37 -Requires: qt3 >= %( echo `rpm -q --queryformat '%{VERSION}' qt3` | cut -b 1-3 ) 38 -Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` | cut -b 1-3 ) 39 +Requires: qt3 40 +Requires: kdelibs3 41 Requires: libart_lgpl 42 -%if %suse_version >= 920 43 +%if 0%{?suse_version} >= 920 44 Requires: xorg-x11-libs 45 %else 46 Requires: XFree86-libs 47
48 BuildRequires: %{libname}-devel >= %{libvers} 49 BuildRequires: qt3-devel 50 BuildRequires: libart_lgpl 51 -%if %suse_version >= 920 52 +%if 0%{?suse_version} >= 920 53 BuildRequires: xorg-x11-devel 54 BuildRequires: xorg-x11-libs 55 %else 56
57 BuildRequires: jack >= 0.109 58 BuildRequires: libjack0 >= 0.109 59 BuildRequires: libjack-devel >= 0.109 60 -%if %suse_version > 1020 61 +%if 0%{?suse_version} > 1020 62 Requires: %{name}-lang = %{version} 63 %endif 64 Provides: kaxtv 65 Obsoletes: kaxtv 66 -# Packmandepends: libxine1 libogg libvorbis lame 67 68 %description 69 Kaffeine plays all files and devices supported by xine. For example: 70
71 Der gstreamer Backend kann derzeit nur zur Visualisierung von Audiodaten 72 verwendet werden. 73 74 - 75 -%if %suse_version > 1020 76 -%package lang 77 -Summary: Provides translations to the package kaffeine 78 -Summary(de): Stellt Übersetzungen für das Paket kaffeine bereit 79 -Group: System/Localization 80 -Provides: kaffeine-lang-all 81 - 82 -%description lang 83 -Provides translations to the package kaffeine 84 - 85 -%description lang -l de 86 -Stellt Übersetzungen für das Paket kaffeien bereit 87 -%endif 88 +%lang_package 89 90 %debug_package 91 92
93 94 %setup -n %{name}-%{version} 95 %patch0 96 +%patch1 97 +%patch2 98 +%patch3 99 +%patch4 100 +%patch5 101 +cp %SOURCE1 po/ 102 +#. /etc/opt/kde3/common_options 103 +#update_admin 104 105 %build 106 . /etc/opt/kde3/common_options 107
108 %ifarch x86_64 amd64 ia32e 109 --enable-libsuffix=64 \ 110 %endif 111 -%if %suse_version == 910 112 +%if 0%{?suse_version} == 910 113 --with-xinit-workaround \ 114 %endif 115 --disable-final 116
117 fi 118 %run_ldconfig 119 120 -%if %suse_version > 1020 121 +%if 0%{?suse_version} > 1020 122 123 %files lang -f %name.lang 124 125
126 127 %files gstreamer 128 %defattr(-,root,root) 129 -/opt/kde3/%_lib/kde3/libgstreamerpart.* 130 -/opt/kde3/share/apps/gstreamerpart 131 -/opt/kde3/share/services/gstreamer_part.desktop 132 +%{_kde_prefix}/%_lib/kde3/libgstreamerpart.* 133 +%{_kde_prefix}/share/apps/gstreamerpart 134 +%{_kde_prefix}/share/services/gstreamer_part.desktop 135 136 %changelog 137 * Wed Oct 03 2007 Carsten Schoene <cs@linux-administrator.com> 138 |
||
[+] | Added | kaffeine-link.diff ^ |
@@ -0,0 +1,22 @@ +--- kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am.orig 2008-01-20 18:50:47.000000000 +0100 ++++ kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am 2008-06-19 19:48:14.000000000 +0200 +@@ -9,7 +9,7 @@ + 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/src/input/disc/plugins/oggvorbis/Makefile.in.orig 2008-01-20 18:52:20.000000000 +0100 ++++ kaffeine/src/input/disc/plugins/oggvorbis/Makefile.in 2008-06-19 19:49:08.000000000 +0200 +@@ -394,7 +394,7 @@ + #>- libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui + #>+ 1 + libkaffeineoggvorbis_la_SOURCES=koggenc.cpp oggconfig.cpp +-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 + #>+ 1 + libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined $(KDE_NO_UNDEFINED) | ||
[+] | Added | kaffeine-quote-subs.patch ^ |
@@ -0,0 +1,30 @@ +--- 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; | ||
[+] | Added | kaffeine-tmpobject.diff ^ |
@@ -0,0 +1,12 @@ +--- 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); + } + | ||
[+] | Added | mutex.diff ^ |
@@ -0,0 +1,62 @@ +--- 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: | ||
[+] | Added | pedantic.diff ^ |
@@ -0,0 +1,10 @@ +--- 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> | ||
[+] | Added | cs.po ^ |
@@ -0,0 +1,2129 @@ +# translation of cs.po to +# translation of cs.po to +# translation of cs.po to +# translation of cs.po to +# translation of kaffeine.po to cs_CZ +# translation of cs.po to cs_CZ +# translation of cs.po to czech +# translation of kaffeine.po to czech +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Klara Cihlarova <koty@seznam.cz>, 2003, 2004, 2005. +# Petr Kopecký <petr.kopecky@sendmail.cz>, 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: cs\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-03-02 14:00+0100\n" +"PO-Revision-Date: 2005-03-30 08:45+0200\n" +"Last-Translator: Klara Cihlarova <koty@seznam.cz>\n" +"Language-Team: cs_CZ <cs@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: dvb/kevents.cpp:40 +msgid "EPG" +msgstr "EPG" + +#: dvb/kevents.cpp:45 dvb/kevents.cpp:69 +msgid "Refresh" +msgstr "Obnovit" + +#: dvb/kevents.cpp:47 dvb/kevents.cpp:70 +msgid "Current/Next" +msgstr "Současný/následující" + +#: dvb/kevents.cpp:54 dvb/krecord.cpp:46 +msgid "Channel" +msgstr "Kanál" + +#: dvb/kevents.cpp:55 dvb/krecord.cpp:47 +msgid "Begin" +msgstr "Začátek" + +#: dvb/kevents.cpp:56 dvb/krecord.cpp:48 +msgid "Duration" +msgstr "Trvání" + +#: dvb/kevents.cpp:57 playlist.cpp:84 +msgid "Title" +msgstr "Titul" + +#: dvb/kevents.cpp:105 +msgid "View all programs" +msgstr "Zobrazit všechny programy" + +#: dvb/kevents.cpp:107 +msgid "Add to timers" +msgstr "Přidat do časovačů" + +#: dvb/ktimereditor.cpp:35 dvb/channeleditorui.cpp:345 rc.cpp:35 +msgid "Name :" +msgstr "Jméno: " + +#: dvb/ktimereditor.cpp:39 +msgid "Channel :" +msgstr "Kanál: " + +#: dvb/ktimereditor.cpp:43 +msgid "Begin :" +msgstr "Začátek: " + +#: dvb/ktimereditor.cpp:47 +msgid "Duration :" +msgstr "Trvání:" + +#: dvb/ktimereditor.cpp:51 +msgid "Record as :" +msgstr "Nahrát jako:" + +#: dvb/ktimereditor.cpp:114 +msgid "Timer editor" +msgstr "Editor časovače" + +#: dvb/ktimereditor.cpp:125 dvb/channeleditor.cpp:98 +msgid "You must give it a name !" +msgstr "Musíte zadat jméno!" + +#: dvb/ktimereditor.cpp:130 +msgid "Name must not contain any slash( / ) !" +msgstr "Jméno nesmí obsahovat žádná lomítka( / )!" + +#: dvb/ktimereditor.cpp:135 +msgid "Name must not start with ( > ) !" +msgstr "Jméno nesmí začínat na ( > )!" + +#: dvb/ktimereditor.cpp:140 +msgid "Duration must be at least 1 minute !" +msgstr "Trvání musí být minimálně 1 minuta!" + +#: dvb/channeleditor.cpp:60 +msgid "Initial transponder settings" +msgstr "Počáteční nastavení transpondéru" + +#: dvb/channeleditor.cpp:105 +msgid "This name is not unique." +msgstr "Jméno není unikátní." + +#: dvb/channeleditor.cpp:116 +msgid "Missing audio pid(s) !" +msgstr "Chybějící audio pid!" + +#: dvb/audioeditor.cpp:158 +msgid "Pid must be non zero !" +msgstr "Pid nesmí být nulové!" + +#: dvb/dvbpanel.cpp:57 dvb/scandialog.cpp:62 dvb/scandialogui.cpp:209 +#: rc.cpp:14 +msgid "Channels" +msgstr "Kanály" + +#: dvb/dvbpanel.cpp:59 dvb/krecord.cpp:93 +msgid "Timers" +msgstr "Časovače" + +#: dvb/dvbpanel.cpp:61 +msgid "Electronic Program Guide" +msgstr "Elektronický program" + +#: dvb/dvbpanel.cpp:63 dvb/dvbconfig.cpp:274 +msgid "DVB settings" +msgstr "DVB nastavení" + +#: dvb/dvbpanel.cpp:86 +msgid "Time shifting" +msgstr "Posunutí času" + +#: dvb/dvbpanel.cpp:88 +msgid "Audio :" +msgstr "Audio:" + +#: dvb/dvbpanel.cpp:114 +msgid "Broadcast" +msgstr "Vysílání" + +#: dvb/dvbpanel.cpp:115 kaffeine.cpp:633 +msgid "Instant record" +msgstr "Nahrávání" + +#: dvb/dvbpanel.cpp:246 dvb/dvbpanel.cpp:529 +msgid "" +"<qt>Can't get DVB data from http://hftom.free.fr/kaxtv/dvbdata.tar.gz !<br>\t" +"\t\tCheck your internet connection, and say Yes to try again.<br>\t\t\tOr " +"say No to cancel.<br>\t\t\tIf you already have this archive, copy it to ~/." +"kde/share/apps/kaffeine/dvbdata.tar.gz and say Yes.<br><br>Should I try " +"again ?</qt>" +msgstr "" +"<qt>Nelze získat DVB data z http://hftom.free.fr/kaxtv/dvbdata.tar.gz!<br>\t" +"\t\tPřekontrolujte internetové připojení a kliknutím na Ano opakujte.<br>\t\t\tNebo " +"kliknutím na Ne zrušte.<br>\t\t\tPokud již archiv máte, překopírujte jej do adresáře " +"~/.kde/share/apps/kaffeine/dvbdata.tar.gz a klikněte na Ano.<br>" +"<br> Má se operace opakovat?</qt>" + +#: dvb/dvbpanel.cpp:342 +msgid "Timer successfully created and started." +msgstr "Časovač úspěšně vytvořen a spuštěn." + +#: dvb/dvbpanel.cpp:481 +msgid "You may want to define some channel first !" +msgstr "Nejdřív byste měli definovat nějaký kanál!" + +#: dvb/dvbpanel.cpp:517 +msgid "Timer successfully created." +msgstr "Časovač úspěšně vytvořen." + +#: dvb/dvbpanel.cpp:690 +msgid "Still recording. Can't switch !" +msgstr "Probíhá nahrávání. Nelze přepnout!" + +#: dvb/dvbpanel.cpp:694 +msgid "Can't tune dvb !" +msgstr "Nelze naladit dvb!" + +#: dvb/dvbpanel.cpp:698 +msgid "Can't set pid(s)" +msgstr "Nelze nastavit pid" + +#: dvb/dvbpanel.cpp:1132 +msgid "Kaffeine is still recording. Do you really want to quit ?" +msgstr "Kaffeine stále nahrává. Skutečně ho chcete ukončit?" + +#: dvb/dvbpanel.cpp:1140 +msgid "Kaffeine has queued timers. Do you really want to quit ?" +msgstr "Kaffeine obsahuje aktivní časovače. Skutečně ho chcete ukončit?" + |