rpms/mythtv/F-14 mythtv-0.24-fixes.patch,1.1,1.2

Author: jarod Update of /cvs/free/rpms/mythtv/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11974 Modified Files: mythtv-0.24-fixes.patch Log Message: Update git fixes branch patch to 8921ded85a 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/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 | 7 bindings/python/MythTV/utility.py | 4 configure | 7 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 | 6 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 | 2 libs/libmyth/audiooutputdigitalencoder.h | 1 libs/libmyth/audiooutputdx.cpp | 2 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 | 4 libs/libmythtv/audioplayer.cpp | 51 libs/libmythtv/audioplayer.h | 3 libs/libmythtv/avformatdecoder.cpp | 126 - libs/libmythtv/avformatdecoder.h | 2 libs/libmythtv/cc608reader.cpp | 1 libs/libmythtv/decoderbase.h | 1 libs/libmythtv/dtvrecorder.cpp | 30 libs/libmythtv/dtvrecorder.h | 2 libs/libmythtv/eithelper.cpp | 16 libs/libmythtv/fourcc.h | 2 libs/libmythtv/frequencies.c | 15 libs/libmythtv/frequencytables.cpp | 4 libs/libmythtv/libmythtv.pro | 6 libs/libmythtv/minilzo.cpp | 2 libs/libmythtv/mythcommflagplayer.cpp | 2 libs/libmythtv/mythdvdplayer.cpp | 10 libs/libmythtv/mythplayer.cpp | 266 +-- libs/libmythtv/mythplayer.h | 32 libs/libmythtv/playercontext.cpp | 2 libs/libmythtv/recordingprofile.cpp | 8 libs/libmythtv/recordingprofile.h | 1 libs/libmythtv/subtitlescreen.cpp | 16 libs/libmythtv/teletextdecoder.cpp | 51 libs/libmythtv/teletextdecoder.h | 42 libs/libmythtv/teletextreader.cpp | 609 ++++++++ libs/libmythtv/teletextreader.h | 162 ++ libs/libmythtv/teletextscreen.cpp | 753 +--------- 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 | 136 - libs/libmythtv/tv_play.h | 16 libs/libmythtv/videodisplayprofile.h | 1 libs/libmythtv/videoout_quartz.cpp | 2 libs/libmythtv/videoout_xv.cpp | 4 libs/libmythtv/videooutbase.cpp | 9 libs/libmythtv/videooutbase.h | 1 libs/libmythui/mythmainwindow.cpp | 2 libs/libmythui/mythrender_opengl.cpp | 6 libs/libmythui/mythrender_opengl.h | 4 libs/libmythui/mythuibuttonlist.cpp | 2 libs/libmythui/mythuiimage.cpp | 16 libs/libmythui/util-osx.cpp | 2 libs/libmythupnp/httprequest.cpp | 28 libs/libmythupnp/soapclient.cpp | 6 libs/libmythupnp/threadpool.cpp | 50 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 | 2 programs/mythbackend/playbacksock.cpp | 2 programs/mythbackend/scheduler.cpp | 15 programs/mythcommflag/.gitignore | 1 programs/mythfilldatabase/.gitignore | 1 programs/mythfrontend/.gitignore | 1 programs/mythfrontend/globalsettings.cpp | 115 - programs/mythfrontend/globalsettings.h | 5 programs/mythfrontend/guidegrid.cpp | 7 programs/mythfrontend/playbackbox.cpp | 9 programs/mythfrontend/playbackbox.h | 1 programs/mythfrontend/progfind.cpp | 84 - programs/mythfrontend/proglist.cpp | 46 programs/mythfrontend/proglist.h | 2 programs/mythfrontend/programrecpriority.cpp | 2 programs/mythjobqueue/.gitignore | 1 programs/mythlcdserver/.gitignore | 1 programs/mythpreviewgen/.gitignore | 1 programs/mythshutdown/.gitignore | 1 programs/mythtranscode/.gitignore | 1 programs/mythtranscode/replex/.gitignore | 1 programs/mythtranscode/transcode.cpp | 2 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/MythCenter-wide/base.xml | 1 themes/MythCenter-wide/osd.xml | 16 themes/MythCenter-wide/schedule-ui.xml | 2 themes/MythCenter/base.xml | 1 version.sh | 23 173 files changed, 2884 insertions(+), 2436 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythtv-0.24-fixes.patch 23 Jan 2011 03:48:05 -0000 1.1 +++ mythtv-0.24-fixes.patch 30 Jan 2011 19:20:22 -0000 1.2 @@ -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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/perl/.gitignore 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/perl/IO/Socket/INET/MythTV.pm 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/perl/MythTV/Channel.pm 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/perl/MythTV/Program.pm 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/perl/MythTV/Recording.pm 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/perl/MythTV/StorageGroup.pm 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/perl/MythTV.pm 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/.gitignore 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py 2011-01-30 00:25:19.000000000 -0500 @@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C return vid @@ -133,7 +133,7 @@ class VideoGrabber( Grabber ): 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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py 2011-01-30 00:25:19.000000000 -0500 @@ -625,9 +625,9 @@ class MythDB( DBCache ): return ('recorded.%s=%%s' % key, datetime.duck(value), 0) @@ -159,7 +159,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/mythproto.py 2011-01-30 00:25:19.000000000 -0500 @@ -188,7 +188,7 @@ def ftopen(file, mode, forceremote=False db = DBCache(db) log = MythLog('Python File Transfer', db=db) @@ -171,7 +171,7 @@ 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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/static.py 2011-01-30 00:25:19.000000000 -0500 @@ -4,7 +4,7 @@ Contains any static and global variables for MythTV Python Bindings """ @@ -183,7 +183,7 @@ 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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/system.py 2011-01-30 00:25:19.000000000 -0500 @@ -195,7 +195,12 @@ class InternetMetadata( Metadata ): class Grabber( System ): @@ -200,7 +200,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/bindings/python/MythTV/utility.py 2011-01-30 00:25:19.000000000 -0500 @@ -180,7 +180,9 @@ class databaseSearch( object ): raise TypeError(errstr % (self.__name__, key)) res[0] = 'NOT '+res[0] @@ -214,7 +214,7 @@ 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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/configure 2011-01-30 00:25:19.000000000 -0500 @@ -1955,6 +1955,8 @@ enable avutil enable asm enable debug @@ -245,7 +245,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 -+++ mythtv-0.24.fixes/contrib/icons/master_iconmap/channel_icons.pl 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/contrib/icons/master_iconmap/channel_icons.pl 2011-01-30 00:25:19.000000000 -0500 @@ -5,10 +5,10 @@ # Also does searches for artwork URLs based on callsign or xmltvid, or displays # the master iconmap xml file from services.mythtv.org. @@ -263,7 +263,7 @@ # diff -Naurp mythtv-0.24.orig/contrib/maintenance/flush_deleted_recgroup.pl mythtv-0.24.fixes/contrib/maintenance/flush_deleted_recgroup.pl --- mythtv-0.24.orig/contrib/maintenance/flush_deleted_recgroup.pl 2009-10-05 18:36:40.000000000 -0400 -+++ mythtv-0.24.fixes/contrib/maintenance/flush_deleted_recgroup.pl 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/contrib/maintenance/flush_deleted_recgroup.pl 2011-01-30 00:25:19.000000000 -0500 @@ -2,10 +2,10 @@ # # Tell MythTV to truly delete all recordings in the "Deleted" recgroup @@ -281,7 +281,7 @@ # Libraries we'll use diff -Naurp mythtv-0.24.orig/contrib/maintenance/optimize_mythdb.pl mythtv-0.24.fixes/contrib/maintenance/optimize_mythdb.pl --- mythtv-0.24.orig/contrib/maintenance/optimize_mythdb.pl 2009-04-10 20:04:30.000000000 -0400 -+++ mythtv-0.24.fixes/contrib/maintenance/optimize_mythdb.pl 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/contrib/maintenance/optimize_mythdb.pl 2011-01-30 00:25:19.000000000 -0500 @@ -3,10 +3,10 @@ # Connects to the mythtv database and repairs/optimizes the tables that it # finds. Suggested use is to cron it to run once per day. @@ -299,7 +299,7 @@ diff -Naurp mythtv-0.24.orig/contrib/user_jobs/mythlink.pl mythtv-0.24.fixes/contrib/user_jobs/mythlink.pl --- mythtv-0.24.orig/contrib/user_jobs/mythlink.pl 2010-07-21 02:05:52.000000000 -0400 -+++ mythtv-0.24.fixes/contrib/user_jobs/mythlink.pl 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/contrib/user_jobs/mythlink.pl 2011-01-30 00:25:19.000000000 -0500 @@ -6,10 +6,10 @@ # Automatically detects database settings from mysql.txt, and loads # the mythtv recording directory from the database (code from nuvexport). @@ -317,7 +317,7 @@ diff -Naurp mythtv-0.24.orig/docs/mythtv-HOWTO.sgml mythtv-0.24.fixes/docs/mythtv-HOWTO.sgml --- mythtv-0.24.orig/docs/mythtv-HOWTO.sgml 2010-09-09 13:48:05.000000000 -0400 -+++ mythtv-0.24.fixes/docs/mythtv-HOWTO.sgml 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/docs/mythtv-HOWTO.sgml 2011-01-30 00:25:19.000000000 -0500 @@ -1258,11 +1258,11 @@ like this: The <tt>lircd.conf</tt> file can have multiple remote controls defined. @@ -542,7 +542,7 @@ <p>Commercial flagging can be CPU intensive. By default, the backend that diff -Naurp mythtv-0.24.orig/external/FFmpeg/libavcodec/dvbsubdec.c mythtv-0.24.fixes/external/FFmpeg/libavcodec/dvbsubdec.c --- mythtv-0.24.orig/external/FFmpeg/libavcodec/dvbsubdec.c 2010-09-02 22:21:18.000000000 -0400 -+++ mythtv-0.24.fixes/external/FFmpeg/libavcodec/dvbsubdec.c 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/external/FFmpeg/libavcodec/dvbsubdec.c 2011-01-30 00:25:19.000000000 -0500 @@ -1481,6 +1481,7 @@ static int dvbsub_decode(AVCodecContext break; case DVBSUB_DISPLAYDEFINITION_SEGMENT: @@ -551,9 +551,20 @@ case DVBSUB_DISPLAY_SEGMENT: *data_size = dvbsub_display_end_segment(avctx, p, segment_length, sub); break; +diff -Naurp mythtv-0.24.orig/external/FFmpeg/libavformat/mpegts.c mythtv-0.24.fixes/external/FFmpeg/libavformat/mpegts.c +--- mythtv-0.24.orig/external/FFmpeg/libavformat/mpegts.c 2010-10-16 17:30:31.000000000 -0400 ++++ mythtv-0.24.fixes/external/FFmpeg/libavformat/mpegts.c 2011-01-30 00:25:19.000000000 -0500 [...2138 lines suppressed...] -+++ mythtv-0.24.fixes/programs/mythlcdserver/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythlcdserver/.gitignore 2011-01-30 00:25:19.000000000 -0500 @@ -0,0 +1 @@ +mythlcdserver diff -Naurp mythtv-0.24.orig/programs/mythpreviewgen/.gitignore mythtv-0.24.fixes/programs/mythpreviewgen/.gitignore --- mythtv-0.24.orig/programs/mythpreviewgen/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/programs/mythpreviewgen/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythpreviewgen/.gitignore 2011-01-30 00:25:19.000000000 -0500 @@ -0,0 +1 @@ +mythpreviewgen diff -Naurp mythtv-0.24.orig/programs/mythshutdown/.gitignore mythtv-0.24.fixes/programs/mythshutdown/.gitignore --- mythtv-0.24.orig/programs/mythshutdown/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/programs/mythshutdown/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythshutdown/.gitignore 2011-01-30 00:25:19.000000000 -0500 @@ -0,0 +1 @@ +mythshutdown diff -Naurp mythtv-0.24.orig/programs/mythtranscode/.gitignore mythtv-0.24.fixes/programs/mythtranscode/.gitignore --- mythtv-0.24.orig/programs/mythtranscode/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/programs/mythtranscode/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythtranscode/.gitignore 2011-01-30 00:25:19.000000000 -0500 @@ -0,0 +1 @@ +mythtranscode diff -Naurp mythtv-0.24.orig/programs/mythtranscode/replex/.gitignore mythtv-0.24.fixes/programs/mythtranscode/replex/.gitignore --- mythtv-0.24.orig/programs/mythtranscode/replex/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/programs/mythtranscode/replex/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythtranscode/replex/.gitignore 2011-01-30 00:25:19.000000000 -0500 @@ -0,0 +1 @@ +mythreplex diff -Naurp mythtv-0.24.orig/programs/mythtranscode/transcode.cpp mythtv-0.24.fixes/programs/mythtranscode/transcode.cpp --- mythtv-0.24.orig/programs/mythtranscode/transcode.cpp 2010-09-23 02:38:05.000000000 -0400 -+++ mythtv-0.24.fixes/programs/mythtranscode/transcode.cpp 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythtranscode/transcode.cpp 2011-01-30 00:25:19.000000000 -0500 @@ -115,7 +115,7 @@ class AudioReencodeBuffer : public Audio { last_audiotime = timecode; @@ -8176,22 +8942,22 @@ } diff -Naurp mythtv-0.24.orig/programs/mythtvosd/.gitignore mythtv-0.24.fixes/programs/mythtvosd/.gitignore --- mythtv-0.24.orig/programs/mythtvosd/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/programs/mythtvosd/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythtvosd/.gitignore 2011-01-30 00:25:19.000000000 -0500 @@ -0,0 +1 @@ +mythtvosd diff -Naurp mythtv-0.24.orig/programs/mythtv-setup/.gitignore mythtv-0.24.fixes/programs/mythtv-setup/.gitignore --- mythtv-0.24.orig/programs/mythtv-setup/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/programs/mythtv-setup/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythtv-setup/.gitignore 2011-01-30 00:25:19.000000000 -0500 @@ -0,0 +1 @@ +mythtv-setup diff -Naurp mythtv-0.24.orig/programs/mythwelcome/.gitignore mythtv-0.24.fixes/programs/mythwelcome/.gitignore --- mythtv-0.24.orig/programs/mythwelcome/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ mythtv-0.24.fixes/programs/mythwelcome/.gitignore 2011-01-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/mythwelcome/.gitignore 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/database/mythconverg_restore.pl 2011-01-30 00:25:19.000000000 -0500 @@ -13,7 +13,7 @@ # Script info @@ -8216,12 +8982,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/.gitignore 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py 2011-01-30 00:25:19.000000000 -0500 @@ -349,16 +349,19 @@ class Videos(object): urlType = u'fullscreen' @@ -8269,7 +9035,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/common/common_api.py 2011-01-30 00:25:19.000000000 -0500 @@ -18,7 +18,7 @@ MythNetvision Grabber scripts that run a MNV grabbers. ''' @@ -8330,7 +9096,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-18 00:21: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 @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> +<html> @@ -8373,7 +9139,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml 2011-01-30 00:25:19.000000000 -0500 @@ -19,9 +19,8 @@ <url> <name>BBC iPlayer Search</name> @@ -8388,7 +9154,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml 2011-01-30 00:25:19.000000000 -0500 @@ -46,7 +46,7 @@ </subDirectory> @@ -8400,7 +9166,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl 2011-01-30 00:25:19.000000000 -0500 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- @@ -8663,7 +9429,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py 2011-01-30 00:25:19.000000000 -0500 @@ -19,7 +19,7 @@ metadata, video and image URLs from MTV. for this api are published at http://developer.mtvnservices.com/docs ''' @@ -8734,7 +9500,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py 2011-01-30 00:25:19.000000000 -0500 @@ -21,8 +21,9 @@ See this link for the specifications: http://www.mythtv.org/wiki/MythNetvision_Grabber_Script_Format ''' @@ -8832,12 +9598,12 @@ # End of XPath extension functions 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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/themes/.gitignore 2011-01-30 00:25:19.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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter/base.xml 2011-01-30 00:25:19.000000000 -0500 @@ -766,6 +766,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,125</area> @@ -8848,7 +9614,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml 2011-01-30 00:25:19.000000000 -0500 @@ -881,6 +881,7 @@ <textarea name="message" from="basetextarea"> <area>170,20,390,126</area> @@ -8859,7 +9625,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml 2011-01-30 00:25:19.000000000 -0500 @@ -429,6 +429,22 @@ <fill color="#FFFFFF" alpha="255" /> <alphapulse min="180" max="255" change="4" /> @@ -8885,7 +9651,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml 2011-01-30 00:25:19.000000000 -0500 @@ -532,7 +532,7 @@ <area>240,2,220,24</area> </textarea> @@ -8902,7 +9668,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-18 00:21:00.000000000 -0500 ++++ mythtv-0.24.fixes/version.sh 2011-01-30 00:25:19.000000000 -0500 @@ -1,12 +1,11 @@ #!/bin/sh # @@ -8944,7 +9710,7 @@ - SVNREPOPATH=$(echo "$$URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/version.sh $$" | sed -e 's,.*/svn/,,' \ - -e 's,/mythtv/version\.sh.*,,' \ - -e 's,/version\.sh.*,,') -+ BRANCH=$(git branch | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/') ++ BRANCH=$(git branch --no-color | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/') ;; esac