rpms/mythtv/EL-6 mythlogserver-segv.patch, NONE, 1.1 mythtv-0.26.0-types_h.patch, NONE, 1.1 ChangeLog, 1.3, 1.4 mythbackend.service, 1.3, 1.4 mythtv-0.26-fixes.patch, 1.1, 1.2 mythtv.spec, 1.89, 1.90
Richard Shaw
hobbes1069 at rpmfusion.org
Fri Mar 15 20:35:33 CET 2013
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2988
Modified Files:
ChangeLog mythbackend.service mythtv-0.26-fixes.patch
mythtv.spec
Added Files:
mythlogserver-segv.patch mythtv-0.26.0-types_h.patch
Log Message:
* Tue Feb 26 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-7
- Update to latest fixes/0.26, v0.26.0-111-g3944ca9.
- Add patch for mythlogserver segfault.
- Add patch for includes in bundled ffmpeg.
- Add conditionals for mariadb replacing mysql in rawhide (F19).
mythlogserver-segv.patch:
logging.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- NEW FILE mythlogserver-segv.patch ---
diff --git a/mythtv/libs/libmythbase/logging.cpp b/mythtv/libs/libmythbase/logging.cpp
index d48a3a2..2407e45 100644
--- a/mythtv/libs/libmythbase/logging.cpp
+++ b/mythtv/libs/libmythbase/logging.cpp
@@ -328,8 +328,15 @@ void LoggerThread::run(void)
{
qRegisterMetaType<QList<QByteArray> >("QList<QByteArray>");
+ // Let m_zmqContext own the socket to prevent core dump in mythlogserver
+ // If this object takes ownership by calling:
+ // m_zmqSocket =
+ // m_zmqContext->createSocket(nzmqt::ZMQSocket::TYP_DEALER, this);
+ // Qt will delete the socket when our destructor is called.
+ // Later, Qt's event loop will post a destroyed event to m_zmqContext
+ // which will call m_zmqSocket->disconnect() causing a core dump.
m_zmqSocket =
- m_zmqContext->createSocket(nzmqt::ZMQSocket::TYP_DEALER, this);
+ m_zmqContext->createSocket(nzmqt::ZMQSocket::TYP_DEALER);
connect(m_zmqSocket,
SIGNAL(messageReceived(const QList<QByteArray>&)),
SLOT(messageReceived(const QList<QByteArray>&)),
mythtv-0.26.0-types_h.patch:
alsa-audio-common.c | 1 +
alsa-audio-enc.c | 1 +
2 files changed, 2 insertions(+)
--- NEW FILE mythtv-0.26.0-types_h.patch ---
diff -Naur MythTV-mythtv-d2f9798.orig/mythtv/external/FFmpeg/libavdevice/alsa-audio-common.c MythTV-mythtv-d2f9798/mythtv/external/FFmpeg/libavdevice/alsa-audio-common.c
--- MythTV-mythtv-d2f9798.orig/mythtv/external/FFmpeg/libavdevice/alsa-audio-common.c 2012-10-02 05:30:24.000000000 -0500
+++ MythTV-mythtv-d2f9798/mythtv/external/FFmpeg/libavdevice/alsa-audio-common.c 2013-03-06 08:00:05.197116477 -0600
@@ -28,6 +28,7 @@
* @author Nicolas George ( nicolas george normalesup org )
*/
+#include <sys/types.h>
#include <alsa/asoundlib.h>
#include "avdevice.h"
#include "libavutil/avassert.h"
diff -Naur MythTV-mythtv-d2f9798.orig/mythtv/external/FFmpeg/libavdevice/alsa-audio-enc.c MythTV-mythtv-d2f9798/mythtv/external/FFmpeg/libavdevice/alsa-audio-enc.c
--- MythTV-mythtv-d2f9798.orig/mythtv/external/FFmpeg/libavdevice/alsa-audio-enc.c 2012-10-02 05:30:24.000000000 -0500
+++ MythTV-mythtv-d2f9798/mythtv/external/FFmpeg/libavdevice/alsa-audio-enc.c 2013-03-06 08:16:22.113142230 -0600
@@ -37,6 +37,7 @@
* which gives a low latency suitable for real-time playback.
*/
+#include <sys/types.h>
#include <alsa/asoundlib.h>
#include "libavformat/internal.h"
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 10 Dec 2012 14:42:38 -0000 1.3
+++ ChangeLog 15 Mar 2013 19:35:30 -0000 1.4
@@ -1,282802 +1,1199 @@
-commit 6c3ae81b967ff21235c82481b6c6244ad97b6d20
-Author: Stuart Morgan <smorgan at mythtv.org>
-Date: Tue Oct 2 11:30:24 2012 +0100
-
- Setting VERSION to v0.26.0
-
-commit cb1e2844f3bd6147f92d8189b4f87c5fe212f826
-Author: Raymond Wagner <rwagner at mythtv.org>
-Date: Tue Oct 2 02:55:07 2012 -0400
-
- Cause backend to terminate if requested IP address is unavailable.
-
- This performs a check within mainserver to ensure the the selected IP
- addresses that the backend should be available on are detected on the
- system, and will otherwise immediately terminate rather than continue to
- operate in a potentially inaccessible fashion.
-
-commit 1a66ff9bee9d1029e3400d750c84a2f2c3d5c47e
-Author: Gavin Hurlbut <ghurlbut at mythtv.org>
-Date: Mon Oct 1 16:28:49 2012 -0700
-
- Please let this be all. More Windows fixes.
-
-commit f1d851b7cd736c661f62f8d697a7726439e35453
-Author: Gavin Hurlbut <ghurlbut at mythtv.org>
-Date: Mon Oct 1 15:03:56 2012 -0700
-
- More windows-related fixes.
-
-commit 0c22b9222ce2122af66b3438362d47a63b80b1c9
-Merge: 907bd2d faf4c11
-Author: Nicolas Riendeau <nriendeau at mythtv.org>
-Date: Mon Oct 1 17:53:56 2012 -0400
-
- Merge branch 'master' of code.mythtv.org:mythtv
-
-commit 907bd2d0e6a6b6a8eff1754daef4db2a217ef850
-Author: Walter Cheuk <wwycheuk at gmail.com>
-Date: Mon Oct 1 17:52:04 2012 -0400
-
- New Chinese/Taiwan locale file
- from Walter Cheuk
-
- Thank you Walter!
-
- Closes #11129
-
- Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-
-commit faf4c11aa7753830083bd583d3bfa470bf8f5010
-Author: Gavin Hurlbut <ghurlbut at mythtv.org>
-Date: Mon Oct 1 14:09:14 2012 -0700
-
- Forgot a lousy ;. Been doing too much python lately.
-
-commit aaa9fc27e2524419e0ef1c132b58bea9e18ea4bc
-Author: Gavin Hurlbut <ghurlbut at mythtv.org>
-Date: Mon Oct 1 12:57:22 2012 -0700
-
- Fix signalhandling to compile for FreeBSD as well
-
-commit 62aa75b3718475560ef71dd327dc3b59f0d521a5
-Author: Gavin Hurlbut <ghurlbut at mythtv.org>
-Date: Mon Oct 1 12:47:34 2012 -0700
-
- Fix signalhandling to compile for Windows (sorry)
-
-commit a1ff1f2df9e9453066f846f9a47cf562f3a2a4b0
-Author: Kenni Lund <kenni at mythtv.org>
-Date: Mon Oct 1 19:55:41 2012 +0200
-
- Generate binary translation files for the Italian translation, following dfefee4749.
-
- Fixes #11120.
-
-commit dfefee4749ed3c3f87a73bcc950ea833a7b624e3
-Author: Morris Cavestro <morriscavestro at yahoo.it>
-Date: Mon Oct 1 19:54:27 2012 +0200
-
- Update the Italian translation of mythgallery, mythmusic and mythfrontend.
-
- Signed-off-by: Kenni Lund <kenni at mythtv.org>
-
-commit 0de360e6aa6adc0e70115a7b8b0681fb48181cc3
-Author: Kenni Lund <kenni at mythtv.org>
-Date: Mon Oct 1 19:37:30 2012 +0200
-
- Update the Danish translation of mythgallery, mythgame, mythnews and mythweather.
-
-commit 6596484ebcbb6b3df482cdc15db04c70f683128d
-Author: Jonatan Lindblad <jlindblad at mythtv.org>
-Date: Sun Sep 30 12:47:50 2012 +0200
-
- Update the Swedish translation.
-
- Update of the Swedish translation for mythfrontend and all plugins made
- by me and Roger MÃ¥rtensson (thank you!).
-
-commit d6ec9e4eefcb974a84a5cf579afce4dbed0605c7
-Author: Rune Evjen <rune.evjen at gmail.com>
-Date: Sat Sep 29 16:27:00 2012 -0400
-
- Updated Norwegian Bokmal MythFrontend, MythGallery, MythGame,
- MythMusic, MythNetvision, MythZoneminder tanslation
- from Rune Evjen
-
- Thank you Rune!
-
- Closes #11130
-
- Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-
-commit 060383fa4f3dcd1b63127dbdf0877a237ba9d1b0
-Author: Kenni Lund <kenni at mythtv.org>
-Date: Sat Sep 29 18:04:17 2012 +0200
-
- Update the Danish translation of mythfrontend.
-
-commit 9c4e49c0cb14b94eca4371b7c0e89f9b2c168eef
-Author: Raymond Wagner <rwagner at mythtv.org>
-Date: Fri Sep 28 16:43:29 2012 -0400
-
- Force all datetime objects to be timezone aware.
-
- This works around some strangeness in the modified datetime class due to
- it being derived from a native C object. The timezone was being set to
- None in the base class's __new__ function, and the corrected timezone
- was ignored when set by the derived class's __init__.
-
-commit 358af8a26dcb6de01a9547767d9015e97a662be7
-Author: French Language Translation Team <knight at teksavvy.com>
-Date: Thu Sep 27 21:48:32 2012 -0400
-
- Updated French MythFrontend, MythArchive, MythMusic and MythWeather
- translation from the French Language Translation Team
-
- Thank you!
-
- Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-
-commit 73f41b03442fa8eb2b0c45d2e381f13917826a49
-Author: Florian Bittner <mythtv at daschatten.de>
-Date: Thu Sep 27 18:50:16 2012 -0400
-
- Updated German MythFrontend and MythWeather translation
- from Florian Bittner
-
- Thank you Florian!
-
- Closes #11125
-
- PS: Now that your translation is complete you might want to run
- lupdate with --no-obsolete to remove the obsolete entries.
-
- Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-
-commit 6c5378c4edb4eb20b26f637fc9604f5ac5cdc1de
-Author: Stuart Morgan <smorgan at mythtv.org>
-Date: Thu Sep 27 23:16:07 2012 +0100
-
- Remove/replace some of the outdated information in the Doxygen documentation landing page.
-
-commit be113a269e6bf8d8847c3af2364938211a423746
-Author: Robert Kulagowski <rkulagow at mythtv.org>
-Date: Thu Sep 27 13:39:04 2012 -0500
-
- Typo.
-
-commit 478de4162e4ec602c19da98d15528a560b0dd1eb
-Author: Ilkka Tengvall <ikke at iki.fi>
-Date: Wed Sep 26 19:08:38 2012 -0400
-
- Updated Finnish MythFrontend and MythWeather translation
- from Ilkka Tengvall.
-
- Thank you Ilkka!
-
- Closes #11122
-
- Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-
-commit 1e06473589d272cb3958c535c72ce7f24ed6b4f1
-Author: Raymond Wagner <rwagner at mythtv.org>
-Date: Wed Sep 26 12:45:32 2012 -0400
-
- Fix immutable type issue in 6a8a845
-
-commit 6a8a8454a38a99f5bb0dc91c9fee2a2e74448db5
-Author: Raymond Wagner <rwagner at mythtv.org>
-Date: Wed Sep 26 02:24:29 2012 -0400
-
[...283239 lines suppressed...]
-commit 54a8b3201795d354c10aebbdf1c8ae81f9943288
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Mon May 6 06:21:49 2002 +0000
+commit ff922bb074b425d086324b7d89db348f90d623dd
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date: Wed Oct 10 10:52:24 2012 -0400
- Add setting for mp3 quality, add half working ff/rew
-
+ Add reporting of logging volume to Smolt.
- git-svn-id: http://svn.mythtv.org/svn/trunk@15 7dbf422c-18fa-0310-86e9-fd20926502f2
+ This reports the logging volume as a percentage of the total amount
+ stored in the database, for each urgency level. This is intended as a
+ simple metric to determine stability of MythTV, as higher counts of
+ higher urgency levels will indicate an increase in problems seen by the
+ user base.
+ (cherry picked from commit 5f90b1d62c4d692a6c23ae22ab2047db85e6572e)
-commit 1608e03455e0c49872a7b71b6b7891bf057ef75a
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sun May 5 22:40:21 2002 +0000
+commit 624ad5a3533ba34033debb37f0058da0670cf4e1
+Author: Jesse Crews <jcrews at gridlox.net>
+Date: Tue Oct 9 10:59:27 2012 +0100
- Added a setting for deinterlacing, and fixed the build process slightly.
+ Fix mythbackend not exiting after network initialization failure. Fixes #11163
-
- git-svn-id: http://svn.mythtv.org/svn/trunk@14 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Signed-off-by: Stuart Morgan <smorgan at mythtv.org>
-commit 3c4461ea20c5ca1bdd580b192fa63f4e35e462c0
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sun May 5 21:56:09 2002 +0000
+commit 2d2932ac11ed6d01f05f502a8e373455774ba46a
+Author: Lawrence Rust <lvr at softsystem.co.uk>
+Date: Sun May 6 12:33:35 2012 +0200
- Add a simple settings class, and use it for the defaults.
-
+ libmythui: Fix a redraw bug in MythUIType
- git-svn-id: http://svn.mythtv.org/svn/trunk@13 7dbf422c-18fa-0310-86e9-fd20926502f2
-
-commit b397a405159c2e76707931d28c5e643926d83392
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sun May 5 21:33:07 2002 +0000
-
- Moved the forced unpause calculation into the Player class.
- Fixed the calculation of max size of the ring buffer.
+ While evaluating the ATI Catalyst 'TearFree Desktop' option I noticed
+ that sometimes a keypress was apparently being held up until the time
+ on the main menu was updated. Initially I thought that this was a lirc
+ or fglrx issue, but on investigation it turned out that MythMainWindow::animate
+ was requesting updates for empty repaint regions. Delving further
+ showed that MythUIType::Draw was resetting m_DirtyRegion to empty
+ even if the clipRect was smaller, thus leaving unpainted regions.
+ m_DirtyRegion may be extended by HandleMovementPulse, SetRedraw
+ or SetChildNeedsRedraw etc AFTER GetDirtyArea is called.
+ So when MythUIType::Draw is called, clipRect may not include the whole
+ of m_DirtyRegion.
- git-svn-id: http://svn.mythtv.org/svn/trunk@12 7dbf422c-18fa-0310-86e9-fd20926502f2
-
-commit 5ffc03899a829ab382b94ec3c764d266790a3745
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sun May 5 06:22:38 2002 +0000
-
- Added the ability to pause "live" tv.
- It forces an unpause when the ring buffer fills up. Need to move the
- forced unpause logic into the player library.
+ This patch subtracts the Draw clipRect from m_DirtyRegion instead of
+ simply emtying it.
+ Fixes #10695
- git-svn-id: http://svn.mythtv.org/svn/trunk@11 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Signed-off-by: Lawrence Rust <lvr at softsystem.co.uk>
+ Signed-off-by: Stuart Morgan <smorgan at mythtv.org>
+ (cherry picked from commit 39984eb579369f6cb25cd8f57acb8b23ebcccfc6)
-commit 8dac78628005f497b06b4bbd07b0ea6b5a7caa67
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sun May 5 03:46:22 2002 +0000
+commit 52c48f983ca3175be983bdaa8c0072b736315d3c
+Author: Xavier Hervy <xavier.hervy at gmail.com>
+Date: Sun Oct 7 19:19:54 2012 +0100
- fixing the last few problems with the RingBuffer
-
+ Allow adding a channel to an empty channel group from the guide. Update the cached channel group list after adding or removing a channel. Fixes #10411
- git-svn-id: http://svn.mythtv.org/svn/trunk@10 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Signed-off-by: Stuart Morgan <smorgan at mythtv.org>
+ (cherry picked from commit 9d5aabc1ed42156bf23a9d0afac0b31fdaedc5e1)
-commit 6fb8538e69520fe9a0e4b10a3e0e110bf8c3f886
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sun May 5 01:48:50 2002 +0000
+commit 4c67cedbea9e4b18d7688f30af02bd46e65cd07d
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date: Sat Oct 6 13:42:21 2012 -0400
- Now the ringbuffer, well, rings.
+ Read in dbPingHost value from config.xml.
-
- git-svn-id: http://svn.mythtv.org/svn/trunk@9 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Fixes #11148
+ (cherry picked from commit 65a720c9b830ab77bbd2931e03fb428e05dee6f9)
-commit 589164c833c69b5c61ec943f6a039438980a2a98
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sun May 5 00:37:39 2002 +0000
+commit ad5bb8b0929d546ac91324ccee5e7f7f2a49742e
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date: Sat Oct 6 12:40:36 2012 +0100
- Add a RingBuffer class, for the TV app. Make the TV app work.
-
- The RingBuffer doesn't cycle yet.
-
-
- git-svn-id: http://svn.mythtv.org/svn/trunk@8 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Only set the BackendServerIP6 setting to ::1 by default if that address is available, otherwise leave it blank
-commit e2a5539b206f644f902d424052fa1bf4ba5a2ffe
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sat May 4 19:42:01 2002 +0000
+commit 6b541e74da22ff4daa28dd13425bcc9ffe2c7303
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date: Sat Oct 6 11:36:59 2012 +0100
- - Converted the playback stuff to a class. Much cleaner.
-
-
- git-svn-id: http://svn.mythtv.org/svn/trunk@7 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Log an error if we are unable to find IPv4 or IPv6 addresses, only
+ exit if we are unable to find any address to bind to
-commit 84103e00fde1bab9007093e832302f7290c836f3
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sat May 4 08:06:24 2002 +0000
+commit dd0521ec029f5e5413592e93b3beff946fb5499f
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date: Sat Oct 6 04:28:48 2012 -0400
- - new class 'NuppelVideoRecorder'
- main changes: uses pthreads instead of forking + lots of shm, easy interface
-
+ Fix single episode grabber for season 0 specials.
- git-svn-id: http://svn.mythtv.org/svn/trunk@6 7dbf422c-18fa-0310-86e9-fd20926502f2
+ This makes the check for arguments to grabInetref() look specifically
+ for None, rather than boolean False, to prevent false positives when
+ dealing with specials that have a season of 0.
+ (cherry picked from commit 7da754ad0d350988f324c239477a6587bf88ba1c)
-commit 39ebee28eb13a7c61331afa32ee886f821d02643
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Sat May 4 04:28:07 2002 +0000
+commit c744347675573dfc690cb263353b3ccc4a950a1a
+Author: R.D. Vaughan <r.d.vaughan at rogers.com>
+Date: Tue Oct 2 13:29:55 2012 -0400
- - converted RTjpeg.N to a c++ class. cleaner now.
-
+ Adjust to datetime issues with MythTV v0.26's move to UTC datetimes in DB
- git-svn-id: http://svn.mythtv.org/svn/trunk@5 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Signed-off-by: Raymond Wagner <rwagner at mythtv.org>
+ (cherry picked from commit fcf6da5608cc5621a7bee48120d988352f34189f)
-commit 654df6845fd347d1e9794277f46d8270a92ed7ad
-Author: Isaac Richards <irichards at mythtv.org>
-Date: Fri May 3 19:14:12 2002 +0000
+commit a49c750cfc1a2d3f0b8a46f98e75a0e79b3a79fc
+Author: Gavin Hurlbut <ghurlbut at mythtv.org>
+Date: Tue Oct 2 13:53:03 2012 -0700
- Initial revision
-
-
- git-svn-id: http://svn.mythtv.org/svn/trunk@2 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Force a commit to fixes/0.26 to test the tagging
-commit ce7a5f624939970a5b095698adb6da23babc930f
-Author: Janne Grunau <jgrunau at mythtv.org>
-Date: Fri May 3 19:14:12 2002 +0000
+commit b4deb185994d6388b55cea18aa3e861c71541101
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date: Tue Oct 2 12:05:20 2012 +0100
- New repository initialized by cvs2svn.
-
- git-svn-id: http://svn.mythtv.org/svn/trunk@1 7dbf422c-18fa-0310-86e9-fd20926502f2
+ Prevent a segfault in MythUIImage, this doesn't fix the root cause of the problem but at least we won't crash. Refs #11047
Index: mythbackend.service
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythbackend.service,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythbackend.service 10 Dec 2012 14:42:39 -0000 1.3
+++ mythbackend.service 15 Mar 2013 19:35:31 -0000 1.4
@@ -59,7 +59,7 @@
ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv
# Whether systemd will continue over-watch and restart on any halt
-#Restart=always
+#Restart=Restart-always
[Install]
WantedBy=multi-user.target
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/mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml | 24
mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_pal.xml | 24
mythplugins/mytharchive/mythburn/scripts/mythburn.py | 16
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/shoutcast.cpp | 20
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/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/mythcontext.cpp | 2
mythtv/libs/libmyth/mythmediamonitor.cpp | 2
mythtv/libs/libmyth/programinfo.cpp | 20
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/highlight.c | 60
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 | 227
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/dtvrecorder.cpp | 339
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/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/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/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/mythuiimage.cpp | 3
mythtv/libs/libmythui/mythuitype.cpp | 11
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10
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/mythfrontend/guidegrid.cpp | 17
mythtv/programs/mythfrontend/main.cpp | 5
mythtv/programs/mythfrontend/playbackbox.cpp | 4
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 | 6
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
144 files changed, 7551 insertions(+), 4606 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mythtv-0.26-fixes.patch
Index: mythtv-0.26-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv-0.26-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-0.26-fixes.patch 10 Dec 2012 14:43:06 -0000 1.1
+++ mythtv-0.26-fixes.patch 15 Mar 2013 19:35:31 -0000 1.2
@@ -1,6 +1,9 @@
README.rst | 1 +
mythplugins/mytharchive/i18n/mytharchive_es_es.qm | Bin 36188 -> 36136 bytes
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45 +-
+ .../mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml | 24 +-
+ .../mythburn/encoder_profiles/ffmpeg_dvd_pal.xml | 24 +-
+ .../mytharchive/mythburn/scripts/mythburn.py | 16 +-
mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4 +-
mythplugins/mythgame/i18n/mythgame_es_es.ts | 4 +-
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68 +-
@@ -19,35 +22,91 @@
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/utils.c | 4 +-
+ mythtv/i18n/mythfrontend_da.qm | Bin 611287 -> 611700 bytes
+ mythtv/i18n/mythfrontend_da.ts | 1208 ++++---
mythtv/i18n/mythfrontend_es_es.qm | Bin 669897 -> 672530 bytes
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/mythcontext.cpp | 2 +-
mythtv/libs/libmyth/mythmediamonitor.cpp | 2 +-
+ mythtv/libs/libmyth/programinfo.cpp | 20 +-
+ 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/highlight.c | 60 +
.../libs/libmythtv/AirPlay/mythraopconnection.cpp | 153 +-
mythtv/libs/libmythtv/Bluray/bdringbuffer.h | 6 +-
mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp | 4 +-
- mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 8 +
+ 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 | 8 +-
+ 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/avformatdecoder.cpp | 99 +-
- mythtv/libs/libmythtv/decoderbase.h | 3 +-
- mythtv/libs/libmythtv/mythplayer.cpp | 39 +-
+ 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 | 227 +-
+ 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/dtvrecorder.cpp | 339 +-
+ 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/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/ringbuffer.h | 4 +-
- mythtv/libs/libmythtv/tv_play.cpp | 11 +-
+ 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/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/mythuiimage.cpp | 3 +-
- mythtv/libs/libmythui/mythuitype.cpp | 7 +-
+ mythtv/libs/libmythui/mythuitype.cpp | 11 +-
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 +-
mythtv/programs/mythavtest/main.cpp | 5 +-
mythtv/programs/mythbackend/autoexpire.cpp | 4 +-
@@ -55,14 +114,17 @@
mythtv/programs/mythbackend/main.cpp | 5 +-
mythtv/programs/mythbackend/main_helpers.cpp | 4 +-
mythtv/programs/mythbackend/mainserver.cpp | 18 +-
- mythtv/programs/mythbackend/scheduler.cpp | 14 +-
+ 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/mythfrontend/guidegrid.cpp | 17 +-
mythtv/programs/mythfrontend/main.cpp | 5 +-
mythtv/programs/mythfrontend/playbackbox.cpp | 4 +-
+ 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 +-
@@ -72,14 +134,15 @@
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 | 6 +-
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 | 107 +-
- 81 files changed, 6210 insertions(+), 3611 deletions(-)
+ mythtv/programs/scripts/metadata/Movie/tmdb3.py | 109 +-
+ 144 files changed, 7551 insertions(+), 4606 deletions(-)
diff --git a/README.rst b/README.rst
index a151d89..576e0dc 100644
@@ -231,6 +294,194 @@
<source>Burn DVD</source>
<translation>Grabar DVD</translation>
</message>
+diff --git a/mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml b/mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml
+index 208cdc5..d865b39 100644
+--- a/mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml
++++ b/mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml
+@@ -8,11 +8,11 @@
+ <parameter name="-v" value="1"/>
+ <parameter name="-i" value="%inputfile"/>
+ <parameter name="-r" value="ntsc"/>
+- <parameter name="-target" value="dvd"/>
+- <parameter name="-b" value="9000k"/>
++ <parameter name="-target" value="ntsc-dvd"/>
++ <parameter name="-b:v" value="9000k"/>
+ <parameter name="-s" value="720x480"/>
+ <parameter name="-acodec" value="ac3"/>
+- <parameter name="-ab" value="192k"/>
++ <parameter name="-b:a" value="192k"/>
+ <parameter name="-ac" value="2"/>
+ <parameter name="-copyts" value=""/>
+ <parameter name="-aspect" value="%aspect"/>
+@@ -29,11 +29,11 @@
+ <parameter name="-v" value="1"/>
+ <parameter name="-i" value="%inputfile"/>
+ <parameter name="-r" value="ntsc"/>
+- <parameter name="-target" value="dvd"/>
+- <parameter name="-b" value="4771k"/>
++ <parameter name="-target" value="ntsc-dvd"/>
++ <parameter name="-b:v" value="4771k"/>
+ <parameter name="-s" value="720x480"/>
+ <parameter name="-acodec" value="ac3"/>
+- <parameter name="-ab" value="192k"/>
++ <parameter name="-b:a" value="192k"/>
+ <parameter name="-ac" value="2"/>
+ <parameter name="-copyts" value=""/>
+ <parameter name="-aspect" value="%aspect"/>
+@@ -48,11 +48,11 @@
+ <parameter name="-v" value="1"/>
+ <parameter name="-i" value="%inputfile"/>
+ <parameter name="-r" value="ntsc"/>
+- <parameter name="-target" value="dvd"/>
+- <parameter name="-b" value="2344k"/>
++ <parameter name="-target" value="ntsc-dvd"/>
++ <parameter name="-b:v" value="2344k"/>
[...30953 lines suppressed...]
+-
+- livetvTime = (livetvTime < nextrectime) ?
+- nextrectime : livetvTime;
+-
+- EnqueuePlace("PrepareToRecord");
++ // If we haven't rescheduled in a while, do so now to
++ // accomodate LiveTV.
++ if (schedTime.secsTo(curtime) > 30)
++ EnqueuePlace("PrepareToRecord");
+ }
+ }
+
+@@ -5113,14 +5118,14 @@ void Scheduler::FillDirectoryInfoCache(bool force)
+
+ void Scheduler::SchedPreserveLiveTV(void)
+ {
+- if (!livetvTime.isValid())
+- return;
++ int prerollseconds = gCoreContext->GetNumSetting("RecordPreRoll", 0);
++ QDateTime curtime = MythDate::current();
++ int secsleft = curtime.secsTo(livetvTime);
+
+- if (livetvTime < schedTime)
+- {
+- livetvTime = QDateTime();
++ // This check needs to be longer than the related one in
++ // HandleRecording().
++ if (secsleft - prerollseconds > 120)
+ return;
+- }
+
+ livetvpriority = gCoreContext->GetNumSetting("LiveTVPriority", 0);
+
+@@ -5139,11 +5144,14 @@ void Scheduler::SchedPreserveLiveTV(void)
+ if (!in.inputid)
+ continue;
+
+- // Get the program that will be recording on this channel
+- // at record start time, if this LiveTV session continues.
++ // Get the program that will be recording on this channel at
++ // record start time and assume this LiveTV session continues
++ // for at least another 30 minutes from now.
+ RecordingInfo *dummy = new RecordingInfo(
+ in.chanid, livetvTime, true, 4);
+-
++ dummy->SetRecordingStartTime(schedTime);
++ if (schedTime.secsTo(dummy->GetRecordingEndTime()) < 1800)
++ dummy->SetRecordingEndTime(schedTime.addSecs(1800));
+ dummy->SetCardID(enc->GetCardID());
+ dummy->SetInputID(in.inputid);
+ dummy->SetRecordingStatus(rsUnknown);
diff --git a/mythtv/programs/mythccextractor/main.cpp b/mythtv/programs/mythccextractor/main.cpp
index 68272bd..a9d26ab 100644
--- a/mythtv/programs/mythccextractor/main.cpp
@@ -21647,6 +28001,43 @@
SignalHandler::Init(signallist);
signal(SIGHUP, SIG_IGN);
#endif
+diff --git a/mythtv/programs/mythcommflag/README.txt b/mythtv/programs/mythcommflag/README.txt
+index 5f216a3..052aa2c 100644
+--- a/mythtv/programs/mythcommflag/README.txt
++++ b/mythtv/programs/mythcommflag/README.txt
+@@ -7,10 +7,6 @@ First, --skipdb tells mythcommflag to try to avoid touching the
+ database; obviously you want to use this if you aren't running
+ a mysql instance with a mythconverg database.
+
+---hogcpu will make mythcommflag use 1 CPU to it's maximum potential,
+-normally mythcommflag will sleep for much of the time to avoid causing
+-problems for a running mythbackend.
+-
+ --file specifies the input file
+
+ --outputfile specifies the output file. Notably if you use "-" as
+@@ -43,7 +39,7 @@ The basic outputmethod is "essentials" and this will be used if you don't
+ specify an output format.
+
+ Here is an example input:
+- mythcommflag --hogcpu --skipdb --file /path/my.avi --outputfile output.txt
++ mythcommflag --skipdb --file /path/my.avi --outputfile output.txt
+
+ This will put something like this in the output file:
+ commercialBreakListFor: /path/my.avi
+@@ -75,10 +71,10 @@ values. The verbose format is easier for humans to read.
+
+ Here are some examples commands:
+
+-mythcommflag --hogcpu --skipdb --file /path/my.avi \
++mythcommflag --skipdb --file /path/my.avi \
+ --outputmethod full --outputfile output.txt
+
+-mythcommflag --very-quiet --hogcpu --skipdb --file /path/my.avi \
++mythcommflag --very-quiet --skipdb --file /path/my.avi \
+ --outputmethod full --outputfile output.txt
+
+ The first will have a header like this:
diff --git a/mythtv/programs/mythcommflag/main.cpp b/mythtv/programs/mythcommflag/main.cpp
index 5c03c1d..4f174fc 100644
--- a/mythtv/programs/mythcommflag/main.cpp
@@ -21767,6 +28158,19 @@
if (!sortedList.contains(sTitle))
sortedList[sTitle] = p->GetTitle();
+diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp
+index e78a07a..09881bc 100644
+--- a/mythtv/programs/mythfrontend/scheduleeditor.cpp
++++ b/mythtv/programs/mythfrontend/scheduleeditor.cpp
+@@ -309,7 +309,7 @@ void ScheduleEditor::Load()
+ ENUM_TO_QVARIANT(kChannelRecord));
+ if (!isManual)
+ new MythUIButtonListItem(m_rulesList,
+- ("Record at any time on any channel"),
++ tr("Record at any time on any channel"),
+ ENUM_TO_QVARIANT(kAllRecord));
+ }
+
diff --git a/mythtv/programs/mythfrontend/services/frontend.cpp b/mythtv/programs/mythfrontend/services/frontend.cpp
index 168a1f9..0426615 100644
--- a/mythtv/programs/mythfrontend/services/frontend.cpp
@@ -21780,6 +28184,32 @@
.arg("12345");
MythEvent me(message);
+diff --git a/mythtv/programs/mythfrontend/statusbox.cpp b/mythtv/programs/mythfrontend/statusbox.cpp
+index 8a93efb..3b31178 100644
+--- a/mythtv/programs/mythfrontend/statusbox.cpp
++++ b/mythtv/programs/mythfrontend/statusbox.cpp
+@@ -624,7 +624,10 @@ void StatusBox::doScheduleStatus()
+
+ MSqlQuery query(MSqlQuery::InitCon());
+
+- query.prepare("SELECT COUNT(*) FROM record WHERE search = 0");
++ query.prepare("SELECT COUNT(*) FROM record "
++ "WHERE type <> :TEMPLATE AND search = :NOSEARCH");
++ query.bindValue(":TEMPLATE", kTemplateRecord);
++ query.bindValue(":NOSEARCH", kNoSearch);
+ if (query.exec() && query.next())
+ {
+ QString rules = tr("%n standard rule(s) (is) defined", "",
+@@ -637,7 +640,8 @@ void StatusBox::doScheduleStatus()
+ return;
+ }
+
+- query.prepare("SELECT COUNT(*) FROM record WHERE search > 0");
++ query.prepare("SELECT COUNT(*) FROM record WHERE search > :NOSEARCH");
++ query.bindValue(":NOSEARCH", kNoSearch);
+ if (query.exec() && query.next())
+ {
+ QString rules = tr("%n search rule(s) are defined", "",
diff --git a/mythtv/programs/mythjobqueue/main.cpp b/mythtv/programs/mythjobqueue/main.cpp
index bd9c638..42a5c76 100644
--- a/mythtv/programs/mythjobqueue/main.cpp
@@ -22016,6 +28446,23 @@
SignalHandler::Init(signallist);
signal(SIGHUP, SIG_IGN);
#endif
+diff --git a/mythtv/programs/mythtranscode/transcode.cpp b/mythtv/programs/mythtranscode/transcode.cpp
+index c75b86a..e08f534 100755
+--- a/mythtv/programs/mythtranscode/transcode.cpp
++++ b/mythtv/programs/mythtranscode/transcode.cpp
+@@ -1527,6 +1527,12 @@ int Transcode::TranscodeFile(const QString &inputname,
+ case CODEC_ID_MP2:
+ audio_codec_name = "mp2";
+ break;
++ case CODEC_ID_AAC:
++ audio_codec_name = "aac";
++ break;
++ case CODEC_ID_AAC_LATM:
++ audio_codec_name = "aac_latm";
++ break;
+ default:
+ audio_codec_name = "unknown";
+ }
diff --git a/mythtv/programs/mythtv-setup/backendsettings.cpp b/mythtv/programs/mythtv-setup/backendsettings.cpp
index c10ad6f..a52f0f3 100644
--- a/mythtv/programs/mythtv-setup/backendsettings.cpp
@@ -22193,7 +28640,7 @@
}
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
-index 6a133f5..c748b7a 100755
+index 6a133f5..0411e30 100755
--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py
+++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
@@ -11,19 +11,22 @@
@@ -22258,6 +28705,15 @@
if release.certification:
m.certifications[country] = release.certification
for genre in movie.genres:
+@@ -56,7 +76,7 @@ def buildSingle(inetref):
+ m.people.append(d)
+ for crew in movie.crew:
+ d = {'name':crew.name, 'job':crew.job, 'department':crew.department,
+- 'url':'http://www.themoviedb.org/people/{0}'.format(cast.id)}
++ 'url':'http://www.themoviedb.org/people/{0}'.format(crew.id)}
+ if crew.profile: d['thumb'] = crew.profile.geturl()
+ m.people.append(d)
+ for backdrop in movie.backdrops:
@@ -70,11 +90,15 @@ def buildSingle(inetref):
xml_declaration=True))
sys.exit()
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mythtv.spec 10 Dec 2012 14:42:39 -0000 1.89
+++ mythtv.spec 15 Mar 2013 19:35:31 -0000 1.90
@@ -1,8 +1,7 @@
-# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
+# Specfile for building MythTV and MythPlugins RPMs from a git checkout.
#
-# by: Chris Petersen <rpm at forevermore.net>
+# by: Chris Petersen <cpetersen at mythtv.org>
# Jarod Wilson <jarod at wilsonet.com>
-# Richard Shaw <hobbes1069 at gmail.com>
#
# Modified/Extended from the great work of:
# Axel Thimm <Axel.Thimm at ATrpms.net>
@@ -31,9 +30,12 @@
#
# The following options are enabled by default. Use these options to disable:
#
+# --without systemd Use systemd for backend rather than SysV init.
# --without vdpau Disable VDPAU support
+# --without vaapi Disable VAAPI support
# --without crystalhd Disable Crystal HD support
# --without perl Disable building of the perl bindings
+# --without php Disable building of the php bindings
# --without python Disable building of the python bindings
#
# # All plugins get built by default, but you can disable them as you wish:
@@ -58,7 +60,7 @@
%define desktop_vendor RPMFusion
# Git revision and branch ID
-%define _gitrev v0.26.0-55-g09ac5b2
+%define _gitrev v0.26.0-111-g3944ca9
%define branch fixes/0.26
# Mythtv and plugins from github.com
@@ -78,7 +80,7 @@
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
%else
-Release: 3.1%{?dist}
+Release: 7%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -96,6 +98,9 @@
# 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}
%define with_vaapi %{?_without_vaapi: 0} %{?!_without_vaapi: 1}
@@ -131,7 +136,11 @@
# https://github.com/MythTV/mythtv/tarball/v0.26
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
+# From the mythtv git repository with the appropriate branch checked out:
+# git diff -p --stat v0.26.0 > mythtv-0.26-fixes.patch
Patch0: mythtv-0.26-fixes.patch
+Patch1: mythlogserver-segv.patch
+Patch2: mythtv-0.26.0-types_h.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -146,17 +155,14 @@
Source109: mythtv-setup.desktop
Source111: 99-mythbackend.rules
-
# Global MythTV and Shared Build Requirements
-%if 0%{?fedora} >= 16
+%if %{with_systemd}
# Use systemd
BuildRequires: systemd-units
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-# For sysv -> systemd transition
-Requires(post): systemd-sysv
%else
# Use SysV
Requires(post): chkconfig
@@ -168,7 +174,11 @@
BuildRequires: desktop-file-utils
BuildRequires: freetype-devel >= 2
BuildRequires: gcc-c++
+%if 0%{?fedora} >= 19
+BuildRequires: mariadb-devel >= 5
+%else
BuildRequires: mysql-devel >= 5
+%endif
BuildRequires: qt-webkit-devel
BuildRequires: qt-devel >= 4.6
BuildRequires: phonon-devel phonon-backend-gstreamer
@@ -184,6 +194,9 @@
BuildRequires: libXvMC-devel
BuildRequires: libXxf86vm-devel
BuildRequires: mesa-libGLU-devel
+%ifarch %arm
+BuildRequires: mesa-libGLES-devel
+%endif
BuildRequires: xorg-x11-proto-devel
%ifarch %{ix86} x86_64
BuildRequires: xorg-x11-drv-intel-devel
@@ -215,7 +228,6 @@
BuildRequires: xvidcore-devel >= 0.9.1
# Audio framework support
-BuildRequires: SDL-devel
BuildRequires: sox-devel
BuildRequires: alsa-lib-devel
BuildRequires: jack-audio-connection-kit-devel
@@ -343,7 +355,11 @@
Requires: mythplugins = %{version}-%{release}
Requires: mythweb = %{version}
Requires: mythffmpeg = %{version}-%{release}
+%if 0%{?fedora} >= 19
+Requires: mariadb-server >= 5, mariadb >= 5
+%else
Requires: mysql-server >= 5, mysql >= 5
+%endif
Requires: xmltv
# Generate the required mythtv-frontend-api version string here so we only
@@ -413,7 +429,11 @@
Requires: mythtv-libs = %{version}-%{release}
Requires: freetype-devel >= 2
+%if 0%{?fedora} >= 19
+Requires: mariadb-devel >= 5
+%else
Requires: mysql-devel >= 5
+%endif
Requires: qt4-devel >= 4.6
Requires: lm_sensors-devel
Requires: lirc-devel
@@ -626,7 +646,6 @@
BuildArch: noarch
Requires: MySQL-python
-Requires: PyXML
Requires: python-lxml
%description -n python-MythTV
@@ -815,6 +834,8 @@
fi
%patch0 -p1 -b .mythtv
+%patch1 -p1 -b .mythlogserver
+%patch2 -p1 -b .types_h
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1031,7 +1052,7 @@
mkdir -p %{buildroot}%{_localstatedir}/cache/mythtv
mkdir -p %{buildroot}%{_localstatedir}/log/mythtv
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
- %if 0%{?fedora} >= 16
+ %if %{with_systemd}
mkdir -p %{buildroot}%{_unitdir}
%else
mkdir -p %{buildroot}%{_sysconfdir}/init.d
@@ -1047,7 +1068,7 @@
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
### SystemD based setup. ###
- %if 0%{?fedora} >= 16
+ %if %{with_systemd}
install -p -m 0644 %{SOURCE105} %{buildroot}%{_unitdir}/
install -p -m 0644 %{SOURCE104} %{buildroot}%{_sysconfdir}/logrotate.d/mythtv
# Install udev rules for devices that may initialize late in the boot
@@ -1157,7 +1178,7 @@
exit 0
%post backend
-%if 0%{?fedora} >= 16
+%if %{with_systemd}
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -1168,7 +1189,7 @@
%preun backend
-%if 0%{?fedora} >= 16
+%if %{with_systemd}
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable mythbackend.service > /dev/null 2>&1 || :
@@ -1182,7 +1203,7 @@
%endif
%postun backend
-%if 0%{?fedora} >= 16
+%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
@@ -1194,21 +1215,6 @@
fi
%endif
-%if 0%{?fedora} >= 16
-%triggerun -- mythtv < 0.24.1-3
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply httpd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save mythbackend >/dev/null 2>&1 ||:
-
-# If the package is allowed to autostart:
-/bin/systemctl --no-reload enable mythbackend.service >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del mythbackend >/dev/null 2>&1 || :
-/bin/systemctl try-restart mythbackend.service >/dev/null 2>&1 || :
-%endif
-
################################################################################
%files
@@ -1254,7 +1260,7 @@
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/cache/mythtv
-%if 0%{?fedora} >=16
+%if %{with_systemd}
%{_unitdir}/mythbackend.service
/lib/udev/rules.d/99-mythbackend.rules
%else
@@ -1322,8 +1328,8 @@
%{perl_vendorlib}/MythTV.pm
%dir %{perl_vendorlib}/MythTV
%{perl_vendorlib}/MythTV/*.pm
-%dir %{perl_vendorlib}/IO/Socket
-%dir %{perl_vendorlib}/IO/Socket/INET
+#%dir %{perl_vendorlib}/IO/Socket
+#%dir %{perl_vendorlib}/IO/Socket/INET
%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
%exclude %{perl_vendorarch}/auto/MythTV/.packlist
%endif
@@ -1451,6 +1457,18 @@
%changelog
+* Tue Feb 26 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-7
+- Update to latest fixes/0.26, v0.26.0-111-g3944ca9.
+- Add patch for mythlogserver segfault.
+- Add patch for includes in bundled ffmpeg.
+- Add conditionals for mariadb replacing mysql in rawhide (F19).
+
+* Sun Jan 20 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.26.0-5
+- Rebuilt for ffmpeg/x264
+
+* Sat Dec 22 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-4
+- Update to latest upstream release.
+
* Tue Dec 4 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-3
- Update to latest upstream release.
More information about the rpmfusion-commits
mailing list