Author: jarod Update of /cvs/free/rpms/mythtv/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv26648 Modified Files: mythplugins-0.24.1-fixes.patch mythtv-0.24.1-fixes.patch mythtv.spec Log Message: * Mon May 30 2011 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.24.1-2 - Drop dependency on mythtv-themes, since upstream is no longer tarring them up, in preference of people using the built-in theme downloader. - Update to 0.24-fixes, git revision 3657f313ac mythplugins-0.24.1-fixes.patch: mytharchive/i18n/mytharchive_en_gb.ts | 6 mythgallery/i18n/mythgallery_en_gb.qm |binary mythgallery/i18n/mythgallery_en_gb.ts | 162 +++++++------ mythgame/i18n/mythgame_en_gb.ts | 101 +++----- mythmusic/i18n/mythmusic_en_gb.ts | 327 +++++++++++++--------------- mythnetvision/i18n/mythnetvision_en_gb.ts | 82 +++---- mythweather/i18n/mythweather_en_gb.ts | 2 mythzoneminder/i18n/mythzoneminder_en_gb.ts | 2 8 files changed, 340 insertions(+), 342 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythplugins-0.24.1-fixes.patch Index: mythplugins-0.24.1-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythplugins-0.24.1-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythplugins-0.24.1-fixes.patch 17 May 2011 22:40:13 -0000 1.1 +++ mythplugins-0.24.1-fixes.patch 31 May 2011 02:19:57 -0000 1.2 @@ -0,0 +1,2020 @@ + mythplugins/mytharchive/i18n/mytharchive_en_gb.ts | 6 +- + mythplugins/mythgallery/i18n/mythgallery_en_gb.qm | Bin 297 -> 684 bytes + mythplugins/mythgallery/i18n/mythgallery_en_gb.ts | 162 +++++----- + mythplugins/mythgame/i18n/mythgame_en_gb.ts | 101 +++---- + mythplugins/mythmusic/i18n/mythmusic_en_gb.ts | 327 ++++++++++---------- + .../mythnetvision/i18n/mythnetvision_en_gb.ts | 82 +++--- + mythplugins/mythweather/i18n/mythweather_en_gb.ts | 2 +- + .../mythzoneminder/i18n/mythzoneminder_en_gb.ts | 2 +- + 8 files changed, 340 insertions(+), 342 deletions(-) + +diff --git a/mythplugins/mytharchive/i18n/mytharchive_en_gb.ts b/mythplugins/mytharchive/i18n/mytharchive_en_gb.ts +index 141b480..20b0cde 100644 +--- a/mythplugins/mytharchive/i18n/mytharchive_en_gb.ts ++++ b/mythplugins/mytharchive/i18n/mytharchive_en_gb.ts +@@ -665,8 +665,10 @@ Place a blank DVD in the drive and select an option below.</translation> + </message> + <message> + <location filename="../mytharchive/recordingselector.cpp" line="119"/> +- <source>Retrieving Recording List. Please Wait...</source> +- <translation>Retrieving Recording List. Please Wait...</translation> ++ <source>Retrieving Recording List. ++Please Wait...</source> ++ <translation>Retrieving Recording List. ++Please Wait...</translation> + </message> + <message> + <location filename="../mytharchive/recordingselector.cpp" line="143"/> +diff --git a/mythplugins/mythgallery/i18n/mythgallery_en_gb.qm b/mythplugins/mythgallery/i18n/mythgallery_en_gb.qm +index cfd4e5b..9bfaaa4 100644 +Binary files a/mythplugins/mythgallery/i18n/mythgallery_en_gb.qm and b/mythplugins/mythgallery/i18n/mythgallery_en_gb.qm differ +diff --git a/mythplugins/mythgallery/i18n/mythgallery_en_gb.ts b/mythplugins/mythgallery/i18n/mythgallery_en_gb.ts +index 949143d..9aeb840 100644 +--- a/mythplugins/mythgallery/i18n/mythgallery_en_gb.ts ++++ b/mythplugins/mythgallery/i18n/mythgallery_en_gb.ts +@@ -22,193 +22,193 @@ + <translation>No images found in this directory.</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="384"/> ++ <location filename="../mythgallery/iconview.cpp" line="387"/> + <source>%1 of %2</source> + <translation>%1 of %2</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="395"/> ++ <location filename="../mythgallery/iconview.cpp" line="398"/> + <source>Gallery Home</source> + <translation>Gallery Home</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="559"/> ++ <location filename="../mythgallery/iconview.cpp" line="562"/> + <source>Error</source> + <translation>Error</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="560"/> ++ <location filename="../mythgallery/iconview.cpp" line="563"/> + <source>The selected device is no longer available</source> + <translation>The selected device is no longer available</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="873"/> ++ <location filename="../mythgallery/iconview.cpp" line="876"/> + <source>Gallery Options</source> + <translation>Gallery Options</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="886"/> ++ <location filename="../mythgallery/iconview.cpp" line="889"/> + <source>SlideShow</source> + <translation>SlideShow</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="887"/> ++ <location filename="../mythgallery/iconview.cpp" line="890"/> + <source>Random</source> + <translation>Random</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="888"/> ++ <location filename="../mythgallery/iconview.cpp" line="891"/> + <source>Meta Data Menu</source> + <translation>Meta Data Menu</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="889"/> ++ <location filename="../mythgallery/iconview.cpp" line="892"/> + <source>Marking Menu</source> + <translation>Marking Menu</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="890"/> ++ <location filename="../mythgallery/iconview.cpp" line="893"/> + <source>File Menu</source> + <translation>File Menu</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="891"/> ++ <location filename="../mythgallery/iconview.cpp" line="894"/> + <source>Settings</source> + <translation>Settings</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="907"/> ++ <location filename="../mythgallery/iconview.cpp" line="910"/> + <source>Metadata Options</source> + <translation>Metadata Options</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="916"/> ++ <location filename="../mythgallery/iconview.cpp" line="919"/> + <source>Rotate CW</source> + <translation>Rotate CW</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="917"/> ++ <location filename="../mythgallery/iconview.cpp" line="920"/> + <source>Rotate CCW</source> + <translation>Rotate CCW</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="922"/> ++ <location filename="../mythgallery/iconview.cpp" line="925"/> + <source>Marking Options</source> + <translation>Marking Options</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="931"/> ++ <location filename="../mythgallery/iconview.cpp" line="934"/> + <source>Select One</source> + <translation>Select One</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="932"/> ++ <location filename="../mythgallery/iconview.cpp" line="935"/> + <source>Clear One Marked</source> + <translation>Clear One Marked</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="933"/> ++ <location filename="../mythgallery/iconview.cpp" line="936"/> + <source>Select All</source> + <translation>Select All</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="934"/> ++ <location filename="../mythgallery/iconview.cpp" line="937"/> + <source>Clear Marked</source> + <translation>Clear Marked</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="939"/> ++ <location filename="../mythgallery/iconview.cpp" line="942"/> + <source>File Options</source> + <translation>File Options</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="948"/> ++ <location filename="../mythgallery/iconview.cpp" line="951"/> + <source>Show Devices</source> + <translation>Show Devices</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="949"/> ++ <location filename="../mythgallery/iconview.cpp" line="952"/> + <source>Eject</source> + <translation>Eject</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="950"/> ++ <location filename="../mythgallery/iconview.cpp" line="953"/> + <source>Import</source> + <translation>Import</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="951"/> ++ <location filename="../mythgallery/iconview.cpp" line="954"/> + <source>Copy here</source> + <translation>Copy here</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="952"/> ++ <location filename="../mythgallery/iconview.cpp" line="955"/> + <source>Move here</source> + <translation>Move here</translation> + </message> + <message> +- <location filename="../mythgallery/iconview.cpp" line="953"/> ++ <location filename="../mythgallery/iconview.cpp" line="956"/> + <source>Delete</source> [...1629 lines suppressed...] + </message> + <message> +- <location filename="../mythnetvision/netsearch.cpp" line="357"/> ++ <location filename="../mythnetvision/netsearch.cpp" line="358"/> + <source>Searching %1 for &quot;%2&quot;...</source> + <translation>Searching %1 for &quot;%2&quot;...</translation> + </message> + <message> +- <location filename="../mythnetvision/netsearch.cpp" line="380"/> +- <location filename="../mythnetvision/netsearch.cpp" line="398"/> ++ <location filename="../mythnetvision/netsearch.cpp" line="381"/> ++ <location filename="../mythnetvision/netsearch.cpp" line="399"/> + <source>Changing to page %1 of search &quot;%2&quot;...</source> + <translation>Changing to page %1 of search &quot;%2&quot;...</translation> + </message> + <message> +- <location filename="../mythnetvision/netsearch.cpp" line="465"/> ++ <location filename="../mythnetvision/netsearch.cpp" line="466"/> + <source>Timed out waiting for query to finish. API might be down.</source> + <translation>Timed out waiting for query to finish. API might be down.</translation> + </message> + <message> +- <location filename="../mythnetvision/netsearch.cpp" line="572"/> ++ <location filename="../mythnetvision/netsearch.cpp" line="573"/> + <source>No browser command set! MythNetVision needs MythBrowser installed to display the video.</source> + <translation>No browser command set! MythNetVision needs MythBrowser installed to display the video.</translation> + </message> + <message> +- <location filename="../mythnetvision/netsearch.cpp" line="616"/> ++ <location filename="../mythnetvision/netsearch.cpp" line="617"/> + <source>Are you sure you want to delete this file?</source> + <translation>Are you sure you want to delete this file?</translation> + </message> + <message> +- <location filename="../mythnetvision/netsearch.cpp" line="707"/> ++ <location filename="../mythnetvision/netsearch.cpp" line="708"/> + <source>This file already downloaded to: + %1</source> + <translation>This file has already downloaded to: +@@ -93,110 +93,110 @@ + <context> + <name>NetTree</name> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="490"/> ++ <location filename="../mythnetvision/nettree.cpp" line="491"/> + <source>Playback/Download Options</source> + <translation>Playback/Download Options</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="512"/> ++ <location filename="../mythnetvision/nettree.cpp" line="513"/> + <source>Open Web Link</source> + <translation>Open Web Link</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="515"/> ++ <location filename="../mythnetvision/nettree.cpp" line="516"/> + <source>Save This Video</source> + <translation>Save This Video</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="518"/> ++ <location filename="../mythnetvision/nettree.cpp" line="519"/> + <source>Scan/Manage Subscriptions</source> + <translation>Scan/Manage Subscriptions</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="519"/> ++ <location filename="../mythnetvision/nettree.cpp" line="520"/> + <source>Change View</source> + <translation>Change View</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="533"/> ++ <location filename="../mythnetvision/nettree.cpp" line="534"/> + <source>View Options</source> + <translation>View Options</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="545"/> ++ <location filename="../mythnetvision/nettree.cpp" line="546"/> + <source>Switch to List View</source> + <translation>Switch to List View</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="547"/> ++ <location filename="../mythnetvision/nettree.cpp" line="548"/> + <source>Switch to Gallery View</source> + <translation>Switch to Gallery View</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="549"/> ++ <location filename="../mythnetvision/nettree.cpp" line="550"/> + <source>Switch to Browse View</source> + <translation>Switch to Browse View</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="561"/> ++ <location filename="../mythnetvision/nettree.cpp" line="562"/> + <source>Subscription Management</source> + <translation>Subscription Management</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="572"/> ++ <location filename="../mythnetvision/nettree.cpp" line="573"/> + <source>Update Site Maps</source> + <translation>Update Site Maps</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="573"/> ++ <location filename="../mythnetvision/nettree.cpp" line="574"/> + <source>Update RSS</source> + <translation>Update RSS</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="574"/> ++ <location filename="../mythnetvision/nettree.cpp" line="575"/> + <source>Manage Site Subscriptions</source> + <translation>Manage Site Subscriptions</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="575"/> ++ <location filename="../mythnetvision/nettree.cpp" line="576"/> + <source>Manage RSS Subscriptions</source> + <translation>Manage RSS Subscriptions</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="577"/> ++ <location filename="../mythnetvision/nettree.cpp" line="578"/> + <source>Enable Automatic Site Updates</source> + <translation>Enable Automatic Site Updates</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="579"/> ++ <location filename="../mythnetvision/nettree.cpp" line="580"/> + <source>Disable Automatic Site Updates</source> + <translation>Disable Automatic Site Updates</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="646"/> +- <location filename="../mythnetvision/nettree.cpp" line="665"/> +- <location filename="../mythnetvision/nettree.cpp" line="703"/> +- <location filename="../mythnetvision/nettree.cpp" line="747"/> ++ <location filename="../mythnetvision/nettree.cpp" line="647"/> ++ <location filename="../mythnetvision/nettree.cpp" line="666"/> ++ <location filename="../mythnetvision/nettree.cpp" line="704"/> ++ <location filename="../mythnetvision/nettree.cpp" line="748"/> + <source>Back</source> + <translation>Back</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="839"/> ++ <location filename="../mythnetvision/nettree.cpp" line="840"/> + <source>No browser command set! MythNetTree needs MythBrowser installed to display the video.</source> + <translation>No browser command set! MythNetTree needs MythBrowser installed to display the video.</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="893"/> ++ <location filename="../mythnetvision/nettree.cpp" line="894"/> + <source>Are you sure you want to delete this file?</source> + <translation>Are you sure you want to delete this file?</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="1225"/> ++ <location filename="../mythnetvision/nettree.cpp" line="1226"/> + <source>Updating RSS. This could take a while...</source> + <translation>Updating RSS. This could take a while...</translation> + </message> + <message> +- <location filename="../mythnetvision/nettree.cpp" line="1240"/> ++ <location filename="../mythnetvision/nettree.cpp" line="1241"/> + <source>Updating Site Maps. This could take a while...</source> + <translation>Updating Site Maps. This could take a while...</translation> + </message> +diff --git a/mythplugins/mythweather/i18n/mythweather_en_gb.ts b/mythplugins/mythweather/i18n/mythweather_en_gb.ts +index 137141b..1267780 100644 +--- a/mythplugins/mythweather/i18n/mythweather_en_gb.ts ++++ b/mythplugins/mythweather/i18n/mythweather_en_gb.ts +@@ -220,7 +220,7 @@ + <translation>Searching for scripts</translation> + </message> + <message> +- <location filename="../mythweather/sourceManager.cpp" line="301"/> ++ <location filename="../mythweather/sourceManager.cpp" line="302"/> + <source>Script %1 is still running when trying to do update, Make sure it isn&apos;t hanging, make sure timeout values are sane... Not running this time around</source> + <translation>Script %1 is still running when trying to do update, Make sure it isn&apos;t hanging, make sure timeout values are sane... Not running this time around</translation> + </message> +diff --git a/mythplugins/mythzoneminder/i18n/mythzoneminder_en_gb.ts b/mythplugins/mythzoneminder/i18n/mythzoneminder_en_gb.ts +index 978d6c8..b68412b 100644 +--- a/mythplugins/mythzoneminder/i18n/mythzoneminder_en_gb.ts ++++ b/mythplugins/mythzoneminder/i18n/mythzoneminder_en_gb.ts +@@ -368,7 +368,7 @@ + <context> + <name>ZMLivePlayer</name> + <message> +- <location filename="../mythzoneminder/zmliveplayer.cpp" line="127"/> ++ <location filename="../mythzoneminder/zmliveplayer.cpp" line="123"/> + <source>Can&apos;t show live view. + You don&apos;t have any monitors defined!</source> + <translation>Can&apos;t show live view. mythtv-0.24.1-fixes.patch: VERSION | 2 configure | 3 i18n/mythfrontend_en_gb.qm |binary i18n/mythfrontend_en_gb.ts | 3924 +++++++++++++--------------- libs/libmythtv/NuppelVideoRecorder.cpp | 2 libs/libmythtv/analogsignalmonitor.cpp | 2 libs/libmythtv/cardutil.cpp | 2 libs/libmythtv/v4lchannel.cpp | 2 libs/libmythtv/vbitext/vbi.c | 2 libs/libmythtv/videodev_myth.h | 360 ++ libs/libmythui/mythuiimage.cpp | 10 programs/mythfrontend/playbackbox.cpp | 4 programs/mythfrontend/playbackboxhelper.cpp | 4 13 files changed, 2327 insertions(+), 1990 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythtv-0.24.1-fixes.patch Index: mythtv-0.24.1-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv-0.24.1-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythtv-0.24.1-fixes.patch 17 May 2011 22:40:13 -0000 1.1 +++ mythtv-0.24.1-fixes.patch 31 May 2011 02:19:57 -0000 1.2 @@ -0,0 +1,11529 @@ + mythtv/VERSION | 2 +- + mythtv/configure | 3 +- + mythtv/i18n/mythfrontend_en_gb.qm | Bin 80703 -> 81236 bytes + mythtv/i18n/mythfrontend_en_gb.ts | 3924 ++++++++++---------- + mythtv/libs/libmythtv/NuppelVideoRecorder.cpp | 2 +- + mythtv/libs/libmythtv/analogsignalmonitor.cpp | 2 +- + mythtv/libs/libmythtv/cardutil.cpp | 2 +- + mythtv/libs/libmythtv/v4lchannel.cpp | 2 +- + mythtv/libs/libmythtv/vbitext/vbi.c | 2 +- + mythtv/libs/libmythtv/videodev_myth.h | 360 ++ + mythtv/libs/libmythui/mythuiimage.cpp | 10 +- + mythtv/programs/mythfrontend/playbackbox.cpp | 4 + + mythtv/programs/mythfrontend/playbackboxhelper.cpp | 4 + + 13 files changed, 2327 insertions(+), 1990 deletions(-) + +diff --git a/mythtv/VERSION b/mythtv/VERSION +index 5e1cbc9..91bc38f 100644 +--- a/mythtv/VERSION ++++ b/mythtv/VERSION +@@ -1 +1 @@ +-SOURCE_VERSION="v0.24.1" ++SOURCE_VERSION="v0.24.1+" +diff --git a/mythtv/configure b/mythtv/configure +index 1efe803..019e909 100755 +--- a/mythtv/configure ++++ b/mythtv/configure +@@ -1714,7 +1714,7 @@ mythtranscode_deps="backend frontend" + opengl_deps_any="agl_h GL_gl_h darwin windows x11" + opengl_video_deps="opengl" + opengl_vsync_deps="opengl" +-v4l_deps="backend linux_videodev_h linux_videodev2_h" ++v4l_deps="backend linux_videodev2_h" + vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h" + xrandr_deps="x11" + xv_deps="x11" +@@ -3773,7 +3773,6 @@ if enabled network; then + fi + fi + +-check_header linux/videodev.h + check_header linux/videodev2.h + check_header sys/videoio.h + +diff --git a/mythtv/i18n/mythfrontend_en_gb.qm b/mythtv/i18n/mythfrontend_en_gb.qm +index efd03b4..01cca3e 100644 +Binary files a/mythtv/i18n/mythfrontend_en_gb.qm and b/mythtv/i18n/mythfrontend_en_gb.qm differ +diff --git a/mythtv/i18n/mythfrontend_en_gb.ts b/mythtv/i18n/mythfrontend_en_gb.ts +index 88122a3..267de45 100644 +--- a/mythtv/i18n/mythfrontend_en_gb.ts ++++ b/mythtv/i18n/mythfrontend_en_gb.ts +@@ -50,65 +50,65 @@ + <context> + <name>CaptureCardEditor</name> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3054"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2968"/> + <source>Capture Card Menu</source> + <translation>Capture Card Menu</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3108"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3022"/> + <source>Are you sure you want to delete ALL capture cards?</source> + <translation>Are you sure you want to delete all capture cards?</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3075"/> +- <location filename="../libs/libmythtv/videosource.cpp" line="3110"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2989"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3024"/> + <source>Yes, delete capture cards</source> + <translation>Yes, delete capture cards</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3055"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2969"/> + <source>Edit...</source> + <translation>Edit...</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3056"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2970"/> + <source>Delete...</source> + <translation>Delete...</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3076"/> +- <location filename="../libs/libmythtv/videosource.cpp" line="3111"/> +- <location filename="../libs/libmythtv/videosource.cpp" line="3134"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2990"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3025"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3048"/> + <source>No, don&apos;t</source> + <translation>No, don&apos;t</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3132"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3046"/> + <source>Are you sure you want to delete this capture card?</source> + <translation>Are you sure you want to delete this capture card?</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3133"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3047"/> + <source>Yes, delete capture card</source> + <translation>Yes, delete capture card</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3010"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2924"/> + <source>Capture cards</source> + <translation>Capture cards</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3073"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2987"/> + <source>Are you sure you want to delete ALL capture cards on %1?</source> + <translation>Are you sure you want to delete ALL capture cards on %1?</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3092"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3006"/> + <source>Error getting list of cards for this host</source> + <translation>Error getting list of cards for this host</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="3093"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="3007"/> + <source>Unable to delete capturecards for %1</source> + <translation>Unable to delete capturecards for %1</translation> + </message> +@@ -116,53 +116,53 @@ + <context> + <name>CardInput</name> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2694"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2608"/> + <source>Scan for channels</source> + <translation>Scan for channels</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2696"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2610"/> + <source>Use channel scanner to find channels for this input.</source> + <translation>Use channel scanner to find channels for this input.</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2698"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2612"/> + <source>Fetch channels from listings source</source> + <translation>Fetch channels from listings source</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2700"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2614"/> + <source>This uses the listings data source to provide the channels for this input.</source> + <translation>This uses the listings data source to provide the channels for this input.</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2702"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2616"/> + <source>This can take a long time to run.</source> + <translation>This can take a long time to run.</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2781"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2695"/> + <source>Create Input Group</source> + <translation>Create Input Group</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2782"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2696"/> + <source>Enter new group name</source> + <translation>Enter new group name</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2792"/> +- <location filename="../libs/libmythtv/videosource.cpp" line="2813"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2706"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2727"/> + <source>Error</source> + <translation>Error</translation> + </message> + <message> +- <location filename="../libs/libmythtv/videosource.cpp" line="2793"/> ++ <location filename="../libs/libmythtv/videosource.cpp" line="2707"/> + <source>Sorry, this Input Group name cannot be blank.</source> + <translation>Sorry, this Input Group name cannot be blank.</translation> + </message> + <message> [...11138 lines suppressed...] ++ __u8 user_data[256]; /* user data last found in compressed stream */ ++ /* user_data[0] contains user data flags, user_data[1] has count */ ++}; ++ ++/* generic structure for setting playback modes */ ++struct video_play_mode ++{ ++ int mode; ++ int p1; ++ int p2; ++}; ++ ++/* for loading microcode / fpga programming */ ++struct video_code ++{ ++ char loadwhat[16]; /* name or tag of file being passed */ ++ int datasize; ++ __u8 *data; ++}; ++ ++#define VIDIOCGCAP _IOR('v',1,struct video_capability) /* Get capabilities */ ++#define VIDIOCGCHAN _IOWR('v',2,struct video_channel) /* Get channel info (sources) */ ++#define VIDIOCSCHAN _IOW('v',3,struct video_channel) /* Set channel */ ++#define VIDIOCGTUNER _IOWR('v',4,struct video_tuner) /* Get tuner abilities */ ++#define VIDIOCSTUNER _IOW('v',5,struct video_tuner) /* Tune the tuner for the current channel */ ++#define VIDIOCGPICT _IOR('v',6,struct video_picture) /* Get picture properties */ ++#define VIDIOCSPICT _IOW('v',7,struct video_picture) /* Set picture properties */ ++#define VIDIOCCAPTURE _IOW('v',8,int) /* Start, end capture */ ++#define VIDIOCGWIN _IOR('v',9, struct video_window) /* Get the video overlay window */ ++#define VIDIOCSWIN _IOW('v',10, struct video_window) /* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */ ++#define VIDIOCGFBUF _IOR('v',11, struct video_buffer) /* Get frame buffer */ ++#define VIDIOCSFBUF _IOW('v',12, struct video_buffer) /* Set frame buffer - root only */ ++#define VIDIOCKEY _IOR('v',13, struct video_key) /* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */ ++#define VIDIOCGFREQ _IOR('v',14, unsigned long) /* Set tuner */ ++#define VIDIOCSFREQ _IOW('v',15, unsigned long) /* Set tuner */ ++#define VIDIOCGAUDIO _IOR('v',16, struct video_audio) /* Get audio info */ ++#define VIDIOCSAUDIO _IOW('v',17, struct video_audio) /* Audio source, mute etc */ ++#define VIDIOCSYNC _IOW('v',18, int) /* Sync with mmap grabbing */ ++#define VIDIOCMCAPTURE _IOW('v',19, struct video_mmap) /* Grab frames */ ++#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */ ++#define VIDIOCGUNIT _IOR('v',21, struct video_unit) /* Get attached units */ ++#define VIDIOCGCAPTURE _IOR('v',22, struct video_capture) /* Get subcapture */ ++#define VIDIOCSCAPTURE _IOW('v',23, struct video_capture) /* Set subcapture */ ++#define VIDIOCSPLAYMODE _IOW('v',24, struct video_play_mode) /* Set output video mode/feature */ ++#define VIDIOCSWRITEMODE _IOW('v',25, int) /* Set write mode */ ++#define VIDIOCGPLAYINFO _IOR('v',26, struct video_info) /* Get current playback info from hardware */ ++#define VIDIOCSMICROCODE _IOW('v',27, struct video_code) /* Load microcode into hardware */ ++#define VIDIOCGVBIFMT _IOR('v',28, struct vbi_format) /* Get VBI information */ ++#define VIDIOCSVBIFMT _IOW('v',29, struct vbi_format) /* Set VBI information */ ++#define VIDIOCGSIGNAL _IOR('v',30, struct video_signal) /* Get signal strength */ ++ ++ ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ ++ ++/* VIDIOCSWRITEMODE */ ++#define VID_WRITE_MPEG_AUD 0 ++#define VID_WRITE_MPEG_VID 1 ++#define VID_WRITE_OSD 2 ++#define VID_WRITE_TTX 3 ++#define VID_WRITE_CC 4 ++#define VID_WRITE_MJPEG 5 ++ ++/* VIDIOCSPLAYMODE */ ++#define VID_PLAY_VID_OUT_MODE 0 ++ /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */ ++#define VID_PLAY_GENLOCK 1 ++ /* p1: 0 = OFF, 1 = ON */ ++ /* p2: GENLOCK FINE DELAY value */ ++#define VID_PLAY_NORMAL 2 ++#define VID_PLAY_PAUSE 3 ++#define VID_PLAY_SINGLE_FRAME 4 ++#define VID_PLAY_FAST_FORWARD 5 ++#define VID_PLAY_SLOW_MOTION 6 ++#define VID_PLAY_IMMEDIATE_NORMAL 7 ++#define VID_PLAY_SWITCH_CHANNELS 8 ++#define VID_PLAY_FREEZE_FRAME 9 ++#define VID_PLAY_STILL_MODE 10 ++#define VID_PLAY_MASTER_MODE 11 ++ /* p1: see below */ ++#define VID_PLAY_MASTER_NONE 1 ++#define VID_PLAY_MASTER_VIDEO 2 ++#define VID_PLAY_MASTER_AUDIO 3 ++#define VID_PLAY_ACTIVE_SCANLINES 12 ++ /* p1 = first active; p2 = last active */ ++#define VID_PLAY_RESET 13 ++#define VID_PLAY_END_MARK 14 ++ ++ ++ ++#define VID_HARDWARE_BT848 1 ++#define VID_HARDWARE_QCAM_BW 2 ++#define VID_HARDWARE_PMS 3 ++#define VID_HARDWARE_QCAM_C 4 ++#define VID_HARDWARE_PSEUDO 5 ++#define VID_HARDWARE_SAA5249 6 ++#define VID_HARDWARE_AZTECH 7 ++#define VID_HARDWARE_SF16MI 8 ++#define VID_HARDWARE_RTRACK 9 ++#define VID_HARDWARE_ZOLTRIX 10 ++#define VID_HARDWARE_SAA7146 11 ++#define VID_HARDWARE_VIDEUM 12 /* Reserved for Winnov videum */ ++#define VID_HARDWARE_RTRACK2 13 ++#define VID_HARDWARE_PERMEDIA2 14 /* Reserved for Permedia2 */ ++#define VID_HARDWARE_RIVA128 15 /* Reserved for RIVA 128 */ ++#define VID_HARDWARE_PLANB 16 /* PowerMac motherboard video-in */ ++#define VID_HARDWARE_BROADWAY 17 /* Broadway project */ ++#define VID_HARDWARE_GEMTEK 18 ++#define VID_HARDWARE_TYPHOON 19 ++#define VID_HARDWARE_VINO 20 /* SGI Indy Vino */ ++#define VID_HARDWARE_CADET 21 /* Cadet radio */ ++#define VID_HARDWARE_TRUST 22 /* Trust FM Radio */ ++#define VID_HARDWARE_TERRATEC 23 /* TerraTec ActiveRadio */ ++#define VID_HARDWARE_CPIA 24 ++#define VID_HARDWARE_ZR36120 25 /* Zoran ZR36120/ZR36125 */ ++#define VID_HARDWARE_ZR36067 26 /* Zoran ZR36067/36060 */ ++#define VID_HARDWARE_OV511 27 ++#define VID_HARDWARE_ZR356700 28 /* Zoran 36700 series */ ++#define VID_HARDWARE_W9966 29 ++#define VID_HARDWARE_SE401 30 /* SE401 USB webcams */ ++#define VID_HARDWARE_PWC 31 /* Philips webcams */ ++#define VID_HARDWARE_MEYE 32 /* Sony Vaio MotionEye cameras */ ++#define VID_HARDWARE_CPIA2 33 ++#define VID_HARDWARE_VICAM 34 ++#define VID_HARDWARE_SF16FMR2 35 ++#define VID_HARDWARE_W9968CF 36 ++#define VID_HARDWARE_SAA7114H 37 ++#define VID_HARDWARE_SN9C102 38 ++#define VID_HARDWARE_ARV 39 ++#endif /* __LINUX_VIDEODEV_H */ ++ ++/* ++ * Local variables: ++ * c-basic-offset: 8 ++ * End: ++ */ +diff --git a/mythtv/libs/libmythui/mythuiimage.cpp b/mythtv/libs/libmythui/mythuiimage.cpp +index c3c3667..3ffd4e6 100644 +--- a/mythtv/libs/libmythui/mythuiimage.cpp ++++ b/mythtv/libs/libmythui/mythuiimage.cpp +@@ -85,10 +85,7 @@ class ImageLoadThread : public QRunnable + void run() + { + QString tmpFilename; +- if ((m_filename.startsWith("/")) || +- (m_filename.startsWith("http://")) || +- (m_filename.startsWith("https://")) || +- (m_filename.startsWith("ftp://"))) ++ if (!(m_filename.startsWith("myth://"))) + tmpFilename = m_filename; + + MythImageReader imageReader(tmpFilename); +@@ -673,10 +670,7 @@ bool MythUIImage::Load(bool allowLoadInBackground, bool forceStat) + VERBOSE(VB_GUI|VB_FILE|VB_EXTRA, LOC + QString( + "Load(), loading '%1' in foreground").arg(filename)); + QString tmpFilename; +- if ((filename.startsWith("/")) || +- (filename.startsWith("http://")) || +- (filename.startsWith("https://")) || +- (filename.startsWith("ftp://"))) ++ if (!(filename.startsWith("myth://"))) + tmpFilename = filename; + + MythImageReader imageReader(tmpFilename); +diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp +index 3b6a381..877bd12 100644 +--- a/mythtv/programs/mythfrontend/playbackbox.cpp ++++ b/mythtv/programs/mythfrontend/playbackbox.cpp +@@ -3855,6 +3855,10 @@ void PlaybackBox::customEvent(QEvent *event) + UpdateUILists(); + m_helper.ForceFreeSpaceUpdate(); + } ++ else if (message == "UPDATE_USAGE_UI") ++ { ++ UpdateUsageUI(); ++ } + else if (message == "RECONNECT_SUCCESS") + { + m_programInfoCache.ScheduleLoad(); +diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.cpp b/mythtv/programs/mythfrontend/playbackboxhelper.cpp +index aae73b9..27835d5 100644 +--- a/mythtv/programs/mythfrontend/playbackboxhelper.cpp ++++ b/mythtv/programs/mythfrontend/playbackboxhelper.cpp +@@ -520,6 +520,8 @@ void PlaybackBoxHelper::UndeleteRecording( + void PlaybackBoxHelper::run(void) + { + m_eventHandler = new PBHEventHandler(*this); ++ // Prime the pump so the disk free display starts updating ++ ForceFreeSpaceUpdate(); + exec(); + } + +@@ -536,6 +538,8 @@ void PlaybackBoxHelper::UpdateFreeSpace(void) + m_freeSpaceUsedMB = (uint64_t) (fsInfos[i].usedSpaceKB >> 10); + } + } ++ MythEvent *e = new MythEvent("UPDATE_USAGE_UI"); ++ QCoreApplication::postEvent(m_listener, e); + } + + uint64_t PlaybackBoxHelper::GetFreeSpaceTotalMB(void) const Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- mythtv.spec 17 May 2011 22:39:27 -0000 1.97 +++ mythtv.spec 31 May 2011 02:19:57 -0000 1.98 @@ -65,8 +65,8 @@ %define desktop_vendor RPMFusion # Git revision and branch ID -# 0.24 release: git tag b0.24 -%define _gitrev b5a3805b92 +# 0.24 release: git tag v0.24.1 +%define _gitrev 3657f313ac %define branch fixes/0.24 # @@ -83,7 +83,7 @@ Release: 0.1.git.%{_gitrev}%{?dist} #Release: 0.1.rc1%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -132,8 +132,8 @@ Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 -#Patch0: mythtv-%{version}-fixes.patch -#Patch1: mythplugins-%{version}-fixes.patch +Patch0: mythtv-%{version}-fixes.patch +Patch1: mythplugins-%{version}-fixes.patch #Patch2: mythweb-%{version}-fixes.patch Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig @@ -333,7 +333,9 @@ Requires: python-MythTV = %{version}-%{release} Requires: mythplugins = %{version}-%{release} -Requires: mythtv-themes = %{version} +# These are available via mythtv's built-in theme downloader now, +# so lets not install them by default. +#Requires: mythtv-themes = %{version} Requires: mysql-server >= 5, mysql >= 5 # XMLTV is not yet packaged for rpmfusion @@ -835,7 +837,7 @@ ##### MythTV cd mythtv-%{version} -#patch0 -p1 +%patch0 -p2 # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; @@ -868,7 +870,7 @@ %if %{with_plugins} cd mythplugins-%{version} -#patch1 -p1 +%patch1 -p2 #patch2 -p1 # Fix /mnt/store -> /var/lib/mythmusic @@ -1453,6 +1455,11 @@ ################################################################################ %changelog +* Mon May 30 2011 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.24.1-2 +- Drop dependency on mythtv-themes, since upstream is no longer tarring + them up, in preference of people using the built-in theme downloader. +- Update to 0.24-fixes, git revision 3657f313ac + * Tue May 17 2011 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.24.1-1 - Update to 0.24.1 stable update release