Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13711 Modified Files: ChangeLog mythtv-0.26-fixes.patch mythtv.spec Log Message: * Sat Apr 27 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-8 - Update to latest fixes/0.26, v0.26.0-149-g5f45c0b. Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 6 Mar 2013 15:28:06 -0000 1.7 +++ ChangeLog 27 Apr 2013 13:06:20 -0000 1.8 @@ -1,3 +1,386 @@ +commit 5f45c0bd684c875f19d59974a5fe51a56731bf16 +Author: tycholursen <tycholursen(a)gmail.com&gt; +Date: Mon Apr 22 07:42:22 2013 -0400 + + New Netherlands locale file + from tycholursen(a)gmail.com + + Thank you! + + closes #11502 + + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org&gt; + +commit 762a613ee4ee26ff385f20025e4c21b6609d4dda +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Fri Apr 19 08:27:59 2013 +1000 + + minor code cleanup. + + Following 8aca90207ffffc9dd512fa11cd9d88d1f4b5884f, remove useless test and tidy-up + (cherry picked from commit 4e23172d774cf36a45b7b7f382797a9887fa6de6) + +commit 7a70ac13a46d95bee874ce9c4e5d1bbd5e0bdac8 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Fri Apr 19 02:22:27 2013 +1000 + + Avoid un-necessary video mode changes. + + Fixes #11494 + (cherry picked from commit 8aca90207ffffc9dd512fa11cd9d88d1f4b5884f) + +commit 0af65f783516afc2072fefc1220202193b90785f +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Fri Apr 19 08:31:25 2013 +1000 + + Revert "Avoid un-necessary video mode changes." + + This reverts commit 3c763fdca88075f8ba7667f5096583d66307b2cd. + +commit 3c763fdca88075f8ba7667f5096583d66307b2cd +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Fri Apr 19 02:22:27 2013 +1000 + + Avoid un-necessary video mode changes. + + Fixes #11494 + (cherry picked from commit 8aca90207ffffc9dd512fa11cd9d88d1f4b5884f) + +commit c5bd828c77c5dcc141c622c3b4bc72844e00cbd6 +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Mon Apr 15 14:51:41 2013 +0100 + + Warn about reliance on the XMLTV 'TimeOffset' setting which has been + removed in 0.27 + + The XMLTV specification states that dates and times must be either in + GMT/UTC or specify an offset from GMT/UTC in ISO8601 format. Since the + 'offset' setting has caused so much confusion over the years we're + removing it and requiring all xmltv input to follow the specs. + + This change also sets the default for this setting to 'Auto' which it + should have been from the beginning. + +commit 3870ce00bad53de5e81c3536839e27f4dd50b847 +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Mon Jan 7 23:43:30 2013 +0100 + + make "Universal (Europe)" the default LNB type + + Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org&gt; + (cherry picked from commit 0556cdb6e40486ae3d1abb84e4c876d5cb1b30e6) + +commit d574cbc193cec0e30007de9fe0462c8e7a721111 +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Fri Mar 29 00:06:14 2013 +0000 + + Make DVB the first target in the CaptureCardGroup triggered configuration. + (cherry picked from commit 801028a3cc56db5c658bf81fd0f5a862d3bcf272) + +commit b45f71246d6dc1e59f286efcdaa2f265ef71b809 +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Thu Mar 28 21:51:08 2013 +0000 + + Reorder and rename the choices in the capture card combo box + + To try and reduce some confusion and common mis-configuration the descriptions and order of the options has been changed. The most commonly used options are listed first, through to the least used and similar or related choices are grouped together. Incorrect descriptions such as 'DVB Capture' are replaced by more descriptive strings e.g. 'DVB-T/S/C, ATSC or ISDB-T tuner card' + (cherry picked from commit 536b7c1a02639c4ee8fa8bb53a511a2e751ed461) + +commit af1d6951ae44122af9dac56591af9f2db022ab66 +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Mon Apr 15 09:15:39 2013 +0100 + + Fix categorytype for Dish & Bell EIT. The wrong values were being set, in particular causing news to be marked as 'sports' and sports as 'series' which would affect certain scheduling decisions. + +commit 5f11bda1994c0dad45ff29e3fc8836eb83f98116 +Author: Kevin Ross <kevin(a)familyross.net&gt; +Date: Mon Apr 15 14:18:23 2013 +1000 + + Fix audio sync. + + Fixes #11440 + + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; + (cherry picked from commit 9ec7421138adef73ef9cb83b74e046092fecdd6a) + +commit 69cd78b4028b7b585d238713151b684c291158e7 +Author: John Patrick Poet <jpoet(a)mythtv.org&gt; +Date: Tue Mar 26 15:07:56 2013 -0600 + + Allow multiple keyframes per payload + +commit 5fe87ed902ec4d8c218de3d399bd5caf89d251ac +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Mon Mar 25 19:59:41 2013 +1100 + + Add E-AC3 support in ATSC and DVB-T stream + + Fixes #11444 + (cherry picked from commit 93bc3d4f3a3d6a785b860a1783ff7915c71a372f) + + Conflicts: + mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c + +commit a399d7f04287310a32c011b42353fab995f0846e +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sun Mar 3 17:23:26 2013 +0000 + + MythMusic: Fix segfault on visualization settings page if a widget is missing + (cherry picked from commit 9ec05b1e0da40456830afcc10c7ec51b2ac94f79) + +commit 7f3f13b04335cae72b854f5995bc097cd9834cf6 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sun Mar 3 17:04:57 2013 +0000 + + MythMusic: Tweak the text areas on the trackinfo_popup + (cherry picked from commit 747248929431e5193abcd57de8189e9e55d1617e) + +commit 13dfcc2e5e9211759966b7a6033c645f653c3110 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sun Mar 24 11:56:17 2013 +0000 + + mytharchivehelper: Remove an unneeded include added in 854cb0c3b6 + +commit 854cb0c3b663d6aa37d9ea4484964bd1c899ec81 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sat Jan 5 23:18:55 2013 +0000 + + MythArchive: fix the import/export of recordings to the native archive format + + * This updates the native import/export to work with the current DB table + fields. Fixes #10871 + + * Add storage group support so the FE running MythArchive no longer needs + local access to the recordings. Fixes #8657. + (cherry picked from commit 003f3023f2483f88f84df73b41fe2f976bb119d0) + +commit 5e06d2a15b6e242d407899ada1ca2a0026c5e9fb +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Fri Jan 4 20:14:44 2013 +0000 + + MythArchive: fix the missing logs when doing a native archive import/export + + The new logging stuff was causing both the export and import of native archives + logging to not be shown in the log viewer this fixes that and also makes the + log viewer wait a while for the logs before giving up which should fix the + logs not always showing the first time. + + Fixes #10505. + (cherry picked from commit 52a7c118aedc747bbea3a92d178eabf8566818ad) + +commit edb10af43dba4f46194ce998c5967c067b35a8de +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sat Jan 5 23:01:16 2013 +0000 + + MythMusic: Fix typo preventing the autoplaycd setting loading correctly + (cherry picked from commit 84c44dd3f69d473dbe11c56e83da269111fae9c1) + +commit d6de041b35358184841200da19ab160e15a287e1 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Fri Jan 4 11:58:02 2013 +0000 + + MythArchive: fix a filename quoted twice bug introduced in b85f5bba72 + + Fixes #10071. + (cherry picked from commit 146b49029d82e6ad92ac36ef66fe14d5c4c998e0) + +commit 571e9c4d96189279e3b936a583df645b5153bb27 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sat Dec 29 11:35:14 2012 +0000 + + MythMusic: use QSettings for the pls parser + + This refactors the playlist parsing to use QSettings for the pls parser instead + of our custom one which has problems with windows style line endings. + + Fixes #11208. + (cherry picked from commit 8d2d9e92f15653928d9abdf831ecb30eb314b52e) + +commit bc7cfb61f762b659c90db7d9cba33b5430d8a851 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Tue Dec 11 13:11:52 2012 +0000 + + MythMusic: fix the notracks text not always showing/hiding when it should + + This fixes a problem with the "You haven't selected any tracks to play" text + not updating properly when adding or removing single tracks from the active + playlist. + + Also work around a bug in MythUIButtonlist not removing the last item properly. + (cherry picked from commit 088d684558a3197b022695e39b3c50d89bca92f7) + +commit 2748747959fc43815d727edb45fe757c2ccd22f4 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Tue Dec 11 10:53:52 2012 +0000 + + MythMusic: add the notracks text area to the playlist editor screen + +commit 6ae394bc1b3e4a559f88c670e58e01c65f1bbc01 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sun Dec 2 12:54:27 2012 +0000 + + MythCenter-wide: Fix the width of the priority text on the channelrecpriority screen + + Fixes #10643. Thanks to Rick Scott for the original patch. + +commit f1fdf1f334d83fc7aaabab467593b05672d03abd +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sun Dec 2 11:09:44 2012 +0000 + + MythCenter/MythCenter-wide: Tidy up the 'Program Details' screen + + Fix the position of the browser in MythCenter. + Make sure the font used in the browser is sans-serif to better match the theme. + + Fixes #10614. + +commit ee98ece5de4b0e12079c70e06172161c0937bc95 +Author: David Engel <dengel(a)mythtv.org&gt; +Date: Fri Mar 22 19:26:24 2013 -0500 + + Change PlaybackBox group and password popup handling to be more sane. + + Backport from master to fixes/0.26. + + If an invalid password is entered, the password popup is reshown. If + the password popup is aborted and was entered from the group popup or + is the initial group, the group popup is reshown. If the group popup + is aborted and was entered because of the QueryInitialFilter setting, + the PlaybackBox screen is closed. + + Refs #11231 + +commit a17d3f453b2528ec7d8da49c92b71f478f25f4a3 +Author: Chris Pinkham <cpinkham(a)mythtv.org&gt; +Date: Fri Mar 22 11:01:34 2013 -0700 + + Fix auto-width calculation in mythtranscode. + + Issue discovered, corrected, and tested by 'rich0' in IRC. Thanks. + (cherry picked from commit effae2211cea71bf9e954d7e99cbce39b3d38f0c) + +commit 6be8c10b39dcbe0fe825d22fec70795d87972a25 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; +Date: Fri Mar 22 06:43:09 2013 -0700 + + Enable proper display of elapsed time when paused with VAAPI. + + Make sure av_pause_frame is updated so that the player can pick up the + current frame number while paused. Refs #10962 + (cherry picked from commit 841ff3a359ce668eb51ef1da917ffab5a0932302) + + Conflicts: + + mythtv/libs/libmythtv/videoout_openglvaapi.cpp + +commit 750a579240c76d8921dc0a6fc24cc18860bc6817 +Author: David Engel <dengel(a)mythtv.org&gt; +Date: Thu Mar 21 16:08:21 2013 -0500 + + Change MythDate::toString() to return an empty string for invalid inputs. + + Cherry picked from master for fixes/0.26. + + It's possible a "0000-00-00 00:00:00" might be somewhat acceptable in + some rare cases because the all 0s value obviously represents a + special value. The UTC to local conversions added in 0.26, however, + now causes it to change to a less obviously special, and perhaps even + misledaing, not all 0s value. Since MythDate::toString() was a + Myth-specific replacement for QDateTime::toString() and + QDate::toString() and those functions return an empty string for + invalid inputs, we probably should too. + + Refs #11405 . + +commit 65e6136a72017826fa58a2e2ae6ebc1578cf17a4 +Author: Paul Harrison <mythtv(a)sky.com&gt; +Date: Sun Mar 3 16:18:23 2013 +0000 + + MythMusic: Add missing default 4:3 stream-ui.xml theme file + + Fixes #11369. + +commit c0419cd1759f299a4232c12cf62dbea8b30180f2 +Author: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; +Date: Tue Mar 19 23:39:50 2013 +0100 + + MythUI: Fix use after free in MythUIEditBar + + The call to ReleaseImages() in MythUIEditBar's dtor caused a free memory read + since SetRedraw() accesses its parent whose dtor has already been called. + + Calling ReleaseImages() from MythUIEditBar's dtor also isn't necessary since the + images in m_images are children of MythUIEditBar and are automatically deleted + by Qt. + + Fixes #11458, Refs #11402 + (cherry picked from commit 6e0f69dca6a554f4baf0fe8f9226458d36c459c7) + +commit f1715d057f42d22a08002fa69790cc08a7306dbc +Author: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; +Date: Tue Mar 19 23:39:18 2013 +0100 + + OpenGLVideo: Fix a double free in AddFilter() when OptimiseFilters() fails + + Fixes #11430 + (cherry picked from commit 5769dca4c4ed442b62741e9abeeb2e3490d9b909) + +commit 25aa598fda8fce1d1ed36c68b9da75ebfd1c7476 +Author: Joey Morris <rjmorris.list(a)zoho.com&gt; +Date: Mon Mar 18 21:35:53 2013 -0700 + + Use the correct index for program.previouslyshown in the query result. + + Signed-off-by: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; + +commit de5dd3b5181869d234b67abc8a5fb112830f3f94 +Author: Richard <peper03(a)yahoo.com&gt; +Date: Tue Feb 19 19:33:36 2013 +0100 + + Sync libdvdnav up to R1251. + + * Fix failed assertion when there's no menu. + * Make sure we get nav packets for all cells in multi angle features + * Fix strict aliasing warnings. + + Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org&gt; + +commit 6ea48f0d0017661b4684d68ae61bb0ed137d85d8 +Author: Richard <peper03(a)yahoo.com&gt; +Date: Tue Feb 19 19:40:53 2013 +0100 + + Sync libdvdread to R1250: + + * Accommodate duplicate language units and pgcs (avoid potentially consuming large amounts of memory) + * Fix a segmentation fault by preventing a read/write beyond end of an array due to using a length value taken from the DVD, which can exceed the allocated size. + + Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org&gt; + (cherry picked from commit 15a062f5ef22be1f8eefa9e8d300d18f8a54996b) + +commit 29bce5c4af609e5b8f7acce2bbe0ca7a01e5defc +Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; +Date: Wed Mar 13 17:08:49 2013 -0700 + + Apply the pixel aspect ratio, if available, to aspect ratio calculation. + + This only applies to mpeg2 video. Refs #11406. + +commit e2901d9f94f67d8a9c1b5e141937799cfba1aeab +Author: Stuart Morgan <smorgan(a)mythtv.org&gt; +Date: Tue Mar 12 20:29:01 2013 +0000 + + Fix missing copyrightlogo widget in Terra. No-one noticed mythweather was broken with Terra for over 6 months ... + (cherry picked from commit 23c0f7435df1cf8f146459b18a45955fc32da3b6) + +commit 77259c5a504d1edb79d8c9d4c6f45265b365a818 +Author: John Poet <jpoet(a)mythtv.org&gt; +Date: Thu Mar 7 15:24:34 2013 -0700 + + dtvrecorder: Don't try to buffer frames for audio-only streams. + (cherry picked from commit 0d9312df1dd3ed2a2da40edce1bbaae5b90c9944) + + Fixes #11442 + commit 3944ca9ad0f8df1a0240c5812e5b3b04431e7eac Author: John Poet <jpoet(a)mythtv.org&gt; Date: Wed Feb 13 15:39:46 2013 -0700 mythtv-0.26-fixes.patch: README.rst | 1 mythplugins/mytharchive/i18n/mytharchive_es_es.qm |binary mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45 mythplugins/mytharchive/mytharchive/exportnative.cpp | 13 mythplugins/mytharchive/mytharchive/importnative.cpp | 12 mythplugins/mytharchive/mytharchive/logviewer.cpp | 53 mythplugins/mytharchive/mytharchive/mythburn.cpp | 5 mythplugins/mytharchive/mytharchivehelper/main.cpp | 421 - mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml | 24 mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_pal.xml | 24 mythplugins/mytharchive/mythburn/scripts/mythburn.py | 17 mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4 mythplugins/mythgame/i18n/mythgame_es_es.ts | 4 mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68 mythplugins/mythmusic/i18n/mythmusic_it.qm |binary mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++--- mythplugins/mythmusic/mythmusic/cddb.cpp | 6 mythplugins/mythmusic/mythmusic/cdrip.cpp | 2 mythplugins/mythmusic/mythmusic/decoderhandler.cpp | 9 mythplugins/mythmusic/mythmusic/musiccommon.cpp | 12 mythplugins/mythmusic/mythmusic/playersettings.cpp | 2 mythplugins/mythmusic/mythmusic/pls.cpp | 209 mythplugins/mythmusic/mythmusic/pls.h | 14 mythplugins/mythmusic/mythmusic/shoutcast.cpp | 20 mythplugins/mythmusic/mythmusic/visualizationsettings.cpp | 6 mythplugins/mythmusic/theme/default-wide/music-base.xml | 7 mythplugins/mythmusic/theme/default-wide/music-ui.xml | 6 mythplugins/mythmusic/theme/default/music-base.xml | 7 mythplugins/mythmusic/theme/default/stream-ui.xml | 450 + mythplugins/mythweather/i18n/mythweather_es_es.qm |binary mythplugins/mythweather/i18n/mythweather_es_es.ts | 3 mythplugins/mythweather/i18n/mythweather_pl.qm |binary mythplugins/mythweather/i18n/mythweather_pl.ts | 3 mythtv/bindings/perl/Makefile.PL | 1 mythtv/bindings/perl/MythTV.pm | 20 mythtv/bindings/python/MythTV/altdict.py | 2 mythtv/bindings/python/MythTV/dataheap.py | 58 mythtv/bindings/python/MythTV/static.py | 2 mythtv/bindings/python/MythTV/system.py | 4 mythtv/bindings/python/MythTV/utility/dt.py | 12 mythtv/bindings/python/setup.py | 2 mythtv/contrib/imports/mirobridge/mirobridge.py | 101 mythtv/external/FFmpeg/libavcodec/h264.c | 3 mythtv/external/FFmpeg/libavcodec/h264_refs.c | 3 mythtv/external/FFmpeg/libavcodec/pcm.c | 5 mythtv/external/FFmpeg/libavformat/avidec.c | 9 mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c | 1 mythtv/external/FFmpeg/libavformat/utils.c | 4 mythtv/i18n/mythfrontend_da.qm |binary mythtv/i18n/mythfrontend_da.ts | 1208 +-- mythtv/i18n/mythfrontend_es_es.qm |binary mythtv/i18n/mythfrontend_es_es.ts | 2180 +++-- mythtv/i18n/mythfrontend_pl.qm |binary mythtv/i18n/mythfrontend_pl.ts | 2733 +++---- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 2 mythtv/libs/libmyth/mythcontext.cpp | 2 mythtv/libs/libmyth/mythmediamonitor.cpp | 2 mythtv/libs/libmyth/programinfo.cpp | 22 mythtv/libs/libmythbase/mythdate.cpp | 6 mythtv/libs/libmythbase/mythdownloadmanager.cpp | 2 mythtv/libs/libmythbase/mythsystem.cpp | 5 mythtv/libs/libmythbase/mythversion.h | 2 mythtv/libs/libmythbase/signalhandling.cpp | 8 mythtv/libs/libmythdvdnav/dvdnav/dvd_types.h | 11 mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 15 mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 9 mythtv/libs/libmythdvdnav/dvdnav/dvdnav_internal.h | 8 mythtv/libs/libmythdvdnav/dvdnav/highlight.c | 60 mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 3 mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 141 mythtv/libs/libmythdvdnav/dvdread/ifo_types.h | 2 mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp | 153 mythtv/libs/libmythtv/Bluray/bdringbuffer.h | 6 mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp | 4 mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp | 6 mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h | 1 mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 74 mythtv/libs/libmythtv/DVD/dvdringbuffer.h | 6 mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp | 23 mythtv/libs/libmythtv/DeviceReadBuffer.cpp | 7 mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp | 35 mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2 mythtv/libs/libmythtv/analogsignalmonitor.cpp | 6 mythtv/libs/libmythtv/analogsignalmonitor.h | 1 mythtv/libs/libmythtv/asirecorder.cpp | 15 mythtv/libs/libmythtv/asirecorder.h | 1 mythtv/libs/libmythtv/asisignalmonitor.cpp | 6 mythtv/libs/libmythtv/asisignalmonitor.h | 1 mythtv/libs/libmythtv/avformatdecoder.cpp | 230 mythtv/libs/libmythtv/avformatdecoder.h | 6 mythtv/libs/libmythtv/avfringbuffer.cpp | 4 mythtv/libs/libmythtv/avfringbuffer.h | 6 mythtv/libs/libmythtv/cc708window.cpp | 2 mythtv/libs/libmythtv/cetonrecorder.cpp | 14 mythtv/libs/libmythtv/cetonrecorder.h | 1 mythtv/libs/libmythtv/cetonsignalmonitor.cpp | 6 mythtv/libs/libmythtv/cetonsignalmonitor.h | 1 mythtv/libs/libmythtv/decoderbase.h | 6 mythtv/libs/libmythtv/diseqcsettings.cpp | 4 mythtv/libs/libmythtv/dtvrecorder.cpp | 342 mythtv/libs/libmythtv/dtvrecorder.h | 8 mythtv/libs/libmythtv/dvbrecorder.cpp | 14 mythtv/libs/libmythtv/dvbrecorder.h | 1 mythtv/libs/libmythtv/dvbsignalmonitor.cpp | 6 mythtv/libs/libmythtv/dvbsignalmonitor.h | 1 mythtv/libs/libmythtv/eithelper.cpp | 15 mythtv/libs/libmythtv/filtermanager.cpp | 38 mythtv/libs/libmythtv/firewiredevice.cpp | 1 mythtv/libs/libmythtv/firewiresignalmonitor.cpp | 6 mythtv/libs/libmythtv/firewiresignalmonitor.h | 1 mythtv/libs/libmythtv/hdhrrecorder.cpp | 14 mythtv/libs/libmythtv/hdhrrecorder.h | 1 mythtv/libs/libmythtv/hdhrsignalmonitor.cpp | 6 mythtv/libs/libmythtv/hdhrsignalmonitor.h | 1 mythtv/libs/libmythtv/iptvsignalmonitor.cpp | 6 mythtv/libs/libmythtv/iptvsignalmonitor.h | 1 mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 8 mythtv/libs/libmythtv/mpeg/streamlisteners.h | 5 mythtv/libs/libmythtv/mpegrecorder.cpp | 11 mythtv/libs/libmythtv/mythccextractorplayer.cpp | 12 mythtv/libs/libmythtv/mythccextractorplayer.h | 2 mythtv/libs/libmythtv/mythcommflagplayer.cpp | 21 mythtv/libs/libmythtv/mythplayer.cpp | 43 mythtv/libs/libmythtv/openglvideo.cpp | 1 mythtv/libs/libmythtv/recordingprofile.cpp | 2 mythtv/libs/libmythtv/ringbuffer.h | 4 mythtv/libs/libmythtv/signalmonitor.cpp | 1 mythtv/libs/libmythtv/signalmonitor.h | 1 mythtv/libs/libmythtv/tv_play.cpp | 13 mythtv/libs/libmythtv/tv_rec.cpp | 6 mythtv/libs/libmythtv/videoout_openglvaapi.cpp | 1 mythtv/libs/libmythtv/videosource.cpp | 87 mythtv/libs/libmythui/DisplayRes.cpp | 36 mythtv/libs/libmythui/DisplayResScreen.h | 6 mythtv/libs/libmythui/DisplayResX.cpp | 4 mythtv/libs/libmythui/libmythui.pro | 1 mythtv/libs/libmythui/mythscreenstack.cpp | 2 mythtv/libs/libmythui/mythuibuttonlist.cpp | 2 mythtv/libs/libmythui/mythuieditbar.cpp | 2 mythtv/libs/libmythui/mythuiimage.cpp | 3 mythtv/libs/libmythui/mythuitype.cpp | 11 mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 mythtv/locales/nl_nl.xml | 37 mythtv/programs/mythavtest/main.cpp | 5 mythtv/programs/mythbackend/autoexpire.cpp | 4 mythtv/programs/mythbackend/autoexpire.h | 1 mythtv/programs/mythbackend/main.cpp | 5 mythtv/programs/mythbackend/main_helpers.cpp | 4 mythtv/programs/mythbackend/mainserver.cpp | 18 mythtv/programs/mythbackend/scheduler.cpp | 72 mythtv/programs/mythccextractor/main.cpp | 5 mythtv/programs/mythcommflag/README.txt | 10 mythtv/programs/mythcommflag/main.cpp | 5 mythtv/programs/mythfilldatabase/main.cpp | 5 mythtv/programs/mythfilldatabase/xmltvparser.cpp | 12 mythtv/programs/mythfrontend/guidegrid.cpp | 17 mythtv/programs/mythfrontend/main.cpp | 5 mythtv/programs/mythfrontend/playbackbox.cpp | 51 mythtv/programs/mythfrontend/playbackbox.h | 6 mythtv/programs/mythfrontend/scheduleeditor.cpp | 2 mythtv/programs/mythfrontend/services/frontend.cpp | 2 mythtv/programs/mythfrontend/statusbox.cpp | 8 mythtv/programs/mythjobqueue/main.cpp | 5 mythtv/programs/mythlcdserver/main.cpp | 5 mythtv/programs/mythlogserver/main.cpp | 5 mythtv/programs/mythmediaserver/main.cpp | 5 mythtv/programs/mythmetadatalookup/main.cpp | 5 mythtv/programs/mythpreviewgen/main.cpp | 5 mythtv/programs/mythshutdown/commandlineparser.cpp | 14 mythtv/programs/mythshutdown/main.cpp | 55 mythtv/programs/mythtranscode/main.cpp | 5 mythtv/programs/mythtranscode/transcode.cpp | 6 mythtv/programs/mythtv-setup/backendsettings.cpp | 20 mythtv/programs/mythtv-setup/main.cpp | 5 mythtv/programs/mythutil/main.cpp | 6 mythtv/programs/mythwelcome/main.cpp | 5 mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 20 mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py | 27 mythtv/programs/scripts/metadata/Movie/tmdb3.py | 109 mythtv/themes/MythCenter-wide/htmls/progdetails_page1.html | 4 mythtv/themes/MythCenter-wide/htmls/progdetails_page2.html | 4 mythtv/themes/MythCenter-wide/music-base.xml | 7 mythtv/themes/MythCenter-wide/music-ui.xml | 6 mythtv/themes/MythCenter-wide/schedule-ui.xml | 4 mythtv/themes/MythCenter/htmls/progdetails_page1.html | 4 mythtv/themes/MythCenter/htmls/progdetails_page2.html | 4 mythtv/themes/MythCenter/schedule-ui.xml | 2 mythtv/themes/Terra/weather-ui.xml | 49 188 files changed, 8609 insertions(+), 5320 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 mythtv-0.26-fixes.patch Index: mythtv-0.26-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.26-fixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythtv-0.26-fixes.patch 5 Mar 2013 17:42:32 -0000 1.4 +++ mythtv-0.26-fixes.patch 27 Apr 2013 13:06:20 -0000 1.5 @@ -1,9 +1,14 @@ README.rst | 1 + mythplugins/mytharchive/i18n/mytharchive_es_es.qm | Bin 36188 -> 36136 bytes mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45 +- + .../mytharchive/mytharchive/exportnative.cpp | 13 +- + .../mytharchive/mytharchive/importnative.cpp | 12 +- + mythplugins/mytharchive/mytharchive/logviewer.cpp | 53 +- + mythplugins/mytharchive/mytharchive/mythburn.cpp | 5 +- + mythplugins/mytharchive/mytharchivehelper/main.cpp | 421 +-- .../mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml | 24 +- .../mythburn/encoder_profiles/ffmpeg_dvd_pal.xml | 24 +- - .../mytharchive/mythburn/scripts/mythburn.py | 16 +- + .../mytharchive/mythburn/scripts/mythburn.py | 17 +- mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4 +- mythplugins/mythgame/i18n/mythgame_es_es.ts | 4 +- mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68 +- @@ -11,7 +16,17 @@ mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++++++++++----- mythplugins/mythmusic/mythmusic/cddb.cpp | 6 +- mythplugins/mythmusic/mythmusic/cdrip.cpp | 2 +- + mythplugins/mythmusic/mythmusic/decoderhandler.cpp | 9 +- + mythplugins/mythmusic/mythmusic/musiccommon.cpp | 12 +- + mythplugins/mythmusic/mythmusic/playersettings.cpp | 2 +- + mythplugins/mythmusic/mythmusic/pls.cpp | 209 +- + mythplugins/mythmusic/mythmusic/pls.h | 14 +- mythplugins/mythmusic/mythmusic/shoutcast.cpp | 20 +- + .../mythmusic/mythmusic/visualizationsettings.cpp | 6 + + .../mythmusic/theme/default-wide/music-base.xml | 7 + + .../mythmusic/theme/default-wide/music-ui.xml | 6 +- + mythplugins/mythmusic/theme/default/music-base.xml | 7 + + mythplugins/mythmusic/theme/default/stream-ui.xml | 450 +++ mythplugins/mythweather/i18n/mythweather_es_es.qm | Bin 23630 -> 23631 bytes mythplugins/mythweather/i18n/mythweather_es_es.ts | 3 +- mythplugins/mythweather/i18n/mythweather_pl.qm | Bin 23846 -> 23847 bytes @@ -29,6 +44,7 @@ mythtv/external/FFmpeg/libavcodec/h264_refs.c | 3 + mythtv/external/FFmpeg/libavcodec/pcm.c | 5 +- mythtv/external/FFmpeg/libavformat/avidec.c | 9 + + mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c | 1 + mythtv/external/FFmpeg/libavformat/utils.c | 4 +- mythtv/i18n/mythfrontend_da.qm | Bin 611287 -> 611700 bytes mythtv/i18n/mythfrontend_da.ts | 1208 ++++--- @@ -36,16 +52,23 @@ mythtv/i18n/mythfrontend_es_es.ts | 2180 +++++------ mythtv/i18n/mythfrontend_pl.qm | Bin 350611 -> 354449 bytes mythtv/i18n/mythfrontend_pl.ts | 2733 +++++++------- + mythtv/libs/libmyth/audio/audiooutputbase.cpp | 2 +- mythtv/libs/libmyth/mythcontext.cpp | 2 +- mythtv/libs/libmyth/mythmediamonitor.cpp | 2 +- - mythtv/libs/libmyth/programinfo.cpp | 20 +- + mythtv/libs/libmyth/programinfo.cpp | 22 +- + mythtv/libs/libmythbase/mythdate.cpp | 6 + mythtv/libs/libmythbase/mythdownloadmanager.cpp | 2 +- mythtv/libs/libmythbase/mythsystem.cpp | 5 + mythtv/libs/libmythbase/mythversion.h | 2 +- mythtv/libs/libmythbase/signalhandling.cpp | 8 +- mythtv/libs/libmythdvdnav/dvdnav/dvd_types.h | 11 + - mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 7 + + mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 15 +- + mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 9 +- + mythtv/libs/libmythdvdnav/dvdnav/dvdnav_internal.h | 8 + mythtv/libs/libmythdvdnav/dvdnav/highlight.c | 60 + + mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 3 +- + mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 141 +- + mythtv/libs/libmythdvdnav/dvdread/ifo_types.h | 2 + .../libs/libmythtv/AirPlay/mythraopconnection.cpp | 153 +- mythtv/libs/libmythtv/Bluray/bdringbuffer.h | 6 +- mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp | 4 +- @@ -63,7 +86,7 @@ mythtv/libs/libmythtv/asirecorder.h | 1 + mythtv/libs/libmythtv/asisignalmonitor.cpp | 6 +- mythtv/libs/libmythtv/asisignalmonitor.h | 1 + - mythtv/libs/libmythtv/avformatdecoder.cpp | 227 +- + mythtv/libs/libmythtv/avformatdecoder.cpp | 230 +- mythtv/libs/libmythtv/avformatdecoder.h | 6 +- mythtv/libs/libmythtv/avfringbuffer.cpp | 4 + mythtv/libs/libmythtv/avfringbuffer.h | 6 +- @@ -73,12 +96,14 @@ mythtv/libs/libmythtv/cetonsignalmonitor.cpp | 6 +- mythtv/libs/libmythtv/cetonsignalmonitor.h | 1 + mythtv/libs/libmythtv/decoderbase.h | 6 +- - mythtv/libs/libmythtv/dtvrecorder.cpp | 339 +- + mythtv/libs/libmythtv/diseqcsettings.cpp | 4 +- + mythtv/libs/libmythtv/dtvrecorder.cpp | 342 +- mythtv/libs/libmythtv/dtvrecorder.h | 8 +- mythtv/libs/libmythtv/dvbrecorder.cpp | 14 +- mythtv/libs/libmythtv/dvbrecorder.h | 1 + mythtv/libs/libmythtv/dvbsignalmonitor.cpp | 6 +- mythtv/libs/libmythtv/dvbsignalmonitor.h | 1 + + mythtv/libs/libmythtv/eithelper.cpp | 15 +- mythtv/libs/libmythtv/filtermanager.cpp | 38 + mythtv/libs/libmythtv/firewiredevice.cpp | 1 + mythtv/libs/libmythtv/firewiresignalmonitor.cpp | 6 +- @@ -96,18 +121,26 @@ mythtv/libs/libmythtv/mythccextractorplayer.h | 2 +- mythtv/libs/libmythtv/mythcommflagplayer.cpp | 21 + mythtv/libs/libmythtv/mythplayer.cpp | 43 +- + mythtv/libs/libmythtv/openglvideo.cpp | 1 + + mythtv/libs/libmythtv/recordingprofile.cpp | 2 +- mythtv/libs/libmythtv/ringbuffer.h | 4 +- mythtv/libs/libmythtv/signalmonitor.cpp | 1 + mythtv/libs/libmythtv/signalmonitor.h | 1 + mythtv/libs/libmythtv/tv_play.cpp | 13 +- mythtv/libs/libmythtv/tv_rec.cpp | 6 +- + mythtv/libs/libmythtv/videoout_openglvaapi.cpp | 1 + + mythtv/libs/libmythtv/videosource.cpp | 87 +- + mythtv/libs/libmythui/DisplayRes.cpp | 36 +- + mythtv/libs/libmythui/DisplayResScreen.h | 6 + + mythtv/libs/libmythui/DisplayResX.cpp | 4 +- mythtv/libs/libmythui/libmythui.pro | 1 + mythtv/libs/libmythui/mythscreenstack.cpp | 2 +- mythtv/libs/libmythui/mythuibuttonlist.cpp | 2 +- - mythtv/libs/libmythui/mythuieditbar.cpp | 1 + + mythtv/libs/libmythui/mythuieditbar.cpp | 2 +- mythtv/libs/libmythui/mythuiimage.cpp | 3 +- mythtv/libs/libmythui/mythuitype.cpp | 11 +- mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 +- + mythtv/locales/nl_nl.xml | 37 + mythtv/programs/mythavtest/main.cpp | 5 +- mythtv/programs/mythbackend/autoexpire.cpp | 4 +- mythtv/programs/mythbackend/autoexpire.h | 1 - @@ -119,9 +152,11 @@ mythtv/programs/mythcommflag/README.txt | 10 +- mythtv/programs/mythcommflag/main.cpp | 5 +- mythtv/programs/mythfilldatabase/main.cpp | 5 +- + mythtv/programs/mythfilldatabase/xmltvparser.cpp | 12 + mythtv/programs/mythfrontend/guidegrid.cpp | 17 +- mythtv/programs/mythfrontend/main.cpp | 5 +- - mythtv/programs/mythfrontend/playbackbox.cpp | 4 +- + mythtv/programs/mythfrontend/playbackbox.cpp | 51 +- + mythtv/programs/mythfrontend/playbackbox.h | 6 + mythtv/programs/mythfrontend/scheduleeditor.cpp | 2 +- mythtv/programs/mythfrontend/services/frontend.cpp | 2 +- mythtv/programs/mythfrontend/statusbox.cpp | 8 +- @@ -135,14 +170,23 @@ mythtv/programs/mythshutdown/main.cpp | 55 +- mythtv/programs/mythtranscode/main.cpp | 5 +- mythtv/programs/mythtranscode/transcode.cpp | 6 + - mythtv/programs/mythtv-setup/backendsettings.cpp | 6 +- + mythtv/programs/mythtv-setup/backendsettings.cpp | 20 +- mythtv/programs/mythtv-setup/main.cpp | 5 +- mythtv/programs/mythutil/main.cpp | 6 +- mythtv/programs/mythwelcome/main.cpp | 5 +- .../distros/mythtv_data/data_mythtv.py | 20 +- .../nv_python_libs/youtube/youtube_api.py | 27 +- mythtv/programs/scripts/metadata/Movie/tmdb3.py | 109 +- - 144 files changed, 7551 insertions(+), 4606 deletions(-) + .../MythCenter-wide/htmls/progdetails_page1.html | 4 +- + .../MythCenter-wide/htmls/progdetails_page2.html | 4 +- + mythtv/themes/MythCenter-wide/music-base.xml | 7 + + mythtv/themes/MythCenter-wide/music-ui.xml | 6 +- + mythtv/themes/MythCenter-wide/schedule-ui.xml | 4 +- + .../themes/MythCenter/htmls/progdetails_page1.html | 4 +- + .../themes/MythCenter/htmls/progdetails_page2.html | 4 +- + mythtv/themes/MythCenter/schedule-ui.xml | 2 +- + mythtv/themes/Terra/weather-ui.xml | 49 +- + 188 files changed, 8609 insertions(+), 5320 deletions(-) diff --git a/README.rst b/README.rst index a151d89..576e0dc 100644 @@ -294,6 +338,694 @@ <source>Burn DVD</source> <translation>Grabar DVD</translation> </message> +diff --git a/mythplugins/mytharchive/mytharchive/exportnative.cpp b/mythplugins/mytharchive/mytharchive/exportnative.cpp +index 38c1e89..7420a48 100644 +--- a/mythplugins/mytharchive/mytharchive/exportnative.cpp ++++ b/mythplugins/mytharchive/mytharchive/exportnative.cpp +@@ -476,21 +476,16 @@ void ExportNative::runScript() + QString configDir = tempDir + "config"; + QString commandline; + +- // remove existing progress.log if present +- if (QFile::exists(logDir + "/progress.log")) +- QFile::remove(logDir + "/progress.log"); ++ // remove any existing logs ++ myth_system("rm -f " + logDir + "/*.log"); + + // remove cancel flag file if present + if (QFile::exists(logDir + "/mythburncancel.lck")) + QFile::remove(logDir + "/mythburncancel.lck"); + + createConfigFile(configDir + "/mydata.xml"); +- commandline = "mytharchivehelper --nativearchive --outfile " + configDir + +- "/mydata.xml"; // job file +- commandline += logPropagateArgs; +- if (!logPropagateQuiet()) +- commandline += " --quiet"; +- commandline += " > " + logDir + "/progress.log 2>&1 &"; // Logs ++ commandline = "mytharchivehelper --logpath " + logDir + " --nativearchive " ++ "--outfile " + configDir + "/mydata.xml"; // job file + [...3376 lines suppressed...] +- <area>180,15,415,34</area> ++ <area>180,15,800,34</area> + <font>baselarge</font> + </textarea> + + <textarea name="artist" from="basetextarea"> +- <area>180,50,415,35</area> ++ <area>180,50,800,35</area> + <font>basemedium</font> + </textarea> + + <textarea name="album" from="basetextarea"> +- <area>180,80,415,35</area> ++ <area>180,80,800,35</area> + <font>basemedium</font> + </textarea> + +diff --git a/mythtv/themes/MythCenter-wide/schedule-ui.xml b/mythtv/themes/MythCenter-wide/schedule-ui.xml +index e20bfd2..4232de8 100644 +--- a/mythtv/themes/MythCenter-wide/schedule-ui.xml ++++ b/mythtv/themes/MythCenter-wide/schedule-ui.xml +@@ -630,10 +630,10 @@ + <area>220,2,250,24</area> + </textarea> + <textarea name="channelname" from="chanstr"> +- <area>570,2,500,24</area> ++ <area>570,2,550,24</area> + </textarea> + <textarea name="priority" from="chanstr"> +- <area>1140,2,30,24</area> ++ <area>1130,2,40,24</area> + <align>right</align> + </textarea> + </state> +diff --git a/mythtv/themes/MythCenter/htmls/progdetails_page1.html b/mythtv/themes/MythCenter/htmls/progdetails_page1.html +index ef70612..d31c75d 100644 +--- a/mythtv/themes/MythCenter/htmls/progdetails_page1.html ++++ b/mythtv/themes/MythCenter/htmls/progdetails_page1.html +@@ -3,8 +3,8 @@ + <html> + <head> + <style type="text/css"> +- h1 {font-size:15pt;font-style: normal;color:#33FF33} +- p {font-size:15pt;font-style: normal;color:#FFFFFF;margin-top: -10pt} ++ h1 {font-size:15pt;font-style: normal;font-family: sans-serif;color:#33FF33} ++ p {font-size:15pt;font-style: normal;font-family: sans-serif;color:#FFFFFF;margin-top: -10pt} + </style> + </head> + +diff --git a/mythtv/themes/MythCenter/htmls/progdetails_page2.html b/mythtv/themes/MythCenter/htmls/progdetails_page2.html +index a1b2e02..3619729 100644 +--- a/mythtv/themes/MythCenter/htmls/progdetails_page2.html ++++ b/mythtv/themes/MythCenter/htmls/progdetails_page2.html +@@ -3,8 +3,8 @@ + <html> + <head> + <style type="text/css"> +- h1 {font-size:15pt;font-style: normal;color:#33FF33} +- p {font-size:15pt;font-style: normal;color:#FFFFFF;margin-top: -10pt} ++ h1 {font-size:15pt;font-style: normal;font-family: sans-serif;color:#33FF33} ++ p {font-size:15pt;font-style: normal;font-family: sans-serif;color:#FFFFFF;margin-top: -10pt} + </style> + </head> + +diff --git a/mythtv/themes/MythCenter/schedule-ui.xml b/mythtv/themes/MythCenter/schedule-ui.xml +index 68d57fe..7e273f4 100644 +--- a/mythtv/themes/MythCenter/schedule-ui.xml ++++ b/mythtv/themes/MythCenter/schedule-ui.xml +@@ -1327,7 +1327,7 @@ + </shape> + + <webbrowser name="browser"> +- <area>40,65,710,490</area> ++ <area>50,70,700,480</area> + <zoom>1.0</zoom> + <background color="#131564"/> + </webbrowser> +diff --git a/mythtv/themes/Terra/weather-ui.xml b/mythtv/themes/Terra/weather-ui.xml +index ac55fb6..0b78f27 100644 +--- a/mythtv/themes/Terra/weather-ui.xml ++++ b/mythtv/themes/Terra/weather-ui.xml +@@ -156,10 +156,15 @@ + </textarea> + + <textarea name="copyright" from="basetextarea"> +- <area>70,640,1140,40</area> ++ <area>70,640,850,40</area> + <align>left,vcenter</align> + <font>basesmaller</font> + </textarea> ++ ++ <imagetype name="copyrightlogo"> ++ <area>940,617,240,60</area> ++ <preserveaspect>true</preserveaspect> ++ </imagetype> + </window> + + <window name="Three Day Forecast"> +@@ -265,10 +270,15 @@ + </textarea> + + <textarea name="copyright" from="basetextarea"> +- <area>70,640,1140,40</area> ++ <area>70,640,850,40</area> + <align>left,vcenter</align> + <font>basesmaller</font> + </textarea> ++ ++ <imagetype name="copyrightlogo"> ++ <area>940,617,240,60</area> ++ <preserveaspect>true</preserveaspect> ++ </imagetype> + </window> + + <window name="Six Day Forecast"> +@@ -428,10 +438,15 @@ + </textarea> + + <textarea name="copyright" from="basetextarea"> +- <area>70,640,1140,40</area> ++ <area>70,640,850,40</area> + <align>left,vcenter</align> + <font>basesmaller</font> + </textarea> ++ ++ <imagetype name="copyrightlogo"> ++ <area>940,617,240,60</area> ++ <preserveaspect>true</preserveaspect> ++ </imagetype> + </window> + + <window name="Static Map"> +@@ -447,10 +462,15 @@ + </imagetype> + + <textarea name="copyright" from="basetextarea"> +- <area>70,640,1140,40</area> ++ <area>70,640,850,40</area> + <align>left,vcenter</align> + <font>basesmaller</font> + </textarea> ++ ++ <imagetype name="copyrightlogo"> ++ <area>940,617,240,60</area> ++ <preserveaspect>true</preserveaspect> ++ </imagetype> + </window> + + <window name="Animated Map"> +@@ -467,10 +487,15 @@ + </imagetype> + + <textarea name="copyright" from="basetextarea"> +- <area>70,640,1140,40</area> ++ <area>70,640,850,40</area> + <align>left,vcenter</align> + <font>basesmaller</font> + </textarea> ++ ++ <imagetype name="copyrightlogo"> ++ <area>940,617,240,60</area> ++ <preserveaspect>true</preserveaspect> ++ </imagetype> + </window> + + <window name="Severe Weather Alerts"> +@@ -488,10 +513,15 @@ + </textarea> + + <textarea name="copyright" from="basetextarea"> +- <area>70,640,1140,40</area> ++ <area>70,640,850,40</area> + <align>left,vcenter</align> + <font>basesmaller</font> + </textarea> ++ ++ <imagetype name="copyrightlogo"> ++ <area>940,617,240,60</area> ++ <preserveaspect>true</preserveaspect> ++ </imagetype> + </window> + + <window name="18 Hour Forecast"> +@@ -652,10 +682,15 @@ + </textarea> + + <textarea name="copyright" from="basetextarea"> +- <area>70,640,1140,40</area> ++ <area>70,640,850,40</area> + <align>left,vcenter</align> + <font>basesmaller</font> + </textarea> ++ ++ <imagetype name="copyrightlogo"> ++ <area>940,617,240,60</area> ++ <preserveaspect>true</preserveaspect> ++ </imagetype> + </window> + + <window name="global-setup"> Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- mythtv.spec 6 Mar 2013 15:16:20 -0000 1.119 +++ mythtv.spec 27 Apr 2013 13:06:21 -0000 1.120 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # Git revision and branch ID -%define _gitrev v0.26.0-111-g3944ca9 +%define _gitrev v0.26.0-149-g5f45c0b %define branch fixes/0.26 # Mythtv and plugins from github.com @@ -80,7 +80,7 @@ %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 7%{?dist} +Release: 8%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -98,8 +98,6 @@ # Set "--with debug" to enable MythTV debug compile mode %define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} -# Use SystemD service by default but allow use of SysV init script. -%define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1} # The following options are enabled by default. Use --without to disable them %define with_vdpau %{?_without_vdpau: 0} %{?!_without_vdpau: 1} @@ -107,8 +105,11 @@ %if 0%{?rhel} %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} +%define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0} + %else %define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1} +%define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1} %endif %define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} @@ -1457,6 +1458,9 @@ %changelog +* Sat Apr 27 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-8 +- Update to latest fixes/0.26, v0.26.0-149-g5f45c0b. + * Tue Feb 26 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.26.0-7 - Update to latest fixes/0.26, v0.26.0-111-g3944ca9. - Add patch for mythlogserver segfault.