Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25722 Added Files: mythtv-0.25-fixes.patch mythtv_0.25_gcc_4.7.patch Log Message: Add patches. mythtv-0.25-fixes.patch: mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238 + mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44 mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264 + mythplugins/mythgame/i18n/mythgame_fi.qm |binary mythplugins/mythgame/i18n/mythgame_fi.ts | 178 mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++++++-- mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96 mythplugins/mythnews/i18n/mythnews_fi.qm |binary mythplugins/mythnews/i18n/mythnews_fi.ts | 44 mythplugins/mythweather/i18n/mythweather_fi.qm |binary mythplugins/mythweather/i18n/mythweather_fi.ts | 60 mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84 mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3 mythtv/VERSION | 2 mythtv/docs/doxygen-create-developer-docs.cfg | 2 mythtv/filters/yadif/filter_yadif.c | 2 mythtv/i18n/mythfrontend_fi.qm |binary mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++++++++------- mythtv/libs/libmyth/rssparse.h | 1 mythtv/libs/libmythbase/compat.h | 2 mythtv/libs/libmythtv/audioinput.h | 1 mythtv/libs/libmythtv/tv_play.cpp | 4 mythtv/programs/mythfrontend/guidegrid.cpp | 4 mythtv/programs/mythutil/markuputils.cpp | 4 30 files changed, 5131 insertions(+), 1783 deletions(-) --- NEW FILE mythtv-0.25-fixes.patch --- mythplugins/mytharchive/i18n/mytharchive_fi.qm | Bin 29996 -> 33814 bytes mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238 ++- mythplugins/mythbrowser/i18n/mythbrowser_fi.qm | Bin 6953 -> 6977 bytes mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44 +- mythplugins/mythgallery/i18n/mythgallery_fi.qm | Bin 13503 -> 18780 bytes mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264 ++- mythplugins/mythgame/i18n/mythgame_fi.qm | Bin 15868 -> 16084 bytes mythplugins/mythgame/i18n/mythgame_fi.ts | 178 +- mythplugins/mythmusic/i18n/mythmusic_fi.qm | Bin 56677 -> 56868 bytes mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 ++++++++++-- mythplugins/mythnetvision/i18n/mythnetvision_fi.qm | Bin 10270 -> 11758 bytes mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96 +- mythplugins/mythnews/i18n/mythnews_fi.qm | Bin 4889 -> 4512 bytes mythplugins/mythnews/i18n/mythnews_fi.ts | 44 +- mythplugins/mythweather/i18n/mythweather_fi.qm | Bin 24061 -> 23685 bytes mythplugins/mythweather/i18n/mythweather_fi.ts | 60 +- .../mythzoneminder/i18n/mythzoneminder_fi.qm | Bin 6899 -> 7281 bytes .../mythzoneminder/i18n/mythzoneminder_fi.ts | 84 +- .../mythzoneminder/mythzmserver/zmserver.cpp | 3 - mythtv/VERSION | 2 +- mythtv/docs/doxygen-create-developer-docs.cfg | 2 +- mythtv/filters/yadif/filter_yadif.c | 2 +- mythtv/i18n/mythfrontend_fi.qm | Bin 532091 -> 613881 bytes mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++------- mythtv/libs/libmyth/rssparse.h | 1 + mythtv/libs/libmythbase/compat.h | 2 + mythtv/libs/libmythtv/audioinput.h | 1 + mythtv/libs/libmythtv/tv_play.cpp | 4 +- mythtv/programs/mythfrontend/guidegrid.cpp | 4 +- mythtv/programs/mythutil/markuputils.cpp | 4 +- 30 files changed, 5131 insertions(+), 1783 deletions(-) diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm index 2fc0f91..8e2d841 100644 Binary files a/mythplugins/mytharchive/i18n/mytharchive_fi.qm and b/mythplugins/mytharchive/i18n/mytharchive_fi.qm differ diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.ts b/mythplugins/mytharchive/i18n/mytharchive_fi.ts index 1a10407..48fb51e 100644 --- a/mythplugins/mytharchive/i18n/mytharchive_fi.ts +++ b/mythplugins/mytharchive/i18n/mytharchive_fi.ts @@ -13,10 +13,64 @@ </message> </context> <context> + <name>BurnThemeUI</name> + <message> + <source>Has an intro and contains a main menu with 4 recordings per page. Does not have a chapter selection submenu.</source> + <translation>Sisältää intron ja päävalikon jossa 4 tallennetta per sivu.Ei ole kappaleita alivalikkona. </translation> + </message> + <message> + <source>Has an intro and contains a summary main menu with 10 recordings per page. Does not have a chapter selection submenu, recording titles, dates or category.</source> + <translation>Sisältää intron ja koostepäävalikon jossa 4 tallennetta per sivu.Ei ole kappaleita alivalikkona, tallenteiden nimiä, päivämääriä tai luokkaa.</translation> + </message> + <message> + <source>Has an intro and contains a main menu with 6 recordings per page. Does not have a scene selection submenu.</source> + <translation>Sisältää intron ja päävalikon jossa 6 tallennetta per sivu.Ei ole kohtauksia alivalikkona.</translation> + </message> + <message> + <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording.</source> + <translation>Sisältää intron ja koostepäävalikon jossa 3 tallennetta per sivu ja kohtaukset alivalikossa ja 8 kappalepistettä. Näyttää ohjelmatietosivun ennen jokaista tallennetta.</translation> + </message> + <message> + <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording. Uses animated thumb images.</source> + <translation>Sisältää intron ja koostepäävalikon jossa 3 tallennetta per sivu ja kohtaukset alivalikossa ja 8 kappalepistettä. Näyttää ohjelmatietosivun ennen jokaista tallennetta. Animoi pienoiskuvat.</translation> + </message> + <message> + <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points.</source> + <translation>Sisältää intron ja päävalikon jossa 3 tallennetta per sivu ja kohtausvalikon jossa 8 kappaletta alivalikkona. </translation> + </message> + <message> + <source>Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. All the thumb images are animated.</source> + <translation>Sisältää intron ja päävalikon jossa 3 tallennetta per sivu ja 8:n kappaleen alivalikko. Kaikki pienoiskuvat on animoituja.</translation> + </message> + <message> + <source>Creates an auto play DVD with no menus. Shows an intro movie then for each title shows a details page followed by the video in sequence.</source> + <translation>Luo automaattisesti käynnistyvän DVD:n ilman menuja. Näyttää introvideon ja jokaiselle nimikkeelle näytetään lisätietosivu jota seuraa videot järjestyksessä.</translation> + </message> + <message> + <source>Creates an auto play DVD with no menus and no intro.</source> + <translation>Luo automaattisesti käynnistyvän DVD:n ilman valikkoja ja introja.</translation> + </message> +</context> +<context> + <name>DVDThemeSelector</name> + <message> + <source>No theme description file found!</source> + <translation>Teeman kuvausta ei löydy!</translation> + </message> + <message> + <source>Empty theme description!</source> + <translation>Tyhjä teeman kuvaus!</translation> + </message> + <message> + <source>Unable to open theme description file!</source> + <translation>Ei saada teeman kuvaustiedostoa auki!</translation> + </message> +</context> +<context> <name>ExportNative</name> <message> <source>Cancel</source> - <translation>Peruuta</translation> + <translation type="obsolete">Peruuta</translation> </message> <message> <source>You need to add at least one item to archive!</source> @@ -24,7 +78,7 @@ </message> <message> <source>Menu</source> - <translation></translation> + <translation>Menu</translation> </message> <message> <source>Remove Item</source> @@ -58,6 +112,10 @@ <name>ImportNative</name> <message> <source>You need to select a valid chanID!</source> + <translation type="obsolete">Valitse kelvollinen kanava-id!</translation> + </message> + <message> + <source>You need to select a valid channel id!</source> <translation>Valitse kelvollinen kanava-id!</translation> </message> <message> @@ -65,27 +123,39 @@ <translation>Ei ollut mahdollista tuoda arkistoa. Tapahtui virhe ajettaessa &apos;mytharchivehelperiä&apos;</translation> </message> <message> - <source>Select a ChanID</source> + <source>Select a channel id</source> <translation>Valitse kanava-id</translation> </message> <message> - <source>Select a ChanNo</source> + <source>Select a channel number</source> <translation>Valitse kanavanumero</translation> </message> <message> + <source>Select a channel name</source> + <translation>Valitse kanavanimi</translation> + </message> + <message> + <source>Select a ChanID</source> + <translation type="obsolete">Valitse kanava-id</translation> + </message> + <message> + <source>Select a ChanNo</source> + <translation type="obsolete">Valitse kanavanumero</translation> + </message> + <message> <source>Select a Channel Name</source> - <translation>Valitse Kanavanimi</translation> + <translation type="obsolete">Valitse Kanavanimi</translation> </message> <message> <source>Select a Callsign</source> - <translation>Valitse Kutsumanimi</translation> + <translation>Valitse kutsumanimi</translation> </message> </context> <context> <name>LogViewer</name> <message> <source>Cancel</source> - <translation>Peruuta</translation> + <translation type="obsolete">Peru</translation> </message> <message> <source>Show Progress Log</source> @@ -112,14 +182,22 @@ <name>MythBurn</name> <message> <source>Cancel</source> - <translation>Peruuta</translation> + <translation type="obsolete">Peruuta</translation> </message> <message> <source>Using Cutlist</source> - <translation>Käyttää leikkauslistaa</translation> + <translation type="obsolete">Käyttää leikkauslistaa</translation> </message> <message> <source>Not Using Cutlist</source> + <translation type="obsolete">Ei käytä leikkauslistaa</translation> + </message> + <message> + <source>Using Cut List</source> + <translation>Käyttää leikkauslistaa</translation> + </message> + <message> + <source>Not Using Cut List</source> <translation>Ei käytä leikkauslistaa</translation> </message> <message> @@ -140,17 +218,25 @@ </message> <message> <source>Menu</source> [...11761 lines suppressed...] + <source>Browse Filesystem (slow)</source> + <translation>Selaa tiedostojärjestelmää (hidas)</translation> + </message> </context> <context> <name>VideoFilterDialog</name> @@ -19650,55 +20782,67 @@ Jos valitset &quot;Käytä oletus toistinta,&quot; laajennoksen toistokomento j </message> </context> <context> + <name>VideoScanner</name> + <message> + <source>Failed to Scan SG Video Hosts</source> + <translation>SG video palveuiden skannaus epäonnistui</translation> + </message> + <message> + <source>If they no longer exist please remove them</source> + <translation>Jos palvelut on lopetettu, ole hyvä ja poista ne.</translation> + </message> +</context> +<context> <name>VideoSetupWizard</name> <message> - <source>Select from one of the preconfigured playback profiles. When satisfied, you can test Standard Definition and High Definition playback with your choice before moving on.</source> - <translation type="unfinished"></translation> + <source>Select from one of the preconfigured playback profiles. When satisfied, you can test Standard Definition and High Definition playback with the selected profile before moving on.</source> + <translation>Valitse joku esiasetetuista toistoprofiileista. Kun olet tyytyväinen, voit kokeilla vakio- ja teräväpiirto toistoa valitulla profiililla ennen kuin jatkat.</translation> </message> <message> - <source>Test your playback settings with Standard definition content. (480p)</source> - <translation type="unfinished"></translation> + <source>Test your playback settings with Standard Definition content. (480p)</source> + <translation>Kokeile toistoasetuksiasi vakiopiirto materiaalilla (480p)</translation> </message> <message> - <source>Test your playback settings with High definition content (1080p).</source> - <translation type="unfinished"></translation> + <source>Test your playback settings with High Definition content (1080p).</source> + <translation>Kokeile toistoasetuksiasi teräväpiirtomateriaalilla (1080p).</translation> </message> <message> <source>Save these changes and move on to the next configuration step.</source> - <translation type="unfinished"></translation> + <translation>Tallenna muutokset ja siirry seuraaviin asetuksiin.</translation> </message> <message> <source>Return to the previous configuration step.</source> - <translation type="unfinished"></translation> + <translation>Palaa edellisiin asetuksiin.</translation> </message> <message> <source>A short test of your system&apos;s playback of Standard Definition content with the %1 profile.</source> - <translation type="unfinished"></translation> + <translation>Testaa pikaisesti järjestelmäsi vakiopiirto (SD) materiaalin toisto %1 profiililla.</translation> </message> <message> <source>Standard Definition Playback Test</source> - <translation type="unfinished"></translation> + <translation>Kokeile vakiopiirtoa (SD)</translation> </message> <message> <source>A short test of your system&apos;s playback of High Definition content with the %1 profile.</source> - <translation type="unfinished"></translation> + <translation>Testaa pikaisesti järjestelmäsi teräväpiirto (HD) materiaalin toisto %1 profiililla.</translation> </message> <message> <source>High Definition Playback Test</source> - <translation type="unfinished"></translation> + <translation>Kokeile teräväpiirtoa (HD)</translation> </message> <message> <source>Downloading Video Sample...</source> - <translation type="unfinished"></translation> + <translation>Ladataan koevideota...</translation> </message> <message> <source>Downloading Video Sample... (%1 of %2 MB)</source> - <translation type="unfinished"></translation> + <translation>Ladataan koevideota... +(%1 / %2 Mt)</translation> </message> <message> <source>Error downloading sample to backend.</source> - <translation type="unfinished"></translation> + <translation>Virhe ladatessa koemateriaalia palvelimelle.</translation> </message> </context> <context> @@ -19823,15 +20967,15 @@ Jos valitset &quot;Käytä oletus toistinta,&quot; laajennoksen toistokomento j </message> <message> <source>Cancel</source> - <translation>Peruuta</translation> + <translation type="obsolete">Peruuta</translation> </message> <message> <source>Upcoming by title</source> - <translation type="unfinished"></translation> + <translation>Tulevat nimikkeen mukaan</translation> </message> <message> <source>Upcoming scheduled</source> - <translation type="unfinished"></translation> + <translation>Tulevat ajastukset</translation> </message> </context> <context> diff --git a/mythtv/libs/libmyth/rssparse.h b/mythtv/libs/libmyth/rssparse.h index 7408ac4..dfe1427 100644 --- a/mythtv/libs/libmyth/rssparse.h +++ b/mythtv/libs/libmyth/rssparse.h @@ -13,6 +13,7 @@ using namespace std; #include <QPair> #include <QMap> #include <QVariant> +#include <sys/types.h> #include "mythexp.h" diff --git a/mythtv/libs/libmythbase/compat.h b/mythtv/libs/libmythbase/compat.h index ff2890f..425624a 100644 --- a/mythtv/libs/libmythbase/compat.h +++ b/mythtv/libs/libmythbase/compat.h @@ -44,6 +44,8 @@ # include <sys/resource.h> // for setpriority # include <sys/socket.h> # include <sys/wait.h> // For WIFEXITED on Mac OS X +# include <stdio.h> // for snprintf(), used by inline dlerror() +# include <unistd.h> // for usleep() #endif #ifdef USING_MINGW diff --git a/mythtv/libs/libmythtv/audioinput.h b/mythtv/libs/libmythtv/audioinput.h index 67f05d1..9155349 100644 --- a/mythtv/libs/libmythtv/audioinput.h +++ b/mythtv/libs/libmythtv/audioinput.h @@ -22,6 +22,7 @@ #define _AUDIOINPUT_H_ #include <QString> +#include <unistd.h> class AudioInput { diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp index d1133c5..badcb03 100644 --- a/mythtv/libs/libmythtv/tv_play.cpp +++ b/mythtv/libs/libmythtv/tv_play.cpp @@ -456,7 +456,7 @@ bool TV::StartTV(ProgramInfo *tvrec, uint flags) } sendPlaybackEnd(); - GetMythMainWindow()->PauseIdleTimer(true); + GetMythMainWindow()->PauseIdleTimer(false); LOG(VB_PLAYBACK, LOG_INFO, LOC + "StartTV -- end"); @@ -7066,7 +7066,7 @@ void TV::ChangeChannel(PlayerContext *ctx, uint chanid, const QString &chan) bool getit = false; if (ctx->recorder) { - if ((ctx->pseudoLiveTVState == kPseudoRecording) || chanid) + if (ctx->pseudoLiveTVState == kPseudoRecording) { getit = true; } diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp index 6dbf1aa..17d5fad 100644 --- a/mythtv/programs/mythfrontend/guidegrid.cpp +++ b/mythtv/programs/mythfrontend/guidegrid.cpp @@ -1390,11 +1390,11 @@ void GuideGrid::customEvent(QEvent *event) } else if (resultid == "guidemenu") { - if (resulttext == tr("Record")) + if (resulttext == tr("Record This")) { quickRecord(); } - else if (resulttext == tr("Change Channel")) + else if (resulttext == tr("Change to Channel")) { enter(); } diff --git a/mythtv/programs/mythutil/markuputils.cpp b/mythtv/programs/mythutil/markuputils.cpp index 94fc136..fee2df3 100644 --- a/mythtv/programs/mythutil/markuputils.cpp +++ b/mythtv/programs/mythutil/markuputils.cpp @@ -144,8 +144,8 @@ static int CopySkipListToCutList(const MythUtilCommandLineParser &cmdline) cutlist[it.key()] = MARK_CUT_END; pginfo.SaveCutList(cutlist); - cout << QString("Cutlist copied to Commercial Skip List\n") - .toLocal8Bit().constData(); + cout << "Commercial Skip List copied to Cutlist\n"; + LOG(VB_GENERAL, LOG_NOTICE, "Commercial Skip List copied to Cutlist"); return GENERIC_EXIT_OK; } mythtv_0.25_gcc_4.7.patch: h264_qpel_mmx.c | 8 !!!!!!!! 1 file changed, 8 modifications(!) --- NEW FILE mythtv_0.25_gcc_4.7.patch --- *** ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c.org 2012-03-31 20:52:29.923150437 -0400 --- ./mythtv/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400 *************** *** 398,404 **** "2: \n\t"\ \ : "+a"(src), "+c"(dst)\ ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ : "memory"\ );\ src += 4-(h+5)*srcStride;\ --- 398,404 ---- "2: \n\t"\ \ : "+a"(src), "+c"(dst)\ ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ : "memory"\ );\ src += 4-(h+5)*srcStride;\ *************** *** 446,452 **** QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ "2: \n\t"\ : "+a"(src)\ ! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ : "memory"\ );\ tmp += 4;\ --- 446,452 ---- QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ "2: \n\t"\ : "+a"(src)\ ! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ : "memory"\ );\ tmp += 4;\ *************** *** 823,829 **** "2: \n\t"\ \ : "+a"(src), "+c"(dst)\ ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ "memory"\ --- 823,829 ---- "2: \n\t"\ \ : "+a"(src), "+c"(dst)\ ! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ "memory"\ *************** *** 878,884 **** QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) "2: \n\t" : "+a"(src) ! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7",) "memory" --- 878,884 ---- QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) "2: \n\t" : "+a"(src) ! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7",) "memory"