rpms/mythtv/F-18 ChangeLog, 1.10, 1.11 mythtv-0.27-fixes.patch, 1.1, 1.2 mythtv.spec, 1.113, 1.114

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14346 Modified Files: ChangeLog mythtv-0.27-fixes.patch mythtv.spec Log Message: * Mon Dec 2 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-3 - Update to latest fixes, v0.27-109-gcb744f8. - Disable mythlogserver as it is only really useful for developers. - Fix version reporting (--version). mythtv-0.27-fixes.patch: b/mythplugins/mytharchive/i18n/mytharchive_sv.qm |binary b/mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 b/mythplugins/mytharchive/mytharchive/archiveutil.cpp | 4 b/mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 b/mythplugins/mytharchive/mythburn/scripts/mythburn.py | 19 b/mythplugins/mythbrowser/i18n/mythbrowser_sv.qm |binary b/mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 b/mythplugins/mythgallery/i18n/mythgallery_sv.qm |binary b/mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 b/mythplugins/mythgame/i18n/mythgame_sv.qm |binary b/mythplugins/mythgame/i18n/mythgame_sv.ts | 136 b/mythplugins/mythmusic/i18n/mythmusic_sv.qm |binary b/mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 4 b/mythplugins/mythnetvision/i18n/mythnetvision_sv.qm |binary b/mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 b/mythplugins/mythnews/i18n/mythnews_sv.qm |binary b/mythplugins/mythnews/i18n/mythnews_sv.ts | 76 b/mythplugins/mythweather/i18n/mythweather_sv.qm |binary b/mythplugins/mythweather/i18n/mythweather_sv.ts | 62 b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.qm |binary b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.ts | 183 b/mythplugins/mythzoneminder/mythzmserver/main.cpp | 13 b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 655 b/mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101 b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp | 25 b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp | 8 b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.h | 2 b/mythplugins/mythzoneminder/mythzoneminder/zmdefines.h | 11 b/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp | 64 b/mythplugins/mythzoneminder/mythzoneminder/zmevents.h | 1 b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64 b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp | 21 b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.h | 3 b/mythplugins/mythzoneminder/theme/default-wide/zoneminder-ui.xml | 244 b/mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml | 203 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/scripts/mythpython | 4 b/mythtv/bindings/python/setup.py | 6 b/mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 b/mythtv/external/FFmpeg/libavformat/mpeg.c | 10 b/mythtv/i18n/mythfrontend_sv.qm |binary b/mythtv/i18n/mythfrontend_sv.ts |28897 +++++----- b/mythtv/libs/libmyth/programinfo.cpp | 283 b/mythtv/libs/libmyth/programinfo.h | 17 b/mythtv/libs/libmyth/programtypes.h | 2 b/mythtv/libs/libmythbase/housekeeper.cpp | 19 b/mythtv/libs/libmythbase/housekeeper.h | 2 b/mythtv/libs/libmythbase/libmythbase.pro | 6 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 b/mythtv/libs/libmythbase/mythcorecontext.cpp | 36 b/mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 b/mythtv/libs/libmythbase/mythsingledownload.cpp | 82 b/mythtv/libs/libmythbase/mythsingledownload.h | 44 b/mythtv/libs/libmythbase/mythsocket.cpp | 12 b/mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 b/mythtv/libs/libmythbase/mythversion.h | 2 b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 b/mythtv/libs/libmythtv/cardutil.cpp | 22 b/mythtv/libs/libmythtv/cardutil.h | 8 b/mythtv/libs/libmythtv/libmythtv.pro | 14 b/mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2 b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 b/mythtv/libs/libmythtv/mythplayer.cpp | 19 b/mythtv/libs/libmythtv/mythplayer.h | 4 b/mythtv/libs/libmythtv/previewgenerator.cpp | 6 b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 125 b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1328 b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 148 b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 64 b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 53 b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 191 b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 98 b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.cpp | 75 b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 37 b/mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.cpp | 91 b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 b/mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 b/mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 b/mythtv/libs/libmythtv/recorders/iptvchannel.h | 20 b/mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17 b/mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h | 3 b/mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 b/mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 b/mythtv/libs/libmythtv/recorders/streamhandler.h | 1 b/mythtv/libs/libmythtv/recordinginfo.cpp | 143 b/mythtv/libs/libmythtv/tv_play.cpp | 43 b/mythtv/libs/libmythtv/tv_rec.cpp | 69 b/mythtv/libs/libmythtv/tv_rec.h | 1 b/mythtv/libs/libmythtv/tvremoteutil.cpp | 2 b/mythtv/libs/libmythtv/videosource.cpp | 2 b/mythtv/libs/libmythupnp/httprequest.cpp | 3 b/mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 b/mythtv/programs/mythbackend/backendhousekeeper.h | 1 b/mythtv/programs/mythbackend/mainserver.cpp | 47 b/mythtv/programs/mythbackend/mainserver.h | 2 b/mythtv/programs/mythbackend/playbacksock.cpp | 6 b/mythtv/programs/mythbackend/playbacksock.h | 3 b/mythtv/programs/mythbackend/scheduler.cpp | 75 b/mythtv/programs/mythbackend/services/dvr.cpp | 2 b/mythtv/programs/mythbackend/services/guide.cpp | 61 b/mythtv/programs/mythbackend/services/serviceUtil.cpp | 6 b/mythtv/programs/mythcommflag/main.cpp | 6 b/mythtv/programs/mythfilldatabase/filldata.cpp | 81 b/mythtv/programs/mythfilldatabase/filldata.h | 7 b/mythtv/programs/mythfilldatabase/main.cpp | 12 b/mythtv/programs/mythfrontend/guidegrid.cpp | 450 b/mythtv/programs/mythfrontend/guidegrid.h | 50 b/mythtv/programs/mythtranscode/main.cpp | 3 b/mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 b/mythtv/programs/mythtranscode/transcode.cpp | 7 b/mythtv/programs/mythutil/commandlineparser.cpp | 35 b/mythtv/programs/mythutil/markuputils.cpp | 157 b/mythtv/programs/mythutil/mythutil.cpp | 6 b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 19 b/mythtv/themes/MythCenter-wide/notification-ui.xml | 2 b/mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 b/mythtv/themes/MythCenter/notification-ui.xml | 2 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 mythtv/bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 130 files changed, 23851 insertions(+), 18651 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythtv-0.27-fixes.patch Index: mythtv-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-18/mythtv-0.27-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythtv-0.27-fixes.patch 3 Nov 2013 21:32:32 -0000 1.1 +++ mythtv-0.27-fixes.patch 2 Dec 2013 19:15:54 -0000 1.2 @@ -2,6 +2,7 @@ mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +- .../mytharchive/mytharchive/archiveutil.cpp | 4 +- mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 +- + .../mytharchive/mythburn/scripts/mythburn.py | 19 +- mythplugins/mythbrowser/i18n/mythbrowser_sv.qm | Bin 7139 -> 7616 bytes mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 +- mythplugins/mythgallery/i18n/mythgallery_sv.qm | Bin 18827 -> 24405 bytes @@ -19,11 +20,20 @@ mythplugins/mythweather/i18n/mythweather_sv.ts | 62 +- .../mythzoneminder/i18n/mythzoneminder_sv.qm | Bin 7032 -> 7267 bytes .../mythzoneminder/i18n/mythzoneminder_sv.ts | 183 +- - mythplugins/mythzoneminder/mythzmserver/main.cpp | 14 +- - .../mythzoneminder/mythzmserver/zmserver.cpp | 25 +- - mythplugins/mythzoneminder/mythzmserver/zmserver.h | 3 +- - .../mythzoneminder/mythzoneminder/zmclient.cpp | 2 +- - .../mythzoneminder/mythzoneminder/zmliveplayer.cpp | 21 +- + mythplugins/mythzoneminder/mythzmserver/main.cpp | 13 +- + .../mythzoneminder/mythzmserver/zmserver.cpp | 655 +- + mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101 +- + .../mythzoneminder/mythzoneminder/zmclient.cpp | 25 +- + .../mythzoneminder/mythzoneminder/zmconsole.cpp | 8 +- + .../mythzoneminder/mythzoneminder/zmconsole.h | 2 - + .../mythzoneminder/mythzoneminder/zmdefines.h | 11 +- + .../mythzoneminder/mythzoneminder/zmevents.cpp | 64 +- + .../mythzoneminder/mythzoneminder/zmevents.h | 1 + + .../mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64 +- + .../mythzoneminder/mythzoneminder/zmplayer.cpp | 21 +- + .../mythzoneminder/mythzoneminder/zmplayer.h | 3 +- + .../theme/default-wide/zoneminder-ui.xml | 244 +- + .../mythzoneminder/theme/default/zoneminder-ui.xml | 203 + mythtv/bindings/python/MythTV/system.py | 11 +- .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 - .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 - @@ -31,51 +41,95 @@ mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 - .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 - + mythtv/bindings/python/scripts/mythpython | 4 +- mythtv/bindings/python/setup.py | 6 +- mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +- + mythtv/external/FFmpeg/libavformat/mpeg.c | 10 +- mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- - mythtv/libs/libmyth/programinfo.cpp | 272 +- + mythtv/libs/libmyth/programinfo.cpp | 283 +- mythtv/libs/libmyth/programinfo.h | 17 + + mythtv/libs/libmyth/programtypes.h | 2 +- mythtv/libs/libmythbase/housekeeper.cpp | 19 +- mythtv/libs/libmythbase/housekeeper.h | 2 + + mythtv/libs/libmythbase/libmythbase.pro | 6 +- mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +- + mythtv/libs/libmythbase/mythcorecontext.cpp | 36 +- + mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 - + mythtv/libs/libmythbase/mythsingledownload.cpp | 82 + + mythtv/libs/libmythbase/mythsingledownload.h | 44 + mythtv/libs/libmythbase/mythsocket.cpp | 12 + mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +- mythtv/libs/libmythbase/mythversion.h | 2 +- .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 14 +- mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +- mythtv/libs/libmythtv/cardutil.cpp | 22 + - mythtv/libs/libmythtv/cardutil.h | 1 + + mythtv/libs/libmythtv/cardutil.h | 8 + + mythtv/libs/libmythtv/libmythtv.pro | 14 + + mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2 +- + mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 +- mythtv/libs/libmythtv/mythplayer.cpp | 19 +- mythtv/libs/libmythtv/mythplayer.h | 4 + mythtv/libs/libmythtv/previewgenerator.cpp | 6 +- mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +- + .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 125 + + .../libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 + + mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1328 + + mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 148 + + mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 64 + + mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 53 + + mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 191 + + mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 98 + + .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 75 + + .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 37 + + mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 +- + .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 91 +- + mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 +- mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +- + mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 +- + mythtv/libs/libmythtv/recorders/iptvchannel.h | 20 +- + mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17 +- + mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 - + .../libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 +- + .../libs/libmythtv/recorders/iptvsignalmonitor.h | 3 +- + mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 +- + mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 + + mythtv/libs/libmythtv/recorders/streamhandler.h | 1 + mythtv/libs/libmythtv/recordinginfo.cpp | 143 +- - mythtv/libs/libmythtv/tv_play.cpp | 8 +- + mythtv/libs/libmythtv/tv_play.cpp | 43 +- + mythtv/libs/libmythtv/tv_rec.cpp | 69 +- + mythtv/libs/libmythtv/tv_rec.h | 1 + mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +- mythtv/libs/libmythtv/videosource.cpp | 2 +- mythtv/libs/libmythupnp/httprequest.cpp | 3 +- - mythtv/programs/mythbackend/backendhousekeeper.cpp | 50 +- + mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 +- mythtv/programs/mythbackend/backendhousekeeper.h | 1 + - mythtv/programs/mythbackend/mainserver.cpp | 30 +- + mythtv/programs/mythbackend/mainserver.cpp | 47 +- mythtv/programs/mythbackend/mainserver.h | 2 +- mythtv/programs/mythbackend/playbacksock.cpp | 6 +- mythtv/programs/mythbackend/playbacksock.h | 3 - - mythtv/programs/mythbackend/scheduler.cpp | 73 +- - mythtv/programs/mythbackend/services/guide.cpp | 36 +- + mythtv/programs/mythbackend/scheduler.cpp | 75 +- + mythtv/programs/mythbackend/services/dvr.cpp | 2 +- + mythtv/programs/mythbackend/services/guide.cpp | 61 +- + .../programs/mythbackend/services/serviceUtil.cpp | 6 + mythtv/programs/mythcommflag/main.cpp | 6 +- mythtv/programs/mythfilldatabase/filldata.cpp | 81 +- mythtv/programs/mythfilldatabase/filldata.h | 7 +- mythtv/programs/mythfilldatabase/main.cpp | 12 +- + mythtv/programs/mythfrontend/guidegrid.cpp | 450 +- + mythtv/programs/mythfrontend/guidegrid.h | 50 +- + mythtv/programs/mythtranscode/main.cpp | 3 +- + mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 + + mythtv/programs/mythtranscode/transcode.cpp | 7 +- mythtv/programs/mythutil/commandlineparser.cpp | 35 +- mythtv/programs/mythutil/markuputils.cpp | 157 +- mythtv/programs/mythutil/mythutil.cpp | 6 + mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 - + mythtv/programs/scripts/metadata/Movie/tmdb3.py | 19 +- mythtv/themes/MythCenter-wide/notification-ui.xml | 2 +- + mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 +- mythtv/themes/MythCenter/notification-ui.xml | 2 +- - 77 files changed, 19550 insertions(+), 17981 deletions(-) + 131 files changed, 23851 insertions(+), 18651 deletions(-) diff --git a/mythplugins/mytharchive/i18n/mytharchive_sv.qm b/mythplugins/mytharchive/i18n/mytharchive_sv.qm index fd29269..a6c7157 100644 @@ -2100,6 +2154,88 @@ commandline += " > " + logDir + "/progress.log 2>&1 &"; uint flags = kMSRunBackground | kMSDontBlockInputDevs | +diff --git a/mythplugins/mytharchive/mythburn/scripts/mythburn.py b/mythplugins/mytharchive/mythburn/scripts/mythburn.py +index 2aca193..f9db11e 100755 +--- a/mythplugins/mytharchive/mythburn/scripts/mythburn.py ++++ b/mythplugins/mytharchive/mythburn/scripts/mythburn.py +@@ -49,7 +49,7 @@ from __future__ import unicode_literals + + + # version of script - change after each update +-VERSION="0.1.20130911-5" ++VERSION="0.1.20131119-1" + + # keep all temporary files for debugging purposes + # set this to True before a first run through when testing +@@ -94,13 +94,13 @@ from PIL import ImageFont + from PIL import ImageColor + import unicodedata + import time +-import datetime + import tempfile + from fcntl import ioctl + import CDROM + from shutil import copy + + import MythTV ++from MythTV import datetime + from MythTV.altdict import OrdDict + + # media types (should match the enum in mytharchivewizard.h) +@@ -1426,7 +1426,7 @@ def getFileInformation(file, folder): + data.description = rec.description + data.rating = str(rec.stars) + data.chanid = rec.chanid +- data.starttime = rec.starttime.isoformat() ++ data.starttime = rec.starttime.utcisoformat() + + cutlist = rec.markup.getcutlist() + if len(cutlist): +@@ -1509,7 +1509,12 @@ def getFileInformation(file, folder): + def WriteXMLToFile(myDOM, filename): + #Save the XML file to disk for use later on + f=open(filename, 'w') +- f.write(myDOM.toprettyxml(indent=" ", encoding="UTF-8")) ++ ++ if sys.hexversion >= 0x020703F0: ++ f.write(myDOM.toprettyxml(indent=" ", encoding="UTF-8")) ++ else: ++ f.write(myDOM.toxml(encoding="UTF-8")) ++ + f.close() + [...7595 lines suppressed...] ++ <textarea name="name4-1" from="name1-1"> ++ <area>35,50,215,30</area> ++ <value>Monitor 1</value> ++ </textarea> ++ ++ <textarea name="status4-1" from="status1-1"> ++ <area>255,50,160,30</area> ++ </textarea> ++ ++ <imagetype name="frame4-1"> ++ <area>35,80,380,285</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name4-2" from="name1-1"> ++ <area>450,50,215,30</area> ++ <value>Monitor 2</value> ++ </textarea> ++ ++ <textarea name="status4-2" from="status1-1"> ++ <area>670,50,160,30</area> ++ </textarea> ++ ++ <imagetype name="frame4-2"> ++ <area>450,80,380,285</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name4-3" from="name1-1"> ++ <area>865,50,215,30</area> ++ <value>Monitor 3</value> ++ </textarea> ++ ++ <textarea name="status4-3" from="status1-1"> ++ <area>1085,50,160,30</area> ++ </textarea> ++ ++ <imagetype name="frame4-3"> ++ <area>865,80,380,285</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name4-4" from="name1-1"> ++ <area>35,370,215,30</area> ++ <value>Monitor 4</value> ++ </textarea> ++ ++ <textarea name="status4-4" from="status1-1"> ++ <area>255,370,160,30</area> ++ </textarea> ++ ++ <imagetype name="frame4-4"> ++ <area>35,400,380,285</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name4-5" from="name1-1"> ++ <area>450,370,215,30</area> ++ <value>Monitor 5</value> ++ </textarea> ++ ++ <textarea name="status4-5" from="status1-1"> ++ <area>670,370,160,30</area> ++ </textarea> ++ ++ <imagetype name="frame4-5"> ++ <area>450,400,380,285</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name4-6" from="name1-1"> ++ <area>865,370,215,30</area> ++ <value>Monitor 6</value> ++ </textarea> ++ ++ <textarea name="status4-6" from="status1-1"> ++ <area>1085,370,160,30</area> ++ </textarea> ++ ++ <imagetype name="frame4-6"> ++ <area>865,400,380,285</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <!-- eight monitor view --> ++ <textarea name="name5-1" from="name1-1"> ++ <area>20,110,160,30</area> ++ <value>Monitor 1</value> ++ </textarea> ++ ++ <textarea name="status5-1" from="status1-1"> ++ <area>185,110,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-1"> ++ <area>20,140,295,220</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name5-2" from="name1-1"> ++ <area>335,110,160,30</area> ++ <value>Monitor 2</value> ++ </textarea> ++ ++ <textarea name="status5-2" from="status1-1"> ++ <area>500,110,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-2"> ++ <area>335,140,295,220</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name5-3" from="name1-1"> ++ <area>650,110,160,30</area> ++ <value>Monitor 3</value> ++ </textarea> ++ ++ <textarea name="status5-3" from="status1-1"> ++ <area>815,110,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-3"> ++ <area>650,140,295,220</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name5-4" from="name1-1"> ++ <area>965,110,160,30</area> ++ <value>Monitor 4</value> ++ </textarea> ++ ++ <textarea name="status5-4" from="status1-1"> ++ <area>1130,110,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-4"> ++ <area>965,140,295,220</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name5-5" from="name1-1"> ++ <area>20,395,160,30</area> ++ <value>Monitor 5</value> ++ </textarea> ++ ++ <textarea name="status5-5" from="status1-1"> ++ <area>185,395,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-5"> ++ <area>20,425,295,220</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name5-6" from="name1-1"> ++ <area>335,395,160,30</area> ++ <value>Monitor 6</value> ++ </textarea> ++ ++ <textarea name="status5-6" from="status1-1"> ++ <area>500,395,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-6"> ++ <area>335,425,295,220</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name5-7" from="name1-1"> ++ <area>650,395,160,30</area> ++ <value>Monitor 7</value> ++ </textarea> ++ ++ <textarea name="status5-7" from="status1-1"> ++ <area>815,395,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-7"> ++ <area>650,425,295,220</area> ++ <filename>mz_testcard.png</filename> ++ </imagetype> ++ ++ <textarea name="name5-8" from="name1-1"> ++ <area>965,395,160,30</area> ++ <value>Monitor 8</value> ++ </textarea> ++ ++ <textarea name="status5-8" from="status1-1"> ++ <area>1130,395,130,30</area> ++ </textarea> ++ ++ <imagetype name="frame5-8"> ++ <area>965,425,295,220</area> + <filename>mz_testcard.png</filename> + </imagetype> + diff --git a/mythtv/themes/MythCenter/notification-ui.xml b/mythtv/themes/MythCenter/notification-ui.xml index 95699af..a92c5ad 100644 --- a/mythtv/themes/MythCenter/notification-ui.xml Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-18/mythtv.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- mythtv.spec 3 Nov 2013 21:32:32 -0000 1.113 +++ mythtv.spec 2 Dec 2013 19:15:54 -0000 1.114 @@ -60,11 +60,11 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27-56-g29eab51 +%define vers_string v0.27-109-gcb744f8 +%define branch fixes/0.27 # Git revision and branch ID -%define _gitrev v0.27-1-g5b917e8 -%define branch fixes/0.27 +%define _gitrev g5b917e8 # # Basic descriptive tags for this package: @@ -79,7 +79,7 @@ %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 1%{?dist} +Release: 3%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -849,8 +849,9 @@ pushd mythtv + # Set the mythtv --version string -cat > VERSION <<EOF +cat > EXPORTED_VERSION <<EOF SOURCE_VERSION=%{vers_string} BRANCH=%{branch} EOF @@ -898,6 +899,7 @@ --libdir=%{_libdir} \ --libdir-name=%{_lib} \ --mandir=%{_mandir} \ + --disable-mythlogserver \ --enable-pthreads \ --enable-ffmpeg-pthreads \ --enable-joystick-menu \ @@ -1250,7 +1252,7 @@ %{_bindir}/mythwikiscripts %{_bindir}/mythmetadatalookup %{_bindir}/mythutil -%{_bindir}/mythlogserver +#{_bindir}/mythlogserver %{_datadir}/mythtv/mythconverg*.pl %{_datadir}/mythtv/locales/ %{_datadir}/mythtv/metadata/ @@ -1469,6 +1471,14 @@ %changelog +* Mon Dec 2 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-3 +- Update to latest fixes, v0.27-109-gcb744f8. +- Disable mythlogserver as it is only really useful for developers. +- Fix version reporting (--version). + +* Tue Nov 05 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.27-2 +- Rebuilt for x264/FFmpeg + * Wed Oct 30 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-1 - Update to release 0.27.