Author: jarod Update of /cvs/free/rpms/mythtv/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv27253 Modified Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch mythtv.spec Log Message: * Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-14 - Update release-0-21-fixes patches (r19169) - Should resolve 720p playback stutter, rpmfusion bz#186 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mythplugins-0.21-svnfixes.patch 6 Oct 2008 18:44:16 -0000 1.3 +++ mythplugins-0.21-svnfixes.patch 29 Nov 2008 06:31:16 -0000 1.4 @@ -1,3 +1,18 @@ +Index: mythplugins/mythweb/INSTALL +=================================================================== +--- mythplugins/mythweb/INSTALL (revision 16468) ++++ mythplugins/mythweb/INSTALL (working copy) +@@ -195,6 +195,10 @@ + mod_deflate + mod_headers + ++In Suse 10.3 and above, you'll need to add "rewrite" in the file ++/etc/sysconfig/apache2 on the "APACHE_MODULES" line if it's not already ++there. ++ + ================= + 5.1 Apache Config + ================= Index: mythplugins/mythweb/modules/music/stream.php =================================================================== --- mythplugins/mythweb/modules/music/stream.php (revision 16468) @@ -5114,10 +5129,6 @@ </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) @@ -6009,14 +6020,6 @@ <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) @@ -6549,10 +6552,6 @@ 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) @@ -6566,10 +6565,6 @@ </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) @@ -7963,14 +7958,6 @@ </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) @@ -9286,10 +9273,28 @@ 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 +Index: mythplugins/mythgallery/i18n/mythgallery_nb.ts =================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream +--- mythplugins/mythgallery/i18n/mythgallery_nb.ts (revision 16468) ++++ mythplugins/mythgallery/i18n/mythgallery_nb.ts (working copy) +@@ -35,7 +35,7 @@ + </message> + <message> + <source>Import pictures?</source> +- <translation>Imporere bilder?</translation> ++ <translation>Importere bilder?</translation> + </message> + <message> + <source>No</source> +@@ -83,7 +83,7 @@ + </message> + <message> + <source>Return</source> +- <translation>Enter</translation> ++ <translation>Tilbake</translation> + </message> + <message> + <source>Clear Marked</source> Index: mythplugins/mythgallery/i18n/mythgallery_nl.ts =================================================================== --- mythplugins/mythgallery/i18n/mythgallery_nl.ts (revision 16468) @@ -9806,10 +9811,6 @@ </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) @@ -10059,10 +10060,6 @@ <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) @@ -10149,10 +10146,28 @@ </message> </context> <context> -Index: mythplugins/mythflix/i18n/mythflix_nl.qm +Index: mythplugins/mythflix/mythflix/netflix-ui.xml =================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream +--- mythplugins/mythflix/mythflix/netflix-ui.xml (revision 16468) ++++ mythplugins/mythflix/mythflix/netflix-ui.xml (working copy) +@@ -91,7 +91,7 @@ + </image> + + <image name="background" draworder="0" fleximage="no"> +- <filename>news-info-bg.png</filename> ++ <filename>mythflix_background.png</filename> + <position>0,0</position> + </image> + +@@ -178,7 +178,7 @@ + </image> + + <image name="background" draworder="0" fleximage="no"> +- <filename>news-info-bg.png</filename> ++ <filename>mythflix_background.png</filename> + <position>0,0</position> + </image> + Index: mythplugins/mythcontrols/i18n/mythcontrols_nl.ts =================================================================== --- mythplugins/mythcontrols/i18n/mythcontrols_nl.ts (revision 16468) @@ -10441,10 +10456,6 @@ <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) @@ -10581,14 +10592,6 @@ </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) @@ -12139,10 +12142,6 @@ command_string = "Internal"; gContext->GetMainWindow()->HandleMedia(command_string, filename); -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) @@ -12920,10 +12919,6 @@ </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) @@ -13353,10 +13348,6 @@ <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) @@ -14510,14 +14501,6 @@ </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) @@ -14679,3 +14662,131 @@ <source>Minutes</source> <translation>Minuten</translation> </message> +Index: mythplugins/mythnews/mythnews/news-sites.xml +=================================================================== +--- mythplugins/mythnews/mythnews/news-sites.xml (revision 16468) ++++ mythplugins/mythnews/mythnews/news-sites.xml (working copy) +@@ -725,85 +725,75 @@ + </item> + + <item> +- <title>Digital Spy - Broadcasting</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url> ++ <title>Digital Spy - News Headlines</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsall.xml</url> + </item> + + <item> +- <title>Digital Spy - Cable</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url> ++ <title>Digital Spy - Entertainment Headlines</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsentertainmentnews.xml</url> + </item> + + <item> +- <title>Digital Spy - Cult</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url> ++ <title>Digital Spy - Media Headlines</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmedianews.xml</url> + </item> + + <item> +- <title>Digital Spy - Entertainment Headlines</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url> ++ <title>Digital Spy - Digital TV</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsdigitaltv.xml</url> + </item> + + <item> +- <title>Digital Spy - Gaydar</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url> ++ <title>Digital Spy - Broadcasting</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsbroadcasting.xml</url> + </item> + + <item> +- <title>Digital Spy - Headlines</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url> ++ <title>Digital Spy - Cult</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dscult.xml</url> + </item> + + <item> +- <title>Digital Spy - Media Headlines</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url> ++ <title>Digital Spy - Gay Spy</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsgayspy.xml</url> + </item> + + <item> + <title>Digital Spy - Movies</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmovies.xml</url> + </item> + + <item> +- <title>Digital Spy - Programming</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url> ++ <title>Digital Spy - Music</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsmusic.xml</url> + </item> + + <item> +- <title>Digital Spy - Radio</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url> ++ <title>Digital Spy - Reality</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsrealitytv.xml</url> + </item> + + <item> +- <title>Digital Spy - Reality TV</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url> ++ <title>Digital Spy - Showbiz</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsshowbiz.xml</url> + </item> + + <item> +- <title>Digital Spy - Satellite</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url> ++ <title>Digital Spy - Soaps</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dssoaps.xml</url> + </item> + + <item> +- <title>Digital Spy - Showbiz</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsshowbiz.xml</url> +- </item> +- +- <item> + <title>Digital Spy - Television</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dstv.xml</url> + </item> + + <item> +- <title>Digital Spy - Terrestrial</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url> ++ <title>Digital Spy - US TV</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsustv.xml</url> + </item> + +- <item> +- <title>Digital Spy - US Television</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsustv.xml</url> +- </item> +- + </category> + + <category name="MythTV"> +@@ -986,6 +976,11 @@ + </item> + + <item> ++ <title>Digital Spy - Odd Section</title> ++ <url>http://syndication.digitalspy.co.uk/rss_news/dsodd.xml</url> ++ </item> ++ ++ <item> + <title>Fark</title> + <url>http://feeds.feedburner.com/fark</url> + <ico>http://www.fark.com/favicon.ico</ico> mythtv-0.21-svnfixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mythtv-0.21-svnfixes.patch 6 Oct 2008 18:44:16 -0000 1.3 +++ mythtv-0.21-svnfixes.patch 29 Nov 2008 06:31:16 -0000 1.4 @@ -7332,15 +7332,19 @@ </message> </context> </TS> -Index: mythtv/i18n/mythfrontend_nb.qm -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream Index: mythtv/i18n/mythfrontend_de.ts =================================================================== --- mythtv/i18n/mythfrontend_de.ts (revision 16468) +++ mythtv/i18n/mythfrontend_de.ts (working copy) -@@ -66,19 +66,19 @@ +@@ -1,4 +1,6 @@ +-<!DOCTYPE TS><TS> ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS><TS version="1.1" language="de"> ++<defaultcodec></defaultcodec> + <context> + <name>@default</name> + <message> +@@ -66,19 +68,19 @@ <name>BackendSelect</name> <message> <source>Please select default Myth Backend Server</source> @@ -7364,7 +7368,7 @@ </message> </context> <context> -@@ -116,11 +116,11 @@ +@@ -116,11 +118,11 @@ </message> <message> <source>No, don&apos;t</source> @@ -7378,7 +7382,7 @@ </message> <message> <source>Yes, delete capture cards</source> -@@ -136,7 +136,7 @@ +@@ -136,7 +138,7 @@ </message> <message> <source>Unable to delete capturecards for %1</source> @@ -7387,7 +7391,7 @@ </message> </context> <context> -@@ -171,23 +171,23 @@ +@@ -171,23 +173,23 @@ </message> <message> <source>Create Input Group</source> @@ -7416,7 +7420,7 @@ </message> </context> <context> -@@ -201,7 +201,7 @@ +@@ -201,7 +203,7 @@ <name>ChannelEditor</name> <message> <source>Channels</source> @@ -7425,7 +7429,7 @@ </message> <message> <source>Are you sure you would like to delete this channel?</source> -@@ -245,36 +245,36 @@ +@@ -245,36 +247,36 @@ </message> <message> <source>Are you sure you would like to delete ALL channels?</source> @@ -7473,7 +7477,7 @@ </context> <context> <name>ChannelRecPriority</name> -@@ -435,7 +435,7 @@ +@@ -435,7 +437,7 @@ </message> <message> <source>Additional Tables</source> @@ -7482,7 +7486,7 @@ </message> <message> <source>Test</source> -@@ -447,7 +447,7 @@ +@@ -447,7 +449,7 @@ </message> <message> <source>Store</source> @@ -7491,7 +7495,7 @@ </message> <message> <source>Cancel</source> -@@ -467,35 +467,35 @@ +@@ -467,35 +469,35 @@ </message> <message> <source>First showing of each episode</source> @@ -7526,7 +7530,7 @@ <message> <source>Only shows marked as widescreen</source> - <translation type="unfinished"></translation> -+ <translation>Nur Sendungen in &apos;widescreen&apos;</translation> ++ <translation>Nur Sendungen im Breitbildformat</translation> </message> <message> <source>Exclude H.264 encoded streams (EIT only)</source> @@ -7535,7 +7539,7 @@ </message> </context> <context> -@@ -669,11 +669,11 @@ +@@ -669,11 +671,11 @@ <name>DTVSignalMonitor</name> <message> <source>Seen</source> @@ -7549,7 +7553,7 @@ </message> </context> <context> -@@ -712,19 +712,19 @@ +@@ -712,19 +714,19 @@ <name>DVBSignalMonitor</name> <message> <source>Signal To Noise</source> @@ -7573,7 +7577,7 @@ </message> </context> <context> -@@ -788,7 +788,7 @@ +@@ -788,7 +790,7 @@ <name>DeviceTree</name> <message> <source>The Cartesian latitude for your location.</source> @@ -7582,7 +7586,7 @@ </message> <message> <source>Use negative numbers for southern and western coordinates.</source> -@@ -828,8 +828,7 @@ +@@ -828,8 +830,7 @@ </message> <message> <source>Select the type of switch from the list.</source> @@ -7592,7 +7596,7 @@ </message> <message> <source>Tone</source> -@@ -845,15 +844,15 @@ +@@ -845,15 +846,15 @@ </message> <message> <source>Legacy SW21</source> @@ -7611,7 +7615,7 @@ </message> <message> <source>Number of ports</source> -@@ -861,7 +860,7 @@ +@@ -861,7 +862,7 @@ </message> <message> <source>The number of ports this switch has.</source> @@ -7620,7 +7624,7 @@ </message> <message> <source>Switch Configuration</source> -@@ -885,7 +884,7 @@ +@@ -885,7 +886,7 @@ </message> <message> <source>Rotor Low Speed (deg/sec)</source> @@ -7629,7 +7633,7 @@ </message> <message> <source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 13V.</source> -@@ -893,7 +892,7 @@ +@@ -893,7 +894,7 @@ </message> <message> <source>Rotor High Speed (deg/sec)</source> @@ -7638,7 +7642,7 @@ </message> <message> <source>To allow the approximate monitoring of rotor movement, enter the rated angular speed of the rotor when powered at 18V.</source> -@@ -907,7 +906,7 @@ +@@ -907,7 +908,7 @@ <message> <source>W</source> <comment>Western Hemisphere</comment> @@ -7647,22 +7651,25 @@ </message> <message> <source>Position Index %1</source> -@@ -1089,6 +1088,14 @@ [...4581 lines suppressed...] +- return setStatus(MEDIASTAT_MOUNTED, OpenedHere); +- } +- else if (m_MediaType == MEDIATYPE_DVD) +- { +- // pretend we're NOTMOUNTED so setStatus emits +- // a signal +- m_Status = MEDIASTAT_NOTMOUNTED; +- return setStatus(MEDIASTAT_USEABLE, OpenedHere); +- } +- else +- return setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere); +- break; +- case CDS_AUDIO: +- VERBOSE(VB_MEDIA, "found an audio disk"); +- m_MediaType = MEDIATYPE_AUDIO; +- return setStatus(MEDIASTAT_USEABLE, OpenedHere); +- break; +- case CDS_MIXED: +- m_MediaType = MEDIATYPE_MIXED; +- VERBOSE(VB_MEDIA, "found a mixed CD"); +- // Note: Mixed mode CDs require an explixit mount call +- // since we'll usually want the audio portion. +- // undefine ASSUME_WANT_AUDIO to change this behavior. +- #ifdef ASSUME_WANT_AUDIO +- return setStatus(MEDIASTAT_USEABLE, OpenedHere); +- #else +- mount(); +- if (isMounted(true)) +- { +- // pretend we're NOTMOUNTED so setStatus +- // emits a signal +- m_Status = MEDIASTAT_NOTMOUNTED; +- return setStatus(MEDIASTAT_MOUNTED, +- OpenedHere); +- } +- else +- { +- return setStatus(MEDIASTAT_USEABLE, +- OpenedHere); +- } +- #endif +- break; +- case CDS_NO_INFO: +- case CDS_NO_DISC: +- if (hasWritableMedia()) +- { +- VERBOSE(VB_MEDIA, "found a blank or writable disk"); +- return setStatus(MEDIASTAT_UNFORMATTED, OpenedHere); +- } +- +- VERBOSE(VB_MEDIA, "found no disk"); +- m_MediaType = MEDIATYPE_UNKNOWN; +- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere); +- break; +- default: +- VERBOSE(VB_MEDIA, "found unknown disk type: " +- + QString().setNum(type)); +- m_MediaType = MEDIATYPE_UNKNOWN; +- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere); +- } +- } +- else if (m_Status == MEDIASTAT_MOUNTED || +- m_Status == MEDIASTAT_NOTMOUNTED) +- { +- VERBOSE(VB_MEDIA, QString("Current status == ") + +- MythMediaDevice::MediaStatusStrings[m_Status]); +- VERBOSE(VB_MEDIA, "Setting status to not mounted?"); +- if (isMounted(true)) +- setStatus(MEDIASTAT_MOUNTED, OpenedHere); +- else +- setStatus(MEDIASTAT_NOTMOUNTED, OpenedHere); +- } +- +- if (m_AllowEject) +- ioctl(m_DeviceHandle, CDROM_LOCKDOOR, 0); +- }// mediaChanged() +- } // isDeviceOpen(); ++ if (m_AllowEject) ++ unlock(); + else +- { +- VERBOSE(VB_MEDIA, "Device not open - returning UNKNOWN"); +- m_MediaType = MEDIATYPE_UNKNOWN; +- return setStatus(MEDIASTAT_UNKNOWN, OpenedHere); +- } ++ lock(); + + if (OpenedHere) + closeDevice(); Index: mythtv/libs/libmythupnp/ssdp.cpp =================================================================== --- mythtv/libs/libmythupnp/ssdp.cpp (revision 16468) @@ -38327,6 +40279,28 @@ for (QFileInfoListIterator it(*List); it; ++it) { QFileInfo Info(*it.current()); +Index: mythtv/programs/mythbackend/backendutil.cpp +=================================================================== +--- mythtv/programs/mythbackend/backendutil.cpp (revision 16468) ++++ mythtv/programs/mythbackend/backendutil.cpp (working copy) +@@ -207,7 +207,7 @@ + // different than when it is locally mounted because of block sizes + if (it2->fsID == -1 && + (!HasfsID(it2->fsID) || it1->dirID == it2->dirID) && +- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) && ++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) && + ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB) + <= maxWriteFiveSec)) + { +@@ -292,7 +292,7 @@ + // Sometimes the space reported for an NFS mounted dir is slightly + // different than when it is locally mounted because of block sizes + if (it2->fsID == -1 && !HasfsID(it2->dirID) && +- (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 16) && ++ (absLongLong(it1->totalSpaceKB - it2->totalSpaceKB) <= 32) && + ((size_t)absLongLong(it1->usedSpaceKB - it2->usedSpaceKB) + <= maxWriteFiveSec)) + { Index: mythtv/programs/mythtv-setup/setup.xml =================================================================== --- mythtv/programs/mythtv-setup/setup.xml (revision 16468) @@ -38810,7 +40784,7 @@ Index: mythtv/contrib/Win32/build/mythtvsetup.iss =================================================================== --- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0) -+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 18567) ++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 19169) @@ -0,0 +1,493 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! @@ -39314,7 +41288,7 @@ Index: mythtv/contrib/Win32/MythInstaller.bat =================================================================== --- mythtv/contrib/Win32/MythInstaller.bat (revision 0) -+++ mythtv/contrib/Win32/MythInstaller.bat (revision 18567) ++++ mythtv/contrib/Win32/MythInstaller.bat (revision 19169) @@ -0,0 +1,69 @@ +@rem = '--*-Perl-*-- +@rem @@ -39396,7 +41370,7 @@ Index: mythtv/contrib/Win32/run/mythfrontend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 18567) ++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 19169) @@ -0,0 +1,57 @@ +@Echo off +:: @@ -39458,7 +41432,7 @@ Index: mythtv/contrib/Win32/run/mythbackend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 18567) ++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 19169) @@ -0,0 +1,58 @@ +@Echo off +:: @@ -39581,42 +41555,6 @@ # make [ newer => [$mythtv.'mythtv/libs/libmyth/libmyth-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmyth/libmyth-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmyth/libmyth-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], [ newer => [$mythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll',$mythtv.'mythtv/last_build.txt'], shell => ['rm '.$unixmythtv.'mythtv/libs/libmythtv/libmythtv-0.21.dll','source '.$unixmythtv.'qt_env.sh','cd '.$unixmythtv.'mythtv','make'], comment => 'libs/libmythtv/libmythtv-0.21.dll - redo make unless all these files exist, and are newer than the last_build.txt identifier' ], -Index: mythtv/contrib/OSX/osx-packager.pl -=================================================================== ---- mythtv/contrib/OSX/osx-packager.pl (revision 16468) -+++ mythtv/contrib/OSX/osx-packager.pl (working copy) -@@ -577,6 +577,7 @@ - 'mythtv' - => [ - '--prefix=' . $PREFIX, -+ '--runtime-prefix=../Resources', - # To "cross compile" something for a lesser Mac: - #'--tune=G3', - #'--disable-altivec', -@@ -1041,6 +1042,13 @@ - if ( $OPT{'verbose'} ) - { push @bundler, '--verbose' } - -+### Framework that has a screwed up link dependency path -+my $AVCfw = '/Developer/FireWireSDK*/Examples/' . -+ 'Framework/AVCVideoServices.framework'; -+my @AVCfw = split / /, `ls -d $AVCfw`; -+my $AVCfw = pop @AVCfw; -+chop $AVCfw; -+ - ### Create each package. - ### Note that this is a bit of a waste of disk space, - ### because there are now multiple copies of each library. -@@ -1072,6 +1080,9 @@ - # Remove copy of binary - unlink "$SCRIPTDIR/$target" or die; - -+ if ( $AVCfw ) -+ { &RecursiveCopy($AVCfw, "$finalTarget/Contents/Frameworks") } -+ - if ( $target eq "MythFrontend" or $target =~ m/^MythTV/ ) - { - my $res = "$finalTarget/Contents/Resources"; Index: mythtv/contrib/channel_changers/6200ch.c =================================================================== --- mythtv/contrib/channel_changers/6200ch.c (revision 16468) Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mythtv.spec 15 Oct 2008 20:23:14 -0000 1.12 +++ mythtv.spec 29 Nov 2008 06:31:16 -0000 1.13 @@ -1,5 +1,5 @@ # svn revision number -%define _svnver r18567 +%define _svnver r19169 %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: 13%{?dist} +Release: 14%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of @@ -45,7 +45,6 @@ Patch100: mythtv-0.21-svnfixes.patch Patch101: mythtv-0.20-mythstreammenu.diff #Patch102: mythtv-0.21-fedora-settings.patch -Patch103: mythtv-0.21-enable-64bit-fast_cmov.patch Patch200: mythplugins-0.21-svnfixes.patch #Patch201: mythplugins-0.21-fedora-settings.patch # @@ -493,7 +492,6 @@ %patch100 -p1 -b .svnfixes #patch101 -p0 -b .mythstreammenu #patch102 -p1 -b .settings -%patch103 -p1 # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; @@ -549,7 +547,7 @@ cd mythvideo # Fix /mnt/store -> /var/lib/mythmusic -perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globalsettings.cpp +perl -pi -e's|/share/Movies/dvd|%{_localstatedir}/lib/mythvideo|' mythvideo/globals.cpp cd .. cd mythweb @@ -1017,6 +1015,10 @@ %endif %changelog +* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-14 +- Update release-0-21-fixes patches (r19169) +- Should resolve 720p playback stutter, rpmfusion bz#186 + * Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-13 - Enable fast cmov on x86_64 - Disable mythgame-emulators convenience meta-package, deps not