Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31553 Modified Files: mythtv.spec Added Files: mythtv-0.25-fixes.patch mythtv_0.25_gcc_4.7.patch Removed Files: mythtv-0.24.2-fixes.patch mythtv-0.24.2-gcc47.patch Log Message: * Tue Mar 20 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25-1 - Update to latest release 0.25. 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" Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- mythtv.spec 2 Mar 2012 22:15:39 -0000 1.89 +++ mythtv.spec 13 Apr 2012 18:28:53 -0000 1.90 @@ -30,15 +30,10 @@ # and override RPM's defaults. # --with debug Enable debug mode # -# The following options are disabled by default. Use these options to enable: -# -# --with directfb Enable directfb support -# # The following options are enabled by default. Use these options to disable: # # --without vdpau Disable VDPAU support # --without crystalhd Disable Crystal HD support -# --without xvmc Disable XvMC support # --without perl Disable building of the perl bindings # --without python Disable building of the python bindings # @@ -51,7 +46,6 @@ # --without mythmusic # --without mythnetvision # --without mythnews -# --without mythvideo # --without mythweather # --without mythzoneminder # --without mythweb @@ -70,13 +64,13 @@ %define _gitrev 40f3bae # Mythtv and plugins from github.com -%global githash1 g4627dc9 -%global githash2 c239b59 +%global githash1 g1f5962a +%global githash2 9615da9 # Mythweb from github.com -%global githash3 g946deb7 -%global githash4 28a6e31 +%global githash3 g1d056f7 +%global githash4 0fc49a5 -%define branch fixes/0.24 +%define branch fixes/0.25 # # Basic descriptive tags for this package: @@ -87,12 +81,12 @@ Group: Applications/Multimedia # Version/Release info -Version: 0.24.2 +Version: 0.25 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} #Release: 0.1.rc1%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -112,6 +106,7 @@ # The following options are enabled by default. Use --without to disable them %define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1} +%define with_vaapi %{?_without_vaapi: 0} %{?!_without_vaapi: 1} %if 0%{?rhel} %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} @@ -119,13 +114,11 @@ %define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1} %endif -%define with_xvmc %{?_without_xvmc: 0} %{?!_without_xvmc: 1} %define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} +%define with_php %{?_without_php: 0} %{!?_without_php: 1} %define with_python %{?_without_python: 0} %{!?_without_python: 1} %define with_pulseaudio %{?_without_pulseaudio: 0} %{!?_without_pulseaudio: 1} -# The following options are disabled by default. Use --with to enable them -%define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0} # FAAC is non-free, so we disable it by default %define with_faac %{?_with_faac: 1} %{?!_with_faac: 0} @@ -137,7 +130,6 @@ %define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame: 1} %define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic: 1} %define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews: 1} -%define with_mythvideo %{?_without_mythvideo: 0} %{!?_without_mythvideo: 1} %define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1} %define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1} %define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1} @@ -145,11 +137,14 @@ ################################################################################ +# https://github.com/MythTV/mythtv/tarball/v0.25 Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz +# https://github.com/MythTV/mythweb/tarball/v0.25 Source1: MythTV-mythweb-v%{version}-0-%{githash3}.tar.gz -Patch0: mythtv-%{version}-fixes.patch + +Patch0: mythtv-0.25-fixes.patch #Patch1: mythplugins-%{version}-fixes.patch -Patch2: mythtv-0.24.2-gcc47.patch +Patch2: mythtv_0.25_gcc_4.7.patch Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig @@ -165,16 +160,6 @@ Source401: mythweb.conf -################################################################################ -# Python setup - -#%if %{with_python} -#%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -#%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')} -#%endif - -################################################################################ - # Global MythTV and Shared Build Requirements %if 0%{?fedora} >= 16 @@ -198,7 +183,7 @@ BuildRequires: gcc-c++ BuildRequires: mysql-devel >= 5 BuildRequires: qt-webkit-devel -BuildRequires: qt-devel >= 4.4 +BuildRequires: qt-devel >= 4.6 BuildRequires: phonon-devel BuildRequires: lm_sensors-devel @@ -233,18 +218,19 @@ BuildRequires: libdvdread-devel >= 0.9.4 BuildRequires: libcdio-devel # nb: libdvdcss will be dynamically loaded if installed -BuildRequires: libfame-devel >= 0.9.0 +#BuildRequires: libfame-devel >= 0.9.0 BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel >= 1.0 BuildRequires: mjpegtools-devel >= 1.6.1 -BuildRequires: taglib-devel >= 1.5 +BuildRequires: taglib-devel >= 1.6 # Is transcode really a BR? #BuildRequires: transcode >= 0.6.8 BuildRequires: x264-devel BuildRequires: xvidcore-devel >= 0.9.1 # Audio framework support +BuildRequires: sox-devel BuildRequires: alsa-lib-devel BuildRequires: arts-devel BuildRequires: jack-audio-connection-kit-devel @@ -252,6 +238,13 @@ BuildRequires: pulseaudio-libs-devel %endif +# Bluray support +BuildRequires: libxml2-devel +#BuildRequires: libudf-devel + +# Subtitle support +BuildRequires: libass-devel + # Need dvb headers to build in dvb support BuildRequires: kernel-headers @@ -260,14 +253,14 @@ BuildRequires: libiec61883-devel BuildRequires: libraw1394-devel -%if %{with_directfb} -BuildRequires: directfb-devel -%endif - %if %{with_vdpau} BuildRequires: libvdpau-devel %endif +%if %{with_vaapi} +BuildRequires: libva-devel +%endif + %if %{with_crystalhd} BuildRequires: libcrystalhd-devel %endif @@ -286,11 +279,18 @@ BuildRequires: perl(HTTP::Request) BuildRequires: perl(Net::UPnP::QueryResponse) BuildRequires: perl(Net::UPnP::ControlPoint) +BuildRequires: perl(DBD::mysql) +BuildRequires: perl(IO::Socket::INET6) +%endif + +%if %{with_php} +# No php specific requirements yet. %endif %if %{with_python} BuildRequires: python-devel BuildRequires: MySQL-python +BuildRequires: python-urlgrabber %endif # Plugin Build Requirements @@ -305,21 +305,11 @@ BuildRequires: zlib-devel %endif -%if %{with_mythmusic} -BuildRequires: libcdaudio-devel >= 0.99.6 -BuildRequires: cdparanoia-devel -BuildRequires: libvisual-devel -BuildRequires: SDL-devel -%endif - %if %{with_mythnews} %endif BuildRequires: ncurses-devel -%if %{with_mythvideo} -Requires: perl(XML::Simple) -%endif %if %{with_mythweather} Requires: mythweather >= %{version} @@ -416,7 +406,7 @@ Requires: freetype >= 2 Requires: lame -Requires: qt4 >= 4.4 +Requires: qt4 >= 4.6 Requires: qt4-MySQL %description libs @@ -436,7 +426,7 @@ Requires: freetype-devel >= 2 Requires: mysql-devel >= 5 -Requires: qt4-devel >= 4.4 +Requires: qt4-devel >= 4.6 Requires: lm_sensors-devel Requires: lirc-devel @@ -488,14 +478,14 @@ Requires: libiec61883-devel Requires: libraw1394-devel -%if %{with_directfb} -Requires: directfb-devel -%endif - %if %{with_vdpau} Requires: libvdpau-devel %endif +%if %{with_vaapi} +Requires: libva-devel +%endif + %if %{with_crystalhd} Requires: libcrystalhd-devel %endif @@ -526,6 +516,7 @@ Summary: Client component of mythtv (a DVR) Group: Applications/Multimedia Requires: freetype, lame +Requires: perl(XML::Simple) Requires: mythtv-common = %{version}-%{release} Requires: mythtv-base-themes = %{version} Provides: mythtv-frontend-api = %{mythfeapiver} @@ -548,7 +539,6 @@ Group: Applications/Multimedia Requires: lame Requires: mythtv-common = %{version}-%{release} -Requires: wget Requires(pre): shadow-utils Conflicts: xmltv-grabbers < 0.5.37 @@ -569,7 +559,6 @@ Requires: freetype Requires: mythtv-backend = %{version}-%{release} Requires: mythtv-base-themes = %{version} -Requires: wget %description setup MythTV provides a unified graphical interface for recording and viewing @@ -621,6 +610,21 @@ ################################################################################ +%if %{with_php} + +%package -n php-MythTV +Summary: PHP bindings for MythTV +Group: Development/Languages +# Wish we could do this: +#BuildArch: noarch + +%description -n php-MythTV +Provides a PHP-based interface to interacting with MythTV. + +%endif + +################################################################################ + %if %{with_python} %package -n python-MythTV @@ -648,7 +652,6 @@ Group: Applications/Multimedia Requires: mythmusic = %{version}-%{release} -Requires: mythvideo = %{version}-%{release} Requires: mythweather = %{version}-%{release} Requires: mythgallery = %{version}-%{release} Requires: mythgame = %{version}-%{release} @@ -756,32 +759,6 @@ %endif ################################################################################ -%if %{with_mythvideo} - -%package -n mythvideo -Summary: A generic video player frontend module for MythTV -Group: Applications/Multimedia -Requires: mythtv-frontend-api = %{mythfeapiver} -Requires: mplayer -Requires: transcode >= 0.6.8 -Requires: python-imdb -Requires: python-MythTV = %{version}-%{release} - -Provides: mythdvd = %{version}-%{release} -Obsoletes: mythdvd < %{version}-%{release} - -%description -n mythvideo -MythVideo is a MythTV module that allows you to play videos, DVDs and -(optionally) VCDs. It can also be configured to let you rip DVDs and -transcode their video and audio content to other (generally smaller) -formats. The player can either use the MythTV internal software (which -now supports DVD menus), or simply to invoke your favorite DVD/XVCD -playing software (mplayer, ogle, xine, etc) as an external -command. The transcoding is based on and derived from the excellent -transcode package. - -%endif -################################################################################ %if %{with_mythweather} %package -n mythweather @@ -902,7 +879,7 @@ # chmod 644 settings.pro # We also need Xv libs to build XvMCNVIDIA - sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure +# sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure # On to mythplugins popd @@ -911,20 +888,20 @@ ##### MythPlugins %if %{with_plugins} -pushd mythplugins +#pushd mythplugins # Fix /mnt/store -> /var/lib/mythmusic - cd mythmusic - sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp - cd .. +# cd mythmusic +# sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp +# cd .. # Fix /mnt/store -> /var/lib/mythvideo - cd mythvideo - sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp - cd .. +# cd mythvideo +# sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp +# cd .. # And back to the compile root -popd +#popd @@ -956,8 +933,7 @@ --enable-libfftw3 \ --enable-x11 --x11-path=%{_includedir} \ --enable-xv \ - --enable-xvmc-vld \ - --enable-opengl-video --enable-opengl-vsync \ + --enable-opengl-video \ --enable-xrandr \ --enable-lirc \ --enable-ivtv \ @@ -967,25 +943,24 @@ --enable-libfaac --enable-nonfree \ %endif --enable-libmp3lame \ + --enable-libx264 \ --enable-libtheora --enable-libvorbis \ --enable-libxvid \ %if %{with_vdpau} --enable-vdpau \ %endif +%if %{with_vaapi} + --enable-vaapi \ +%endif %if %{with_crystalhd} --enable-crystalhd \ %endif -%if !%{with_xvmc} - --disable-xvmcw \ -%endif -%if %{with_directfb} - --enable-directfb \ -%else - --disable-directfb \ -%endif %if !%{with_perl} --without-bindings=perl \ %endif +%if !%{with_php} + --without-bindings=php \ +%endif %if !%{with_python} --without-bindings=python \ %endif @@ -1075,11 +1050,6 @@ %else --disable-mythnews \ %endif - %if %{with_mythvideo} - --enable-mythvideo \ - %else - --disable-mythvideo \ - %endif %if %{with_mythweather} --enable-mythweather \ %else @@ -1096,9 +1066,8 @@ --disable-mythnetvision \ %endif --enable-opengl \ - --enable-libvisual \ --enable-fftw \ - --enable-sdl +# --enable-sdl make %{?_smp_mflags} @@ -1119,6 +1088,7 @@ ln -s mythtv-setup %{buildroot}%{_bindir}/mythtvsetup mkdir -p %{buildroot}%{_localstatedir}/lib/mythtv + mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo mkdir -p %{buildroot}%{_localstatedir}/cache/mythtv mkdir -p %{buildroot}%{_localstatedir}/log/mythtv mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d @@ -1178,9 +1148,6 @@ %if %{with_mythmusic} mkdir -p %{buildroot}%{_localstatedir}/lib/mythmusic %endif -%if %{with_mythvideo} - mkdir -p %{buildroot}%{_localstatedir}/lib/mythvideo -%endif %if %{with_mythgallery} mkdir -p %{buildroot}%{_localstatedir}/lib/pictures %endif @@ -1296,8 +1263,9 @@ %doc mythtv/COPYING %doc mythtv/FAQ %doc mythtv/database mythtv/keys.txt -%doc mythtv/docs/*.html mythtv/docs/*.png -%doc mythtv/docs/*.txt +# Do we really need the API documentation? +#%doc mythtv/docs/*.html mythtv/docs/*.png +#%doc mythtv/docs/*.txt %doc mythtv/PACKAGE-LICENSING %doc mythtv/contrib @@ -1306,20 +1274,27 @@ %dir %{_datadir}/mythtv %config(noreplace) %{_sysconfdir}/mythtv/mysql.txt %config(noreplace) %{_sysconfdir}/mythtv/config.xml +%{_bindir}/mythccextractor %{_bindir}/mythcommflag +%{_bindir}/mythmetadatalookup +%{_bindir}/mythutil %{_bindir}/mythpreviewgen %{_bindir}/mythtranscode %{_bindir}/mythwikiscripts %{_datadir}/mythtv/mythconverg*.pl %{_datadir}/mythtv/locales/ +%{_datadir}/mythtv/metadata/ +%{_datadir}/mythtv/hardwareprofile/ %files backend %{_bindir}/mythbackend %{_bindir}/mythfilldatabase %{_bindir}/mythjobqueue +%{_bindir}/mythmediaserver %{_bindir}/mythreplex %{_bindir}/mythffmpeg %{_datadir}/mythtv/MXML_scpd.xml +%{_datadir}/mythtv/backend-config/ %attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv %attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv %if 0%{?fedora} >=16 @@ -1332,6 +1307,7 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/mythbackend %attr(-,mythtv,mythtv) %dir %{_localstatedir}/log/mythtv %{_datadir}/mythtv/internetcontent/ +%{_datadir}/mythtv/html/ %files setup %{_bindir}/mythtv-setup @@ -1340,7 +1316,6 @@ %{_datadir}/applications/*mythtv-setup.desktop %files frontend -%defattr(-,root,root,-) %{_datadir}/mythtv/CDS_scpd.xml %{_datadir}/mythtv/CMGR_scpd.xml %{_datadir}/mythtv/MFEXML_scpd.xml @@ -1350,11 +1325,10 @@ %{_datadir}/mythtv/setup.xml %{_bindir}/mythavtest %{_bindir}/mythfrontend -%{_bindir}/mythtvosd +#%%{_bindir}/mythmessage %{_bindir}/mythlcdserver %{_bindir}/mythshutdown %{_bindir}/mythwelcome -%{_bindir}/mythffplay %dir %{_libdir}/mythtv %dir %{_libdir}/mythtv/filters %{_libdir}/mythtv/filters/* @@ -1367,6 +1341,8 @@ %{_datadir}/applications/*mythfrontend.desktop %{_datadir}/pixmaps/myth*.png %{_datadir}/mythtv/metadata/ +# Myth Video is now Video Gallery +%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo %files base-themes %{_datadir}/mythtv/themes/ @@ -1392,6 +1368,11 @@ %exclude %{perl_vendorarch}/auto/MythTV/.packlist %endif +%if %{with_php} +%files -n php-MythTV +%{_datadir}/mythtv/bindings/php/* +%endif + %if %{with_python} %files -n python-MythTV %{_bindir}/mythpython @@ -1471,18 +1452,6 @@ %{_datadir}/mythtv/i18n/mythnews_*.qm %endif -%if %{with_mythvideo} -%files -n mythvideo -%doc mythplugins/mythvideo/COPYING -%doc mythplugins/mythvideo/README* -%{_libdir}/mythtv/plugins/libmythvideo.so -%{_datadir}/mythtv/mythvideo -%{_datadir}/mythtv/i18n/mythvideo_*.qm -%{_datadir}/mythtv/video_settings.xml -%{_datadir}/mythtv/videomenu.xml -%attr(-,mythtv,mythtv) %{_localstatedir}/lib/mythvideo -%endif - %if %{with_mythweather} %files -n mythweather %doc mythplugins/mythweather/AUTHORS @@ -1529,6 +1498,9 @@ ################################################################################ %changelog +* Tue Mar 20 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25-1 +- Update to latest release 0.25. + * Fri Mar 03 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.24.2-2 - Remove transcode as build requirement. - Misc. spec file cleanup. --- mythtv-0.24.2-fixes.patch DELETED --- --- mythtv-0.24.2-gcc47.patch DELETED ---