rpms/mythtv/devel mythlogserver-segv.patch, NONE, 1.1 mythtv-0.26-fixes.patch, 1.3, 1.4 mythtv.spec, 1.116, 1.117
Richard Shaw
hobbes1069 at rpmfusion.org
Tue Mar 5 18:42:33 CET 2013
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20134
Modified Files:
mythtv-0.26-fixes.patch mythtv.spec
Added Files:
mythlogserver-segv.patch
Log Message:
* Tue Mar 5 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.
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-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.3 -r 1.4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythtv-0.26-fixes.patch 22 Dec 2012 22:45:07 -0000 1.3
+++ mythtv-0.26-fixes.patch 5 Mar 2013 17:42:32 -0000 1.4
@@ -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,10 +22,16 @@
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
@@ -30,20 +39,67 @@
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 | 117 +-
- mythtv/libs/libmythtv/decoderbase.h | 3 +-
- mythtv/libs/libmythtv/mythplayer.cpp | 41 +-
+ 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 +-
@@ -58,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 +-
@@ -75,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 +-
- 84 files changed, 6245 insertions(+), 3630 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
@@ -234,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"/>
+ <parameter name="-s" value="352x480"/>
+ <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"/>
+@@ -67,11 +67,11 @@
[...30930 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
@@ -21815,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
@@ -21935,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
@@ -21948,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
@@ -22184,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
@@ -22361,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 @@
@@ -22426,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/devel/mythtv.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mythtv.spec 20 Jan 2013 22:12:16 -0000 1.116
+++ mythtv.spec 5 Mar 2013 17:42:32 -0000 1.117
@@ -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-64-g637d6d8
+%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.2.git.%{_gitrev}%{?dist}
%else
-Release: 5%{?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,10 @@
# 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
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -146,17 +154,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
@@ -184,6 +189,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
@@ -625,7 +633,6 @@
BuildArch: noarch
Requires: MySQL-python
-Requires: PyXML
Requires: python-lxml
%description -n python-MythTV
@@ -814,6 +821,7 @@
fi
%patch0 -p1 -b .mythtv
+%patch1 -p1 -b .mythlogserver
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1030,7 +1038,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
@@ -1046,7 +1054,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
@@ -1156,7 +1164,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 || :
@@ -1167,7 +1175,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 || :
@@ -1181,7 +1189,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
@@ -1193,21 +1201,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
@@ -1253,7 +1246,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
@@ -1321,8 +1314,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
@@ -1450,6 +1443,10 @@
%changelog
+* Tue Mar 5 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.
+
* Sun Jan 20 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.26.0-5
- Rebuilt for ffmpeg/x264
More information about the rpmfusion-commits
mailing list