Author: jarod Update of /cvs/free/rpms/mythtv/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv28574 Modified Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch mythtv.spec Log Message: * Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-16 - Update release-0-21-fixes patches (r19505) - Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286) mythplugins-0.21-svnfixes.patch: Index: mythplugins-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythplugins-0.21-svnfixes.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythplugins-0.21-svnfixes.patch 12 Dec 2008 03:48:37 -0000 1.5 +++ mythplugins-0.21-svnfixes.patch 31 Dec 2008 00:15:22 -0000 1.6 @@ -3978,6 +3978,20 @@ </message> </context> </TS> +Index: mythplugins/mythmusic/mythmusic/playbackbox.cpp +=================================================================== +--- mythplugins/mythmusic/mythmusic/playbackbox.cpp (revision 16468) ++++ mythplugins/mythmusic/mythmusic/playbackbox.cpp (working copy) +@@ -987,6 +987,9 @@ + GenericTree *node = music_tree_list->getCurrentNode(); + Metadata *editMeta = gMusicData->all_music->getMetadata( node->getInt() ); + ++ if (!editMeta) ++ return; ++ + EditMetadataDialog editDialog(editMeta, gContext->GetMainWindow(), + "edit_metadata", "music-", "edit metadata"); + if (kDialogCodeRejected != editDialog.exec()) Index: mythplugins/mythmusic/mythmusic/miniplayer.cpp =================================================================== --- mythplugins/mythmusic/mythmusic/miniplayer.cpp (revision 16468) @@ -5200,6 +5214,10 @@ </message> </context> </TS> +Index: mythplugins/mytharchive/i18n/mytharchive_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mytharchive/i18n/mytharchive_nl.ts =================================================================== --- mythplugins/mytharchive/i18n/mytharchive_nl.ts (revision 16468) @@ -6091,6 +6109,14 @@ <source>Parental Pin:</source> <translation>Pincode:</translation> </message> +Index: mythplugins/mytharchive/i18n/mytharchive_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: mythplugins/mytharchive/i18n/mytharchive_dk.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mytharchive/mytharchive/archivemenu.xml =================================================================== --- mythplugins/mytharchive/mytharchive/archivemenu.xml (revision 16468) @@ -6623,6 +6649,10 @@ title = title[:32] #Create the DVD ISO image +Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythbrowser/i18n/mythbrowser_fi.ts =================================================================== --- mythplugins/mythbrowser/i18n/mythbrowser_fi.ts (revision 16468) @@ -6636,6 +6666,10 @@ </message> </context> </TS> +Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythbrowser/i18n/mythbrowser_nl.ts =================================================================== --- mythplugins/mythbrowser/i18n/mythbrowser_nl.ts (revision 16468) @@ -8029,6 +8063,14 @@ </message> </context> </TS> +Index: mythplugins/mythweather/i18n/mythweather_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: mythplugins/mythweather/i18n/mythweather_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl =================================================================== --- mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl (revision 16468) @@ -9344,6 +9386,10 @@ a multi-location screen you have to set the location of each individual data item. This may not be ideal, but it does allow for very easy screen and source development, along with very customizable location setups. The +Index: mythplugins/mythgallery/i18n/mythgallery_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts =================================================================== --- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468) @@ -9739,6 +9785,10 @@ </message> </context> </TS> +Index: mythplugins/mythgallery/i18n/mythgallery_nb.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythgallery/i18n/mythgallery_fi.ts =================================================================== --- mythplugins/mythgallery/i18n/mythgallery_fi.ts (revision 16468) @@ -9882,6 +9932,10 @@ </message> </context> <context> +Index: mythplugins/mythgallery/i18n/mythgallery_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp =================================================================== --- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468) @@ -10131,6 +10185,10 @@ <source>Minutes</source> <translation>Minuten</translation> </message> +Index: mythplugins/mythflix/i18n/mythflix_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythflix/i18n/mythflix_fi.ts =================================================================== --- mythplugins/mythflix/i18n/mythflix_fi.ts (revision 16468) @@ -10217,6 +10275,10 @@ </message> </context> <context> +Index: mythplugins/mythflix/i18n/mythflix_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythflix/mythflix/netflix-ui.xml =================================================================== --- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468) @@ -10239,7 +10301,21 @@ <position>0,0</position> </image> +Index: mythplugins/mythflix/mythflix/images/mythflix_background.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Property changes on: mythplugins/mythflix/mythflix/images/mythflix_background.png +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream +Added: svn:mergeinfo + +Index: mythplugins/mythflix/mythflix/images/news-info-bg.png +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts =================================================================== --- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468) @@ -10528,6 +10604,10 @@ <source>No</source> <translation type="obsolete">Nee</translation> </message> +Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythcontrols/i18n/mythcontrols_fi.ts =================================================================== --- mythplugins/mythcontrols/i18n/mythcontrols_fi.ts (revision 16468) @@ -10664,6 +10744,14 @@ </message> </context> <context> +Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: mythplugins/mythvideo/i18n/mythvideo_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythvideo/i18n/mythvideo_nl.ts =================================================================== --- mythplugins/mythvideo/i18n/mythvideo_nl.ts (revision 16468) @@ -12214,6 +12302,21 @@ command_string = "Internal"; gContext->GetMainWindow()->HandleMedia(command_string, filename); +Index: mythplugins/mythvideo/mythvideo/fileassoc.cpp +=================================================================== +--- mythplugins/mythvideo/mythvideo/fileassoc.cpp (revision 16468) ++++ mythplugins/mythvideo/mythvideo/fileassoc.cpp (working copy) +@@ -23,8 +23,8 @@ + + public: + FileAssociation(const QString &new_extension) : +- id(-1), extension(new_extension), ignore(false), use_default(true), +- changed(true), loaded_from_db(false) {} ++ id(-1), extension(new_extension), player_command(""), ignore(false), ++ use_default(true), changed(true), loaded_from_db(false) {} + FileAssociation(int i, const QString &e, const QString &p, bool g, bool u) : + id(i), extension(e), player_command(p), ignore(g), use_default(u), + changed(false), loaded_from_db(true) {} Index: mythplugins/mythvideo/mythvideo/videofilter.cpp =================================================================== --- mythplugins/mythvideo/mythvideo/videofilter.cpp (revision 16468) @@ -12227,6 +12330,10 @@ } else { +Index: mythplugins/mythphone/i18n/mythphone_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythphone/i18n/mythphone_nl.ts =================================================================== --- mythplugins/mythphone/i18n/mythphone_nl.ts (revision 16468) @@ -13004,6 +13111,10 @@ </message> </context> </TS> +Index: mythplugins/mythgame/i18n/mythgame_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythgame/i18n/mythgame_nl.ts =================================================================== --- mythplugins/mythgame/i18n/mythgame_nl.ts (revision 16468) @@ -13433,6 +13544,10 @@ <source>Favorite:</source> <translation>Favoriet:</translation> </message> +Index: mythplugins/mythgame/i18n/mythgame_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythgame/i18n/mythgame_fi.ts =================================================================== --- mythplugins/mythgame/i18n/mythgame_fi.ts (revision 16468) @@ -14586,6 +14701,14 @@ </message> </context> <context> +Index: mythplugins/mythnews/i18n/mythnews_nl.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream +Index: mythplugins/mythnews/i18n/mythnews_fi.qm +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream Index: mythplugins/mythnews/i18n/mythnews_nl.ts =================================================================== --- mythplugins/mythnews/i18n/mythnews_nl.ts (revision 16468) mythtv-0.21-svnfixes.patch: Index: mythtv-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythtv-0.21-svnfixes.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythtv-0.21-svnfixes.patch 12 Dec 2008 03:48:38 -0000 1.5 +++ mythtv-0.21-svnfixes.patch 31 Dec 2008 00:15:22 -0000 1.6 @@ -26423,7 +26423,7 @@ Index: mythtv/libs/libs-targetfix.pro =================================================================== --- mythtv/libs/libs-targetfix.pro (revision 0) -+++ mythtv/libs/libs-targetfix.pro (revision 19344) ++++ mythtv/libs/libs-targetfix.pro (revision 19505) @@ -0,0 +1,20 @@ +# Common project modifications to change the generated target. + @@ -27168,6 +27168,24 @@ if (!query.exec() || !query.isActive()) { +Index: mythtv/libs/libmythtv/playgroup.cpp +=================================================================== +--- mythtv/libs/libmythtv/playgroup.cpp (revision 16468) ++++ mythtv/libs/libmythtv/playgroup.cpp (working copy) +@@ -114,7 +114,12 @@ + + virtual void save(void) { + if (intValue() < 50 || intValue() > 200) +- setValue(0); ++ { ++ // We need to bypass the bounds checking that would ++ // normally occur in order to get the special value of 0 ++ // into the database ++ IntegerSetting::setValue(0); ++ } + PlayGroupDBStorage::save(); + } + }; Index: mythtv/libs/libmythtv/DVDRingBuffer.cpp =================================================================== --- mythtv/libs/libmythtv/DVDRingBuffer.cpp (revision 16468) @@ -28089,7 +28107,7 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.h =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19344) ++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 19505) @@ -0,0 +1,12 @@ +#ifndef _FREESAT_HUFFMAN_H_ +#define _FREESAT_HUFFMAN_H_ @@ -28112,7 +28130,7 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_tables.h =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19344) ++++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 19505) @@ -0,0 +1,4370 @@ +struct fsattab fsat_table[] = { + { 0x00000000, 2, 'T'}, @@ -32493,7 +32511,7 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 19344) ++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 19505) @@ -0,0 +1,107 @@ +#include "freesat_huffman.h" + @@ -32612,8 +32630,12 @@ =================================================================== --- mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp (revision 16468) +++ mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp (working copy) -@@ -926,10 +926,11 @@ - int MPEGStreamData::ProcessData(unsigned char *buffer, int len) +@@ -923,15 +923,16 @@ + } + #undef DONE_WITH_PES_PACKET + +-int MPEGStreamData::ProcessData(unsigned char *buffer, int len) ++int MPEGStreamData::ProcessData(const unsigned char *buffer, int len) { int pos = 0; + bool resync = false; @@ -32623,8 +32645,11 @@ - if (buffer[pos] != SYNC_BYTE) + if (buffer[pos] != SYNC_BYTE || resync) { - int newpos = ResyncStream(buffer, pos, len); +- int newpos = ResyncStream(buffer, pos, len); ++ int newpos = ResyncStream(buffer, pos+1, len); if (newpos == -1) + return len - pos; + if (newpos == -2) @@ -942,9 +943,12 @@ const TSPacket *pkt = reinterpret_cast<const TSPacket*>(&buffer[pos]); @@ -32639,6 +32664,16 @@ } return len - pos; +@@ -995,7 +999,8 @@ + return true; + } + +-int MPEGStreamData::ResyncStream(unsigned char *buffer, int curr_pos, int len) ++int MPEGStreamData::ResyncStream(const unsigned char *buffer, int curr_pos, ++ int len) + { + // Search for two sync bytes 188 bytes apart, + int pos = curr_pos; Index: mythtv/libs/libmythtv/mpeg/pespacket.cpp =================================================================== --- mythtv/libs/libmythtv/mpeg/pespacket.cpp (revision 16468) @@ -32723,6 +32758,28 @@ } return add_pids.size() || del_pids.size(); +Index: mythtv/libs/libmythtv/mpeg/mpegstreamdata.h +=================================================================== +--- mythtv/libs/libmythtv/mpeg/mpegstreamdata.h (revision 16468) ++++ mythtv/libs/libmythtv/mpeg/mpegstreamdata.h (working copy) +@@ -107,7 +107,7 @@ + virtual bool HandleTables(uint pid, const PSIPTable &psip); + virtual void HandleTSTables(const TSPacket* tspacket); + virtual bool ProcessTSPacket(const TSPacket& tspacket); +- virtual int ProcessData(unsigned char *buffer, int len); ++ virtual int ProcessData(const unsigned char *buffer, int len); + inline void HandleAdaptationFieldControl(const TSPacket* tspacket); + + // Listening +@@ -293,7 +293,7 @@ + void ProcessPMT(const ProgramMapTable *pmt); + void ProcessEncryptedPacket(const TSPacket&); + +- static int ResyncStream(unsigned char *buffer, int curr_pos, int len); ++ static int ResyncStream(const unsigned char *buffer, int curr_pos, int len); + + void UpdateTimeOffset(uint64_t si_utc_time); + Index: mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp =================================================================== --- mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp (revision 16468) @@ -33957,7 +34014,7 @@ Index: mythtv/libs/libavcodec/rectangle.h =================================================================== --- mythtv/libs/libavcodec/rectangle.h (revision 0) -+++ mythtv/libs/libavcodec/rectangle.h (revision 19344) ++++ mythtv/libs/libavcodec/rectangle.h (revision 19505) @@ -0,0 +1,121 @@ +/* + * rectangle filling function @@ -34182,7 +34239,7 @@ Index: mythtv/libs/libavcodec/i386/h264_i386.h =================================================================== --- mythtv/libs/libavcodec/i386/h264_i386.h (revision 0) -+++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 19344) ++++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 19505) @@ -0,0 +1,144 @@ +/* + * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder @@ -43849,7 +43906,7 @@ Index: mythtv/contrib/Win32/build/mythtvsetup.iss =================================================================== --- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0) -+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19344) ++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19505) @@ -0,0 +1,493 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! @@ -44353,7 +44410,7 @@ Index: mythtv/contrib/Win32/MythInstaller.bat =================================================================== --- mythtv/contrib/Win32/MythInstaller.bat (revision 0) -+++ mythtv/contrib/Win32/MythInstaller.bat (revision 19344) ++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19505) @@ -0,0 +1,69 @@ +@rem = '--*-Perl-*-- +@rem @@ -44435,7 +44492,7 @@ Index: mythtv/contrib/Win32/run/mythfrontend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19344) ++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19505) @@ -0,0 +1,57 @@ +@Echo off +:: @@ -44497,7 +44554,7 @@ Index: mythtv/contrib/Win32/run/mythbackend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19344) ++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19505) @@ -0,0 +1,58 @@ +@Echo off +:: Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mythtv.spec 12 Dec 2008 04:55:42 -0000 1.15 +++ mythtv.spec 31 Dec 2008 00:15:22 -0000 1.16 @@ -1,5 +1,5 @@ # svn revision number -%define _svnver r19344 +%define _svnver r19505 %define branch release-0-21-fixes # Nb: base 0.21 svn rev is r16468 #define branch trunk @@ -22,7 +22,7 @@ %if "%{branch}" == "trunk" Release: 0.2.%{_svnver}%{?dist} %else -Release: 15%{?dist} +Release: 16%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of @@ -1023,6 +1023,10 @@ %endif %changelog +* Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-16 +- Update release-0-21-fixes patches (r19505) +- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286) + * Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-15 - Update to release-0-21-fixes patches (r19344) - Includes critical fix for supporting use of FireWire cable