rpms/mythtv/F-14 mythplugins-0.24-fixes.patch, 1.2, 1.3 mythtv-0.24-fixes.patch, 1.3, 1.4 mythtv.spec, 1.87, 1.88

Jarod Wilson jarod at rpmfusion.org
Fri Mar 25 04:51:40 CET 2011


Author: jarod

Update of /cvs/free/rpms/mythtv/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21152

Modified Files:
	mythplugins-0.24-fixes.patch mythtv-0.24-fixes.patch 
	mythtv.spec 
Log Message:
* Thu Mar 24 2011 Jarod Wilson <jarod at wilsonet.com> 0.24-7
- Update to 0.24 fixes, git revision 464fa28373
- Remove i810 and openchrome detritus


mythplugins-0.24-fixes.patch:
 .gitignore                                                           |    6 
 configure                                                            |   17 
 mytharchive/i18n/.gitignore                                          |    1 
 mytharchive/i18n/mytharchive_fi.qm                                   |    6 
 mytharchive/i18n/mytharchive_fi.ts                                   |    8 
 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/i18n/mythgallery_fi.qm                                   |   19 -
 mythgallery/i18n/mythgallery_fi.ts                                   |    8 
 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/cddecoder.h                                      |    1 
 mythmusic/mythmusic/cdrip.cpp                                        |    2 
 mythmusic/mythmusic/filescanner.cpp                                  |   40 +-
 mythmusic/mythmusic/musicplayer.cpp                                  |    5 
 mythmusic/mythmusic/visualize.cpp                                    |   19 -
 mythmusic/mythmusic/visualize.h                                      |   11 
 mythmusic/theme/default-wide/music-ui.xml                            |   42 +-
 mythmusic/theme/default/music-ui.xml                                 |  173 +++++++++-
 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                                  |   22 -
 mythweather/i18n/.gitignore                                          |    1 
 mythweather/mythweather/scripts/ca_envcan/ENVCANParser.pm            |    6 
 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 
 56 files changed, 533 insertions(+), 168 deletions(-)

Index: mythplugins-0.24-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythplugins-0.24-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
Binary files /tmp/cvsZ8G6Ob and /tmp/cvsiunmEk differ

mythtv-0.24-fixes.patch:
 Makefile                                                                                        |    6 
 bindings/python/MythTV/__init__.py                                                              |    4 
 bindings/python/MythTV/dataheap.py                                                              |    2 
 bindings/python/MythTV/methodheap.py                                                            |  102 -
 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 
 docs/mythtv-HOWTO.sgml                                                                          |  123 +
 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/mythfrontend_en_gb.ts                                                                      |    2 
 i18n/mythfrontend_fi.ts                                                                         |   42 
 i18n/mythfrontend_pt.ts                                                                         |    2 
 libs/libmyth/audiooutput.cpp                                                                    |   40 
 libs/libmyth/audiooutput.h                                                                      |    3 
 libs/libmyth/audiooutputalsa.cpp                                                                |  213 +-
 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                                                               |    9 
 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/libmyth/mythuifilebrowser.cpp                                                              |   12 
 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/libmythfreemheg/Engine.cpp                                                                 |    9 
 libs/libmythfreesurround/freesurround.cpp                                                       |    4 
 libs/libmythfreesurround/freesurround.h                                                         |    2 
 libs/libmythmetadata/videometadata.cpp                                                          |   16 
 libs/libmythsoundtouch/cpu_detect.h                                                             |    8 
 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                                                                          |   29 
 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                                                                    |   13 
 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                                                                |   18 
 libs/libmythtv/mythplayer.cpp                                                                   |  415 ++---
 libs/libmythtv/mythplayer.h                                                                     |   36 
 libs/libmythtv/nuppeldecoder.cpp                                                                |   18 
 libs/libmythtv/playercontext.cpp                                                                |    2 
 libs/libmythtv/privatedecoder_vda.cpp                                                           |    8 
 libs/libmythtv/privatedecoder_vda.h                                                             |    4 
 libs/libmythtv/recordinginfo.cpp                                                                |   13 
 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/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.cpp                                                                 |    2 
 libs/libmythtv/videoout_d3d.h                                                                   |    2 
 libs/libmythtv/videoout_opengl.cpp                                                              |    2 
 libs/libmythtv/videoout_opengl.h                                                                |    2 
 libs/libmythtv/videoout_quartz.cpp                                                              |    7 
 libs/libmythtv/videoout_vdpau.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/DisplayResOSX.cpp                                                                |    2 
 libs/libmythui/mythmainwindow.cpp                                                               |    2 
 libs/libmythui/mythrender_opengl.cpp                                                            |   34 
 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/mythuitype.cpp                                                                   |    2 
 libs/libmythui/mythuiwebbrowser.cpp                                                             |    6 
 libs/libmythui/util-osx-cocoa.mm                                                                |    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 
 programs/mythbackend/mainserver.cpp                                                             |   20 
 programs/mythbackend/playbacksock.cpp                                                           |    2 
 programs/mythbackend/scheduler.cpp                                                              |   15 
 programs/mythfrontend/exitprompt.cpp                                                            |   25 
 programs/mythfrontend/globalsettings.cpp                                                        |  115 -
 programs/mythfrontend/globalsettings.h                                                          |    5 
 programs/mythfrontend/guidegrid.cpp                                                             |    7 
 programs/mythfrontend/playbackbox.cpp                                                           |   17 
 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/mythtranscode/mpeg2fix.cpp                                                             |    2 
 programs/mythtranscode/mpeg2fix.h                                                               |    2 
 programs/mythtranscode/replex/.gitignore                                                        |    1 
 programs/mythtranscode/transcode.cpp                                                            |    9 
 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                                                          |   26 
 themes/MythCenter-wide/zoneminder-ui.xml                                                        |   12 
 themes/MythCenter/base.xml                                                                      |    1 
 version.sh                                                                                      |   23 
 149 files changed, 3278 insertions(+), 2445 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.24-fixes.patch	3 Mar 2011 02:34:21 -0000	1.3
+++ mythtv-0.24-fixes.patch	25 Mar 2011 03:51:40 -0000	1.4
@@ -1,127 +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-02-28 22:42:43.000000000 -0500
-@@ -0,0 +1,4 @@
-+Makefile.perl
-+Makefile.perl.*
-+blib/
-+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-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
- #
--# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/IO/Socket/INET/MythTV.pm $
--# @date      $Date$
--# @version   $Revision$
--# @author    $Author$
-+# @url       $URL$
-+# @date      $Date$
-+# @version   $Revision$
-+# @author    $Author$
- # @copyright Silicon Mechanics
- #
- 
-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-02-28 22:42:43.000000000 -0500
-@@ -3,10 +3,10 @@
- #
- # Object containing info about a particular MythTV channel.
- #
--# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/Channel.pm $
--# @date      $Date$
--# @version   $Revision$
--# @author    $Author$
-+# @url       $URL$
-+# @date      $Date$
-+# @version   $Revision$
-+# @author    $Author$
- #
- 
- # 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-02-28 22:42:43.000000000 -0500
-@@ -3,10 +3,10 @@
- #
- # Object containing info about a particular MythTV program.
- #
--# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/Program.pm $
--# @date      $Date$
--# @version   $Revision$
--# @author    $Author$
-+# @url       $URL$
-+# @date      $Date$
-+# @version   $Revision$
-+# @author    $Author$
- #
- 
- 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-02-28 22:42:43.000000000 -0500
-@@ -3,10 +3,10 @@
- #
- # Object containing info about a particular MythTV recording.
- #
--# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/Recording.pm $
--# @date      $Date$
--# @version   $Revision$
--# @author    $Author$
-+# @url       $URL$
-+# @date      $Date$
-+# @version   $Revision$
-+# @author    $Author$
- #
- 
- 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-02-28 22:42:43.000000000 -0500
-@@ -3,10 +3,10 @@
- #
- # Object containing info about a particular MythTV Storage Group.
- #
--# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV/StorageGroup.pm $
--# @date      $Date$
--# @version   $Revision$
--# @author    $Author$
-+# @url       $URL$
-+# @date      $Date$
-+# @version   $Revision$
-+# @author    $Author$
- #
- 
- # 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-02-28 22:42:43.000000000 -0500
-@@ -1,10 +1,10 @@
- #
- # MythTV bindings for perl.
- #
--# @url       $URL: http://svn.mythtv.org/svn/tags/release-0-24/mythtv/bindings/perl/MythTV.pm $
--# @date      $Date$
--# @version   $Revision$
--# @author    $Author$
-+# @url       $URL$
-+# @date      $Date$
-+# @version   $Revision$
-+# @author    $Author$
- #
- 
- # 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-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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/bindings/python/MythTV/dataheap.py	2011-03-24 22:18:50.000000000 -0400
 @@ -863,7 +863,7 @@ class Video( VideoSchema, DBDataWrite, C
          return vid
  
@@ -133,7 +12,7 @@
  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
++++ mythtv-0.24.fixes/bindings/python/MythTV/__init__.py	2011-03-24 22:18:50.000000000 -0400
 @@ -53,8 +53,10 @@ from methodheap import *
  from sys import version_info
  if version_info >= (2, 6): # 2.6 or newer
@@ -148,8 +27,145 @@
  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-02-28 22:42:43.000000000 -0500
-@@ -625,9 +625,9 @@ class MythDB( DBCache ):
++++ mythtv-0.24.fixes/bindings/python/MythTV/methodheap.py	2011-03-24 22:18:50.000000000 -0400
+@@ -11,7 +11,7 @@ from exceptions import *
+ from logging import MythLog
+ from connections import FEConnection, XMLConnection
+ from utility import databaseSearch, datetime
+-from database import DBCache
++from database import DBCache, DBData
+ from system import SystemEvent
+ from mythproto import BEEvent, FileOps, Program, FreeSpace
+ from dataheap import *
+@@ -20,6 +20,9 @@ from datetime import timedelta
+ from weakref import proxy
+ import re
+ 
++class CaptureCard( DBData ):
++    pass
++
+ class MythBE( FileOps ):
+     __doc__ = FileOps.__doc__+"""
+         getPendingRecordings()    - returns a list of scheduled recordings
+@@ -50,7 +53,7 @@ class MythBE( FileOps ):
+                                     and dictionary of filenames with sizes
+     """
+ 
+-    locked_tuners = []
++    locked_tuners = {}
+ 
+     def __del__(self):
+         self.freeTuner()
+@@ -110,51 +113,77 @@ class MythBE( FileOps ):
+         Returns an ID of -2 if tuner is locked
+                          -1 if no tuner could be found
+         """
+-        local = True
+         cmd = 'LOCK_TUNER'
++        be = self
++
+         if id is not None:
++            card = None
++            try:
++                # pull information from database to confirm existance
++                card = CaptureCard(id)
++            except MythError:
++                raise MythError("Capture card %s not found" % id)
++
+             cmd += ' %d' % id
+-            res = self.getRecorderDetails(id).hostname
+-            if res != self.localname():
[...4312 lines suppressed...]
 +</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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/bbc_config.xml	2011-03-24 22:18:50.000000000 -0400
 @@ -19,9 +19,8 @@
              <url>
                  <name>BBC iPlayer Search</name>
@@ -11457,7 +10562,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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/trailersMashup.xml	2011-03-24 22:18:50.000000000 -0400
 @@ -46,7 +46,7 @@
    </subDirectory>
  
@@ -11469,7 +10574,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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/tributecaHTML_item.xsl	2011-03-24 22:18:50.000000000 -0400
 @@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!--
@@ -11732,7 +10837,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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py	2011-03-24 22:18:50.000000000 -0400
 @@ -19,7 +19,7 @@ metadata, video and image URLs from MTV.
  for this api are published at http://developer.mtvnservices.com/docs
  '''
@@ -11803,7 +10908,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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py	2011-03-24 22:18:50.000000000 -0400
 @@ -21,8 +21,9 @@ See this link for the specifications:
  http://www.mythtv.org/wiki/MythNetvision_Grabber_Script_Format
  '''
@@ -11901,7 +11006,7 @@
  # 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
++++ mythtv-0.24.fixes/themes/DVR/util_menu.xml	2011-03-24 22:18:50.000000000 -0400
 @@ -8,6 +8,13 @@
      </button>
  
@@ -11918,12 +11023,12 @@
          <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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/themes/.gitignore	2011-03-24 22:18:50.000000000 -0400
 @@ -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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter/base.xml	2011-03-24 22:18:50.000000000 -0400
 @@ -766,6 +766,7 @@
          <textarea name="message" from="basetextarea">
              <area>170,20,390,125</area>
@@ -11934,7 +11039,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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/base.xml	2011-03-24 22:18:50.000000000 -0400
 @@ -881,6 +881,7 @@
          <textarea name="message" from="basetextarea">
              <area>170,20,390,126</area>
@@ -11945,7 +11050,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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/osd.xml	2011-03-24 22:18:50.000000000 -0400
 @@ -429,6 +429,22 @@
                  <fill color="#FFFFFF" alpha="255" />
                  <alphapulse min="180" max="255" change="4" />
@@ -11971,7 +11076,25 @@
  
 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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/themes/MythCenter-wide/schedule-ui.xml	2011-03-24 22:18:50.000000000 -0400
+@@ -145,7 +145,7 @@
+         </textarea>
+ 
+         <textarea name="subtitle" from="basetextarea">
+-            <area>40,80,620,30</area>
++            <area>40,80,640,30</area>
+             <align>left,vcenter</align>
+             <font>basesmall</font>
+         </textarea>
+@@ -157,7 +157,7 @@
+         </textarea>
+ 
+         <textarea name="rectypestatus" from="basetextarea">
+-            <area>680,80,550,30</area>
++            <area>710,80,530,30</area>
+             <align>right,vcenter</align>
+             <font>basesmallyellow</font>
+         </textarea>
 @@ -532,7 +532,7 @@
                          <area>240,2,220,24</area>
                      </textarea>
@@ -11981,9 +11104,69 @@
                      </textarea>
                      <textarea name="card" from="shortstarttimedate">
                          <area>1165,2,30,24</area>
+@@ -1205,26 +1205,26 @@
+         </buttonlist>
+ 
+         <textarea name="title" from="basetextarea">
+-            <area>30,454,1200,50</area>
++            <area>30,454,1220,40</area>
+             <font>baselarge</font>
+         </textarea>
+         <textarea name="channel" from="basetextarea">
+             <area>30,494,360,30</area>
+         </textarea>
+         <textarea name="timedate" from="basetextarea">
+-            <area>410,490,520,30</area>
++            <area>410,494,520,30</area>
+         </textarea>
+         <textarea name="description" from="basetextarea">
+-            <area>30,524,1200,150</area>
++            <area>30,524,1220,160</area>
+             <multiline>yes</multiline>
+             <template>%"|SUBTITLE|"\n%%YEARSTARS| %%DESCRIPTION%</template>
+         </textarea>
+         <textarea name="type" from="basetextarea">
+-            <area>30,670,560,30</area>
++            <area>30,685,560,30</area>
+             <font>basemedium_highlight</font>
+         </textarea>
+         <textarea name="programid" from="basetextarea">
+-            <area>800,670,440,30</area>
++            <area>800,685,450,30</area>
+             <align>right</align>
+         </textarea>
+         <textarea name="msg" from="basetextarea">
+@@ -1411,22 +1411,22 @@
+         </buttonlist>
+ 
+         <textarea name="title" from="basetextarea">
+-            <area>90,50,1040,46</area>
++            <area>90,50,1075,40</area>
+             <font>baselarge</font>
+         </textarea>
+         <textarea name="timedate" from="basetextarea">
+-            <area>90,290,540,28</area>
++            <area>90,290,540,30</area>
+         </textarea>
+         <textarea name="channel" from="basetextarea">
+-            <area>780,290,380,36</area>
++            <area>780,290,385,30</area>
+             <align>right</align>
+         </textarea>
+         <textarea name="rectypestatus" from="basetextarea">
+-            <area>90,254,600,36</area>
++            <area>90,254,600,30</area>
+             <font>basesmallyellow</font>
+         </textarea>
+         <textarea name="description" from="basetextarea">
+-            <area>90,90,1040,176</area>
++            <area>90,90,1075,160</area>
+             <multiline>yes</multiline>
+             <template>%"|SUBTITLE|"\n%%LONGREPEAT%%(|STARS|) %%DESCRIPTION%</template>
+         </textarea>
 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
++++ mythtv-0.24.fixes/themes/MythCenter-wide/zoneminder-ui.xml	2011-03-24 22:18:50.000000000 -0400
 @@ -652,23 +652,23 @@
  
      <window name="zmplayer">
@@ -12014,14 +11197,9 @@
  
          <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
-@@ -1 +0,0 @@
--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-02-28 22:42:43.000000000 -0500
++++ mythtv-0.24.fixes/version.sh	2011-03-24 22:18:50.000000000 -0400
 @@ -1,12 +1,11 @@
  #!/bin/sh
  #


Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mythtv.spec	3 Mar 2011 02:34:21 -0000	1.87
+++ mythtv.spec	25 Mar 2011 03:51:40 -0000	1.88
@@ -66,7 +66,7 @@
 
 # Git revision and branch ID
 # 0.24 release: git tag b0.24
-%define _gitrev 4af46b1f5d
+%define _gitrev 464fa28373
 %define branch fixes/0.24
 
 #
@@ -83,7 +83,7 @@
 Release: 0.1.git.%{_gitrev}%{?dist}
 #Release: 0.1.rc1%{?dist}
 %else
-Release: 6%{?dist}
+Release: 7%{?dist}
 %endif
 
 # The primary license is GPLv2+, but bits are borrowed from a number of
@@ -417,10 +417,6 @@
 Requires:  libXxf86vm-devel
 Requires:  mesa-libGLU-devel
 Requires:  xorg-x11-proto-devel
-%ifarch %{ix86} x86_64
-Requires:  xorg-x11-drv-i810-devel
-Requires:  xorg-x11-drv-openchrome-devel
-%endif
 
 # OpenGL video output and vsync support
 Requires:  libGL-devel, libGLU-devel
@@ -1457,6 +1453,10 @@
 ################################################################################
 
 %changelog
+* Thu Mar 24 2011 Jarod Wilson <jarod at wilsonet.com> 0.24-7
+- Update to 0.24 fixes, git revision 464fa28373
+- Remove i810 and openchrome detritus
+
 * Mon Feb 28 2011 Jarod Wilson <jarod at wilsonet.com> 0.24-6
 - Update to 0.24 fixes, git revision 4af46b1f5d
 - Fix mythtv version output to properly show git revision



More information about the rpmfusion-commits mailing list