2:34 a.m.
Author: jarod
Update of /cvs/free/rpms/mythtv/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20547
Modified Files:
mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch
mythtv.spec
Log Message:
* Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6
- Update to 0.24 fixes, git revision 4af46b1f5d
- Fix mythtv version output to properly show git revision
mythplugins-0.24-fixes.patch:
.gitignore | 6
mytharchive/i18n/.gitignore | 1
mytharchive/mytharchive/recordingselector.cpp | 2
mytharchive/mytharchivehelper/.gitignore | 1
mytharchive/mytharchivehelper/pxsup2dast.c | 2
mytharchive/mythburn/scripts/mythburn.py | 13 -
mytharchive/theme/default-wide/mytharchive-ui.xml | 12
mytharchive/theme/default-wide/mythburn-ui.xml | 7
mytharchive/theme/default/mytharchive-ui.xml | 12
mytharchive/theme/default/mythburn-ui.xml | 7
mythbrowser/i18n/.gitignore | 1
mythbrowser/theme/default-wide/browser-ui.xml | 15 -
mythbrowser/theme/default/browser-ui.xml | 15 -
mythgallery/dcrawplugin/.gitignore | 1
mythgallery/i18n/.gitignore | 1
mythgallery/mythgallery/.gitignore | 1
mythgallery/mythgallery/gallerysettings.cpp | 10
mythgallery/mythgallery/galleryutil.cpp | 4
mythgallery/mythgallery/main.cpp | 3
mythgame/i18n/.gitignore | 1
mythgame/mythgame/.gitignore | 1
mythmusic/i18n/.gitignore | 1
mythmusic/mythmusic/.gitignore | 1
mythmusic/mythmusic/cdrip.cpp | 2
mythmusic/mythmusic/filescanner.cpp | 40 +--
mythmusic/mythmusic/musicplayer.cpp | 5
mythnetvision/i18n/.gitignore | 1
mythnetvision/mythfillnetvision/.gitignore | 1
mythnews/i18n/.gitignore | 1
mythnews/mythnews/main.cpp | 2
mythvideo/i18n/.gitignore | 1
mythvideo/mtd/.gitignore | 1
mythvideo/mythvideo/.gitignore | 1
mythvideo/mythvideo/scripts/jamu.py | 14 -
mythweather/i18n/.gitignore | 1
mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl | 40 +--
mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl | 127 ++++++++++
mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl | 4
mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl | 4
mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl | 1
mythweather/mythweather/scripts/wunderground/wunderground-maps.pl | 1
mythzoneminder/i18n/.gitignore | 1
mythzoneminder/mythzmserver/.gitignore | 1
mythzoneminder/mythzoneminder/zmliveplayer.cpp | 4
mythzoneminder/theme/default-wide/zoneminder-ui.xml | 12
45 files changed, 278 insertions(+), 105 deletions(-)
Index: mythplugins-0.24-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythplugins-0.24-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythplugins-0.24-fixes.patch 23 Jan 2011 03:48:05 -0000 1.1
+++ mythplugins-0.24-fixes.patch 3 Mar 2011 02:34:21 -0000 1.2
@@ -1,6 +1,6 @@
diff -Naurp mythplugins-0.24.orig/.gitignore mythplugins-0.24.fixes/.gitignore
--- mythplugins-0.24.orig/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1,6 @@
+Makefile
+themenop
@@ -10,12 +10,12 @@
+mythconfig.mak
diff -Naurp mythplugins-0.24.orig/mytharchive/i18n/.gitignore
mythplugins-0.24.fixes/mytharchive/i18n/.gitignore
--- mythplugins-0.24.orig/mytharchive/i18n/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mytharchive/i18n/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mytharchive/i18n/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp
mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp
--- mythplugins-0.24.orig/mytharchive/mytharchive/recordingselector.cpp 2010-10-06
06:38:18.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mytharchive/recordingselector.cpp 2011-02-28
22:42:02.000000000 -0500
@@ -116,7 +116,7 @@ bool RecordingSelector::Create(void)
void RecordingSelector::Init(void)
@@ -27,12 +27,12 @@
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore
mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/.gitignore 1969-12-31
19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/.gitignore 2011-02-28
22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mytharchivehelper
diff -Naurp mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c
mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c
--- mythplugins-0.24.orig/mytharchive/mytharchivehelper/pxsup2dast.c 2010-08-28
16:16:22.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mytharchivehelper/pxsup2dast.c 2011-02-28
22:42:02.000000000 -0500
@@ -1,6 +1,6 @@
/*
#
@@ -43,7 +43,7 @@
# too ät iki piste fi
diff -Naurp mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py
mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py
--- mythplugins-0.24.orig/mytharchive/mythburn/scripts/mythburn.py 2010-10-06
09:07:39.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/mythburn/scripts/mythburn.py 2011-02-28
22:42:02.000000000 -0500
@@ -38,7 +38,7 @@
#******************************************************************************
@@ -99,7 +99,7 @@
command += mediafile
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml
mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mytharchive-ui.xml 2010-09-22
08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default/mytharchive-ui.xml 2011-02-28
22:42:02.000000000 -0500
@@ -146,7 +146,7 @@ Common MythArchive window definitions
</statetype>
</state>
@@ -156,7 +156,7 @@
<gradient start="#52CA38"
end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml
mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default/mythburn-ui.xml 2010-09-22
08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default/mythburn-ui.xml 2011-02-28
22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
@@ -173,7 +173,7 @@
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml
mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mytharchive-ui.xml 2010-09-22
08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mytharchive-ui.xml 2011-02-28
22:42:02.000000000 -0500
@@ -147,7 +147,7 @@ Common MythArchive window definitions
</statetype>
</state>
@@ -230,7 +230,7 @@
<gradient start="#52CA38"
end="#349838" alpha="100" />
diff -Naurp mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml
mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml
--- mythplugins-0.24.orig/mytharchive/theme/default-wide/mythburn-ui.xml 2010-09-22
08:39:41.000000000 -0400
-+++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mytharchive/theme/default-wide/mythburn-ui.xml 2011-02-28
22:42:02.000000000 -0500
@@ -10,9 +10,10 @@ MythArchive GUI theme
<window name="profilepopup">
<area>-1,-1,413,426</area>
@@ -247,22 +247,117 @@
<area>20,20,360,40</area>
diff -Naurp mythplugins-0.24.orig/mythbrowser/i18n/.gitignore
mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore
--- mythplugins-0.24.orig/mythbrowser/i18n/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythbrowser/i18n/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml
mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml
+--- mythplugins-0.24.orig/mythbrowser/theme/default/browser-ui.xml 2010-10-09
15:44:27.000000000 -0400
++++ mythplugins-0.24.fixes/mythbrowser/theme/default/browser-ui.xml 2011-02-28
22:42:02.000000000 -0500
+@@ -53,9 +53,8 @@
+ <statetype name="buttonitem">
+ <area>0,0,180,40</area>
+ <state name="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector.png</filename>
+- </imagetype>
++ <area>0,0,180,40</area>
++ <shape name="background"
from="basewidgetshape" />
+ <textarea name="buttontext"
from="basetextarea">
+ <area>0,0,180,40</area>
+ <font>basesmall</font>
+@@ -63,14 +62,12 @@
+ </textarea>
+ </state>
+ <state name="selectedactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_selected.png</filename>
+- </imagetype>
++ <shape name="background"
from="baseselectedwidgetshape" />
+ </state>
+ <state name="selectedinactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_inactive.png</filename>
+- </imagetype>
++ <textarea name="buttontext">
++ <font>basesmallgrey</font>
++ </textarea>
+ </state>
+ </statetype>
+ <statetype name="downscrollarrow">
+diff -Naurp mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml
mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml
+--- mythplugins-0.24.orig/mythbrowser/theme/default-wide/browser-ui.xml 2010-10-09
15:44:27.000000000 -0400
++++ mythplugins-0.24.fixes/mythbrowser/theme/default-wide/browser-ui.xml 2011-02-28
22:42:02.000000000 -0500
+@@ -61,9 +61,8 @@
+ <statetype name="buttonitem">
+ <area>0,0,180,40</area>
+ <state name="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector.png</filename>
+- </imagetype>
++ <area>0,0,180,40</area>
++ <shape name="background"
from="basewidgetshape" />
+ <textarea name="buttontext"
from="basetextarea">
+ <area>0,0,180,40</area>
+ <font>basesmall</font>
+@@ -73,14 +72,12 @@
+ </textarea>
+ </state>
+ <state name="selectedactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_selected.png</filename>
+- </imagetype>
++ <shape name="background"
from="baseselectedwidgetshape" />
+ </state>
+ <state name="selectedinactive" from="active">
+- <imagetype name="buttonbackground">
+- <filename>horiz_selector_inactive.png</filename>
+- </imagetype>
++ <textarea name="buttontext">
++ <font>basesmallgrey</font>
++ </textarea>
+ </state>
+ </statetype>
+ <statetype name="downscrollarrow">
diff -Naurp mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore
mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore
--- mythplugins-0.24.orig/mythgallery/dcrawplugin/.gitignore 1969-12-31
19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgallery/dcrawplugin/.gitignore 2011-02-28
22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
diff -Naurp mythplugins-0.24.orig/mythgallery/i18n/.gitignore
mythplugins-0.24.fixes/mythgallery/i18n/.gitignore
--- mythplugins-0.24.orig/mythgallery/i18n/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythgallery/i18n/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythgallery/i18n/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp
mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp
+--- mythplugins-0.24.orig/mythgallery/mythgallery/gallerysettings.cpp 2010-08-28
16:16:22.000000000 -0400
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/gallerysettings.cpp 2011-02-28
22:42:02.000000000 -0500
+@@ -78,6 +78,15 @@ static HostLineEdit *MythGalleryImportDi
+ return gc;
+ };
+
++static HostCheckBox *MythGalleryAutoLoad()
++{
++ HostCheckBox *gc = new HostCheckBox("GalleryAutoLoad");
++ gc->setLabel(QObject::tr("Automatically load MythGallery to display
pictures"));
++ gc->setValue(false);
++ gc->setHelpText(QObject::tr("When a new CD-Rom or removable storage device
containing pictures is detected then load MythGallery to display the content."));
++ return gc;
++}
++
+ #ifdef USING_OPENGL
+
+ static HostCheckBox *SlideshowUseOpenGL()
+@@ -217,6 +226,7 @@ GallerySettings::GallerySettings()
+ general->addChild(MythGalleryThumbnailLocation());
+ general->addChild(MythGallerySortOrder());
+ general->addChild(MythGalleryImportDirs());
++ general->addChild(MythGalleryAutoLoad());
+ general->addChild(MythGalleryMoviePlayerCmd());
+ addChild(general);
+
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp
mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp
--- mythplugins-0.24.orig/mythgallery/mythgallery/galleryutil.cpp 2010-08-28
16:16:22.000000000 -0400
-+++ mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/galleryutil.cpp 2011-02-28
22:42:02.000000000 -0500
@@ -98,7 +98,7 @@ bool GalleryUtil::IsImage(const QString
QStringList::const_iterator it = filt.begin();
for (; it != filt.end(); ++it)
@@ -283,71 +378,281 @@
diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore
mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore
--- mythplugins-0.24.orig/mythgallery/mythgallery/.gitignore 1969-12-31
19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/.gitignore 2011-02-28
22:42:02.000000000 -0500
@@ -0,0 +1 @@
+config.h
+diff -Naurp mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp
mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp
+--- mythplugins-0.24.orig/mythgallery/mythgallery/main.cpp 2010-10-18 09:02:43.000000000
-0400
++++ mythplugins-0.24.fixes/mythgallery/mythgallery/main.cpp 2011-02-28 22:42:02.000000000
-0500
+@@ -59,6 +59,9 @@ static void runGallery(void)
+
+ static void handleMedia(MythMediaDevice *dev)
+ {
++ if (! gCoreContext->GetNumSetting("GalleryAutoLoad", 0))
++ return;
++
+ if (dev && dev->isUsable())
+ run(dev);
+ }
diff -Naurp mythplugins-0.24.orig/mythgame/i18n/.gitignore
mythplugins-0.24.fixes/mythgame/i18n/.gitignore
--- mythplugins-0.24.orig/mythgame/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythgame/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythgame/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythgame/mythgame/.gitignore
mythplugins-0.24.fixes/mythgame/mythgame/.gitignore
--- mythplugins-0.24.orig/mythgame/mythgame/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythgame/mythgame/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythgame/mythgame/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+gameui.moc
diff -Naurp mythplugins-0.24.orig/mythmusic/i18n/.gitignore
mythplugins-0.24.fixes/mythmusic/i18n/.gitignore
--- mythplugins-0.24.orig/mythmusic/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythmusic/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythmusic/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp
mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp
+--- mythplugins-0.24.orig/mythmusic/mythmusic/cdrip.cpp 2010-09-12 18:53:44.000000000
-0400
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/cdrip.cpp 2011-02-28 22:42:02.000000000
-0500
+@@ -945,8 +945,6 @@ QString Ripper::filenameFromMetadata(Met
+ VERBOSE(VB_GENERAL, QString("Invalid file storage definition."));
+ }
+
+- filename = QString(filename.toLocal8Bit().constData());
+-
+ QStringList directoryList = filename.split("/");
+ for (int i = 0; i < (directoryList.size() - 1); i++)
+ {
+diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp
mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp
+--- mythplugins-0.24.orig/mythmusic/mythmusic/filescanner.cpp 2010-05-13
00:18:15.000000000 -0400
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/filescanner.cpp 2011-02-28
22:42:02.000000000 -0500
+@@ -22,7 +22,7 @@ FileScanner::FileScanner ()
+ MSqlQuery query(MSqlQuery::InitCon());
+
+ // Cache the directory ids from the database
+- query.prepare("SELECT directory_id, LOWER(path) FROM music_directories");
++ query.prepare("SELECT directory_id, path FROM music_directories");
+ if (query.exec())
+ {
+ while(query.next())
+@@ -109,12 +109,12 @@ void FileScanner::BuildFileList(QString
+ QString dir(filename);
+ dir.remove(0, m_startdir.length());
+
+- newparentid = m_directoryid[QString(dir.toUtf8()).toLower()];
++ newparentid = m_directoryid[dir];
+
+ if (newparentid == 0)
+ {
+ int id = GetDirectoryId(dir, parentid);
+- m_directoryid[QString(dir.toUtf8()).toLower()] = id;
++ m_directoryid[dir] = id;
+
+ if (id > 0)
+ {
+@@ -252,8 +252,7 @@ void FileScanner::AddFileToDB(const QStr
+ query.prepare("INSERT INTO music_albumart SET filename = :FILE, "
+ "directory_id = :DIRID, imagetype = :TYPE;");
+ query.bindValue(":FILE", name);
+- query.bindValue(":DIRID", m_directoryid[
+- QString(directory.toUtf8()).toLower()]);
++ query.bindValue(":DIRID", m_directoryid[directory]);
+ query.bindValue(":TYPE", AlbumArtImages::guessImageType(name));
+
+ if (!query.exec() || query.numRowsAffected() <= 0)
+@@ -274,24 +273,24 @@ void FileScanner::AddFileToDB(const QStr
+ QString album_cache_string;
+
+ // Set values from cache
+- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
++ int did = m_directoryid[directory];
+ if (did > 0)
+ data->setDirectoryId(did);
+
+- int aid = m_artistid[QString(data->Artist().toUtf8()).toLower()];
++ int aid = m_artistid[data->Artist().toLower()];
+ if (aid > 0)
+ {
+ data->setArtistId(aid);
+
+ // The album cache depends on the artist id
+ album_cache_string = data->getArtistId() + "#"
+- + QString(data->Album().toUtf8()).toLower();
++ + data->Album().toLower();
+
+ if (m_albumid[album_cache_string] > 0)
+ data->setAlbumId(m_albumid[album_cache_string]);
+ }
+
+- int gid = m_genreid[QString(data->Genre().toUtf8()).toLower()];
++ int gid = m_genreid[data->Genre().toLower()];
+ if (gid > 0)
+ data->setGenreId(gid);
+
+@@ -299,14 +298,14 @@ void FileScanner::AddFileToDB(const QStr
+ data->dumpToDatabase();
+
+ // Update the cache
+- m_artistid[QString(data->Artist().toUtf8()).toLower()] =
++ m_artistid[data->Artist().toLower()] =
+ data->getArtistId();
+
+- m_genreid[QString(data->Genre().toUtf8()).toLower()] =
++ m_genreid[data->Genre().toLower()] =
+ data->getGenreId();
+
+ album_cache_string = data->getArtistId() + "#"
+- + QString(data->Album().toUtf8()).toLower();
++ + data->Album().toLower();
+ m_albumid[album_cache_string] = data->getAlbumId();
+ delete data;
+ }
+@@ -445,8 +444,7 @@ void FileScanner::RemoveFileFromDB (cons
+ query.prepare("DELETE FROM music_albumart WHERE filename= :FILE AND "
+ "directory_id= :DIRID;");
+ query.bindValue(":FILE", sqlfilename);
+- query.bindValue(":DIRID", m_directoryid[
+- QString(directory.toUtf8()).toLower()]);
++ query.bindValue(":DIRID", m_directoryid[directory]);
+
+ if (!query.exec() || query.numRowsAffected() <= 0)
+ {
+@@ -491,24 +489,24 @@ void FileScanner::UpdateFileInDB(const Q
+ QString album_cache_string;
+
+ // Set values from cache
+- int did = m_directoryid[QString(directory.toUtf8()).toLower()];
++ int did = m_directoryid[directory];
+ if (did > 0)
+ disk_meta->setDirectoryId(did);
+
+- int aid = m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()];
++ int aid = m_artistid[disk_meta->Artist().toLower()];
+ if (aid > 0)
+ {
+ disk_meta->setArtistId(aid);
+
+ // The album cache depends on the artist id
+ album_cache_string = disk_meta->getArtistId() + "#" +
+- QString(disk_meta->Album().toUtf8()).toLower();
++ disk_meta->Album().toLower();
+
+ if (m_albumid[album_cache_string] > 0)
+ disk_meta->setAlbumId(m_albumid[album_cache_string]);
+ }
+
+- int gid = m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()];
++ int gid = m_genreid[disk_meta->Genre().toLower()];
+ if (gid > 0)
+ disk_meta->setGenreId(gid);
+
+@@ -516,12 +514,12 @@ void FileScanner::UpdateFileInDB(const Q
+ disk_meta->dumpToDatabase();
+
+ // Update the cache
+- m_artistid[QString(disk_meta->Artist().toUtf8()).toLower()]
++ m_artistid[disk_meta->Artist().toLower()]
+ = disk_meta->getArtistId();
+- m_genreid[QString(disk_meta->Genre().toUtf8()).toLower()]
++ m_genreid[disk_meta->Genre().toLower()]
+ = disk_meta->getGenreId();
+ album_cache_string = disk_meta->getArtistId() + "#" +
+- QString(disk_meta->Album().toUtf8()).toLower();
++ disk_meta->Album().toLower();
+ m_albumid[album_cache_string] = disk_meta->getAlbumId();
+ }
+
diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore
mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore
--- mythplugins-0.24.orig/mythmusic/mythmusic/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+config.h
+diff -Naurp mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp
mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp
+--- mythplugins-0.24.orig/mythmusic/mythmusic/musicplayer.cpp 2010-10-10
17:59:02.000000000 -0400
++++ mythplugins-0.24.fixes/mythmusic/mythmusic/musicplayer.cpp 2011-02-28
22:42:02.000000000 -0500
+@@ -993,8 +993,9 @@ void MusicPlayer::decoderHandlerReady(vo
+ VERBOSE(VB_PLAYBACK, QString ("decoder handler is ready, decoding %1").
+ arg(getDecoder()->getFilename()));
+
+- if (getDecoder()->getFilename().contains("cda") == 1)
+- dynamic_cast<CdDecoder*>(getDecoder())->setDevice(m_CDdevice);
++ CdDecoder *cddecoder = dynamic_cast<CdDecoder*>(getDecoder());
++ if (cddecoder)
++ cddecoder->setDevice(m_CDdevice);
+
+ getDecoder()->setOutput(m_output);
+ //getDecoder()-> setBlockSize(2 * 1024);
diff -Naurp mythplugins-0.24.orig/mythnetvision/i18n/.gitignore
mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore
--- mythplugins-0.24.orig/mythnetvision/i18n/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythnetvision/i18n/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore
mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore
--- mythplugins-0.24.orig/mythnetvision/mythfillnetvision/.gitignore 1969-12-31
19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythnetvision/mythfillnetvision/.gitignore 2011-02-28
22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythfillnetvision
diff -Naurp mythplugins-0.24.orig/mythnews/i18n/.gitignore
mythplugins-0.24.fixes/mythnews/i18n/.gitignore
--- mythplugins-0.24.orig/mythnews/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythnews/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythnews/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
+diff -Naurp mythplugins-0.24.orig/mythnews/mythnews/main.cpp
mythplugins-0.24.fixes/mythnews/mythnews/main.cpp
+--- mythplugins-0.24.orig/mythnews/mythnews/main.cpp 2010-08-29 18:21:36.000000000 -0400
++++ mythplugins-0.24.fixes/mythnews/mythnews/main.cpp 2011-02-28 22:42:02.000000000
-0500
+@@ -69,7 +69,7 @@ int mythplugin_init(const char *libversi
+ "Couldn't upgrade database to new schema, exiting.");
+ return -1;
+ }
+- gCoreContext->ActivateSettingsCache(false);
++ gCoreContext->ActivateSettingsCache(true);
+
+ setupKeys();
+
diff -Naurp mythplugins-0.24.orig/mythvideo/i18n/.gitignore
mythplugins-0.24.fixes/mythvideo/i18n/.gitignore
--- mythplugins-0.24.orig/mythvideo/i18n/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythvideo/i18n/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythvideo/i18n/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythvideo/mtd/.gitignore
mythplugins-0.24.fixes/mythvideo/mtd/.gitignore
--- mythplugins-0.24.orig/mythvideo/mtd/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythvideo/mtd/.gitignore 2011-01-18 00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythvideo/mtd/.gitignore 2011-02-28 22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mtd
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore
mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore
--- mythplugins-0.24.orig/mythvideo/mythvideo/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythvideo/mythvideo/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+*.moc
diff -Naurp mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py
mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py
--- mythplugins-0.24.orig/mythvideo/mythvideo/scripts/jamu.py 2010-09-12
12:10:46.000000000 -0400
-+++ mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py 2011-01-18
00:21:00.000000000 -0500
-@@ -306,6 +306,7 @@ __version__=u"v0.7.7"
++++ mythplugins-0.24.fixes/mythvideo/mythvideo/scripts/jamu.py 2011-02-28
22:42:02.000000000 -0500
+@@ -306,6 +306,8 @@ __version__=u"v0.7.7"
# 0.7.5 Added the TMDB MovieRating as videometadata table "rating" field
# 0.7.6 Modifications to support MythTV python bindings changes
# 0.7.7 Pull hostname from python bindings instead of socket libraries
-+ # Added support of unicode characters within a jamu.conf file
++ # Added support of unicode characters within a jamu.conf file
++ # Replace 'xml' module version check with generic Python version, to
correct failure in Python 2.7
usage_txt=u'''
-@@ -1246,7 +1247,7 @@ class Configuration(object):
+@@ -476,14 +478,10 @@ class OutStreamEncoder(object):
+ sys.stdout = OutStreamEncoder(sys.stdout, 'utf8')
+ sys.stderr = OutStreamEncoder(sys.stderr, 'utf8')
+
+-try:
+- import xml
+-except Exception, e:
+- print '''The python module xml must be installed.
error(%s)''' % e
++if sys.version_info <= (2,5):
++ print '''JAMU requires Python 2.5 or newer to run.'''
+ sys.exit(1)
+-if xml.__version__ < u'41660':
+- print '''
+-\n! Warning - The module xml (v41660 or greater) must be installed. Your version is
different (v%s) than what Jamu was tested with. Jamu may not work on your
installation.\nIt is recommended that you upgrade.\n''' % xml.__version__
++
+ import xml.etree.cElementTree as ElementTree
+
+
+@@ -1246,7 +1244,7 @@ class Configuration(object):
)
sys.exit(1)
cfg = ConfigParser.SafeConfigParser()
@@ -358,12 +663,12 @@
self.config['config_file'] = section[5:]
diff -Naurp mythplugins-0.24.orig/mythweather/i18n/.gitignore
mythplugins-0.24.fixes/mythweather/i18n/.gitignore
--- mythplugins-0.24.orig/mythweather/i18n/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythweather/i18n/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythweather/i18n/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+i18n
diff -Naurp
mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl
mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl
---
mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2010-06-22
00:11:23.000000000 -0400
-+++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2011-01-18
00:21:00.000000000 -0500
++++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl 2011-02-28
22:42:02.000000000 -0500
@@ -1,4 +1,5 @@
#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
@@ -453,7 +758,7 @@
+print "copyright::Environment Canada\n";
diff -Naurp
mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl
mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl
---
mythplugins-0.24.orig/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 1969-12-31
19:00:00.000000000 -0500
-+++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 2011-01-18
00:21:00.000000000 -0500
++++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl 2011-02-28
22:42:02.000000000 -0500
@@ -0,0 +1,127 @@
+#!/usr/bin/perl
+# vim:ts=4:sw=4:ai:et:si:sts=4
@@ -584,7 +889,7 @@
+print "copyright::Environment Canada\n";
diff -Naurp mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
---
mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2010-06-22
00:11:23.000000000 -0400
-+++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2011-01-18
00:21:00.000000000 -0500
++++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl 2011-02-28
22:42:02.000000000 -0500
@@ -154,14 +154,14 @@ elsif ($weather_string =~ /^heavy rain$/
}
elsif ($weather_string =~ /^thundery rain$/i ||
@@ -604,7 +909,7 @@
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp
mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
---
mythplugins-0.24.orig/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2010-06-22
00:11:23.000000000 -0400
-+++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2011-01-18
00:21:00.000000000 -0500
++++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl 2011-02-28
22:42:02.000000000 -0500
@@ -179,14 +179,14 @@ foreach $item (@{$xml->{channel}->{item}
}
elsif ($weather_string =~ /^thundery rain$/i ||
@@ -624,7 +929,7 @@
elsif ($weather_string =~ /^sleet$/i ||
diff -Naurp
mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl
mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl
---
mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2010-10-10
17:47:57.000000000 -0400
-+++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2011-01-18
00:21:00.000000000 -0500
++++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-animaps.pl 2011-02-28
22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
@@ -635,7 +940,7 @@
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp
mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl
mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl
---
mythplugins-0.24.orig/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2010-10-10
17:47:57.000000000 -0400
-+++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2011-01-18
00:21:00.000000000 -0500
++++
mythplugins-0.24.fixes/mythweather/mythweather/scripts/wunderground/wunderground-maps.pl 2011-02-28
22:42:02.000000000 -0500
@@ -5,6 +5,7 @@ use English;
use strict;
use warnings;
@@ -646,17 +951,17 @@
use lib dirname(abs_path($0 or $PROGRAM_NAME)),
diff -Naurp mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore
mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/i18n/.gitignore 1969-12-31 19:00:00.000000000
-0500
-+++ mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore 2011-01-18 00:21:00.000000000
-0500
++++ mythplugins-0.24.fixes/mythzoneminder/i18n/.gitignore 2011-02-28 22:42:02.000000000
-0500
@@ -0,0 +1 @@
+i18n
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore
mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore
--- mythplugins-0.24.orig/mythzoneminder/mythzmserver/.gitignore 1969-12-31
19:00:00.000000000 -0500
-+++ mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythzoneminder/mythzmserver/.gitignore 2011-02-28
22:42:02.000000000 -0500
@@ -0,0 +1 @@
+mythzmserver
diff -Naurp mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp
mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp
--- mythplugins-0.24.orig/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2010-08-15
06:52:05.000000000 -0400
-+++ mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2011-01-18
00:21:00.000000000 -0500
++++ mythplugins-0.24.fixes/mythzoneminder/mythzoneminder/zmliveplayer.cpp 2011-02-28
22:42:02.000000000 -0500
@@ -12,10 +12,6 @@
*
* ============================================================ */
@@ -668,3 +973,36 @@
// qt
#include <QDateTime>
#include <QTimer>
+diff -Naurp mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml
mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml
+--- mythplugins-0.24.orig/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2010-10-06
11:44:50.000000000 -0400
++++ mythplugins-0.24.fixes/mythzoneminder/theme/default-wide/zoneminder-ui.xml 2011-02-28
22:42:02.000000000 -0500
+@@ -652,23 +652,23 @@
+
+ <window name="zmplayer">
+
+- <font name="label" from="basesmall">
++ <fontdef name="label" from="basesmall">
+ <color>#ffff00</color>
+ <size>16</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="data" from="basesmall">
++ <fontdef name="data" from="basesmall">
+ <color>#ffffff</color>
+ <size>14</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="buttons" from="basesmall">
++ <fontdef name="buttons" from="basesmall">
+ <color>#ffffff</color>
+ <size>12</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+ <textarea name="pagetitle" from="basetextarea">
+ <area>30,10,570,40</area>
mythtv-0.24-fixes.patch:
.gitignore
| 3
Makefile
| 6
VERSION
| 1
bindings/perl/.gitignore
| 4
bindings/perl/IO/Socket/INET/MythTV.pm
| 8
bindings/perl/MythTV.pm
| 8
bindings/perl/MythTV/Channel.pm
| 8
bindings/perl/MythTV/Program.pm
| 8
bindings/perl/MythTV/Recording.pm
| 8
bindings/perl/MythTV/StorageGroup.pm
| 8
bindings/python/.gitignore
| 1
bindings/python/MythTV/__init__.py
| 4
bindings/python/MythTV/dataheap.py
| 2
bindings/python/MythTV/methodheap.py
| 7
bindings/python/MythTV/mythproto.py
| 2
bindings/python/MythTV/static.py
| 2
bindings/python/MythTV/system.py
| 24
bindings/python/MythTV/utility.py
| 4
configure
| 9
contrib/icons/master_iconmap/channel_icons.pl
| 8
contrib/maintenance/flush_deleted_recgroup.pl
| 8
contrib/maintenance/optimize_mythdb.pl
| 8
contrib/user_jobs/mythlink.pl
| 8
docs/mythtv-HOWTO.sgml
| 123 +
external/.gitignore
| 16
external/FFmpeg/Makefile
| 11
external/FFmpeg/libavcodec/dvbsubdec.c
| 1
external/FFmpeg/libavformat/mpegts.c
| 1
external/FFmpeg/libavformat/rmdec.c
| 7
filters/quickdnr/quickdnr.pro
| 2
i18n/.gitignore
| 1
i18n/mythfrontend_en_gb.qm
| 52
i18n/mythfrontend_en_gb.ts
| 2
i18n/mythfrontend_fr.qm
| 468 +++---
i18n/mythfrontend_fr.ts
| 2
i18n/mythfrontend_pt.qm
| 375 ++--
i18n/mythfrontend_pt.ts
| 2
libs/libavutil/.gitignore
| 1
libs/libmyth/audiooutput.cpp
| 40
libs/libmyth/audiooutput.h
| 3
libs/libmyth/audiooutputalsa.cpp
| 169 +-
libs/libmyth/audiooutputalsa.h
| 7
libs/libmyth/audiooutputbase.cpp
| 395 +++--
libs/libmyth/audiooutputbase.h
| 9
libs/libmyth/audiooutputca.cpp
| 4
libs/libmyth/audiooutputdigitalencoder.h
| 1
libs/libmyth/audiooutputdx.cpp
| 2
libs/libmyth/audiooutputpulse.cpp
| 7
libs/libmyth/audiooutputsettings.cpp
| 14
libs/libmyth/audiooutpututil.cpp
| 26
libs/libmyth/audiooutpututil.h
| 3
libs/libmyth/audiosettings.cpp
| 4
libs/libmyth/mediamonitor-darwin.cpp
| 2
libs/libmythdb/.gitignore
| 2
libs/libmythdb/mythcorecontext.cpp
| 5
libs/libmythdb/mythdownloadmanager.cpp
| 51
libs/libmythdb/mythsystem.cpp
| 14
libs/libmythdb/mythversion.h
| 2
libs/libmythdb/storagegroup.cpp
| 3
libs/libmythfreesurround/freesurround.cpp
| 4
libs/libmythfreesurround/freesurround.h
| 2
libs/libmythmetadata/.gitignore
| 2
libs/libmythmetadata/videometadata.cpp
| 16
libs/libmythsoundtouch/AAFilter.cpp
| 6
libs/libmythsoundtouch/AAFilter.h
| 6
libs/libmythsoundtouch/BPMDetect.h
| 6
libs/libmythsoundtouch/FIFOSampleBuffer.cpp
| 6
libs/libmythsoundtouch/FIFOSampleBuffer.h
| 6
libs/libmythsoundtouch/FIFOSamplePipe.h
| 6
libs/libmythsoundtouch/FIRFilter.cpp
| 6
libs/libmythsoundtouch/FIRFilter.h
| 6
libs/libmythsoundtouch/RateTransposer.cpp
| 6
libs/libmythsoundtouch/RateTransposer.h
| 6
libs/libmythsoundtouch/STTypes.h
| 6
libs/libmythsoundtouch/SoundTouch.cpp
| 6
libs/libmythsoundtouch/SoundTouch.h
| 6
libs/libmythsoundtouch/TDStretch.cpp
| 6
libs/libmythsoundtouch/TDStretch.h
| 6
libs/libmythsoundtouch/cpu_detect.h
| 14
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp
| 6
libs/libmythsoundtouch/mmx_gcc.cpp
| 6
libs/libmythtv/RingBuffer.cpp
| 39
libs/libmythtv/audioplayer.cpp
| 51
libs/libmythtv/audioplayer.h
| 3
libs/libmythtv/avformatdecoder.cpp
| 257 ++-
libs/libmythtv/avformatdecoder.h
| 8
libs/libmythtv/bswap.h
| 19
libs/libmythtv/cc608reader.cpp
| 1
libs/libmythtv/decoderbase.cpp
| 2
libs/libmythtv/decoderbase.h
| 4
libs/libmythtv/dtvrecorder.cpp
| 30
libs/libmythtv/dtvrecorder.h
| 2
libs/libmythtv/eithelper.cpp
| 16
libs/libmythtv/fourcc.h
| 2
libs/libmythtv/frame.h
| 2
libs/libmythtv/frequencies.c
| 15
libs/libmythtv/frequencytables.cpp
| 4
libs/libmythtv/libmythtv.pro
| 6
libs/libmythtv/minilzo.cpp
| 2
libs/libmythtv/mpeg/H264Parser.cpp
| 424 ++++-
libs/libmythtv/mpeg/H264Parser.h
| 27
libs/libmythtv/mythcommflagplayer.cpp
| 2
libs/libmythtv/mythdvdplayer.cpp
| 10
libs/libmythtv/mythplayer.cpp
| 336 ++--
libs/libmythtv/mythplayer.h
| 36
libs/libmythtv/nuppeldecoder.cpp
| 18
libs/libmythtv/playercontext.cpp
| 2
libs/libmythtv/recordingprofile.cpp
| 8
libs/libmythtv/recordingprofile.h
| 1
libs/libmythtv/subtitlescreen.cpp
| 33
libs/libmythtv/teletextdecoder.cpp
| 51
libs/libmythtv/teletextdecoder.h
| 42
libs/libmythtv/teletextreader.cpp
| 609 ++++++++
libs/libmythtv/teletextreader.h
| 162 ++
libs/libmythtv/teletextscreen.cpp
| 754 +---------
libs/libmythtv/teletextscreen.h
| 154 --
libs/libmythtv/textsubtitleparser.h
| 6
libs/libmythtv/transporteditor.cpp
| 2
libs/libmythtv/transporteditor.h
| 2
libs/libmythtv/tv_play.cpp
| 286 +--
libs/libmythtv/tv_play.h
| 23
libs/libmythtv/tv_rec.cpp
| 4
libs/libmythtv/videodisplayprofile.h
| 1
libs/libmythtv/videoout_d3d.h
| 2
libs/libmythtv/videoout_opengl.h
| 2
libs/libmythtv/videoout_quartz.cpp
| 2
libs/libmythtv/videoout_vdpau.h
| 2
libs/libmythtv/videoout_xv.cpp
| 4
libs/libmythtv/videoout_xv.h
| 6
libs/libmythtv/videooutbase.cpp
| 9
libs/libmythtv/videooutbase.h
| 1
libs/libmythui/mythmainwindow.cpp
| 2
libs/libmythui/mythrender_opengl.cpp
| 21
libs/libmythui/mythrender_opengl.h
| 4
libs/libmythui/mythscreentype.cpp
| 4
libs/libmythui/mythuibuttonlist.cpp
| 2
libs/libmythui/mythuiimage.cpp
| 16
libs/libmythui/mythuistatetype.cpp
| 16
libs/libmythui/mythuiwebbrowser.cpp
| 6
libs/libmythui/util-osx.cpp
| 2
libs/libmythupnp/httprequest.cpp
| 28
libs/libmythupnp/soapclient.cpp
| 6
libs/libmythupnp/threadpool.cpp
| 59
libs/libmythupnp/upnpcds.cpp
| 2
libs/libmythupnp/upnpcdsobjects.cpp
| 2
locales/.gitignore
| 1
programs/mythavtest/.gitignore
| 1
programs/mythbackend/.gitignore
| 1
programs/mythbackend/mainserver.cpp
| 20
programs/mythbackend/playbacksock.cpp
| 2
programs/mythbackend/scheduler.cpp
| 15
programs/mythcommflag/.gitignore
| 1
programs/mythfilldatabase/.gitignore
| 1
programs/mythfrontend/.gitignore
| 1
programs/mythfrontend/exitprompt.cpp
| 25
programs/mythfrontend/globalsettings.cpp
| 115 -
programs/mythfrontend/globalsettings.h
| 5
programs/mythfrontend/guidegrid.cpp
| 7
programs/mythfrontend/playbackbox.cpp
| 13
programs/mythfrontend/playbackbox.h
| 1
programs/mythfrontend/progfind.cpp
| 84 -
programs/mythfrontend/proglist.cpp
| 46
programs/mythfrontend/proglist.h
| 2
programs/mythfrontend/programrecpriority.cpp
| 24
programs/mythjobqueue/.gitignore
| 1
programs/mythlcdserver/.gitignore
| 1
programs/mythpreviewgen/.gitignore
| 1
programs/mythshutdown/.gitignore
| 1
programs/mythtranscode/.gitignore
| 1
programs/mythtranscode/mpeg2fix.cpp
| 2
programs/mythtranscode/mpeg2fix.h
| 2
programs/mythtranscode/replex/.gitignore
| 1
programs/mythtranscode/transcode.cpp
| 9
programs/mythtv-setup/.gitignore
| 1
programs/mythtvosd/.gitignore
| 1
programs/mythwelcome/.gitignore
| 1
programs/scripts/.gitignore
| 1
programs/scripts/database/mythconverg_restore.pl
| 8
programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
| 18
programs/scripts/internetcontent/nv_python_libs/common/common_api.py
| 17
programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html
| 39
programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml
| 5
programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml
| 2
programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl
| 100 -
programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
| 18
programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
| 39
themes/.gitignore
| 1
themes/DVR/util_menu.xml
| 7
themes/MythCenter-wide/base.xml
| 1
themes/MythCenter-wide/osd.xml
| 16
themes/MythCenter-wide/schedule-ui.xml
| 2
themes/MythCenter-wide/zoneminder-ui.xml
| 12
themes/MythCenter/base.xml
| 1
version.sh
| 23
194 files changed, 3611 insertions(+), 2856 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 mythtv-0.24-fixes.patch
Index: mythtv-0.24-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv-0.24-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythtv-0.24-fixes.patch 30 Jan 2011 19:20:22 -0000 1.2
+++ mythtv-0.24-fixes.patch 3 Mar 2011 02:34:21 -0000 1.3
@@ -1,6 +1,6 @@
diff -Naurp mythtv-0.24.orig/bindings/perl/.gitignore
mythtv-0.24.fixes/bindings/perl/.gitignore
--- mythtv-0.24.orig/bindings/perl/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1,4 @@
+Makefile.perl
+Makefile.perl.*
@@ -8,7 +8,7 @@
+pm_to_blib
diff -Naurp mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm
mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-01-30
00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-02-28
22:42:43.000000000 -0500
@@ -3,10 +3,10 @@
# A MythTV Socket class that extends IO::Socket::INET to include some
# MythTV-specific data queries
@@ -26,7 +26,7 @@
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm
mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Channel.pm 2010-05-22 20:48:40.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-02-28 22:42:43.000000000
-0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV channel.
@@ -44,7 +44,7 @@
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Program.pm
mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Program.pm 2010-09-10 22:23:32.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-02-28 22:42:43.000000000
-0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV program.
@@ -62,7 +62,7 @@
package MythTV::Program;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm
mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/Recording.pm 2010-09-03 15:55:56.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-02-28 22:42:43.000000000
-0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV recording.
@@ -80,7 +80,7 @@
package MythTV::Recording;
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm
mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm
--- mythtv-0.24.orig/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-02-28 22:42:43.000000000
-0500
@@ -3,10 +3,10 @@
#
# Object containing info about a particular MythTV Storage Group.
@@ -98,7 +98,7 @@
# Make sure that the main MythTV package is loaded
diff -Naurp mythtv-0.24.orig/bindings/perl/MythTV.pm
mythtv-0.24.fixes/bindings/perl/MythTV.pm
--- mythtv-0.24.orig/bindings/perl/MythTV.pm 2010-09-29 13:08:29.000000000 -0400
-+++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-02-28 22:42:43.000000000 -0500
@@ -1,10 +1,10 @@
#
# MythTV bindings for perl.
@@ -116,12 +116,12 @@
# Version
diff -Naurp mythtv-0.24.orig/bindings/python/.gitignore
mythtv-0.24.fixes/bindings/python/.gitignore
--- mythtv-0.24.orig/bindings/python/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+build/
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/dataheap.py
mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/dataheap.py 2010-11-02 23:15:16.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-02-28 22:42:43.000000000
-0500
@@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C
return vid
@@ -131,9 +131,24 @@
(self.host, self.filename))
class VideoGrabber( Grabber ):
+diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/__init__.py
mythtv-0.24.fixes/bindings/python/MythTV/__init__.py
+--- mythtv-0.24.orig/bindings/python/MythTV/__init__.py 2010-09-09 01:11:01.000000000
-0400
++++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py 2011-02-28 22:42:43.000000000
-0500
+@@ -53,8 +53,10 @@ from methodheap import *
+ from sys import version_info
+ if version_info >= (2, 6): # 2.6 or newer
+ exec(import26)
+-else:
++elif version_info >= (2, 5):
+ exec(importall)
++else:
++ raise Exception("The MythTV Python bindings will only operate against Python
2.5 or later.")
+
+ __version__ = OWN_VERSION
+ static.mysqldb = MySQLdb.version_info
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/methodheap.py
mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py
--- mythtv-0.24.orig/bindings/python/MythTV/methodheap.py 2010-09-23 00:01:58.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-02-28 22:42:43.000000000
-0500
@@ -625,9 +625,9 @@ class MythDB( DBCache ):
return ('recorded.%s=%%s' % key, datetime.duck(value), 0)
@@ -159,7 +174,7 @@
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/mythproto.py
mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py
--- mythtv-0.24.orig/bindings/python/MythTV/mythproto.py 2010-10-14 11:36:31.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py 2011-02-28 22:42:43.000000000
-0500
@@ -188,7 +188,7 @@ def ftopen(file, mode, forceremote=False
db = DBCache(db)
log = MythLog('Python File Transfer', db=db)
@@ -171,20 +186,44 @@
if mode not in ('r','w'):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/static.py
mythtv-0.24.fixes/bindings/python/MythTV/static.py
--- mythtv-0.24.orig/bindings/python/MythTV/static.py 2010-10-08 13:55:04.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/static.py 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/static.py 2011-02-28 22:42:43.000000000
-0500
@@ -4,7 +4,7 @@
Contains any static and global variables for MythTV Python Bindings
"""
-OWN_VERSION = (0,24,0,0)
-+OWN_VERSION = (0,24,0,1)
++OWN_VERSION = (0,24,0,2)
SCHEMA_VERSION = 1264
MVSCHEMA_VERSION = 1038
NVSCHEMA_VERSION = 1007
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/system.py
mythtv-0.24.fixes/bindings/python/MythTV/system.py
--- mythtv-0.24.orig/bindings/python/MythTV/system.py 2010-10-08 13:55:04.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/system.py 2011-01-30 00:25:19.000000000
-0500
-@@ -195,7 +195,12 @@ class InternetMetadata( Metadata ):
++++ mythtv-0.24.fixes/bindings/python/MythTV/system.py 2011-02-28 22:42:43.000000000
-0500
+@@ -36,8 +36,21 @@ class System( DBCache ):
+ if path is None:
+ raise MythError('Invalid input to System()')
+ self.path = path
+- if not os.access(self.path, os.F_OK):
+- raise MythFileError('Defined grabber path does not exist.')
++
++ cmd = self.path.split()[0]
++ if self.path.startswith('/'):
++ # test full given path
++ if not os.access(cmd, os.F_OK):
++ raise MythFileError('Defined executable path does not exist.')
++ else:
++ # search command from PATH
++ for folder in os.environ['PATH'].split(':'):
++ if os.access(os.path.join(folder,cmd), os.F_OK):
++ self.path = os.path.join(folder,self.path)
++ break
++ else:
++ raise MythFileError('Defined executable path does not exist.')
++
+ self.returncode = 0
+ self.stderr = ''
+
+@@ -195,7 +208,12 @@ class InternetMetadata( Metadata ):
class Grabber( System ):
def _processMetadata(self, xml):
@@ -200,7 +239,7 @@
def command(self, *args):
diff -Naurp mythtv-0.24.orig/bindings/python/MythTV/utility.py
mythtv-0.24.fixes/bindings/python/MythTV/utility.py
--- mythtv-0.24.orig/bindings/python/MythTV/utility.py 2010-10-13 17:26:06.000000000
-0400
-+++ mythtv-0.24.fixes/bindings/python/MythTV/utility.py 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/utility.py 2011-02-28 22:42:43.000000000
-0500
@@ -180,7 +180,9 @@ class databaseSearch( object ):
raise TypeError(errstr % (self.__name__, key))
res[0] = 'NOT '+res[0]
@@ -214,7 +253,16 @@
fields.append(res[1])
diff -Naurp mythtv-0.24.orig/configure mythtv-0.24.fixes/configure
--- mythtv-0.24.orig/configure 2010-11-08 12:40:43.000000000 -0500
-+++ mythtv-0.24.fixes/configure 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/configure 2011-02-28 22:42:43.000000000 -0500
+@@ -742,7 +742,7 @@ check_ld(){
+ test "${f}" = "${f#-l}" && flags="$flags
$f" || libs="$libs $f"
+ done
+ check_cc $($filter_cflags $flags) || return
+- check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $extralibs $libs
++ check_cmd $ld $LDFLAGS $flags -o $TMPE $TMPO $libs $extralibs
+ }
+
+ check_cppflags(){
@@ -1955,6 +1955,8 @@ enable avutil
enable asm
enable debug
@@ -245,7 +293,7 @@
SHLIBDIR=\$(INSTALL_ROOT)$shlibdir
diff -Naurp mythtv-0.24.orig/contrib/icons/master_iconmap/channel_icons.pl
mythtv-0.24.fixes/contrib/icons/master_iconmap/channel_icons.pl
--- mythtv-0.24.orig/contrib/icons/master_iconmap/channel_icons.pl 2009-04-10
20:04:30.000000000 -0400
[...4656 lines suppressed...]
--- mythtv-0.24.orig/programs/mythwelcome/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/programs/mythwelcome/.gitignore 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/programs/mythwelcome/.gitignore 2011-02-28 22:42:43.000000000
-0500
@@ -0,0 +1 @@
+mythwelcome
diff -Naurp mythtv-0.24.orig/programs/scripts/database/mythconverg_restore.pl
mythtv-0.24.fixes/programs/scripts/database/mythconverg_restore.pl
--- mythtv-0.24.orig/programs/scripts/database/mythconverg_restore.pl 2010-10-17
20:25:30.000000000 -0400
-+++ mythtv-0.24.fixes/programs/scripts/database/mythconverg_restore.pl 2011-01-30
00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/database/mythconverg_restore.pl 2011-02-28
22:42:43.000000000 -0500
@@ -13,7 +13,7 @@
# Script info
@@ -8982,12 +11285,12 @@
{
diff -Naurp mythtv-0.24.orig/programs/scripts/.gitignore
mythtv-0.24.fixes/programs/scripts/.gitignore
--- mythtv-0.24.orig/programs/scripts/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/programs/scripts/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+scripts
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py 2010-08-28
16:16:22.000000000 -0400
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py 2011-02-28
22:42:43.000000000 -0500
@@ -349,16 +349,19 @@ class Videos(object):
urlType = u'fullscreen'
@@ -9035,7 +11338,7 @@
s_e = self.getSeasonEpisode(title)
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/common/common_api.py
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/common/common_api.py
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/common/common_api.py 2010-08-28
16:16:22.000000000 -0400
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/common/common_api.py 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/common/common_api.py 2011-02-28
22:42:43.000000000 -0500
@@ -18,7 +18,7 @@ MythNetvision Grabber scripts that run a
MNV grabbers.
'''
@@ -9096,7 +11399,7 @@
else:
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html 1969-12-31
19:00:00.000000000 -0500
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/HTML/mtv.html 2011-02-28
22:42:43.000000000 -0500
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
@@ -9139,7 +11442,7 @@
+</html>
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2010-08-28
16:16:22.000000000 -0400
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-02-28
22:42:43.000000000 -0500
@@ -19,9 +19,8 @@
<url>
<name>BBC iPlayer Search</name>
@@ -9154,7 +11457,7 @@
</urls>
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2010-08-28
16:16:22.000000000 -0400
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-02-28
22:42:43.000000000 -0500
@@ -46,7 +46,7 @@
</subDirectory>
@@ -9166,7 +11469,7 @@
<subDirectory name="TrailerAddict.com">
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2010-07-13
12:14:21.000000000 -0400
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-02-28
22:42:43.000000000 -0500
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
@@ -9429,7 +11732,7 @@
</xsl:stylesheet>
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2010-08-28
16:16:22.000000000 -0400
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-02-28
22:42:43.000000000 -0500
@@ -19,7 +19,7 @@ metadata, video and image URLs from MTV.
for this api are published at http://developer.mtvnservices.com/docs
'''
@@ -9500,7 +11803,7 @@
dictionaries.append([self.massageDescription(self.feed_names[self.tree_key][self.feed]),
self.setTreeViewIcon()])
diff -Naurp
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
---
mythtv-0.24.orig/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2010-08-28
16:16:22.000000000 -0400
-+++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-01-30
00:25:19.000000000 -0500
++++
mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-02-28
22:42:43.000000000 -0500
@@ -21,8 +21,9 @@ See this link for the specifications:
http://www.mythtv.org/wiki/MythNetvision_Grabber_Script_Format
'''
@@ -9596,14 +11899,31 @@
######################################################################################################
#
# End of XPath extension functions
+diff -Naurp mythtv-0.24.orig/themes/DVR/util_menu.xml
mythtv-0.24.fixes/themes/DVR/util_menu.xml
+--- mythtv-0.24.orig/themes/DVR/util_menu.xml 2010-08-13 15:45:54.000000000 -0400
++++ mythtv-0.24.fixes/themes/DVR/util_menu.xml 2011-02-28 22:42:43.000000000 -0500
+@@ -8,6 +8,13 @@
+ </button>
+
+ <button>
++ <type>NET_VIDEO</type>
++ <text>Internet Video</text>
++ <action>MENU netvisionmenu.xml</action>
++ <depends>mythnetvision</depends>
++ </button>
++
++ <button>
+ <type>MUSIC</type>
+ <text>Music</text>
+ <action>PLUGIN mythmusic</action>
diff -Naurp mythtv-0.24.orig/themes/.gitignore mythtv-0.24.fixes/themes/.gitignore
--- mythtv-0.24.orig/themes/.gitignore 1969-12-31 19:00:00.000000000 -0500
-+++ mythtv-0.24.fixes/themes/.gitignore 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/.gitignore 2011-02-28 22:42:43.000000000 -0500
@@ -0,0 +1 @@
+themes
diff -Naurp mythtv-0.24.orig/themes/MythCenter/base.xml
mythtv-0.24.fixes/themes/MythCenter/base.xml
--- mythtv-0.24.orig/themes/MythCenter/base.xml 2010-09-22 08:39:41.000000000 -0400
-+++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-02-28 22:42:43.000000000 -0500
@@ -766,6 +766,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,125</area>
@@ -9614,7 +11934,7 @@
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/base.xml
mythtv-0.24.fixes/themes/MythCenter-wide/base.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/base.xml 2010-10-06 10:17:51.000000000 -0400
-+++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-01-30 00:25:19.000000000
-0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-02-28 22:42:43.000000000
-0500
@@ -881,6 +881,7 @@
<textarea name="message" from="basetextarea">
<area>170,20,390,126</area>
@@ -9625,7 +11945,7 @@
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/osd.xml
mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/osd.xml 2010-11-09 21:44:09.000000000 -0500
-+++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-02-28 22:42:43.000000000 -0500
@@ -429,6 +429,22 @@
<fill color="#FFFFFF" alpha="255" />
<alphapulse min="180" max="255"
change="4" />
@@ -9651,7 +11971,7 @@
diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml
mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml
--- mythtv-0.24.orig/themes/MythCenter-wide/schedule-ui.xml 2010-10-06 10:17:51.000000000
-0400
-+++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-01-30
00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-02-28
22:42:43.000000000 -0500
@@ -532,7 +532,7 @@
<area>240,2,220,24</area>
</textarea>
@@ -9661,6 +11981,39 @@
</textarea>
<textarea name="card"
from="shortstarttimedate">
<area>1165,2,30,24</area>
+diff -Naurp mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml
mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml
+--- mythtv-0.24.orig/themes/MythCenter-wide/zoneminder-ui.xml 2010-10-06
11:37:20.000000000 -0400
++++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml 2011-02-28
22:42:43.000000000 -0500
+@@ -652,23 +652,23 @@
+
+ <window name="zmplayer">
+
+- <font name="label" from="basesmall">
++ <fontdef name="label" from="basesmall">
+ <color>#ffff00</color>
+ <size>16</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="data" from="basesmall">
++ <fontdef name="data" from="basesmall">
+ <color>#ffffff</color>
+ <size>14</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+- <font name="buttons" from="basesmall">
++ <fontdef name="buttons" from="basesmall">
+ <color>#ffffff</color>
+ <size>12</size>
+ <weight>bold</weight>
+- </font>
++ </fontdef>
+
+ <textarea name="pagetitle" from="basetextarea">
+ <area>30,10,570,40</area>
diff -Naurp mythtv-0.24.orig/VERSION mythtv-0.24.fixes/VERSION
--- mythtv-0.24.orig/VERSION 2010-11-10 12:31:31.000000000 -0500
+++ mythtv-0.24.fixes/VERSION 1969-12-31 19:00:00.000000000 -0500
@@ -9668,7 +12021,7 @@
-SOURCE_VERSION="0.24"
diff -Naurp mythtv-0.24.orig/version.sh mythtv-0.24.fixes/version.sh
--- mythtv-0.24.orig/version.sh 2010-08-29 18:22:54.000000000 -0400
-+++ mythtv-0.24.fixes/version.sh 2011-01-30 00:25:19.000000000 -0500
++++ mythtv-0.24.fixes/version.sh 2011-02-28 22:42:43.000000000 -0500
@@ -1,12 +1,11 @@
#!/bin/sh
#
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mythtv.spec 31 Jan 2011 20:11:30 -0000 1.86
+++ mythtv.spec 3 Mar 2011 02:34:21 -0000 1.87
@@ -66,7 +66,7 @@
# Git revision and branch ID
# 0.24 release: git tag b0.24
-%define _gitrev 8921ded85a
+%define _gitrev 4af46b1f5d
%define branch fixes/0.24
#
@@ -83,7 +83,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 5%{?dist}
+Release: 6%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1457,6 +1457,10 @@
################################################################################
%changelog
+* Mon Feb 28 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-6
+- Update to 0.24 fixes, git revision 4af46b1f5d
+- Fix mythtv version output to properly show git revision
+
* Sun Jan 30 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-5
- Update to 0.24 fixes, git revision 8921ded85a (rpmfbz#1605, #1585)
- Add BR: libcdio-devel for forthcoming improved BD support