Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9219 Modified Files: .cvsignore ChangeLog mythtv-0.27-fixes.patch mythtv.spec sources Log Message: * Mon Nov 3 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27.4-2 - Update to latest bugfix release, 0.27.4. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 28 Jul 2014 02:16:15 -0000 1.15 +++ .cvsignore 3 Nov 2014 19:15:51 -0000 1.16 @@ -1 +1 @@ -mythtv-0.27.3.tar.gz +mythtv-0.27.4.tar.gz View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.18 -r 1.19 ChangeLog Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ChangeLog 13 Oct 2014 22:47:27 -0000 1.18 +++ ChangeLog 3 Nov 2014 19:15:51 -0000 1.19 @@ -1,1988 +1,67 @@ -commit 629f7112ec77ddd6732ae00378ccf1b7283cbeec -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; -Date: Tue Sep 23 17:35:32 2014 +0100 +commit e0b002787e32d2e21ec57d9686ec4a8411c0fa60 +Author: lomion <lomion(a)aon.at&gt; +Date: Sun Oct 26 17:50:57 2014 -0400 - Handle [HD] in UK EIT fixups part 2 - 44c85ad369a9d2bd564728a65f4f8b1164df2483 didn't include HD in the - regexp which picked up the HD notification in the description. + New locle file for Austria from lomion(a)aon.at - Hand cherry-picked from de131518b294fa75895b0de91a1f8dcf9f7ab274 - -commit a8040898f654a89f7f11dc5dabbaf06b44dc8f6b -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Tue Sep 23 10:18:19 2014 +0100 - - UPnP: Fix dlna protocol string in 0.27, it wasn't DLNA compliant. - -commit 5a0266e0a0da1db8123488c34dd10809d98de3e0 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Tue Sep 23 10:14:16 2014 +0100 - - UPnP: Fix recording date folder names following UTC conversion. - -commit e2f46569ac53030345efa74782ae44cee3ec5a79 -Author: Karl Dietz <dekarl(a)mythtv.org&gt; -Date: Fri Sep 19 23:43:46 2014 +0200 - - Handle [HD] in UK EIT fixups - - It appears that some transports transmit SD component descriptors on the - HD services. See https://forum.mythtv.org/viewtopic.php?f=2&t=353 - (cherry picked from commit 44c85ad369a9d2bd564728a65f4f8b1164df2483) - -commit 5c2cda7563c3a4656b112ecb48d3b97e9599dca6 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Thu Sep 18 11:54:55 2014 +0100 - - UPnP: Convert dates and times to local time before serving to the client - -commit 2d4a7c9235287b0589035974bff282e3f2e9a7e5 -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Sun Jan 19 11:29:44 2014 +0100 - - Sync libdvdnav up to R1294: - - * Add missing strings.h #include for strncasecmp(). - * Fix crash when trying to play a DVD from different region than currently set in the DVD drive. - * Prevent segmentation faults in vdnav_describe_title_chapters() in case of parts with missing PGC. - * Let dvdnav_describe_title_chapters() ignore parts where the pgc_start_byte is above the last_byte. - * Let dvdnav_describe_title_chapters() skip PGCs with a cell number of zero. - * Fix integer overflow in dvdnav_convert_time(). - * Do not close file twice. - * Make sure program_map is not NULL. - * Let dvdnav_describe_title_chapters() skip PGCs with missing cells. - * Prevent general CPP macro from causing strange behavior. - * Avoid a crash when program number is zero. - * Check for out-of-bounds values for pgcn. - * In vm_new_vm(), use the proper calloc() argument order and don't derive 1 from the unrelated sizeof(char). - (cherry picked from commit 2a6038b5d7bf570e28fd8c3061483b0a22dcd830) - -commit e9f14bf72d40a52987eaf3c80e40c78f411b3cec -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Sun Jan 19 11:24:12 2014 +0100 - - Sync libdvdread up to R1290: + Thank you! - * Add missing strings.h #include for strcasecmp() / strncasecmp(). - * Replace uses of the deprecated dvdcss_handle type by dvdcss_t. - * Replace deprecated dvdcss_title() function by dvdcss_seek(). - * Do not extract libdvdcss version via dvdcss_interface_2. - * Add #define for DVDCSS_SEEK_KEY to allow compilation without dvdcss.h. - * If the start offset points past the last_byte (outside the region read) stop reading PTTs and adjust nr_of_srpts. - * Use correct name of the libdvdcss DLL on Windows. - * Fix spelling errors. - * Document warnings generated by DVDs made with the VDR-to-DVD device LG RC590M. - * Add an error message. - * Clear pf_temp to make sure it is initialized. - * Free `cached_dir_base` to fix memory leak. - * Abort when PTT search table has zero entries. - * Use 0 instead of NULL in integer comparison. - (cherry picked from commit 2874f0d150342539644a5838f5147fa4c31f51ff) - -commit 74ac2bdaa30743589abcd41bf7012fdf28cef74b -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Sun Sep 7 12:52:25 2014 +0100 - - MythMusic: Allow smart playlist to be saved even if it produces no matches. The nature of smart playlists means that it may match tracks in the future. + Closes #12265 - (cherry picked from commit 2f3f422e507dd5601aa0b0426bc81f59cda020a7) + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org&gt; -commit fb347b69f055ed3bc16e439dec0514550dad5816 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Sun Sep 7 12:37:11 2014 +0100 +commit c4de5c5e173de69e238e627b37b33ae94a3c7873 +Author: Yianni Vidalis <yiannividalis(a)hotmail.com&gt; +Date: Thu Oct 23 07:35:24 2014 -0400 - MythMusic: Fix NULL insert into NOT NULL column in SmartPlaylist editor. + New virtual Greek keyboard from Yianni Vidalis - (cherry picked from commit 43b799a5fc57214102d586a01fc755e541e29ccd) - -commit 3afae9e094fb70b99abbf483b9d6c1aba83059aa -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Sun Sep 7 12:31:56 2014 +0100 - - MythMusic: Fix sql error in SmartPlaylist editor when adding a new playlist. + Thank you Yianni! - (cherry picked from commit e5d6a425053e2c6ce747cf8adfd7aaddf4bcb97a) + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org&gt; -commit 45fcdd836d507da8b798a2802b69e241f9e66e97 +commit b305eb5b7fc662146e74983fa3754d622695cdeb Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Sun Sep 7 12:28:39 2014 +0100 - - MythMusic: Fix smart playlists uses lastplay or date_entered. - - (cherry picked from commit 428609b782c5644b2e885d861f19dbb354f344c0) - -commit 231972ca6da5432d05d513fd2a351aa0202470ee -Author: Karl Dietz <dekarl(a)mythtv.org&gt; -Date: Wed Apr 2 20:00:53 2014 +0200 - - simplify handling of missing endtime at end of file in mythfilldatabase - - Instead of making up endtime of "next midnight" and "next 06:00 am" we - just let the database fill in its default of 0000-00-00 00:00 and replace - it later with whatever the next starttime is on that channel. - - This has seen very light testing, so I'm commiting it to master only. If - I get positive reports from users I'm happing to merge it into fixes. - - Fixes #11541 - - Reported as working on fixes/0.27 in https://code.mythtv.org/trac/ticket/11541#comment:12 - (cherry picked from commit 619b00848a0f272cf4e0529be4fedf48d9c414e9) - -commit 926bb8d2427388f3f051ee642bd7b629b4d18601 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Thu Aug 21 22:43:37 2014 +1000 - - RingBuffer: always read directly from file if read ahead thread isn’t running - - readInternalMode can only work if the read ahead thread is running - - (cherry picked from commit 0641cd9ac3eb142f239b70085bac459f3694eadd) - -commit 5b07c918a47b707943f20af71db67706ee1000b2 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Thu Aug 21 22:40:56 2014 +1000 - - RingBuffer: Properly wait for readahead thread to start - - Inverted test, no wait occurred causing a race condition later on which causes failures in LiveTV, usually when changing channels - - (cherry picked from commit 6b29f598776f8a2ecba09674b4c900ce0fb1fe7f) - -commit 082d5c1fbccd48dd862f14007c0445dee8502f3d -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Mon Aug 11 09:38:21 2014 +1000 - - Revert "TV UnpauseLiveTV calls tvchain->SwitchTo opposed to JumpTo to minimise visible disruption" - - This commit broke LiveTV channel change - - This reverts commit bfc6b9ed58029955d5a4230cad5851ed4848ed20. - - (cherry picked from commit 0f11604dd8429c9b6be847703898e9d4a55bb86e) - -commit d8d10dbef53a70784d1ffc2e3e702d3f5206a7f5 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Mon Aug 11 09:37:34 2014 +1000 - - Revert "Player: Enable AVSync to recover quicker after a seek or program change" - - This commit broke audio or frame rate change detection following a seek or channel change - - This reverts commit 195eb07fb106fbabf164a1989860adcc132ab9d2. - - (cherry picked from commit 0128796ef424552fb9af4c92c2ac05d2436b36b9) - -commit f097a8710d8f65b30ddf1d92e6759773b3cf151b -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; [...1636 lines suppressed...] - Revert "ff_id3v2_read: add option to limit ID3 magic number search" - Revert "ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL" - - This reverts commit 7f8aa37bc3666d060b3eb2baa02fcea3597a22fd. - This reverts commit 5219e20d58e15305e188ba60a75bfc37a1f82341. - - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; - -commit 6d743290d8ec2c399741404ad2e2d9482c32263f -Author: Martin Storsjö <martin(a)martin.st&gt; -Date: Fri Jun 6 12:03:09 2014 +0300 - - adpcm: Write the proper predictor in trellis mode in IMA QT - - The actual predictor value, set by the trellis code, never - was written back into the variable that was written into - the block header. This was accidentally removed in b304244b. - - This significantly improves the audio quality of the trellis - case, which was plain broken since b304244b. - - Encoding IMA QT with trellis still actually gives a slightly - worse quality than without trellis, since the trellis encoder - doesn't use the exact same way of rounding as in - adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble. - - Fixes part of Ticket3701 - - Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at&gt; - (cherry picked from commit fa8f060b75bf9074792a0f9ff4ed002652ef62b8) - - Conflicts: - tests/ref/acodec/adpcm-ima_qt-trellis - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; - -commit 2a3e0b91ffd450a8895c4fe1861a6b4df9bbd869 -Author: Martin Storsjö <martin(a)martin.st&gt; -Date: Thu Jun 5 11:56:10 2014 +0300 - - adpcm: Fix trellis encoding of IMA QT - - This was broken in 095be4fb - samples+ch (for the previous - non-planar case) equals &samples_p[ch][0]. The confusion - probably stemmed from the IMA WAV case where it originally - was &samples[avctx->channels + ch], which was correctly - changed into &samples_p[ch][1]. - - Fixes part of Ticket3701 - - Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at&gt; - (cherry picked from commit a32765c4252eb106a2ade543026ef6f59e699bfa) - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; - -commit 28d615e58890edecdc4bddbe7a82f563805b3081 -Author: Carl Eugen Hoyos <cehoyos(a)ag.or.at&gt; -Date: Thu May 29 08:41:15 2014 +0200 - - avcodec/utvideodec: Increase vlc len - - Fixes a regression since fb3e380 similar to ticket #2661, - reported by fluffrabbit at aol dot com. - - Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at&gt; - (cherry picked from commit 673716c54b39eba9579a38ad222130e3f9549167) - - Conflicts: - libavcodec/utvideodec.c - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; - -commit 8d5cf2a69c2c988960efd346069ced53fdb9ec58 -Author: Michael Niedermayer <michaelni(a)gmx.at&gt; -Date: Wed Jun 4 05:04:13 2014 +0200 - - avformat/avidec: allow rounding errors between scale/rate and timebase - - Fixes Ticket3670 - - Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at&gt; - (cherry picked from commit 571ab8344a9a2864d22d01af41283cee9328b927) - - Conflicts: - libavformat/avidec.c - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; - -commit 2b88a8a952249a7fc85e4cf6b6d6a79858546bc2 -Author: Lawrence Rust <lvr(a)softsystem.co.uk&gt; -Date: Fri Mar 7 19:31:42 2014 +0000 - - Fix 0b9470c Fix fileringbuffer locking... - - Commit 0b9470c (Fix fileringbuffer locking up on read()) modified - FileRingBuffer::safe_read to use fstat() to check the file size - before reading. The new code compares (internalreadpos + tot) - with the reported size. This is mostly correct except when - MythPlayer::SwitchProgram detects the transition across a livetv - programme boundary. In this case internalreadpos holds the read - position for the old file until the decoder calls FileChanged(). - - This patch includes readAdjust (set by SetAdjustFilesize()) to - correctly determine the current read position in the file. - - Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk&gt; - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; - (cherry picked from commit 363361a9e26322d9e6a87e17effc50add8653533) - -commit 4d7b305afc071addb06b566ac1d9fbadd431c741 -Author: Lawrence Rust <lvr(a)softsystem.co.uk&gt; -Date: Wed Jul 4 16:39:13 2012 +0200 - - Player: Don't call DoneDisplayingFrame for PiP until next frame is ready - - When displaying 'pictute in picture' (PiP), VideoOutput::ShowPIP - composites the PiP windows onto the main video frame. To do so, it uses - the player's GetCurrentFrame method to obtain the most recently displayed - PiP frame. However, MythPlayer::DisplayNormalFrames immediately releases - the last frame displayed back to the decoding queue. Consequently when - GetCurrentFrame calls GetLastShownFrame to obtain that frame it may have been - overwritten by the decoder thread. - - This patch defers calling DoneDisplayingFrame if the player is a PiP - player so that future calls to GetLastShownFrame return an intact frame. - - Fixes #10878 - - Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk&gt; - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; - (cherry picked from commit 49df62f1a76f0e617208e261a09f5f8a634b3ce9) - - Conflicts: - mythtv/libs/libmythtv/mythplayer.cpp - -commit fba8e800c98356bd06ee03087b6b421f94610490 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Fri Jun 27 14:05:25 2014 +0100 - - Sync minilzo from 2.03 to 2.07. - - This commit is UNTESTED. I don't have any framegrabbers. However - there's no reason it shouldn't work as it's just a minor version bump. - - Refs LMS-2014-06-16-1, CVE-2014-4607 - - (cherry picked from commit b99f21b2791c4685fb48460a165a7cd804256f03) - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org&gt; - -commit dbb4ef308863a837c1c0617a7a478fb2fe309757 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Mon Jun 30 13:13:11 2014 -0700 - - Audio: Abort Drain if audio device is in pause - - Prevent deadlock in MythMusic - - (cherry picked from commit d6663a5498f1ba1147a801dd4902b779b3afd1f8) - -commit 74d812d1f80cac064ce2ebb7f8164f2a5e825708 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Sun Jul 6 10:48:19 2014 +1000 - - Fix memory leak - - Coverity CID 1224482 - - (cherry picked from commit e16a9b0072c068a42759a78b4633d656b3627453) - -commit cebafcf4131c6dff59a6234c5e35408719749890 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Sun Jul 6 08:57:58 2014 +1000 - - Properly allocate VDPAU PiP video buffers and fix memory leak - - The video buffers were never freed - - (cherry picked from commit 548aaf78373cf0360b759b633df10c3690e3f06b) - -commit 3b0f5790c9081a17a019ded726ae497bd5c6f62c -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Sun Jul 6 01:25:21 2014 +1000 - - Don’t attempt to play the video streams for mp3, flac, off and m4a container. - - FFmpeg incorrectly detects the artwork in those file as MJPEG, which myth would then attempt to play. - A nicer fix would be to display that image instead. - - Fixes #11597 - - (cherry picked from commit 9df8bb364ba56cc34d34af40e5980110193bd334) - -commit 418deb69b5f299f18840d55be878714bcefb57a0 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; -Date: Sat Jul 5 23:37:35 2014 +1000 - - Ignore IPv6 settings value if it’s invalid - - This would otherwise cause the backend to always believe the requested host was local - - Fixes #12172 - - (cherry picked from commit de991d98754bd50045d65080592828631786e161) + (cherry picked from commit f4634d2ea524baf2e7c2d99995b7b565e635cd07) mythtv-0.27-fixes.patch: libs/libmythbase/mythversion.h | 2 libs/libmythtv/datadirect.cpp | 52 ++++ libs/libmythtv/datadirect.h | 2 libs/libmythupnp/ssdp.cpp | 30 ++ locales/de_at.xml | 37 +++ themes/default/keyboard/el.xml | 270 +++++++++++++++++++++++++ themes/default/keyboard/el_ui.xml | 410 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 792 insertions(+), 11 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 mythtv-0.27-fixes.patch Index: mythtv-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv-0.27-fixes.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mythtv-0.27-fixes.patch 13 Oct 2014 22:48:06 -0000 1.7 +++ mythtv-0.27-fixes.patch 3 Nov 2014 19:15:52 -0000 1.8 @@ -1,15249 +1,930 @@ - mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 +- - mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 + - mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 13 +- - mythtv/external/FFmpeg/README.sync | 3 +- - mythtv/external/FFmpeg/RELEASE | 2 +- - mythtv/external/FFmpeg/VERSION | 2 +- - mythtv/external/FFmpeg/doc/Doxyfile | 2 +- - mythtv/external/FFmpeg/ffmpeg_filter.c | 9 +- - mythtv/external/FFmpeg/libavcodec/aac.h | 2 +- - mythtv/external/FFmpeg/libavcodec/adpcmenc.c | 3 +- - mythtv/external/FFmpeg/libavcodec/alsdec.c | 2 +- - mythtv/external/FFmpeg/libavcodec/dirac_arith.h | 3 +- - mythtv/external/FFmpeg/libavcodec/diracdec.c | 49 +- - mythtv/external/FFmpeg/libavcodec/g723_1.c | 3 +- - mythtv/external/FFmpeg/libavcodec/golomb-test.c | 2 +- - .../FFmpeg/libavcodec/h264_mp4toannexb_bsf.c | 2 +- - mythtv/external/FFmpeg/libavcodec/libvorbisenc.c | 3 +- - mythtv/external/FFmpeg/libavcodec/libx264.c | 26 +- - mythtv/external/FFmpeg/libavcodec/mjpegdec.c | 2 +- - mythtv/external/FFmpeg/libavcodec/mjpegenc.c | 2 +- - mythtv/external/FFmpeg/libavcodec/mjpegenc.h | 2 +- - mythtv/external/FFmpeg/libavcodec/mlpdec.c | 2 +- - mythtv/external/FFmpeg/libavcodec/msrle.c | 3 + - mythtv/external/FFmpeg/libavcodec/mss34dsp.c | 4 +- - mythtv/external/FFmpeg/libavcodec/mss4.c | 2 +- - mythtv/external/FFmpeg/libavcodec/utvideodec.c | 2 +- - mythtv/external/FFmpeg/libavcodec/vc1dec.c | 3 +- - mythtv/external/FFmpeg/libavcodec/wma.c | 6 +- - .../FFmpeg/libavcodec/x86/idct_sse2_xvid.c | 2 +- - .../FFmpeg/libavcodec/x86/mpegvideoenc_template.c | 2 +- - mythtv/external/FFmpeg/libavfilter/filtfmts.c | 10 +- - mythtv/external/FFmpeg/libavfilter/graphdump.c | 3 +- - mythtv/external/FFmpeg/libavfilter/vf_deshake.c | 4 +- - mythtv/external/FFmpeg/libavformat/aiffdec.c | 2 +- - mythtv/external/FFmpeg/libavformat/asfdec.c | 5 +- - mythtv/external/FFmpeg/libavformat/avidec.c | 2 +- - mythtv/external/FFmpeg/libavformat/flvenc.c | 12 + - mythtv/external/FFmpeg/libavformat/h263dec.c | 2 +- - mythtv/external/FFmpeg/libavformat/id3v2.c | 17 +- - mythtv/external/FFmpeg/libavformat/id3v2.h | 4 +- - mythtv/external/FFmpeg/libavformat/mpc.c | 2 +- - mythtv/external/FFmpeg/libavformat/mpegts.c | 2 +- - mythtv/external/FFmpeg/libavformat/mux.c | 6 + - mythtv/external/FFmpeg/libavformat/omadec.c | 2 +- - mythtv/external/FFmpeg/libavformat/utils.c | 2 +- - mythtv/external/FFmpeg/libavutil/cpu.c | 18 + - mythtv/external/FFmpeg/libavutil/lzo.c | 13 +- - mythtv/external/FFmpeg/libavutil/opt.c | 6 +- - mythtv/external/FFmpeg/libswresample/dither.c | 2 +- - mythtv/external/FFmpeg/libswresample/rematrix.c | 5 + - mythtv/external/FFmpeg/libswresample/resample.c | 7 +- - mythtv/external/FFmpeg/libswscale/swscale.c | 7 +- - .../FFmpeg/libswscale/x86/swscale_template.c | 78 +- - mythtv/external/FFmpeg/tests/ref/fate/vc1_sa10143 | 28 +- - mythtv/libs/libmyth/audio/audiooutputbase.cpp | 9 +- - mythtv/libs/libmyth/mediamonitor-darwin.cpp | 10 + - mythtv/libs/libmythbase/mythcorecontext.cpp | 3 +- - mythtv/libs/libmythbase/mythversion.h | 2 +- - mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 2 +- - mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 2 +- - mythtv/libs/libmythdvdnav/dvdnav/remap.c | 1 + - mythtv/libs/libmythdvdnav/dvdnav/searching.c | 32 +- - mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 6 +- - mythtv/libs/libmythdvdnav/dvdread/dvd_input.c | 44 +- - mythtv/libs/libmythdvdnav/dvdread/dvd_reader.c | 1 + - mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c | 5 +- - mythtv/libs/libmythdvdnav/dvdread/ifo_print.c | 4 +- - mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 23 +- - mythtv/libs/libmythmetadata/libmythmetadata.pro | 4 +- - mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 +- - mythtv/libs/libmythmetadata/metadatacommon.h | 52 +- - mythtv/libs/libmythmetadata/metadatadownload.cpp | 339 +- - mythtv/libs/libmythmetadata/metadatafactory.cpp | 69 +- - mythtv/libs/libmythmetadata/metadatafactory.h | 2 + - mythtv/libs/libmythmetadata/metadatagrabber.cpp | 595 +++ - mythtv/libs/libmythmetadata/metadatagrabber.h | 100 + - .../libs/libmythmetadata/metadataimagedownload.cpp | 150 +- - .../libs/libmythmetadata/metadataimagedownload.h | 1 + - mythtv/libs/libmythmetadata/videometadata.cpp | 17 +- - .../requesthandler/fileserverhandler.cpp | 3 +- - mythtv/libs/libmythtv/avformatdecoder.cpp | 48 +- - mythtv/libs/libmythtv/cc608decoder.cpp | 2 +- - mythtv/libs/libmythtv/cc708reader.cpp | 2 +- - .../libs/libmythtv/channelscan/channelscan_sm.cpp | 19 +- - mythtv/libs/libmythtv/channelscan/channelscan_sm.h | 2 + - mythtv/libs/libmythtv/eitcache.cpp | 4 +- - mythtv/libs/libmythtv/eitfixup.cpp | 4 +- - mythtv/libs/libmythtv/lzoconf.h | 219 +- - mythtv/libs/libmythtv/lzodefs.h | 2527 ++++++++---- - mythtv/libs/libmythtv/metadataimagehelper.cpp | 3 + - mythtv/libs/libmythtv/minilzo.cpp | 4191 ++++++++++++++------ - mythtv/libs/libmythtv/minilzo.h | 20 +- - mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp | 8 + - mythtv/libs/libmythtv/mythplayer.cpp | 141 +- - mythtv/libs/libmythtv/openglvideo.cpp | 2 +- - mythtv/libs/libmythtv/programdata.cpp | 41 +- - mythtv/libs/libmythtv/ringbuffer.cpp | 19 +- - mythtv/libs/libmythtv/subtitlescreen.cpp | 58 +- - mythtv/libs/libmythtv/tv_play.cpp | 8 +- - mythtv/libs/libmythtv/videobuffers.cpp | 6 + - mythtv/libs/libmythtv/videoout_nullvdpau.cpp | 4 +- - mythtv/libs/libmythtv/videoout_opengl.cpp | 6 +- - mythtv/libs/libmythui/mythuiwebbrowser.cpp | 2 +- - mythtv/libs/libmythupnp/upnpcds.h | 2 +- - mythtv/libs/libmythupnp/upnpcmgr.h | 2 +- - mythtv/programs/mythbackend/main_helpers.cpp | 9 +- - mythtv/programs/mythbackend/mainserver.cpp | 20 +- - mythtv/programs/mythbackend/upnpcdstv.cpp | 27 +- - mythtv/programs/mythbackend/upnpcdsvideo.cpp | 2 +- - mythtv/programs/mythfrontend/editvideometadata.cpp | 10 +- - mythtv/programs/mythfrontend/grabbersettings.cpp | 125 +- - mythtv/programs/mythfrontend/grabbersettings.h | 7 +- - mythtv/programs/mythfrontend/playbackbox.cpp | 158 +- - mythtv/programs/mythfrontend/playbackbox.h | 13 +- - mythtv/programs/mythfrontend/scheduleeditor.cpp | 76 +- - mythtv/programs/mythfrontend/scheduleeditor.h | 1 + - mythtv/programs/mythmetadatalookup/lookup.cpp | 12 +- - mythtv/programs/mythmetadatalookup/main.cpp | 12 + - mythtv/programs/mythtranscode/mpeg2fix.cpp | 23 +- - mythtv/programs/mythtranscode/mpeg2fix.h | 4 + - .../programs/mythtranscode/videodecodebuffer.cpp | 36 +- - mythtv/programs/mythtranscode/videodecodebuffer.h | 25 +- - mythtv/themes/classic/tv_schedule.xml | 2 +- - 123 files changed, 7006 insertions(+), 2872 deletions(-) + mythtv/libs/libmythbase/mythversion.h | 2 +- + mythtv/libs/libmythtv/datadirect.cpp | 52 +++- + mythtv/libs/libmythtv/datadirect.h | 2 + + mythtv/libs/libmythupnp/ssdp.cpp | 30 ++- + mythtv/locales/de_at.xml | 37 +++ + mythtv/themes/default/keyboard/el.xml | 270 ++++++++++++++++++++ + mythtv/themes/default/keyboard/el_ui.xml | 410 +++++++++++++++++++++++++++++++ + 7 files changed, 792 insertions(+), 11 deletions(-) -diff --git a/mythplugins/mythmusic/mythmusic/importmusic.cpp b/mythplugins/mythmusic/mythmusic/importmusic.cpp -index d0faf12..31a89da 100644 ---- a/mythplugins/mythmusic/mythmusic/importmusic.cpp -+++ b/mythplugins/mythmusic/mythmusic/importmusic.cpp -@@ -127,7 +127,7 @@ ImportMusicDialog::~ImportMusicDialog() - if (gPlayer->getCurrentMetadata() && m_playingMetaData) - { - if (gPlayer->isPlaying() && gPlayer->getCurrentMetadata()->Filename() == m_playingMetaData->Filename()) -- gPlayer->stop(); -+ gPlayer->stop(true); - } - - if (m_locationEdit) -diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp -index ea46a3d..867c765 100644 ---- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp -+++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp -@@ -261,6 +261,12 @@ void MusicPlayer::stop(bool stopAll) - m_output->Reset(); - } - -+ if (m_oneshotMetadata) -+ { -+ delete m_oneshotMetadata; -+ m_oneshotMetadata = NULL; -+ } -+ - m_isPlaying = false; - - if (stopAll && getDecoder()) -diff --git a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp -index de952e8..0fc546d 100644 ---- a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp -+++ b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp -@@ -52,10 +52,8 @@ static SmartPLField SmartPLFields[] = - { "Play Count", "music_songs.numplays", ftNumeric, 0, 9999, 0 }, - { "Compilation", "music_albums.compilation", ftBoolean, 0, 0, 0 }, - { "Comp. Artist", "music_comp_artists.artist_name", ftString, 0, 0, 0 }, -- { "Last Play", "FROM_DAYS(TO_DAYS(music_songs.lastplay))", -- ftDate, 0, 0, 0 }, -- { "Date Imported", "FROM_DAYS(TO_DAYS(music_songs.date_entered))", -- ftDate, 0, 0, 0 }, -+ { "Last Play", "music_songs.lastplay", ftDate, 0, 0, 0 }, -+ { "Date Imported", "music_songs.date_entered", ftDate, 0, 0, 0 }, - }; - - struct SmartPLOperator -@@ -334,7 +332,7 @@ bool SmartPLCriteriaRow::saveToDatabase(int smartPlaylistID) - query.bindValue(":FIELD", Field); - query.bindValue(":OPERATOR", Operator); - query.bindValue(":VALUE1", Value1); -- query.bindValue(":VALUE2", Value2); -+ query.bindValue(":VALUE2", Value2.isNull() ? "" : Value2); - - if (!query.exec()) - { -@@ -750,7 +748,7 @@ void SmartPlaylistEditor::updateMatches(void) - [...15751 lines suppressed...] -+ framePool.enqueue(tmpFrame); - } - av_free_packet(pkt); - return 0; -@@ -2398,6 +2404,11 @@ int MPEG2fixup::Start() - - while (af->count()) - { -+ if (!CC || !CPC) -+ { -+ framePool.enqueue(af->takeFirst()); -+ continue; -+ } - // What to do if the CC is corrupt? - // Just wait and hope it repairs itself - if (CC->sample_rate == 0 || !CPC || CPC->duration == 0) -diff --git a/mythtv/programs/mythtranscode/mpeg2fix.h b/mythtv/programs/mythtranscode/mpeg2fix.h -index 58fe5ca..d430ad4 100644 ---- a/mythtv/programs/mythtranscode/mpeg2fix.h -+++ b/mythtv/programs/mythtranscode/mpeg2fix.h -@@ -219,10 +219,14 @@ class MPEG2fixup - } - AVCodecContext *getCodecContext(int id) - { -+ if (id >= inputFC->nb_streams) -+ return NULL; - return inputFC->streams[id]->codec; - } - AVCodecParserContext *getCodecParserContext(int id) - { -+ if (id >= inputFC->nb_streams) -+ return NULL; - return inputFC->streams[id]->parser; - } - -diff --git a/mythtv/programs/mythtranscode/videodecodebuffer.cpp b/mythtv/programs/mythtranscode/videodecodebuffer.cpp -index 73d23e0..b6bbdf9 100644 ---- a/mythtv/programs/mythtranscode/videodecodebuffer.cpp -+++ b/mythtv/programs/mythtranscode/videodecodebuffer.cpp -@@ -1,11 +1,14 @@ - #include "videodecodebuffer.h" - -+#include "mythplayer.h" -+#include "videooutbase.h" ++ </keyboard> + - VideoDecodeBuffer::VideoDecodeBuffer(MythPlayer *player, VideoOutput *videoout, - bool cutlist, int size) - : m_player(player), m_videoOutput(videoout), -- m_honorCutlist(cutlist), -- m_eof(false), m_maxFrames(size), -- m_runThread(true), m_isRunning(false) -+ m_honorCutlist(cutlist), m_maxFrames(size), -+ m_runThread(true), m_isRunning(false), -+ m_eof(false) - { - - } -@@ -35,8 +38,12 @@ void VideoDecodeBuffer::run() - m_isRunning = true; - while (m_runThread) - { -+ QMutexLocker locker(&m_queueLock); ++ </container> + - if (m_frameList.size() < m_maxFrames && !m_eof) - { -+ locker.unlock(); -+ - DecodedFrameInfo tfInfo; - tfInfo.frame = NULL; - tfInfo.didFF = 0; -@@ -47,21 +54,22 @@ void VideoDecodeBuffer::run() - { - tfInfo.frame = m_videoOutput->GetLastDecodedFrame(); - -- QMutexLocker locker(&m_queueLock); -+ locker.relock(); - m_frameList.append(tfInfo); - } -- else -+ else if (m_player->GetEof() != kEofStateNone) - { -+ locker.relock(); - m_eof = true; - } -+ else -+ continue; - - m_frameWaitCond.wakeAll(); - } - else - { -- m_frameWaitLock.lock(); -- m_frameWaitCond.wait(&m_frameWaitLock); -- m_frameWaitLock.unlock(); -+ m_frameWaitCond.wait(locker.mutex()); - } - } - m_isRunning = false; -@@ -69,27 +77,21 @@ void VideoDecodeBuffer::run() - - VideoFrame *VideoDecodeBuffer::GetFrame(int &didFF, bool &isKey) - { -- m_queueLock.lock(); -+ QMutexLocker locker(&m_queueLock); - - if (m_frameList.isEmpty()) - { -- m_queueLock.unlock(); -- - if (m_eof) - return NULL; - -- m_frameWaitLock.lock(); -- m_frameWaitCond.wait(&m_frameWaitLock); -- m_frameWaitLock.unlock(); -+ m_frameWaitCond.wait(locker.mutex()); - - if (m_frameList.isEmpty()) - return NULL; -- -- m_queueLock.lock(); - } - - DecodedFrameInfo tfInfo = m_frameList.takeFirst(); -- m_queueLock.unlock(); -+ locker.unlock(); - m_frameWaitCond.wakeAll(); - - didFF = tfInfo.didFF; -diff --git a/mythtv/programs/mythtranscode/videodecodebuffer.h b/mythtv/programs/mythtranscode/videodecodebuffer.h -index 50c33d0..b4e241a 100644 ---- a/mythtv/programs/mythtranscode/videodecodebuffer.h -+++ b/mythtv/programs/mythtranscode/videodecodebuffer.h -@@ -6,18 +6,20 @@ - #include <QMutex> - #include <QRunnable> - --#include "mythplayer.h" - #include "videooutbase.h" - -+class MythPlayer; -+class VideoOutput; ++ </window> + - class VideoDecodeBuffer : public QRunnable - { - public: - VideoDecodeBuffer(MythPlayer *player, VideoOutput *videoout, - bool cutlist, int size = 5); -- ~VideoDecodeBuffer(); -+ virtual ~VideoDecodeBuffer(); - -- void stop(void); -- void run(); -+ void stop(void); -+ virtual void run(); - VideoFrame *GetFrame(int &didFF, bool &isKey); - - private: -@@ -28,17 +30,16 @@ class VideoDecodeBuffer : public QRunnable - bool isKey; - } DecodedFrameInfo; - -- MythPlayer *m_player; -- VideoOutput *m_videoOutput; -- bool m_honorCutlist; -+ MythPlayer * const m_player; -+ VideoOutput * const m_videoOutput; -+ bool const m_honorCutlist; -+ int const m_maxFrames; -+ bool volatile m_runThread; -+ bool volatile m_isRunning; -+ QMutex mutable m_queueLock; // Guards the following... - bool m_eof; -- int m_maxFrames; -- bool m_runThread; -- bool m_isRunning; -- QMutex m_queueLock; - QList<DecodedFrameInfo> m_frameList; - QWaitCondition m_frameWaitCond; -- QMutex m_frameWaitLock; - }; - - #endif -diff --git a/mythtv/themes/classic/tv_schedule.xml b/mythtv/themes/classic/tv_schedule.xml -index c517e3a..6559d45 100644 ---- a/mythtv/themes/classic/tv_schedule.xml -+++ b/mythtv/themes/classic/tv_schedule.xml -@@ -46,7 +46,7 @@ - <button> - <type>TV_CONFLICTS</type> - <text>Upcoming Recordings</text> -- <description>VCR-like recording scheduler</description> -+ <description>See what will be recorded next</description> - <action>TV_FIX_CONFLICTS</action> - </button> - ++</mythuitheme> Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- mythtv.spec 19 Oct 2014 22:08:52 -0000 1.146 +++ mythtv.spec 3 Nov 2014 19:15:52 -0000 1.147 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27.3-164-g629f711 +%define vers_string v0.27.4-6-ge0b0027 %define branch fixes/0.27 # Git revision and branch ID @@ -74,11 +74,11 @@ URL: http://www.mythtv.org/ # Version/Release info -Version: 0.27.3 +Version: 0.27.4 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 2.1%{?dist} +Release: 2%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -136,7 +136,6 @@ # http://code.mythtv.org/trac/ticket/11338 # Offset required for 0.27, patch was for 0.26.1 Patch2: mythtv-0.27-libcec2.patch -Patch3: mythtv-sd_fix.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -807,10 +806,9 @@ find \( -name 'configure' -o -name '*pro' -o -name 'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+ fi -#patch0 -p1 -b .mythtv +%patch0 -p1 -b .mythtv %patch1 -p1 -b .types_h %patch2 -p1 -b .libcec2 -%patch3 -p0 -b .sd_fix # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -1425,6 +1423,9 @@ %changelog +* Mon Nov 3 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27.4-2 +- Update to latest bugfix release, 0.27.4. + * Mon Oct 13 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27.3-2.1 - Update to latest fixes. - Add patch for schedules direct service change. Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 28 Jul 2014 02:16:16 -0000 1.60 +++ sources 3 Nov 2014 19:15:52 -0000 1.61 @@ -1 +1 @@ -23d6be12fc7d6b70dfef6a7170e5dabd mythtv-0.27.3.tar.gz +c158d039a35823741e136799ede7957d mythtv-0.27.4.tar.gz