Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26853 Modified Files: mythtv-0.25-fixes.patch mythtv.spec Removed Files: mythbackend.init mythbackend.sysconfig Log Message: * Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25-3 - Removed obsolete build requirement for arts-devel. - Re-add %clean since it's still needed for mythweb. - Update logrotate config for systemd. mythtv-0.25-fixes.patch: mythplugins/mytharchive/i18n/mytharchive_fi.qm |binary mythplugins/mytharchive/i18n/mytharchive_fi.ts | 238 mythplugins/mythbrowser/i18n/mythbrowser_fi.qm |binary mythplugins/mythbrowser/i18n/mythbrowser_fi.ts | 44 mythplugins/mythgallery/i18n/mythgallery_fi.qm |binary mythplugins/mythgallery/i18n/mythgallery_fi.ts | 264 mythplugins/mythgame/i18n/mythgame_fi.qm |binary mythplugins/mythgame/i18n/mythgame_fi.ts | 178 mythplugins/mythmusic/i18n/mythmusic_fi.qm |binary mythplugins/mythmusic/i18n/mythmusic_fi.ts | 2219 +++++- mythplugins/mythnetvision/i18n/mythnetvision_fi.qm |binary mythplugins/mythnetvision/i18n/mythnetvision_fi.ts | 96 mythplugins/mythnetvision/mythnetvision/nettree.cpp | 8 mythplugins/mythnetvision/mythnetvision/rsseditor.cpp | 6 mythplugins/mythnews/i18n/mythnews_fi.qm |binary mythplugins/mythnews/i18n/mythnews_fi.ts | 44 mythplugins/mythweather/i18n/mythweather_fi.qm |binary mythplugins/mythweather/i18n/mythweather_fi.ts | 60 mythplugins/mythzoneminder/i18n/mythzoneminder_fi.qm |binary mythplugins/mythzoneminder/i18n/mythzoneminder_fi.ts | 84 mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 3 mythtv/VERSION | 2 mythtv/bindings/python/MythTV/mythproto.py | 2 mythtv/bindings/python/MythTV/static.py | 2 mythtv/configure | 15 mythtv/docs/doxygen-create-developer-docs.cfg | 2 mythtv/filters/yadif/filter_yadif.c | 2 mythtv/i18n/mythfrontend_fi.qm |binary mythtv/i18n/mythfrontend_fi.ts | 3662 ++++++---- mythtv/i18n/mythfrontend_nb.qm |binary mythtv/i18n/mythfrontend_nb.ts | 2 mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 mythtv/libs/libmyth/audio/audiooutputbase.h | 4 mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp | 27 mythtv/libs/libmyth/remoteutil.cpp | 16 mythtv/libs/libmyth/remoteutil.h | 1 mythtv/libs/libmyth/rssparse.h | 1 mythtv/libs/libmythbase/compat.h | 2 mythtv/libs/libmythbase/logging.cpp | 3 mythtv/libs/libmythbase/serverpool.cpp | 46 mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp | 6 mythtv/libs/libmythsoundtouch/STTypes.h | 2 mythtv/libs/libmythsoundtouch/libmythsoundtouch.pro | 1 mythtv/libs/libmythtv/audioinput.h | 1 mythtv/libs/libmythtv/avformatdecoder.cpp | 10 mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 mythtv/libs/libmythtv/libmythtv.pro | 1 mythtv/libs/libmythtv/mythairplayserver.cpp | 2 mythtv/libs/libmythtv/mythplayer.cpp | 30 mythtv/libs/libmythtv/mythplayer.h | 3 mythtv/libs/libmythtv/mythraopdevice.cpp | 5 mythtv/libs/libmythtv/playercontext.h | 4 mythtv/libs/libmythtv/ringbuffer.cpp | 8 mythtv/libs/libmythtv/teletextscreen.cpp | 8 mythtv/libs/libmythtv/tv_play.cpp | 26 mythtv/libs/libmythtv/tvremoteutil.cpp | 55 mythtv/libs/libmythtv/tvremoteutil.h | 7 mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 mythtv/libs/libmythtv/videodisplayprofile.h | 2 mythtv/libs/libmythtv/videoout_xv.cpp | 7 mythtv/libs/libmythtv/videoout_xv.h | 1 mythtv/libs/libmythtv/videooutbase.cpp | 48 mythtv/libs/libmythui/mythmainwindow.cpp | 2 mythtv/libs/libmythupnp/httprequest.cpp | 1 mythtv/programs/mythfrontend/audiogeneralsettings.cpp | 5 mythtv/programs/mythfrontend/globalsettings.cpp | 2 mythtv/programs/mythfrontend/guidegrid.cpp | 4 mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 mythtv/programs/mythtranscode/transcode.h | 5 mythtv/programs/mythutil/markuputils.cpp | 4 72 files changed, 5420 insertions(+), 1981 deletions(-) Index: mythtv-0.25-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-17/mythtv-0.25-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mythtv-0.25-fixes.patch 18 Apr 2012 20:43:49 -0000 1.2 +++ mythtv-0.25-fixes.patch 23 Apr 2012 15:11:18 -0000 1.3 @@ -22,39 +22,55 @@ mythtv/VERSION | 2 +- mythtv/bindings/python/MythTV/mythproto.py | 2 +- mythtv/bindings/python/MythTV/static.py | 2 +- + mythtv/configure | 15 +- mythtv/docs/doxygen-create-developer-docs.cfg | 2 +- mythtv/filters/yadif/filter_yadif.c | 2 +- mythtv/i18n/mythfrontend_fi.qm | Bin 532091 -> 613881 bytes mythtv/i18n/mythfrontend_fi.ts | 3662 +++++++++++++------- mythtv/i18n/mythfrontend_nb.qm | Bin 603663 -> 603587 bytes mythtv/i18n/mythfrontend_nb.ts | 2 +- - mythtv/libs/libmyth/audio/audiooutputbase.cpp | 11 +- + mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 2 +- + mythtv/libs/libmyth/audio/audiooutputbase.cpp | 55 +- + mythtv/libs/libmyth/audio/audiooutputbase.h | 4 + + mythtv/libs/libmyth/audio/audiooutputca.cpp | 2 +- + .../libmyth/audio/audiooutputdigitalencoder.cpp | 27 +- mythtv/libs/libmyth/remoteutil.cpp | 16 - mythtv/libs/libmyth/remoteutil.h | 1 - mythtv/libs/libmyth/rssparse.h | 1 + mythtv/libs/libmythbase/compat.h | 2 + mythtv/libs/libmythbase/logging.cpp | 3 +- + mythtv/libs/libmythbase/serverpool.cpp | 46 +- .../requesthandler/deletethread.cpp | 6 +- mythtv/libs/libmythsoundtouch/STTypes.h | 2 +- .../libs/libmythsoundtouch/libmythsoundtouch.pro | 1 + mythtv/libs/libmythtv/audioinput.h | 1 + + mythtv/libs/libmythtv/avformatdecoder.cpp | 10 +- mythtv/libs/libmythtv/dvdringbuffer.cpp | 49 +- + mythtv/libs/libmythtv/libmythtv.pro | 1 + mythtv/libs/libmythtv/mythairplayserver.cpp | 2 +- - mythtv/libs/libmythtv/mythraopdevice.cpp | 3 +- + mythtv/libs/libmythtv/mythplayer.cpp | 30 +- + mythtv/libs/libmythtv/mythplayer.h | 3 + + mythtv/libs/libmythtv/mythraopdevice.cpp | 5 +- mythtv/libs/libmythtv/playercontext.h | 4 +- mythtv/libs/libmythtv/ringbuffer.cpp | 8 +- + mythtv/libs/libmythtv/teletextscreen.cpp | 8 +- mythtv/libs/libmythtv/tv_play.cpp | 26 +- mythtv/libs/libmythtv/tvremoteutil.cpp | 55 +- mythtv/libs/libmythtv/tvremoteutil.h | 7 +- + mythtv/libs/libmythtv/videodisplayprofile.cpp | 3 - + mythtv/libs/libmythtv/videodisplayprofile.h | 2 - mythtv/libs/libmythtv/videoout_xv.cpp | 7 +- mythtv/libs/libmythtv/videoout_xv.h | 1 + - mythtv/libs/libmythtv/videooutbase.cpp | 28 +- + mythtv/libs/libmythtv/videooutbase.cpp | 48 +- + mythtv/libs/libmythui/mythmainwindow.cpp | 2 + mythtv/libs/libmythupnp/httprequest.cpp | 1 + + .../programs/mythfrontend/audiogeneralsettings.cpp | 5 +- + mythtv/programs/mythfrontend/globalsettings.cpp | 2 +- mythtv/programs/mythfrontend/guidegrid.cpp | 4 +- mythtv/programs/mythfrontend/scheduleeditor.cpp | 7 +- mythtv/programs/mythtranscode/transcode.h | 5 +- mythtv/programs/mythutil/markuputils.cpp | 4 +- - 56 files changed, 5278 insertions(+), 1895 deletions(-) + 72 files changed, 5420 insertions(+), 1981 deletions(-) diff --git a/mythplugins/mytharchive/i18n/mytharchive_fi.qm b/mythplugins/mytharchive/i18n/mytharchive_fi.qm index 2fc0f91..8e2d841 100644 @@ -5561,6 +5577,46 @@ SCHEMA_VERSION = 1299 NVSCHEMA_VERSION = 1007 MUSICSCHEMA_VERSION = 1018 +diff --git a/mythtv/configure b/mythtv/configure +index 5e9c8a8..09fbe4c 100755 +--- a/mythtv/configure ++++ b/mythtv/configure +@@ -1663,7 +1663,7 @@ zlib_encoder_select="zlib" + zmbv_decoder_select="zlib" + zmbv_encoder_select="zlib" + +-vaapi_deps="va_va_h" ++vaapi_deps="va_va_h va_va_glx_h va_va_x11_h" + vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" + + # parsers +@@ -1796,7 +1796,7 @@ v4l1_deps="backend v4l2 linux_videodev_h" + vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h" + xrandr_deps="x11" + xv_deps="x11" +-vaapi_deps="x11 opengl" ++vaapi_deps="x11 opengl va_va_h va_va_glx_h va_va_x11_h" + asi_deps="backend" + + <<BLOCKQUOTE +@@ -3956,14 +3956,9 @@ if enabled crystalhd; then + disable crystalhd; + fi + +-if enabled vaapi; then +- enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h || disable vaapi +- if enabled vaapi; then +- check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" || +- { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; } +- fi +-else +- disable vaapi ++if enabled vaapi && enabled va_va_h && enabled va_va_glx_h && enabled va_va_x11_h; then ++ check_cpp_condition va/va.h "VA_VERSION_HEX >= 0x001F0000" || ++ { echolog "VAAPI requires libva >= 0.31.1" && disable vaapi; } + fi + + if enabled dxva2; then diff --git a/mythtv/docs/doxygen-create-developer-docs.cfg b/mythtv/docs/doxygen-create-developer-docs.cfg index f246d5a..ab9a6bd 100644 --- a/mythtv/docs/doxygen-create-developer-docs.cfg @@ -12177,33 +12233,82 @@ </message> <message> <location filename="../themes/themestrings.h" line="610"/> +diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp +index 6beddd4..176252a 100644 +--- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp ++++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp +@@ -458,7 +458,7 @@ AudioOutputSettings* AudioOutputALSA::GetOutputSettings(bool passthrough) + QMap<QString, QString> *alsadevs = GetDevices("pcm"); + while(1) + { +- QString real_device = (((passthru || enc) && m_discretedigital) ? ++ QString real_device = ((passthrough && m_discretedigital) ? + passthru_device : main_device); + + QString desc = alsadevs->value(real_device); diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp -index f6a7a36..370884b 100644 +index f6a7a36..4024221 100644 --- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp -@@ -103,7 +103,7 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) : +@@ -103,8 +103,8 @@ AudioOutputBase::AudioOutputBase(const AudioSettings &settings) : src_out(NULL), kAudioSRCOutputSize(0), memory_corruption_test2(0xdeadbeef), memory_corruption_test3(0xdeadbeef), - m_configure_succeeded(true),m_length_last_data(0), +- m_spdifenc(NULL) + m_configure_succeeded(false),m_length_last_data(0), - m_spdifenc(NULL) ++ m_spdifenc(NULL), m_forcedprocessing(false) { src_in = (float *)AOALIGN(src_in_buf); -@@ -318,6 +318,12 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor) + memset(&src_data, 0, sizeof(SRC_DATA)); +@@ -170,7 +170,8 @@ void AudioOutputBase::InitSettings(const AudioSettings &settings) + output_settings = GetOutputSettingsUsers(false); + output_settingsdigital = GetOutputSettingsUsers(true); + +- max_channels = output_settings->BestSupportedChannels(); ++ max_channels = max(output_settings->BestSupportedChannels(), ++ output_settingsdigital->BestSupportedChannels()); + configured_channels = max_channels; + + upmix_default = max_channels > 2 ? +@@ -318,19 +319,41 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor) return; stretchfactor = lstretchfactor; + + int channels = needs_upmix || needs_downmix ? + configured_channels : source_channels; -+ if (channels < 1 || channels > 8) ++ if (channels < 1 || channels > 8 || !m_configure_succeeded) + return; + ++ bool willstretch = stretchfactor < 0.99f || stretchfactor > 1.01f; eff_stretchfactor = (int)(100000.0f * lstretchfactor + 0.5); ++ if (pSoundStretch) { -@@ -329,8 +335,7 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor) +- VBGENERAL(QString("Changing time stretch to %1").arg(stretchfactor)); +- pSoundStretch->setTempo(stretchfactor); ++ if (!willstretch && m_forcedprocessing) ++ { ++ m_forcedprocessing = false; ++ processing = false; ++ delete pSoundStretch; ++ pSoundStretch = NULL; ++ VBGENERAL(QString("Cancelling time stretch")); ++ bytes_per_frame = m_previousbpf; ++ waud = raud = 0; ++ reset_active.Ref(); ++ } ++ else ++ { ++ VBGENERAL(QString("Changing time stretch to %1") ++ .arg(stretchfactor)); ++ pSoundStretch->setTempo(stretchfactor); ++ } + } +- else if (stretchfactor != 1.0f) ++ else if (willstretch) + { VBGENERAL(QString("Using time stretch %1").arg(stretchfactor)); pSoundStretch = new soundtouch::SoundTouch(); pSoundStretch->setSampleRate(samplerate); @@ -12213,6 +12318,131 @@ pSoundStretch->setTempo(stretchfactor); pSoundStretch->setSetting(SETTING_SEQUENCE_MS, 35); /* If we weren't already processing we need to turn on float conversion +@@ -339,6 +362,8 @@ void AudioOutputBase::SetStretchFactorLocked(float lstretchfactor) + if (!processing) + { + processing = true; ++ m_forcedprocessing = true; ++ m_previousbpf = bytes_per_frame; + bytes_per_frame = source_channels * + AudioOutputSettings::SampleSize(FORMAT_FLT); + waud = raud = 0; +@@ -589,7 +614,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) + + waud = raud = 0; + reset_active.Clear(); +- actually_paused = processing = false; ++ actually_paused = processing = m_forcedprocessing = false; + + channels = settings.channels; + source_channels = lsource_channels; +@@ -637,7 +662,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) + .arg(output_settingsdigital->FeaturesToString()) + .arg(configured_channels) + .arg(channels) +- .arg(output_settings->IsSupportedChannels(channels)) ++ .arg(OutputSettings(enc || passthru)->IsSupportedChannels(channels)) + .arg(max_channels)); + + int dest_rate = 0; +@@ -646,7 +671,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) + // or if 48k override was checked in settings + if ((samplerate != 48000 && + gCoreContext->GetNumSetting("Audio48kOverride", false)) || +- (enc && (samplerate > 48000 || (need_resampler && dest_rate > 48000)))) ++ (enc && (samplerate > 48000))) + { + VBAUDIO("Forcing resample to 48 kHz"); + if (src_quality < 0) +@@ -654,8 +679,10 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) + need_resampler = true; + dest_rate = 48000; + } +- else if ( +- (need_resampler = !OutputSettings(enc)->IsSupportedRate(samplerate))) ++ // this will always be false for passthrough audio as ++ // CanPassthrough() already tested these conditions ++ else if ((need_resampler = ++ !OutputSettings(enc || passthru)->IsSupportedRate(samplerate))) + { + dest_rate = OutputSettings(enc)->NearestSupportedRate(samplerate); + } +@@ -738,7 +765,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) + if (need_resampler || needs_upmix || needs_downmix || + stretchfactor != 1.0f || (internal_vol && SWVolume()) || + (enc && output_format != FORMAT_S16) || +- !OutputSettings(enc)->IsSupportedFormat(output_format)) ++ !OutputSettings(enc || passthru)->IsSupportedFormat(output_format)) + { + VBAUDIO("Audio processing enabled"); + processing = true; +diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h +index 52d4b06..22a2851 100644 +--- a/mythtv/libs/libmyth/audio/audiooutputbase.h ++++ b/mythtv/libs/libmyth/audio/audiooutputbase.h +@@ -282,6 +282,10 @@ class AudioOutputBase : public AudioOutput, public MThread + + // SPDIF Encoder for digital passthrough + SPDIFEncoder *m_spdifenc; ++ ++ // Flag indicating if SetStretchFactor enabled audio float processing ++ bool m_forcedprocessing; ++ int m_previousbpf; + }; + + #endif +diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp +index 9bf6d63..126ebd4 100644 +--- a/mythtv/libs/libmyth/audio/audiooutputca.cpp ++++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp +@@ -892,7 +892,7 @@ AudioStreamBasicDescription *CoreAudioData::FormatsList(AudioStreamID s) + } + + // Add a terminating ID: +- list[listSize/sizeof(AudioStreamID)].mFormatID = 0; ++ list[listSize/sizeof(AudioStreamBasicDescription)].mFormatID = 0; + + return list; + } +diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp +index fd995a3..21229c0 100644 +--- a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp ++++ b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp +@@ -117,13 +117,28 @@ bool AudioOutputDigitalEncoder::Init( + av_context->bit_rate = bitrate; + av_context->sample_rate = samplerate; + av_context->channels = channels; +-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT( 52, 113, 0 ) +- av_context->channel_layout = AV_CH_LAYOUT_5POINT1; ++ switch (channels) ++ { ++ case 1: ++ av_context->channel_layout = AV_CH_LAYOUT_MONO; ++ break; ++ case 2: ++ av_context->channel_layout = AV_CH_LAYOUT_STEREO; ++ break; ++ case 3: ++ av_context->channel_layout = AV_CH_LAYOUT_SURROUND; ++ break; ++ case 4: ++ av_context->channel_layout = AV_CH_LAYOUT_4POINT0; ++ break; ++ case 5: ++ av_context->channel_layout = AV_CH_LAYOUT_5POINT0; ++ break; ++ default: ++ av_context->channel_layout = AV_CH_LAYOUT_5POINT1; ++ break; ++ } + av_context->sample_fmt = AV_SAMPLE_FMT_S16; +-#else +- av_context->channel_layout = CH_LAYOUT_5POINT1; +- av_context->sample_fmt = SAMPLE_FMT_S16; +-#endif + + // open it + ret = avcodec_open(av_context, codec); diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp index a326c5e..ca37630 100644 --- a/mythtv/libs/libmyth/remoteutil.cpp @@ -12291,6 +12521,78 @@ for (i = 0, name = &facilitynames[0]; name->c_name && strcmp(name->c_name, string); i++, name++); +diff --git a/mythtv/libs/libmythbase/serverpool.cpp b/mythtv/libs/libmythbase/serverpool.cpp +index 89d6dec..7ff6df8 100644 +--- a/mythtv/libs/libmythbase/serverpool.cpp ++++ b/mythtv/libs/libmythbase/serverpool.cpp +@@ -308,21 +308,22 @@ bool ServerPool::listen(QList<QHostAddress> addrs, quint16 port, + if (m_port == 0) + m_port = server->serverPort(); + } +- else if (requireall) +- { +- LOG(VB_GENERAL, LOG_ERR, QString("Failed listening on TCP %1:%2") +- .arg(PRETTYIP(it)).arg(port)); +- close(); +- server->disconnect(); +- server->deleteLater(); +- return false; +- } + else + { +- LOG(VB_GENERAL, LOG_WARNING, QString("Failed listening on TCP %1:%2") +- .arg(PRETTYIP(it)).arg(port)); ++ LOG(VB_GENERAL, LOG_ERR, ++ QString("Failed listening on TCP %1:%2 - Error %3: %4") ++ .arg(PRETTYIP(it)) ++ .arg(port) ++ .arg(server->serverError()) ++ .arg(server->errorString())); + server->disconnect(); + server->deleteLater(); ++ ++ if (requireall) ++ { ++ close(); ++ return false; ++ } + } + } + +@@ -365,21 +366,22 @@ bool ServerPool::bind(QList<QHostAddress> addrs, quint16 port, + .arg(PRETTYIP(it)).arg(port)); + m_udpSockets.append(socket); + } +- else if (requireall) +- { +- LOG(VB_GENERAL, LOG_ERR, QString("Failed binding to UDP %1:%2") +- .arg(PRETTYIP(it)).arg(port)); +- close(); +- socket->disconnect(); +- socket->deleteLater(); +- return false; +- } + else + { +- LOG(VB_GENERAL, LOG_WARNING, QString("Failed binding to UDP %1:%2") +- .arg(PRETTYIP(it)).arg(port)); ++ LOG(VB_GENERAL, LOG_ERR, ++ QString("Failed binding to UDP %1:%2 - Error %3: %4") ++ .arg(PRETTYIP(it)) ++ .arg(port) ++ .arg(socket->error()) ++ .arg(socket->errorString())); + socket->disconnect(); + socket->deleteLater(); ++ ++ if (requireall) ++ { ++ close(); ++ return false; ++ } + } + } + diff --git a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp b/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp index f5c8f27..e55fe14 100644 --- a/mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp @@ -12352,6 +12654,43 @@ class AudioInput { +diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp +index dd02e57..8311697 100644 +--- a/mythtv/libs/libmythtv/avformatdecoder.cpp ++++ b/mythtv/libs/libmythtv/avformatdecoder.cpp +@@ -53,10 +53,12 @@ extern "C" { + #include "videoout_d3d.h" + #endif + +-#ifdef USING_VAAPI ++#ifdef USING_GLVAAPI + #include "videoout_openglvaapi.h" ++#endif // USING_GLVAAPI ++#ifdef USING_VAAPI + #include "vaapicontext.h" +-#endif // USING_VAAPI ++#endif + + extern "C" { + #include "libavutil/avutil.h" +@@ -1845,7 +1847,7 @@ int AvFormatDecoder::ScanStreams(bool novideo) + video_codec_id = vdpau_mcid; + } + #endif // USING_VDPAU +-#ifdef USING_VAAPI ++#ifdef USING_GLVAAPI + MythCodecID vaapi_mcid; + PixelFormat pix_fmt = PIX_FMT_YUV420P; + vaapi_mcid = VideoOutputOpenGLVAAPI::GetBestSupportedCodec( +@@ -1862,7 +1864,7 @@ int AvFormatDecoder::ScanStreams(bool novideo) + enc->pix_fmt = pix_fmt; + } + } +-#endif // USING_VAAPI ++#endif // USING_GLVAAPI + #ifdef USING_DXVA2 + MythCodecID dxva2_mcid; + PixelFormat pix_fmt = PIX_FMT_YUV420P; diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp index 5a445a0..3a0573a 100644 --- a/mythtv/libs/libmythtv/dvdringbuffer.cpp @@ -12427,6 +12766,18 @@ LOG(VB_PLAYBACK, LOG_INFO, LOC + QString("DVD Serial Number %1").arg(m_serialnumber)); +diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro +index f50d2cb..6df71d0 100644 +--- a/mythtv/libs/libmythtv/libmythtv.pro ++++ b/mythtv/libs/libmythtv/libmythtv.pro +@@ -407,6 +407,7 @@ using_frontend { + LIBS += -lva -lva-x11 -lva-glx + using_opengl_video:HEADERS += videoout_openglvaapi.h + using_opengl_video:SOURCES += videoout_openglvaapi.cpp ++ using_opengl_video:DEFINES += USING_GLVAAPI + } + + # Misc. frontend diff --git a/mythtv/libs/libmythtv/mythairplayserver.cpp b/mythtv/libs/libmythtv/mythairplayserver.cpp index 9cea0b7..18aa13f 100644 --- a/mythtv/libs/libmythtv/mythairplayserver.cpp @@ -12440,8 +12791,84 @@ { LOG(VB_GENERAL, LOG_INFO, LOC + QString("Listening for connections on port %1") +diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp +index 1261340..5ba55d6 100644 +--- a/mythtv/libs/libmythtv/mythplayer.cpp ++++ b/mythtv/libs/libmythtv/mythplayer.cpp +@@ -2317,9 +2317,6 @@ void MythPlayer::VideoStart(void) + videoOutput, fr_int, rf_int, m_double_framerate); + } + +- if (isDummy) +- ChangeSpeed(); +- + InitAVSync(); + videosync->Start(); + } +@@ -3479,15 +3476,7 @@ void MythPlayer::ChangeSpeed(void) + if (normal_speed && audio.HasAudioOut()) + { + audio.SetStretchFactor(play_speed); +- if (decoder) +- { +- bool disable = (play_speed < 0.99f) || (play_speed > 1.01f); +- LOG(VB_PLAYBACK, LOG_INFO, LOC + +- QString("Stretch Factor %1, %2 passthru ") +- .arg(audio.GetStretchFactor()) +- .arg((disable) ? "disable" : "allow")); +- decoder->SetDisablePassThrough(disable); +- } ++ syncWithAudioStretch(); + } + } + +@@ -4903,7 +4892,7 @@ void MythPlayer::SetDecoder(DecoderBase *dec) + } + decoder_change_lock.unlock(); + } +- ++ syncWithAudioStretch(); + totalDecoderPause = false; + } + +@@ -5100,6 +5089,21 @@ void MythPlayer::SaveTotalFrames(void) + decoder->SaveTotalFrames(); + } + ++void MythPlayer::syncWithAudioStretch() ++{ ++ if (decoder && audio.HasAudioOut()) ++ { ++ float stretch = audio.GetStretchFactor(); ++ bool disable = (stretch < 0.99f) || (stretch > 1.01f); ++ LOG(VB_PLAYBACK, LOG_INFO, LOC + ++ QString("Stretch Factor %1, %2 passthru ") ++ .arg(audio.GetStretchFactor()) ++ .arg((disable) ? "disable" : "allow")); ++ decoder->SetDisablePassThrough(disable); ++ } ++ return; ++} ++ + static unsigned dbg_ident(const MythPlayer *player) + { + static QMutex dbg_lock; +diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h +index 127b79f..a005437 100644 +--- a/mythtv/libs/libmythtv/mythplayer.h ++++ b/mythtv/libs/libmythtv/mythplayer.h +@@ -778,6 +778,9 @@ class MTV_PUBLIC MythPlayer + + // Debugging variables + Jitterometer *output_jmeter; ++ ++ private: ++ void syncWithAudioStretch(); + }; + + #endif diff --git a/mythtv/libs/libmythtv/mythraopdevice.cpp b/mythtv/libs/libmythtv/mythraopdevice.cpp -index 82a6a61..887de97 100644 +index 82a6a61..f27f166 100644 --- a/mythtv/libs/libmythtv/mythraopdevice.cpp +++ b/mythtv/libs/libmythtv/mythraopdevice.cpp @@ -1,6 +1,7 @@ @@ -12461,6 +12888,16 @@ { LOG(VB_GENERAL, LOG_INFO, LOC + QString("Listening for connections on port %1").arg(m_setupPort)); +@@ -242,8 +243,8 @@ void MythRAOPDevice::deleteClient(void) + if ((*it)->GetSocket()->state() == QTcpSocket::UnconnectedState) + { + LOG(VB_GENERAL, LOG_INFO, LOC + "Removing client connection."); +- delete *it; + m_clients.removeOne(*it); ++ delete *it; + return; + } + } diff --git a/mythtv/libs/libmythtv/playercontext.h b/mythtv/libs/libmythtv/playercontext.h index 5854de4..a4ce9f1 100644 --- a/mythtv/libs/libmythtv/playercontext.h @@ -12518,6 +12955,25 @@ } } else +diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp +index 5490672..6bb0e13 100644 +--- a/mythtv/libs/libmythtv/teletextscreen.cpp ++++ b/mythtv/libs/libmythtv/teletextscreen.cpp +@@ -65,8 +65,12 @@ bool TeletextScreen::Create(void) + void TeletextScreen::ClearScreen(void) + { + DeleteAllChildren(); +- for (int i = 0; i < m_rowImages.size(); i++) +- delete m_rowImages.value(i); ++ QHash<int, QImage*>::iterator it = m_rowImages.begin(); ++ for (; it != m_rowImages.end(); ++it) ++ { ++ if (*it) ++ delete (*it); ++ } + m_rowImages.clear(); + SetRedraw(); + } diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp index d1133c5..912b46f 100644 --- a/mythtv/libs/libmythtv/tv_play.cpp @@ -12694,6 +13150,48 @@ MTV_PUBLIC vector<InputInfo> RemoteRequestFreeInputList( uint cardid, const vector<uint> &excluded_cardids); MTV_PUBLIC InputInfo RemoteRequestBusyInputID(uint cardid); +diff --git a/mythtv/libs/libmythtv/videodisplayprofile.cpp b/mythtv/libs/libmythtv/videodisplayprofile.cpp +index f2995d3..ccad78e 100644 +--- a/mythtv/libs/libmythtv/videodisplayprofile.cpp ++++ b/mythtv/libs/libmythtv/videodisplayprofile.cpp +@@ -1101,7 +1101,6 @@ void VideoDisplayProfile::CreateVDPAUProfiles(const QString &hostname) + "vdpauskipchroma,vdpaucolorspace=auto"); + } + +-#if defined(Q_OS_MACX) + void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname) + { + (void) QObject::tr("VDA High Quality", "Sample: VDA high quality"); +@@ -1140,7 +1139,6 @@ void VideoDisplayProfile::CreateVDAProfiles(const QString &hostname) + "opengldoubleratelinearblend", "opengllinearblend", + ""); + } +-#endif + + void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname) + { +@@ -1172,7 +1170,6 @@ void VideoDisplayProfile::CreateOpenGLProfiles(const QString &hostname) + void VideoDisplayProfile::CreateProfiles(const QString &hostname) + { + CreateNewProfiles(hostname); +- CreateVDPAUProfiles(hostname); + } + + QStringList VideoDisplayProfile::GetVideoRenderers(const QString &decoder) +diff --git a/mythtv/libs/libmythtv/videodisplayprofile.h b/mythtv/libs/libmythtv/videodisplayprofile.h +index 3df92bf..d314d05 100644 +--- a/mythtv/libs/libmythtv/videodisplayprofile.h ++++ b/mythtv/libs/libmythtv/videodisplayprofile.h +@@ -150,9 +150,7 @@ class MTV_PUBLIC VideoDisplayProfile + static void CreateProfiles(const QString &hostname); + static void CreateNewProfiles(const QString &hostname); + static void CreateVDPAUProfiles(const QString &hostname); +-#if defined(Q_OS_MACX) + static void CreateVDAProfiles(const QString &hostname); +-#endif + static void CreateOpenGLProfiles(const QString &hostname); + + static QStringList GetVideoRenderers(const QString &decoder); diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp index f2f5827..01e7580 100644 --- a/mythtv/libs/libmythtv/videoout_xv.cpp @@ -12739,10 +13237,66 @@ QMap<PictureAttribute,int> xv_attribute_max; QMap<PictureAttribute,int> xv_attribute_def; diff --git a/mythtv/libs/libmythtv/videooutbase.cpp b/mythtv/libs/libmythtv/videooutbase.cpp -index 59e4bb1..443570f 100644 +index 59e4bb1..b0b7892 100644 --- a/mythtv/libs/libmythtv/videooutbase.cpp +++ b/mythtv/libs/libmythtv/videooutbase.cpp -@@ -1829,18 +1829,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize) +@@ -38,10 +38,11 @@ + #endif + + #ifdef USING_VAAPI +-#include "videoout_openglvaapi.h" + #include "videoout_nullvaapi.h" + #endif +- ++#ifdef USING_GLVAAPI ++#include "videoout_openglvaapi.h" ++#endif + #include "videoout_null.h" + #include "dithertable.h" + +@@ -96,9 +97,11 @@ void VideoOutput::GetRenderOptions(render_opts &opts) + #endif // USING_VDPAU + + #ifdef USING_VAAPI +- VideoOutputOpenGLVAAPI::GetRenderOptions(opts); + VideoOutputNullVAAPI::GetRenderOptions(opts); + #endif // USING_VAAPI ++#ifdef USING_GLVAAPI ++ VideoOutputOpenGLVAAPI::GetRenderOptions(opts); ++#endif // USING_GLVAAPI + } + + /** +@@ -161,9 +164,9 @@ VideoOutput *VideoOutput::Create( + renderers += VideoOutputVDPAU::GetAllowedRenderers(codec_id, video_dim); + #endif // USING_VDPAU + +-#ifdef USING_VAAPI ++#ifdef USING_GLVAAPI + renderers += VideoOutputOpenGLVAAPI::GetAllowedRenderers(codec_id, video_dim); +-#endif // USING_VAAPI ++#endif // USING_GLVAAPI + } + + LOG(VB_PLAYBACK, LOG_INFO, LOC + "Allowed renderers: " + +@@ -226,12 +229,13 @@ VideoOutput *VideoOutput::Create( + #endif // USING_VDPAU + + #ifdef USING_VAAPI +- if (renderer == "openglvaapi") +- vo = new VideoOutputOpenGLVAAPI(); + if (renderer == "nullvaapi") + vo = new VideoOutputNullVAAPI(); + #endif // USING_VAAPI +- ++#ifdef USING_GLVAAPI ++ if (renderer == "openglvaapi") ++ vo = new VideoOutputOpenGLVAAPI(); ++#endif // USING_GLVAAPI + #ifdef USING_XV + if (xvlist.contains(renderer)) + vo = new VideoOutputXv(); +@@ -1829,18 +1833,32 @@ void VideoOutput::InitDisplayMeasurements(uint width, uint height, bool resize) int VideoOutput::CalcHueBase(const QString &adaptor_name) { @@ -12782,6 +13336,20 @@ - return 0; //< nVidia normal + return hue_adj; } +diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp +index 219d932..a2edee1 100644 +--- a/mythtv/libs/libmythui/mythmainwindow.cpp ++++ b/mythtv/libs/libmythui/mythmainwindow.cpp +@@ -1290,7 +1290,9 @@ void MythMainWindow::attach(QWidget *child) + currentWidget()->setEnabled(false); + + d->widgetList.push_back(child); ++#ifndef Q_WS_MACX + child->winId(); ++#endif + child->raise(); + child->setFocus(); + child->setMouseTracking(true); diff --git a/mythtv/libs/libmythupnp/httprequest.cpp b/mythtv/libs/libmythupnp/httprequest.cpp index e0a93cc..4885de3 100644 --- a/mythtv/libs/libmythupnp/httprequest.cpp @@ -12794,6 +13362,42 @@ { "pdf" , "application/pdf" }, { "avi" , "video/avi" }, { "css" , "text/css" }, +diff --git a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp +index 7a676fd..7d40e09 100644 +--- a/mythtv/programs/mythfrontend/audiogeneralsettings.cpp ++++ b/mythtv/programs/mythfrontend/audiogeneralsettings.cpp +@@ -354,7 +354,8 @@ AudioOutputSettings AudioConfigSettings::UpdateCapabilities( + m_MaxAudioChannels->resetMaxCount(3); + for (int i = 1; i <= max_speakers; i++) + { +- if (invalid || settings.IsSupportedChannels(i)) ++ if (invalid || settings.IsSupportedChannels(i) || ++ settingsdigital.IsSupportedChannels(i)) + { + QString txt; + +@@ -415,6 +416,8 @@ void AudioConfigSettings::AudioAdvanced() + + if (audiosettings.exec() == kDialogCodeAccepted) + { ++ // Rescan audio list to check of override digital device ++ AudioRescan(); + bool LPCM2 = settings.canFeature(FEATURE_LPCM) && + gCoreContext->GetNumSetting("StereoPCM", false); + // restore speakers configure only of StereoPCM has changed and +diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp +index 0983623..b93931e 100644 +--- a/mythtv/programs/mythfrontend/globalsettings.cpp ++++ b/mythtv/programs/mythfrontend/globalsettings.cpp +@@ -1169,7 +1169,7 @@ PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) : + } + #endif + +-#ifdef USING_OPENGL ++#ifdef USING_OPENGL_VIDEO + if (!profiles.contains("OpenGL Normal") && + !profiles.contains("OpenGL High Quality") && + !profiles.contains("OpenGL Slim")) diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp index 6dbf1aa..17d5fad 100644 --- a/mythtv/programs/mythfrontend/guidegrid.cpp Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-17/mythtv.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- mythtv.spec 18 Apr 2012 20:43:49 -0000 1.92 +++ mythtv.spec 23 Apr 2012 15:11:18 -0000 1.93 @@ -61,7 +61,7 @@ # Git revision and branch ID # 0.24 release: git tag v0.24.1 -%define _gitrev 40f3bae +%define _gitrev 1a671d0 # Mythtv and plugins from github.com %global githash1 g1f5962a @@ -86,7 +86,7 @@ Release: 0.1.git.%{_gitrev}%{?dist} #Release: 0.1.rc1%{?dist} %else -Release: 2%{?dist} +Release: 3%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -147,8 +147,8 @@ Patch2: mythtv_0.25_gcc_4.7.patch Source10: PACKAGE-LICENSING -Source101: mythbackend.sysconfig -Source102: mythbackend.init +#Source101: mythbackend.sysconfig +#Source102: mythbackend.init Source103: mythbackend.logrotate Source104: mythbackend.service Source106: mythfrontend.png @@ -224,15 +224,13 @@ BuildRequires: libvorbis-devel >= 1.0 BuildRequires: mjpegtools-devel >= 1.6.1 BuildRequires: taglib-devel >= 1.6 -# Is transcode really a BR? -#BuildRequires: transcode >= 0.6.8 BuildRequires: x264-devel BuildRequires: xvidcore-devel >= 0.9.1 # Audio framework support +BuildRequires: SDL-devel BuildRequires: sox-devel BuildRequires: alsa-lib-devel -BuildRequires: arts-devel BuildRequires: jack-audio-connection-kit-devel %if %{with_pulseaudio} BuildRequires: pulseaudio-libs-devel @@ -375,15 +373,15 @@ MythTV implements the following DVR features, and more, with a unified graphical interface: - - Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV. - - Video compression using RTjpeg or MPEG-4, and support for DVB and - hardware encoder cards/devices. - - Program listing retrieval using XMLTV - - Themable, semi-transparent on-screen display - - Electronic program guide - - Scheduled recording of TV programs - - Resolution of conflicts between scheduled recordings - - Basic video editing +- Basic 'live-tv' functionality. Pause/Fast Forward/Rewind "live" TV. +- Video compression using RTjpeg or MPEG-4, and support for DVB and + hardware encoder cards/devices. +- Program listing retrieval using XMLTV +- Themable, semi-transparent on-screen display +- Electronic program guide +- Scheduled recording of TV programs +- Resolution of conflicts between scheduled recordings +- Basic video editing ################################################################################ @@ -463,7 +461,6 @@ # Audio framework support Requires: alsa-lib-devel -Requires: arts-devel Requires: jack-audio-connection-kit-devel %if %{with_pulseaudio} Requires: pulseaudio-libs-devel @@ -835,7 +832,7 @@ %setup -q -T -b 1 -n MythTV-mythweb-%{githash4} # Fix up permissions for MythWeb - chmod -R g-w ./* +chmod -R g-w ./* # Remove execute bits from some php mythweb files # chmod -x mythweb/classes/*.php @@ -883,32 +880,9 @@ # We also need Xv libs to build XvMCNVIDIA # sed -i -e 's,VENDOR_XVMC_LIBS="-lXvMCNVIDIA",VENDOR_XVMC_LIBS="-lXvMCNVIDIA -lXv",' configure -# On to mythplugins popd -##### MythPlugins -%if %{with_plugins} - -#pushd mythplugins - -# Fix /mnt/store -> /var/lib/mythmusic -# cd mythmusic -# sed -i -e's,/mnt/store/music,%{_localstatedir}/lib/mythmusic,' mythmusic/globalsettings.cpp -# cd .. - -# Fix /mnt/store -> /var/lib/mythvideo -# cd mythvideo -# sed -i -e 's,/share/Movies/dvd,%{_localstatedir}/lib/mythvideo,' mythvideo/globalsettings.cpp -# cd .. - -# And back to the compile root -#popd - - - - -%endif ################################################################################ @@ -988,6 +962,7 @@ # Insert rpm version-release for mythbackend --version output echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION + echo 'BRANCH="%{branch}"' >> VERSION # Make make %{?_smp_mflags} @@ -1079,10 +1054,6 @@ ################################################################################ %install - -# Clean - rm -rf %{buildroot} - # First, install MythTV pushd mythtv @@ -1295,6 +1266,7 @@ %{_bindir}/mythmediaserver %{_bindir}/mythreplex %{_bindir}/mythffmpeg +%{_bindir}/mythffplay %{_datadir}/mythtv/MXML_scpd.xml %{_datadir}/mythtv/backend-config/ %attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv @@ -1499,7 +1471,20 @@ ################################################################################ +%clean +rm -rf %{buildroot} +%if %{with_mythweb} +rm -rf ../MythTV-mythweb-%{githash4} +%endif + +################################################################################ + %changelog +* Sat Apr 21 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25-3 +- Removed obsolete build requirement for arts-devel. +- Re-add %%clean since it's still needed for mythweb. +- Update logrotate config for systemd. + * Wed Apr 18 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25-2 - Update to latest fixes/0.25. - Change --logfile to --logpath for init files. @@ -1613,414 +1598,3 @@ * Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.24-0.1.svn.r23902 - Update to svn trunk, revision 23902 - Starts tracking 0.24-bound svn trunk, now that 0.23 has branched - -* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.2.rc1 -- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less) - -* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23718 -- Update to svn trunk, revision 23718 - -* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23702 -- Update to svn trunk, revision 23702 -- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins - -* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23662 -- Update to svn trunk, revision 23662 - -* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23630 -- Update to svn trunk, revision 23630 -- Make mythbackend --version actually print useful stuff now (like pkg ver) - -* Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23586 -- Update to svn trunk, revision 23586 -- Attempt to fix implicit link issue w/XvMCW - -* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23535 -- Update to svn trunk, revision 23535 - -* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23479 -- Update to svn trunk, revision 23479 -- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel - -* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23456 -- Update to svn trunk, revision 23456 - -* Tue Feb 02 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23443 -- Update to svn trunk, revision 23443 -- Don't try applying 0.22 svn fixes branch patches to 0.23 svn trunk, duh - -* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.23-0.1.svn.r23433 -- Update to svn trunk, revision 23433 -- Drop dropped mythflix plugin -- Add new mythnetvision plugin - -* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-2 -- Update to release-0-22-fixes branch, svn revision 22880 - -* Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-1 -- Update to 0.22 release - -* Sat Oct 31 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.9.rc2 -- Update to 0.22-rc2 - -* Tue Oct 27 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.8.rc1 -- Update to release-0-22-fixes branch, svn revision 22579 - -* Tue Oct 20 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.7.rc1 -- Update to release-0-22-fixes branch, svn revision 22548 - -* Fri Oct 16 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.6.rc1 -- Update to release-0-22-fixes branch, svn revision 22507 - -* Wed Oct 14 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.5.rc1 -- Update to 0.22-rc1 -- Now tracking release-0-22-fixes branch - -* Tue Oct 13 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22427 -- Update to pre-0.22 svn trunk revision 22427 -- Conditionalize R: php-process on F11+ so we can build and - install properly on F10 (builds forthcoming once 0.22 is out) - -* Sun Oct 11 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22366 -- Update to pre-0.22 svn trunk revision 22366 -- Disable faac by default, since its been deteremined to be non-free now - -* Thu Oct 08 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22304 -- Update to pre-0.22 svn trunk revision 22304 - -* Tue Oct 06 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22270 -- Update to pre-0.22 svn trunk revision 22270 -- Fix temp include path for building plugins -- Drop some old shouldn't-be-needed-anymore BR -- Use fftw v3 instead of v2 now - -* Sun Oct 04 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22228 -- Update to pre-0.22 svn trunk revision 22228 - -* Fri Oct 02 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22179 -- Update to pre-0.22 svn trunk revision 22179 -- Drop BR: libmad-devel, its no longer used - -* Wed Sep 30 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22144 -- Update to pre-0.22 svn trunk revision 22144 - -* Sat Sep 26 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r22076 -- Update to pre-0.22 svn trunk revision 22076 - -* Fri Sep 18 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r21940 -- Update to pre-0.22 svn trunk revision 21940 -- Include initial cut of semi-experimental advanced imon/lcdproc icon support -- Assorted spec enhancements from James Twyford (via mythtv trac ticket 7090) - -* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r21902 -- Update to pre-0.22 svn trunk revision 21902 - -* Wed Sep 16 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.4.svn.r21864 -- Fix botched arch-specific handling of vdpau support - -* Tue Sep 15 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.3.svn.r21864 -- Oops, no libvdpau for powerpc - -* Mon Sep 14 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21864 -- Update to pre-0.22 svn trunk revision 21864 -- Enable vdpau support, now that libvdpau is packaged in Fedora - -* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21778 -- Update to pre-0.22 svn trunk revision 21778 -- Build for ppc again, breakage is fixed - -* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21770 -- Update to pre-0.22 svn trunk revision 21770 - -* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21745 -- Update to pre-0.22 svn trunk revision 21745 - -* Sun Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21685 -- Update to pre-0.22 svn trunk revision 21685 - -* Fri Sep 05 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21667 -- Update to pre-0.22 svn trunk revision 21667 - -* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21591 -- Update to pre-0.22 svn trunk revision 21591 -- ExcludeArch: ppc/ppc64 for now, since it keeps failing to build - and I just don't have the time to investigate the fix at the moment, - so both ppc mythtv svn trunk users will just have to deal with it... - -* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21585 -- Update to pre-0.22 svn trunk revision 21585 - -* Mon Aug 17 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21336 -- Update to pre-0.22 svn trunk revision 21336 - -* Sat Aug 09 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21179 -- Update to pre-0.22 svn trunk revision 21179 - -* Tue Aug 04 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r21118 -- Update to pre-0.22 svn trunk revision 21118 -- Add infra for builds with vdpau support (need libvdpau in either - Fedora or RPM Fusion before we can enable by default...) - -* Sat Jun 20 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20728 -- Update to pre-0.22 svn trunk revision 20728 -- Drop BR: kdelibs3-devel, MythBrowser ported to qt4 now (rfbz#626) - -* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20701 -- Update to pre-0.22 svn trunk revision 20701 - -* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20668 -- Update to pre-0.22 svn trunk revision 20668 - -* Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20586 -- Update to pre-0.22 svn trunk revision 20586 -- Fix upgrade path for people that have mythphone installed (rfbz#596) -- Remove ExcludeArch: ppc64, build deps now present - -* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20488 -- Update to pre-0.22 svn trunk, revision 20488 - -* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20462 -- Update to pre-0.22 svn trunk, revision 20462 - -* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20448 -- Update to pre-0.22 svn trunk, revision 20448 -- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567) - -* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20371 -- Update to pre-0.22 svn trunk, revision 20371 -- Relocate Requires: wget to the sub-packages where necessary (rfbz#384) -- Don't use a52dec, mythtv has its own internal support these days - -* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20317 -- Update to pre-0.22 svn trunk, revision 20317 - -* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.2.svn.r20293 -- Update to pre-0.22 svn trunk, revision 20293 -- Add BuildRequires: phonon-devel - -* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273 -- rebuild for new F11 features - -* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r20273 -- Update to pre-0.22 svn trunk, revision 20273 - -* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r20232 -- Update to pre-0.22 svn trunk, revision 20232 - -* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r20196 -- Update to pre-0.22 svn trunk, revision r20196 -- Carries work-around for qt 4.5 "everthing is a prepared statement now" - bug/quirk (rpmfusion bz#421) - -* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r20107 -- Update to pre-0.22 svn trunk, revision 20107 -- Features misc gcc 4.4 and qt 4.5 build fixage - -* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r20089 -- Update to pre-0.22 svn trunk, revision 20089 - -* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r20019 -- Update to pre-0.22 svn trunk, revision 20019 - -* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19980 -- Update to pre-0.22 svn trunk, revision 19980 - -* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19874 -- Update to pre-0.22 svn trunk, revision 19874 - -* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19811 -- Update to pre-0.22 svn trunk, revision 19811 -- Drop mythcontrols plugin (functionality merged into mythfrontend) -- Re-enable building iptv support - -* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19722 -- Update to pre-0.22 svn trunk, revision 19722 -- MythPhone plugin is dead as a doornail (MythTV changeset 19702) - -* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19721 -- Update to pre-0.22 svn trunk, revision 19721 - -* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19630 -- Update to pre-0.22 svn trunk, revision 19630 -- Fix a %%files list screw-up w/mythgame-emulators nukage - -* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19622 -- Update to pre-0.22 svn trunk, revision 19622 - -* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19534 -- Update to pre-0.22 svn trunk, revision 19534 -- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled - -* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19467 -- Update to pre-0.22 svn trunk, revision 19467 - -* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; 0.22-0.1.svn.r19390 -- MythTV svn trunk (pre-0.22), revision 19390 -- Re-enable fast cmov on x86_64 by default -- Add BR: yasm-devel to enable yasm-specific improvements - -* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net&gt; 0.22-0.1.svn -- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps -- Major cleanup and porting from my personal spec (which was a combination - of works from atrpms and some of Jarod's earlier works). -- Add a few more --with and --without options, including the ability to - disable specific mythplugins and/or all plugins. - -* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-15 -- Update to release-0-21-fixes patches (r19344) -- Includes critical fix for supporting use of FireWire cable - boxes w/Fedora's native FireWire driver stack (finally!) -- Fix missing package ownership of some stray dirs (rpmfusion bz#222) - -* Fri Nov 28 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-14 -- Update release-0-21-fixes patches (r19169) -- Should resolve 720p playback stutter, rpmfusion bz#186 - -* Tue Oct 14 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-13 -- Enable fast cmov on x86_64 -- Disable mythgame-emulators convenience meta-package, deps not - available in the free repo (if available at all) - -* Mon Oct 06 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-12 -- Update release-0-21-fixes patches (r18567) - -* Tue Sep 23 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-11 -- Work-around for broken cdparanoia header (rhbz#463009) - -* Wed Sep 17 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-10 -- Nuke a bunch of configure flags that really shouldn't be - enabled anymore, per discussion with mythtv devs. - -* Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-9 -- Conditionalize some qt/qt3 stuff so spec builds on - all currently supported Fedora releases -- Add work-around for lirc-libs mock quirk on f8 builds - -* Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-8 -- Don't BR: libdvdcss-devel -- Update release-0-21-fixes patches (r18161) -- Rebuild for libraw1394 v2.0.0 - -* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-7 -- rebuild - -* Sun Jul 20 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-7 -- Disable XvMC VLD and Pro support on ppc due to lack of - openchrome driver. - -* Sat Jul 19 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-6 -- Fix spec typo -- Disable mythstream patch for now, too much fuzz, revisit later - -* Fri Jul 18 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-5 -- Update release-0-21-fixes patches (r17859) -- Don't use %%bcond, breaks on some older buildsystems -- Put several bits in -common sub-package, as both backend - and frontend may need them for one reason or another - -* Fri May 16 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-4 -- Add BR: xorg-x11-drv-i810-devel, xorg-x11-drv-openchrome-devel -- Make building with nVidia XvMC an available custom option, fix up - conflict between it and other XvMC implementations -- Update release-0-21-fixes patches (r17338) - -* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-3 -- Fix up PACKAGE-LICENSING inclusion - -* Sat Apr 05 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-2 -- RPMFusion package review cleanups -- Put mythtv-setup.desktop in mythtv-setup package -- Fix up initscript to start properly -- Drop unused %%ghostattr define -- Attempt to clarify licensing -- Clean up assorted Requires and BuildRequires -- Update release-0-21-fixes patches (r16965) - -* Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-1 -- MythTV 0.21 (r16468) -- Add release-0-21-fixes for DVD menu display fix (r16486) - -* Tue Mar 04 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.17.r16394 -- Update to latest release-0-21-fixes pre-release branch code (16394). - -* Fri Feb 29 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.16.r16316 -- Update to latest release-0-21-fixes pre-release branch code (16316). -- Add mythgame-emulators meta-package that requires a bunch of - emulators for roms mythgame knows about. -- Account for python egg on f9+ -- Enable gsm support by default - -* Wed Feb 27 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.15.r16307 -- Update to latest release-0-21-fixes pre-release branch code (16307). -- Try to fix up a bunch of rpmlint warnings and errors. - -* Sat Feb 23 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.14.r16238 -- Update to latest svn trunk (16238). -- Package up python bits. - -* Thu Feb 14 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.13.r16019 -- Update to latest svn trunk (16019). - -* Mon Feb 11 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.12.r15914 -- Update to latest svn trunk (15914). -- Turn on multi-threaded video decoding. - -* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.11.r15699 -- More spec file overhauling, make it build in Fedora 9 - -* Thu Jan 31 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.10.r15699 -- Update to latest svn trunk (15699). -- Misc spec reformatting. - -* Sat Jan 26 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.9.r15614 -- Update to latest svn trunk (15614). - -* Tue Jan 01 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.8.r15281 -- Update to latest svn trunk (15281). -- Fix up version-release insertion in mythbackend --version output - -* Fri Dec 07 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.7.r15081 -- Update to latest svn trunk (15081). - -* Sat Nov 17 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.6.r14888 -- Update to latest svn trunk (14888). - -* Wed Oct 17 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.6.r14695 -- Update to latest svn trunk (14695). - -* Fri Oct 12 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.6.r14667 -- Update to latest svn trunk (14667). -- Build dvb support against kernel-headers instead -- Drop unnecessary patches -- Tweak BR: to not use any file deps (I only care about recent distros) -- Rework mythweb bits to be compliant w/Fedora packaging guidelines -- Enable OpenGL video output support -- Make dvb and opengl bits non-conditional (always enabled) - -* Wed Oct 10 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.5.r14658 -- Update to latest svn trunk (14658). -- Tweak configure options a bit more - -* Tue Oct 02 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.4.r14589 -- Update to latest svn trunk (14589). -- Restructure how optflags are passed into build -- Nuke some extra non-standard macros -- Drop ancient dvb tarball, create with_dvb option, always using v4l-devel - -* Wed Sep 12 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.4.r14488 -- Update to latest svn trunk (14488). - -* Tue Aug 28 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.3.r14346 -- Update to latest svn trunk (14346). - -* Mon Aug 27 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.3.r14337 -- Update to latest svn trunk (14337). - -* Tue May 22 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.2.r13492 -- Update to latest svn trunk (13492). -- More non-standard macro nuking - -* Mon May 21 2007 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-0.1.r13487 -- Update to latest svn trunk (13487). -- Reshuffle theme files -- Credit where credit is due: forking this off the current ATrpms spec --- mythbackend.init DELETED --- --- mythbackend.sysconfig DELETED ---