July 2014 - rpmfusion-commits

rpms/mythweb/devel ChangeLog,1.7,1.8 mythweb.spec,1.12,1.13

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythweb/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25762 Modified Files: ChangeLog mythweb.spec Log Message: * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 - Update to latest upstream release. Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 6 Nov 2013 16:27:06 -0000 1.7 +++ ChangeLog 28 Jul 2014 12:42:41 -0000 1.8 @@ -1,3 +1,82 @@ +commit fca2bd2f78136a5363b1fbe7a313677b6bd1adc5 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Tue May 6 08:34:51 2014 +0200 + + change base for custom aspect from 10,000 to 1,000,000 + + Patch by FU-REN XIAO (蕭輔仁) + + Fixes #11996 + (cherry picked from commit af4635569c4facacde9c089ca0be712797bfdc75) + +commit c99ad5fbea7dc6e3024a78b859d875e01b9f8a21 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Tue May 6 08:34:28 2014 +0200 + + remove trailing white space + (cherry picked from commit b8655cb58e6b9065d46c41a8c345fff60ebc39a3) + +commit a492e9343caff760e0081f785d540ca6a1fe39fa +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Apr 28 17:55:41 2014 +0200 + + Mythweb - allow direct downloading of .mkv, .avi, .mp4, .xvid, .okv files + + Patch by Barry Rosenstock and David Goldfarb + + Fixes #7730 + (cherry picked from commit c82601f426ba87ec86ffa6c4f076f7b325c9b902) + +commit 3829292163bcdc5bd8e4ff8140dba34002954adf +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Apr 28 17:44:07 2014 +0200 + + fix sorting by season/episode for seasons > 9 and episodes > 99 + + Patch by Steve Campbell, extended to cover "year as season" and series + with lots of episodes + + Fixes #11893 + (cherry picked from commit 86d4b489d5b633c5d92bc1adbc94ccc9485098e6) + +commit 3793da2ac7d5baa43b403dbfa10b4919aadece2b +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Apr 28 17:08:28 2014 +0200 + + Fix mime type for video streaming + + Patch by deg + + Fixes #12129 + (cherry picked from commit aac42919007aa5296e296d4aad4eeed06920a14f) + +commit b4983f178bc847bfe7647ce5b9f235f5d2cbe362 +Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net> +Date: Sun Mar 23 20:15:28 2014 +0000 + + Fixes #12096. Add a note to enable cgi for asx streaming + (cherry picked from commit 022cc273cb7d888f7db90ce779af6e7e143b049f) + +commit 0be4a506835b02edbb86c059df2941e5805844d5 +Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net> +Date: Wed Mar 19 09:25:45 2014 +0000 + + Update the default Options string in the apache config. + + Apache 2.4+ removes the use of the "All" directive. + + No trac ticket, but this was reported on the forum + (cherry picked from commit 00d5acd1a6621e7862233e42e68ec4c932e63898) + +commit 5a3c43c50e498f6adcb1d3272d4836b837ee8d7a +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Mar 17 21:17:33 2014 +0100 + + Avoid localized decimal delimiter for integer + + Fixes #12038 + (cherry picked from commit 5c6067f1d31a3fcd7cfd93631df84f18fab7750f) + commit 6d10afe73e1fb5f21688d4b6d6919cab618e6e88 Author: Stuart Morgan <smorgan(a)mythtv.org> Date: Thu Oct 17 21:37:02 2013 +0100 Index: mythweb.spec =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mythweb.spec 31 May 2014 13:24:41 -0000 1.12 +++ mythweb.spec 28 Jul 2014 12:42:41 -0000 1.13 @@ -1,10 +1,10 @@ -%global ver_string v0.27.1 +%global ver_string v0.27.3 Name: mythweb Summary: The web interface to MythTV URL: http://www.mythtv.org/ -Version: 0.27.1 +Version: 0.27.3 Release: 1%{?dist} License: GPLv2 and LGPLv2 and MIT @@ -105,6 +105,9 @@ %changelog +* Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 +- Update to latest upstream release. + * Mon May 26 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.1-1 - Update to latest upstream release.

10 years, 3 months

1
0
0 / 0

rpms/mythtv/F-19 ChangeLog, 1.14, 1.15 mythtv-0.27-fixes.patch, 1.5, 1.6 mythtv.spec, 1.130, 1.131

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25593 Modified Files: ChangeLog mythtv-0.27-fixes.patch mythtv.spec Log Message: * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 - Update to new upstream release. View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.14 -r 1.15 ChangeLog Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ChangeLog 11 Mar 2014 11:19:30 -0000 1.14 +++ ChangeLog 28 Jul 2014 12:38:32 -0000 1.15 @@ -1,1796 +1,1329 @@ -commit 6b14852a6a3750e1d5c1bf7d461a5338ef535cbb -Author: David Engel <dengel(a)mythtv.org> -Date: Thu Mar 6 15:50:52 2014 -0600 +commit 0dd5ab38982619af18f99c4032c1010d68991047 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Tue Jul 22 06:40:49 2014 -0700 - Apply preroll on virtual tuners when the same multiplex is in use. - - Previously, if any tuner in the same input group was already busy, - preroll would not be applied. Now, if the recording on the other - input is on the same multiplex as the new recording, preroll will be - applied. + Subtitles: Avoid trying to draw empty text or background objects. - Refs #12023 + Cherry-picked / adapted from 203db78ed2c8e9d59159d970b1eb89b5764a79f3. - (cherry picked from commit 11e65dfd38ca419b2157f0dbaa19f965647f648c) - -commit cb3b784dbaa5142a38d24b68be6de7fc13bf0585 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Mon Mar 3 21:35:33 2014 +1100 + Refs #12056 - Change verbosity for some network messages - (cherry picked from commit e6245ca330bc7dcc4d358819a299b28f02f5b5a5) - -commit 384858c5f78c199a5ec87ed0191feb8b6049cf6c -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Mon Mar 3 11:32:25 2014 +1100 +commit 57699052e6eb16293a5954ad4312331448d9ef10 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Wed Jul 16 13:54:46 2014 -0700 - Bump API binary number following round of changes in ringbuffers + Subtitles: Fix cc608 indents. + + The original code was trying to be clever and indent one character + less than intended presumably to account the extra space character + that control codes also imply, but it's not clear that was ever an + appropriate thing to do. + + Thanks to faginbagin@ for identifying the problem and the fix. + Refs #12051. + (cherry picked from commit 7d60440b2d790208a25ce707480f5b01657410f1) -commit 57c32eacfa87783b75412184cc98c6a46dea99c0 +commit f91e18d652a5057b2e40f14a6afbda6b4abc128d Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Thu Feb 27 20:48:28 2014 +1100 +Date: Sat Jul 19 23:56:21 2014 +1000 - Never attempt to read more than in 512kB blocks - - Recalculate the threshold and read block size when we've encountered EOF several times in a row. - 512kB ought to be enough to read a file smoothly (famous last words) + Revert "mythtranscode: fix incorrect memory allocation" - This reduces the amount of unnecessary verbosity. When watching a SD 3Mbit/s DVB stream, it will take over a second to get 1MB of data, leading to a warning entry in the log for every single read. + Causes memory corruption on some system, need to investigate - Refs #10428 - - (cherry picked from commit 1cfdfa3f56876eb20170f33e9592b5c7ffd05064) + This reverts commit 4630430b110dc173963c53d2bc0e7d15e6115d3e. -commit 366ba7dd96c03a20d83a78f9875177d25e57189c +commit 302dde18b440a52f8c53744129a4c9adfee3ef71 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Thu Feb 27 12:51:25 2014 +1100 +Date: Sat Jul 19 15:13:21 2014 +1000 - Allow seeking within the entire liveTV chain of recordings. + mythtranscode: always check if audio stream still exists - Seeking across liveTV was fundamentally broken. You could only seek within the current recordings or go to the beginning of the next one or 15s to the end of the previous one. - This changes correct this behaviour. It is now possible to seek across the entire live TV session. We ensure however that we do not seek further than 15s from the end of a recordings (3s if reaching end of live program). + This doesn’t cater for when there’s a change in audio format or new audio stream, but it prevents the crash when that occurs. - Fixes #12076 + Fixes #12207 - (cherry picked from commit 11daeaadc52214605e204cdfe6f7c001c9c1cc9b) + (cherry picked from commit 43eed00660447d327b8dc13f3daa38e8e5ae8038) -commit d35650578d8bea28e4c2ccabbd3e299d5c402004 +commit 4630430b110dc173963c53d2bc0e7d15e6115d3e Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Tue Feb 25 10:19:17 2014 +1100 +Date: Sat Jul 19 16:20:05 2014 +1000 - Fix typo + mythtranscode: fix incorrect memory allocation - CR got deleted for some reason + Use proper FFmpeg API to allocate AVPacket + Fixes #12213 - (cherry picked from commit 534394068373c52fd712d653e5fea725c564a673) + (cherry picked from commit 09ed2c69354f6870667880aee16257b9600b01d8) -commit ca275af14f60f3cc78e48ac2ad7c55e377e72774 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Sun Feb 23 20:24:28 2014 +1100 +commit 39b73bcc3bb0f7f9cc1e6ed5e895d0949b51c4cd +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Mon Jul 7 18:04:49 2014 +0100 - Prevent playback to exit early should backend's writes be delayed + MythUIWebBrowser: silence a warning when we can't find the parent window - Typical scenario is when watching on-going recordings and being very close to real time TV: should the backend take more than 360ms between two writes, the reader would treat it as an EOF and abort the read. + Base widgets don't necessarily have a window as a parent so don't log + an error in this case. - When encountering EOF, we now check if the file is being written to in parallel and if so wait. - - We can also remove all EOF retries in FileRingBuffer::safe_read() as we definitely know now if we did reach EOF (as we check against the file size). - This allows for almost instantaneous program transition in live TV. - - (cherry picked from commit 443b624ebcc8ea56026cb49ca833edc7d73832c1) + Signed-off-by: Paul Harrison <pharrison(a)mythtv.org> + (cherry picked from commit 25dd4944996e746f1aee73bcbba4889f48e7ef9f) -commit 22936ebd383a96d99602781137d9ce5dec76ab8e +commit 9511b67b9a411d675bdb7c0d43d021aa0bdabd54 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Sun Feb 23 20:19:50 2014 +1100 +Date: Fri Jul 18 03:36:24 2014 +1000 - Have backend advertise which files are currently being written to + protoserver: fixes QUERY_FILE_HASH hanging - It is necessary in some playback scenarios to know if a file being read is currently being written to. This is useful in determining when encountering EOF if we should wait for more data or abort the read. - - MythCoreContext will now keep track of files as they are being opened for writing - Connected frontends will receive the information via the event socket in the form of a BACKEND_MESSAGE event. - - The myth protocol is extended with two new BACKEND_MESSAGE events: - FILE_WRITTEN: Sent when a file is opened in write mode, and when the file is being written to (at most every 10s) - FILE_CLOSED: Sent when the file opened in write mode is closed. - - The myth protocol version doesn’t have to be increased as frontends will make use of it only if available and the changes are backward compatible with exiting myth protocol. - - (cherry picked from commit fafc658597b547e2f0173032515e9790170ebcbe) + same as 933b61ffbe9af3cc6a69df001463fd2141c36b60 + +commit 4e199fcb24e4ed811fa225310144826613af26e1 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Wed Jan 15 14:47:30 2014 +0000 + + BE: Fix 'MythSocket: Programmer error, QEventLoop isn't running...' during BE exit - Conflicts: - mythtv/libs/libmythbase/threadedfilewriter.cpp + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit f8614bb8eea8428a558f257a8c4a7f04af807c94) -commit 0b9470c87fe4d727e173cddf715270da7d18311e +commit ccc5aef96d4c729ee3f3e7a7253e265815c04345 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Thu Feb 20 16:48:44 2014 +1100 +Date: Fri Jul 18 02:23:10 2014 +1000 - Fix fileringbuffer locking up on read() + metadata: fix wrong test leading to incorrect hash calculation - From time to time, most often seen during LiveTV, FileRingBuffer::safe_read() would lock and not return for a long time (on my system, it would block in excess of 20s). - Upon investigation, the issue occurs while reading a file currently being written to, if a call to read() encountered EOF, returned early and a following call to read() was made, before another write. Under those conditions, read() wouldn't return for a long time, causing the backend to abort the read and dropping the frontend connection. + This would have almost always returned true, meaning it would attempt to calculate the hash of a file unlikely to exist locally. + Simplify code + style - So instead we now check the size of the current file via a call to POSIX fstat and never try to read beyond the EOF position. - If the file being read isn't a regular, or fstat returned an error, the old behaviour is used: read until we get as much data as we asked. - - Surprisingly, this has fixed most of the issues I've been having for years with liveTV: - - Stuttering or temporary free when close to the live - - Freeze at program transition. - - Add debugging information while in file mode - - Fixes #12045 - - (cherry picked from commit 20f7cd2858e79385ceec07b2c19c7e4f84714e18) - -commit 28b768a4b9e2fa3b76835057378512cb41a3838c -Author: Stuart Auchterlonie <stuarta(a)mythtv.org> -Date: Tue Feb 25 11:30:29 2014 +0000 - [...2325 lines suppressed...] +Date: Wed Jul 4 16:39:13 2012 +0200 - MythZoneMinder: fix the grabbing of the live stream images + Player: Don't call DoneDisplayingFrame for PiP until next frame is ready - * Add a missing field to the ShareData struct added it later ZM versions - * Change the minimum supported ZM version to 1.24.0. - * Remove the v4l2 hack + 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. - Note: this bumps the MythZoneMinder protocol version so both the FE plugin - and mythzmserver need to be updated. + This patch defers calling DoneDisplayingFrame if the player is a PiP + player so that future calls to GetLastShownFrame return an intact frame. - Refs #8182 + Fixes #10878 - (cherry picked from commit b1867bd45765157432f5598aa26377fb922ed116) - -commit d9561055abeec11fba234c9bdfbde5e79e695803 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Tue Sep 24 06:38:25 2013 -0700 - - Clear duration and framecount flags with mythutil --clearseektable. + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit 49df62f1a76f0e617208e261a09f5f8a634b3ce9) - Otherwise those flags are hard to get rid of when mythcommflag - --rebuild doesn't produce a correct seektable for some reason. - (cherry picked from commit c4f0c0c57c87c4bfe2e9d143648df2a02c44d578) + Conflicts: + mythtv/libs/libmythtv/mythplayer.cpp -commit b6a657478df796c810c788922a545d84f36e7129 -Author: David Engel <dengel(a)mythtv.org> -Date: Mon Sep 23 13:26:45 2013 -0500 +commit fba8e800c98356bd06ee03087b6b421f94610490 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Fri Jun 27 14:05:25 2014 +0100 - Fix startts copy & paste error in previous ForgetHistory() change. + 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. - Also, do use subtitle & description semantics when the original - information is no longer available, but do it in a way that can be - easily detected and works in all code paths. + Refs LMS-2014-06-16-1, CVE-2014-4607 - (cherry picked from commit d2231e90b3f581c69e12cd376324a6b8cdf9ac65) + (cherry picked from commit b99f21b2791c4685fb48460a165a7cd804256f03) + Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> -commit 2ccd08f72b3d445b9a768bf72da25749326821d9 -Author: David Engel <dengel(a)mythtv.org> -Date: Mon Sep 23 12:29:09 2013 -0500 +commit dbb4ef308863a837c1c0617a7a478fb2fe309757 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Mon Jun 30 13:13:11 2014 -0700 - Change RI::ForgetHistory() to use dupmethod when available. + Audio: Abort Drain if audio device is in pause - Previously, ForgetHistory() implicily used subtitle and description as - the duplicate check method. Consequently, it doesn't always match - correctly when other methods are used and there are guide changes in - data that should be ignored. In addition, don't assume any dupmethod - in the Previously Recorded screen to avoid being to overzealous when - called from there. + Prevent deadlock in MythMusic - (cherry picked from commit 567cba3184db0e5801dc1ae7736d5d778ec2d96c) + (cherry picked from commit d6663a5498f1ba1147a801dd4902b779b3afd1f8) -commit 4ae99828b0b82a8498eb0af986dfbceb626f739c -Author: Paul Harrison <pharrison(a)mythtv.org> -Date: Sun Sep 22 23:45:54 2013 +0100 +commit 74d812d1f80cac064ce2ebb7f8164f2a5e825708 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Jul 6 10:48:19 2014 +1000 - MythMusic: fix playback of ogg radio streams - - Peek the probe data from the stream buffer rather than read the data otherwise - ffmpeg fails to open the stream because the magic it is looking for has already - been read from the stream. + Fix memory leak - Also increase the probe buffer to 16K this seems to be required for some ogg - streams to be probed properly. + Coverity CID 1224482 - (cherry picked from commit 6b09d7c629e4efac81276eee9f4b7cbe3bc661ef) - -commit b2486bae6d57bdd8aa78301da7f43982ae5dba73 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:43:51 2013 -0400 - - Update Python bindings version. - -commit 3d7ac5c2d71f91990bdf73eab2299bc4caf5f278 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:42:35 2013 -0400 - - Remove more tmdb bits. - (cherry picked from commit a5d54217962a706c4cedc33012e9e7049d4877f6) - -commit 6d4572a88c1c785cf5b6e6a38256b82d6fded148 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:38:33 2013 -0400 - - Remove tmdb library from python installer script. - (cherry picked from commit 9c0dfbc9f6b753a5b3d6f2e294baaf9577519a91) + (cherry picked from commit e16a9b0072c068a42759a78b4633d656b3627453) -commit db4167ec3d1396c81d00d3fe71b6ca104880136d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:23:05 2013 -0400 - - Remove tmdb.py and associated library. - (cherry picked from commit 53c272dc4ffe2f5392ff54fb3e446801395274fb) - -commit adcda83028125dd6a26f69513ee99da2e7302be3 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 16:59:06 2013 -0400 +commit cebafcf4131c6dff59a6234c5e35408719749890 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Jul 6 08:57:58 2014 +1000 - Allow system calls to pull global settings from the database. + Properly allocate VDPAU PiP video buffers and fix memory leak + + The video buffers were never freed - This adjusts the System() class to first try local settings of the - supplied value, fall back to global settings, and then the supplied - default, before finally erroring. This corrects an issue where the - VideoGrabber() child class did not properly pull the global settings for - TelevisionGrabber and MovieGrabber, and thus just used the internal - defaults. - (cherry picked from commit 4e072b2de29c32c4d00fe62849feadd80d2c0c02) + (cherry picked from commit 548aaf78373cf0360b759b633df10c3690e3f06b) -commit 5b917e8d6548c40f3c6df0dcd18a090d90995306 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Wed Sep 18 23:24:45 2013 +0200 +commit 3b0f5790c9081a17a019ded726ae497bd5c6f62c +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Jul 6 01:25:21 2014 +1000 - Update the Swedish translation. + Don’t attempt to play the video streams for mp3, flac, off and m4a container. - Update of the Swedish translation for mythfrontend and all plugins made - by me and Roger Mårtensson (thank you!). + 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. - (cherry picked from commit 246b2e6a2e496aa8f56c32d38d3997cbf5ff2b1c) - -commit abae25afb73f967421eb7797a868a9bdb187c18c -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Sep 12 21:40:14 2013 -0400 - - Enable --debug flag in test application. + Fixes #11597 + + (cherry picked from commit 9df8bb364ba56cc34d34af40e5980110193bd334) -commit 0d91e6fc4184c17c5a9d39e1b2a264602a47747d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Sep 12 21:35:05 2013 -0400 +commit 418deb69b5f299f18840d55be878714bcefb57a0 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 5 23:37:35 2014 +1000 - Have pager return Nones if the server returns null. + Ignore IPv6 settings value if it’s invalid + + This would otherwise cause the backend to always believe the requested host was local - This temporarily resolves an issue where the TheMovieDb server returns - nulls in searches when a movie has been deleted but not yet flushed out - of the cache. This prevents the error internally, but does not attempt - to re-order to remove the nulls, so is merely passing the issue onto the - application using this library. + Fixes #12172 - Refs #29 + (cherry picked from commit de991d98754bd50045d65080592828631786e161) mythtv-0.27-fixes.patch: mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 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 mythtv/external/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 mythtv/external/FFmpeg/libavcodec/x86/idct_sse2_xvid.c | 2 mythtv/external/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 mythtv/external/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/libmythmetadata/libmythmetadata.pro | 4 mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 mythtv/libs/libmythmetadata/metadatacommon.h | 51 mythtv/libs/libmythmetadata/metadatadownload.cpp | 211 mythtv/libs/libmythmetadata/metadatafactory.cpp | 2 mythtv/libs/libmythmetadata/metadatagrabber.cpp | 584 + mythtv/libs/libmythmetadata/metadatagrabber.h | 100 mythtv/libs/libmythmetadata/metadataimagedownload.cpp | 148 mythtv/libs/libmythmetadata/metadataimagedownload.h | 1 mythtv/libs/libmythmetadata/videometadata.cpp | 17 mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp | 3 mythtv/libs/libmythtv/avformatdecoder.cpp | 12 mythtv/libs/libmythtv/cc608decoder.cpp | 2 mythtv/libs/libmythtv/lzoconf.h | 219 mythtv/libs/libmythtv/lzodefs.h | 2527 ++++-- mythtv/libs/libmythtv/minilzo.cpp | 4191 +++++++--- mythtv/libs/libmythtv/minilzo.h | 20 mythtv/libs/libmythtv/mythplayer.cpp | 10 mythtv/libs/libmythtv/openglvideo.cpp | 2 mythtv/libs/libmythtv/ringbuffer.cpp | 7 mythtv/libs/libmythtv/subtitlescreen.cpp | 58 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/mythfrontend/grabbersettings.cpp | 125 mythtv/programs/mythfrontend/grabbersettings.h | 7 mythtv/programs/mythmetadatalookup/main.cpp | 12 mythtv/programs/mythtranscode/mpeg2fix.cpp | 17 mythtv/programs/mythtranscode/mpeg2fix.h | 4 mythtv/themes/classic/tv_schedule.xml | 2 92 files changed, 6321 insertions(+), 2577 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 mythtv-0.27-fixes.patch Index: mythtv-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/mythtv-0.27-fixes.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythtv-0.27-fixes.patch 14 May 2014 19:42:54 -0000 1.5 +++ mythtv-0.27-fixes.patch 28 Jul 2014 12:38:32 -0000 1.6 @@ -1,68996 +1,13104 @@ - mythplugins/configure | 18 +- - mythplugins/mytharchive/i18n/mytharchive_sv.qm | Bin 34033 -> 35218 bytes - mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +- - .../mytharchive/mytharchive/archiveutil.cpp | 4 +- - mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 +- - .../mytharchive/mythburn/scripts/mythburn.py | 19 +- - mythplugins/mythbrowser/i18n/mythbrowser_sv.qm | Bin 7139 -> 7616 bytes - mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 +- - mythplugins/mythgallery/i18n/mythgallery_sv.qm | Bin 18827 -> 24405 bytes - mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 +- - mythplugins/mythgame/i18n/mythgame_sv.qm | Bin 16378 -> 16696 bytes - mythplugins/mythgame/i18n/mythgame_sv.ts | 136 +- - mythplugins/mythmusic/i18n/mythmusic_sv.qm | Bin 60650 -> 61545 bytes - mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 +- - mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9 +- - mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34 +- - mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 +- - mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 +- - mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 +- - mythplugins/mythmusic/mythmusic/musicplayer.cpp | 101 +- - mythplugins/mythmusic/mythmusic/musicplayer.h | 4 +- - mythplugins/mythmusic/mythmusic/playersettings.cpp | 1 + - mythplugins/mythmusic/mythmusic/playlist.cpp | 2 +- - .../mythmusic/mythmusic/playlisteditorview.cpp | 19 +- - mythplugins/mythmusic/mythmusic/searchview.cpp | 15 +- - mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 +- - mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 4 +- - mythplugins/mythmusic/mythmusic/streamview.cpp | 7 +- - .../mythmusic/mythmusic/visualizationsettings.cpp | 4 +- - mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes - mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 +- - .../mythnetvision/mythnetvision/mythnetvision.pro | 5 +- - mythplugins/mythnews/i18n/mythnews_sv.qm | Bin 4604 -> 4965 bytes - mythplugins/mythnews/i18n/mythnews_sv.ts | 76 +- - mythplugins/mythweather/i18n/mythweather_sv.qm | Bin 22243 -> 23197 bytes - mythplugins/mythweather/i18n/mythweather_sv.ts | 62 +- - .../mythzoneminder/i18n/mythzoneminder_sv.qm | Bin 7032 -> 7267 bytes - .../mythzoneminder/i18n/mythzoneminder_sv.ts | 183 +- - mythplugins/mythzoneminder/mythzmserver/main.cpp | 13 +- - .../mythzoneminder/mythzmserver/zmserver.cpp | 655 +- - mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101 +- - .../mythzoneminder/mythzoneminder/zmclient.cpp | 25 +- - .../mythzoneminder/mythzoneminder/zmconsole.cpp | 8 +- - .../mythzoneminder/mythzoneminder/zmconsole.h | 2 - - .../mythzoneminder/mythzoneminder/zmdefines.h | 11 +- - .../mythzoneminder/mythzoneminder/zmevents.cpp | 64 +- - .../mythzoneminder/mythzoneminder/zmevents.h | 1 + - .../mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64 +- - .../mythzoneminder/mythzoneminder/zmplayer.cpp | 21 +- - .../mythzoneminder/mythzoneminder/zmplayer.h | 3 +- - .../theme/default-wide/zoneminder-ui.xml | 244 +- - .../mythzoneminder/theme/default/zoneminder-ui.xml | 203 + - mythtv/bindings/python/MythTV/dataheap.py | 1 + - mythtv/bindings/python/MythTV/system.py | 11 +- - .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 - - .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 - - mythtv/bindings/python/MythTV/tmdb/__init__.py | 0 - mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 - - .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - - mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 - - .../python/MythTV/wikiscripts/wikiscripts.py | 2 +- - mythtv/bindings/python/scripts/mythpython | 4 +- - mythtv/bindings/python/setup.py | 6 +- - mythtv/bindings/python/tmdb3/README | 86 +- - .../python/tmdb3/scripts/populate_locale.py | 5 +- - mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1 - - mythtv/bindings/python/tmdb3/setup.py | 15 +- - mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3 +- - mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18 +- - mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24 +- - mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26 +- - mythtv/bindings/python/tmdb3/tmdb3/request.py | 59 +- - mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652 +- - mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35 +- - .../bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90 +- - mythtv/bindings/python/tmdb3/tmdb3/util.py | 201 +- - mythtv/configure | 18 +- - mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +- - mythtv/external/FFmpeg/libavformat/mpeg.c | 10 +- - mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes - mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- - mythtv/libs/libmyth/libmyth.pro | 6 +- - mythtv/libs/libmyth/mythconfiggroups.cpp | 1 - - mythtv/libs/libmyth/mythconfiggroups.h | 2 +- - mythtv/libs/libmyth/programinfo.cpp | 295 +- - mythtv/libs/libmyth/programinfo.h | 17 + - mythtv/libs/libmyth/programtypes.h | 2 +- - mythtv/libs/libmyth/remoteutil.h | 2 + - mythtv/libs/libmythbase/bonjourregister.cpp | 40 + - mythtv/libs/libmythbase/bonjourregister.h | 4 + - mythtv/libs/libmythbase/housekeeper.cpp | 22 +- - mythtv/libs/libmythbase/housekeeper.h | 2 + - mythtv/libs/libmythbase/libmythbase.pro | 6 +- - mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +- - mythtv/libs/libmythbase/mythcorecontext.cpp | 138 +- - mythtv/libs/libmythbase/mythcorecontext.h | 4 + - mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 - - mythtv/libs/libmythbase/mythmiscutil.h | 1 + - mythtv/libs/libmythbase/mythsingledownload.cpp | 86 + - mythtv/libs/libmythbase/mythsingledownload.h | 49 + - mythtv/libs/libmythbase/mythsocket.cpp | 12 + - mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +- - mythtv/libs/libmythbase/mythsystemlegacy.h | 1 + - mythtv/libs/libmythbase/mythtimer.cpp | 2 + - mythtv/libs/libmythbase/mythtimezone.cpp | 1 + - mythtv/libs/libmythbase/mythversion.h | 2 +- - mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 +- - mythtv/libs/libmythbase/threadedfilewriter.h | 1 + - mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 + - mythtv/libs/libmythmetadata/metadatacommon.cpp | 29 +- - mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 +- - mythtv/libs/libmythmetadata/metaio.cpp | 8 + - mythtv/libs/libmythmetadata/metaio.h | 2 + - mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 - - mythtv/libs/libmythmetadata/metaioid3.cpp | 15 +- - .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 151 +- - mythtv/libs/libmythtv/AirPlay/mythairplayserver.h | 25 +- - mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +- - mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 +- - mythtv/libs/libmythtv/cardutil.cpp | 22 + - mythtv/libs/libmythtv/cardutil.h | 8 + - mythtv/libs/libmythtv/dbcheck.cpp | 6 +- - mythtv/libs/libmythtv/eitcache.cpp | 60 +- - mythtv/libs/libmythtv/eitcache.h | 2 + - mythtv/libs/libmythtv/fileringbuffer.cpp | 53 +- - mythtv/libs/libmythtv/libmythtv.pro | 15 +- - mythtv/libs/libmythtv/livetvchain.cpp | 230 +- - mythtv/libs/libmythtv/livetvchain.h | 9 +- - mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 6 +- - mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 +- - mythtv/libs/libmythtv/mythplayer.cpp | 97 +- - mythtv/libs/libmythtv/mythplayer.h | 4 + - mythtv/libs/libmythtv/previewgenerator.cpp | 6 +- - mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +- - .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140 + - .../libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 + - mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392 + - mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162 + - mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70 + - mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55 + - mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193 + - mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103 + - .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103 + - .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38 + - mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 +- - .../libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12 + - mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 +- - .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 96 +- - mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 +- - mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +- - mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 +- - mythtv/libs/libmythtv/recorders/iptvchannel.h | 20 +- - mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17 +- - mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 - - .../libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 +- - .../libs/libmythtv/recorders/iptvsignalmonitor.h | 3 +- - .../libs/libmythtv/recorders/iptvstreamhandler.cpp | 28 +- - mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4 +- - mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 +- - mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 + - mythtv/libs/libmythtv/recorders/streamhandler.h | 1 + - mythtv/libs/libmythtv/recordinginfo.cpp | 143 +- - mythtv/libs/libmythtv/ringbuffer.cpp | 82 +- - mythtv/libs/libmythtv/tv_play.cpp | 86 +- - mythtv/libs/libmythtv/tv_play.h | 1 + - mythtv/libs/libmythtv/tv_rec.cpp | 69 +- - mythtv/libs/libmythtv/tv_rec.h | 1 + - mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +- - mythtv/libs/libmythtv/videooutbase.cpp | 2 +- - mythtv/libs/libmythtv/videosource.cpp | 2 +- - mythtv/libs/libmythtv/vsync.cpp | 8 +- - mythtv/libs/libmythui/AppleRemote.cpp | 10 + - mythtv/libs/libmythui/mythgesture.cpp | 1 + - mythtv/libs/libmythui/mythmainwindow.cpp | 57 +- - mythtv/libs/libmythui/mythnotificationcenter.cpp | 1 + - mythtv/libs/libmythui/mythpainter.cpp | 1 + - mythtv/libs/libmythui/mythrender_opengl.cpp | 2 + - mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 +- - mythtv/libs/libmythupnp/httprequest.cpp | 3 +- - mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 + - mythtv/libs/libmythupnp/upnpcds.cpp | 28 +- - mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 +- - mythtv/programs/mythbackend/backendhousekeeper.h | 1 + - mythtv/programs/mythbackend/encoderlink.cpp | 117 +- - mythtv/programs/mythbackend/encoderlink.h | 9 +- - mythtv/programs/mythbackend/main.cpp | 13 + - mythtv/programs/mythbackend/mainserver.cpp | 47 +- - mythtv/programs/mythbackend/mainserver.h | 2 +- [...81317 lines suppressed...] -+ <area>35,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-2" from="name1-1"> -+ <area>450,50,215,30</area> -+ <value>Monitor 2</value> -+ </textarea> -+ -+ <textarea name="status4-2" from="status1-1"> -+ <area>670,50,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-2"> -+ <area>450,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-3" from="name1-1"> -+ <area>865,50,215,30</area> -+ <value>Monitor 3</value> -+ </textarea> -+ -+ <textarea name="status4-3" from="status1-1"> -+ <area>1085,50,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-3"> -+ <area>865,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-4" from="name1-1"> -+ <area>35,370,215,30</area> -+ <value>Monitor 4</value> -+ </textarea> -+ -+ <textarea name="status4-4" from="status1-1"> -+ <area>255,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-4"> -+ <area>35,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-5" from="name1-1"> -+ <area>450,370,215,30</area> -+ <value>Monitor 5</value> -+ </textarea> -+ -+ <textarea name="status4-5" from="status1-1"> -+ <area>670,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-5"> -+ <area>450,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-6" from="name1-1"> -+ <area>865,370,215,30</area> -+ <value>Monitor 6</value> -+ </textarea> -+ -+ <textarea name="status4-6" from="status1-1"> -+ <area>1085,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-6"> -+ <area>865,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+  -+ <textarea name="name5-1" from="name1-1"> -+ <area>20,110,160,30</area> -+ <value>Monitor 1</value> -+ </textarea> -+ -+ <textarea name="status5-1" from="status1-1"> -+ <area>185,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-1"> -+ <area>20,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-2" from="name1-1"> -+ <area>335,110,160,30</area> -+ <value>Monitor 2</value> -+ </textarea> -+ -+ <textarea name="status5-2" from="status1-1"> -+ <area>500,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-2"> -+ <area>335,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-3" from="name1-1"> -+ <area>650,110,160,30</area> -+ <value>Monitor 3</value> -+ </textarea> -+ -+ <textarea name="status5-3" from="status1-1"> -+ <area>815,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-3"> -+ <area>650,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-4" from="name1-1"> -+ <area>965,110,160,30</area> -+ <value>Monitor 4</value> -+ </textarea> -+ -+ <textarea name="status5-4" from="status1-1"> -+ <area>1130,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-4"> -+ <area>965,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-5" from="name1-1"> -+ <area>20,395,160,30</area> -+ <value>Monitor 5</value> -+ </textarea> -+ -+ <textarea name="status5-5" from="status1-1"> -+ <area>185,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-5"> -+ <area>20,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-6" from="name1-1"> -+ <area>335,395,160,30</area> -+ <value>Monitor 6</value> -+ </textarea> -+ -+ <textarea name="status5-6" from="status1-1"> -+ <area>500,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-6"> -+ <area>335,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-7" from="name1-1"> -+ <area>650,395,160,30</area> -+ <value>Monitor 7</value> -+ </textarea> -+ -+ <textarea name="status5-7" from="status1-1"> -+ <area>815,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-7"> -+ <area>650,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-8" from="name1-1"> -+ <area>965,395,160,30</area> -+ <value>Monitor 8</value> -+ </textarea> -+ -+ <textarea name="status5-8" from="status1-1"> -+ <area>1130,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-8"> -+ <area>965,425,295,220</area> - <filename>mz_testcard.png</filename> - </imagetype> - -diff --git a/mythtv/themes/MythCenter/notification-ui.xml b/mythtv/themes/MythCenter/notification-ui.xml -index 95699af..a92c5ad 100644 ---- a/mythtv/themes/MythCenter/notification-ui.xml -+++ b/mythtv/themes/MythCenter/notification-ui.xml -@@ -262,7 +262,7 @@ - <preserveaspect>true</preserveaspect> - </imagetype> - -- <shape name="textbackground"> -+ <shape name="textbackground" depends="description|description_noprogress|extra|title|origin"> - <area>85,100%-260,-85,-55</area> - <fill color="#000000" alpha="100" /> - </shape> Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/mythtv.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- mythtv.spec 28 May 2014 02:26:53 -0000 1.130 +++ mythtv.spec 28 Jul 2014 12:38:33 -0000 1.131 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27.1 +%define vers_string v0.27.3-109-g0dd5ab3 %define branch fixes/0.27 # Git revision and branch ID @@ -74,7 +74,7 @@ URL: http://www.mythtv.org/ # Version/Release info -Version: 0.27.1 +Version: 0.27.3 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else @@ -468,7 +468,7 @@ Requires: libvorbis-devel >= 1.0 Requires: mjpegtools-devel >= 1.6.1 Requires: taglib-devel >= 1.5 -Requires: transcode >= 0.6.8 +#Requires: transcode >= 0.6.8 Requires: x264-devel Requires: xvidcore-devel >= 0.9.1 @@ -1435,6 +1435,9 @@ %changelog +* Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 +- Update to new upstream release. + * Mon May 26 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.1-1 - Update to new upstream release.

10 years, 3 months

1
0
0 / 0

rpms/mythtv/F-20 ChangeLog, 1.15, 1.16 mythtv-0.27-fixes.patch, 1.5, 1.6 mythtv.spec, 1.138, 1.139

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25483 Modified Files: ChangeLog mythtv-0.27-fixes.patch mythtv.spec Log Message: * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 - Update to new upstream release. View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.15 -r 1.16 ChangeLog Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/F-20/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 11 Mar 2014 11:18:54 -0000 1.15 +++ ChangeLog 28 Jul 2014 12:38:03 -0000 1.16 @@ -1,1796 +1,1329 @@ -commit 6b14852a6a3750e1d5c1bf7d461a5338ef535cbb -Author: David Engel <dengel(a)mythtv.org> -Date: Thu Mar 6 15:50:52 2014 -0600 +commit 0dd5ab38982619af18f99c4032c1010d68991047 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Tue Jul 22 06:40:49 2014 -0700 - Apply preroll on virtual tuners when the same multiplex is in use. - - Previously, if any tuner in the same input group was already busy, - preroll would not be applied. Now, if the recording on the other - input is on the same multiplex as the new recording, preroll will be - applied. + Subtitles: Avoid trying to draw empty text or background objects. - Refs #12023 + Cherry-picked / adapted from 203db78ed2c8e9d59159d970b1eb89b5764a79f3. - (cherry picked from commit 11e65dfd38ca419b2157f0dbaa19f965647f648c) - -commit cb3b784dbaa5142a38d24b68be6de7fc13bf0585 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Mon Mar 3 21:35:33 2014 +1100 + Refs #12056 - Change verbosity for some network messages - (cherry picked from commit e6245ca330bc7dcc4d358819a299b28f02f5b5a5) - -commit 384858c5f78c199a5ec87ed0191feb8b6049cf6c -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Mon Mar 3 11:32:25 2014 +1100 +commit 57699052e6eb16293a5954ad4312331448d9ef10 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Wed Jul 16 13:54:46 2014 -0700 - Bump API binary number following round of changes in ringbuffers + Subtitles: Fix cc608 indents. + + The original code was trying to be clever and indent one character + less than intended presumably to account the extra space character + that control codes also imply, but it's not clear that was ever an + appropriate thing to do. + + Thanks to faginbagin@ for identifying the problem and the fix. + Refs #12051. + (cherry picked from commit 7d60440b2d790208a25ce707480f5b01657410f1) -commit 57c32eacfa87783b75412184cc98c6a46dea99c0 +commit f91e18d652a5057b2e40f14a6afbda6b4abc128d Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Thu Feb 27 20:48:28 2014 +1100 +Date: Sat Jul 19 23:56:21 2014 +1000 - Never attempt to read more than in 512kB blocks - - Recalculate the threshold and read block size when we've encountered EOF several times in a row. - 512kB ought to be enough to read a file smoothly (famous last words) + Revert "mythtranscode: fix incorrect memory allocation" - This reduces the amount of unnecessary verbosity. When watching a SD 3Mbit/s DVB stream, it will take over a second to get 1MB of data, leading to a warning entry in the log for every single read. + Causes memory corruption on some system, need to investigate - Refs #10428 - - (cherry picked from commit 1cfdfa3f56876eb20170f33e9592b5c7ffd05064) + This reverts commit 4630430b110dc173963c53d2bc0e7d15e6115d3e. -commit 366ba7dd96c03a20d83a78f9875177d25e57189c +commit 302dde18b440a52f8c53744129a4c9adfee3ef71 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Thu Feb 27 12:51:25 2014 +1100 +Date: Sat Jul 19 15:13:21 2014 +1000 - Allow seeking within the entire liveTV chain of recordings. + mythtranscode: always check if audio stream still exists - Seeking across liveTV was fundamentally broken. You could only seek within the current recordings or go to the beginning of the next one or 15s to the end of the previous one. - This changes correct this behaviour. It is now possible to seek across the entire live TV session. We ensure however that we do not seek further than 15s from the end of a recordings (3s if reaching end of live program). + This doesn’t cater for when there’s a change in audio format or new audio stream, but it prevents the crash when that occurs. - Fixes #12076 + Fixes #12207 - (cherry picked from commit 11daeaadc52214605e204cdfe6f7c001c9c1cc9b) + (cherry picked from commit 43eed00660447d327b8dc13f3daa38e8e5ae8038) -commit d35650578d8bea28e4c2ccabbd3e299d5c402004 +commit 4630430b110dc173963c53d2bc0e7d15e6115d3e Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Tue Feb 25 10:19:17 2014 +1100 +Date: Sat Jul 19 16:20:05 2014 +1000 - Fix typo + mythtranscode: fix incorrect memory allocation - CR got deleted for some reason + Use proper FFmpeg API to allocate AVPacket + Fixes #12213 - (cherry picked from commit 534394068373c52fd712d653e5fea725c564a673) + (cherry picked from commit 09ed2c69354f6870667880aee16257b9600b01d8) -commit ca275af14f60f3cc78e48ac2ad7c55e377e72774 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Sun Feb 23 20:24:28 2014 +1100 +commit 39b73bcc3bb0f7f9cc1e6ed5e895d0949b51c4cd +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Mon Jul 7 18:04:49 2014 +0100 - Prevent playback to exit early should backend's writes be delayed + MythUIWebBrowser: silence a warning when we can't find the parent window - Typical scenario is when watching on-going recordings and being very close to real time TV: should the backend take more than 360ms between two writes, the reader would treat it as an EOF and abort the read. + Base widgets don't necessarily have a window as a parent so don't log + an error in this case. - When encountering EOF, we now check if the file is being written to in parallel and if so wait. - - We can also remove all EOF retries in FileRingBuffer::safe_read() as we definitely know now if we did reach EOF (as we check against the file size). - This allows for almost instantaneous program transition in live TV. - - (cherry picked from commit 443b624ebcc8ea56026cb49ca833edc7d73832c1) + Signed-off-by: Paul Harrison <pharrison(a)mythtv.org> + (cherry picked from commit 25dd4944996e746f1aee73bcbba4889f48e7ef9f) -commit 22936ebd383a96d99602781137d9ce5dec76ab8e +commit 9511b67b9a411d675bdb7c0d43d021aa0bdabd54 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Sun Feb 23 20:19:50 2014 +1100 +Date: Fri Jul 18 03:36:24 2014 +1000 - Have backend advertise which files are currently being written to + protoserver: fixes QUERY_FILE_HASH hanging - It is necessary in some playback scenarios to know if a file being read is currently being written to. This is useful in determining when encountering EOF if we should wait for more data or abort the read. - - MythCoreContext will now keep track of files as they are being opened for writing - Connected frontends will receive the information via the event socket in the form of a BACKEND_MESSAGE event. - - The myth protocol is extended with two new BACKEND_MESSAGE events: - FILE_WRITTEN: Sent when a file is opened in write mode, and when the file is being written to (at most every 10s) - FILE_CLOSED: Sent when the file opened in write mode is closed. - - The myth protocol version doesn’t have to be increased as frontends will make use of it only if available and the changes are backward compatible with exiting myth protocol. - - (cherry picked from commit fafc658597b547e2f0173032515e9790170ebcbe) + same as 933b61ffbe9af3cc6a69df001463fd2141c36b60 + +commit 4e199fcb24e4ed811fa225310144826613af26e1 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Wed Jan 15 14:47:30 2014 +0000 + + BE: Fix 'MythSocket: Programmer error, QEventLoop isn't running...' during BE exit - Conflicts: - mythtv/libs/libmythbase/threadedfilewriter.cpp + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit f8614bb8eea8428a558f257a8c4a7f04af807c94) -commit 0b9470c87fe4d727e173cddf715270da7d18311e +commit ccc5aef96d4c729ee3f3e7a7253e265815c04345 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Thu Feb 20 16:48:44 2014 +1100 +Date: Fri Jul 18 02:23:10 2014 +1000 - Fix fileringbuffer locking up on read() + metadata: fix wrong test leading to incorrect hash calculation - From time to time, most often seen during LiveTV, FileRingBuffer::safe_read() would lock and not return for a long time (on my system, it would block in excess of 20s). - Upon investigation, the issue occurs while reading a file currently being written to, if a call to read() encountered EOF, returned early and a following call to read() was made, before another write. Under those conditions, read() wouldn't return for a long time, causing the backend to abort the read and dropping the frontend connection. + This would have almost always returned true, meaning it would attempt to calculate the hash of a file unlikely to exist locally. + Simplify code + style - So instead we now check the size of the current file via a call to POSIX fstat and never try to read beyond the EOF position. - If the file being read isn't a regular, or fstat returned an error, the old behaviour is used: read until we get as much data as we asked. - - Surprisingly, this has fixed most of the issues I've been having for years with liveTV: - - Stuttering or temporary free when close to the live - - Freeze at program transition. - - Add debugging information while in file mode - - Fixes #12045 - - (cherry picked from commit 20f7cd2858e79385ceec07b2c19c7e4f84714e18) - -commit 28b768a4b9e2fa3b76835057378512cb41a3838c -Author: Stuart Auchterlonie <stuarta(a)mythtv.org> -Date: Tue Feb 25 11:30:29 2014 +0000 - [...2325 lines suppressed...] +Date: Wed Jul 4 16:39:13 2012 +0200 - MythZoneMinder: fix the grabbing of the live stream images + Player: Don't call DoneDisplayingFrame for PiP until next frame is ready - * Add a missing field to the ShareData struct added it later ZM versions - * Change the minimum supported ZM version to 1.24.0. - * Remove the v4l2 hack + 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. - Note: this bumps the MythZoneMinder protocol version so both the FE plugin - and mythzmserver need to be updated. + This patch defers calling DoneDisplayingFrame if the player is a PiP + player so that future calls to GetLastShownFrame return an intact frame. - Refs #8182 + Fixes #10878 - (cherry picked from commit b1867bd45765157432f5598aa26377fb922ed116) - -commit d9561055abeec11fba234c9bdfbde5e79e695803 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Tue Sep 24 06:38:25 2013 -0700 - - Clear duration and framecount flags with mythutil --clearseektable. + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit 49df62f1a76f0e617208e261a09f5f8a634b3ce9) - Otherwise those flags are hard to get rid of when mythcommflag - --rebuild doesn't produce a correct seektable for some reason. - (cherry picked from commit c4f0c0c57c87c4bfe2e9d143648df2a02c44d578) + Conflicts: + mythtv/libs/libmythtv/mythplayer.cpp -commit b6a657478df796c810c788922a545d84f36e7129 -Author: David Engel <dengel(a)mythtv.org> -Date: Mon Sep 23 13:26:45 2013 -0500 +commit fba8e800c98356bd06ee03087b6b421f94610490 +Author: Stuart Morgan <smorgan(a)mythtv.org> +Date: Fri Jun 27 14:05:25 2014 +0100 - Fix startts copy & paste error in previous ForgetHistory() change. + 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. - Also, do use subtitle & description semantics when the original - information is no longer available, but do it in a way that can be - easily detected and works in all code paths. + Refs LMS-2014-06-16-1, CVE-2014-4607 - (cherry picked from commit d2231e90b3f581c69e12cd376324a6b8cdf9ac65) + (cherry picked from commit b99f21b2791c4685fb48460a165a7cd804256f03) + Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> -commit 2ccd08f72b3d445b9a768bf72da25749326821d9 -Author: David Engel <dengel(a)mythtv.org> -Date: Mon Sep 23 12:29:09 2013 -0500 +commit dbb4ef308863a837c1c0617a7a478fb2fe309757 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Mon Jun 30 13:13:11 2014 -0700 - Change RI::ForgetHistory() to use dupmethod when available. + Audio: Abort Drain if audio device is in pause - Previously, ForgetHistory() implicily used subtitle and description as - the duplicate check method. Consequently, it doesn't always match - correctly when other methods are used and there are guide changes in - data that should be ignored. In addition, don't assume any dupmethod - in the Previously Recorded screen to avoid being to overzealous when - called from there. + Prevent deadlock in MythMusic - (cherry picked from commit 567cba3184db0e5801dc1ae7736d5d778ec2d96c) + (cherry picked from commit d6663a5498f1ba1147a801dd4902b779b3afd1f8) -commit 4ae99828b0b82a8498eb0af986dfbceb626f739c -Author: Paul Harrison <pharrison(a)mythtv.org> -Date: Sun Sep 22 23:45:54 2013 +0100 +commit 74d812d1f80cac064ce2ebb7f8164f2a5e825708 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Jul 6 10:48:19 2014 +1000 - MythMusic: fix playback of ogg radio streams - - Peek the probe data from the stream buffer rather than read the data otherwise - ffmpeg fails to open the stream because the magic it is looking for has already - been read from the stream. + Fix memory leak - Also increase the probe buffer to 16K this seems to be required for some ogg - streams to be probed properly. + Coverity CID 1224482 - (cherry picked from commit 6b09d7c629e4efac81276eee9f4b7cbe3bc661ef) - -commit b2486bae6d57bdd8aa78301da7f43982ae5dba73 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:43:51 2013 -0400 - - Update Python bindings version. - -commit 3d7ac5c2d71f91990bdf73eab2299bc4caf5f278 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:42:35 2013 -0400 - - Remove more tmdb bits. - (cherry picked from commit a5d54217962a706c4cedc33012e9e7049d4877f6) - -commit 6d4572a88c1c785cf5b6e6a38256b82d6fded148 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:38:33 2013 -0400 - - Remove tmdb library from python installer script. - (cherry picked from commit 9c0dfbc9f6b753a5b3d6f2e294baaf9577519a91) + (cherry picked from commit e16a9b0072c068a42759a78b4633d656b3627453) -commit db4167ec3d1396c81d00d3fe71b6ca104880136d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:23:05 2013 -0400 - - Remove tmdb.py and associated library. - (cherry picked from commit 53c272dc4ffe2f5392ff54fb3e446801395274fb) - -commit adcda83028125dd6a26f69513ee99da2e7302be3 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 16:59:06 2013 -0400 +commit cebafcf4131c6dff59a6234c5e35408719749890 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Jul 6 08:57:58 2014 +1000 - Allow system calls to pull global settings from the database. + Properly allocate VDPAU PiP video buffers and fix memory leak + + The video buffers were never freed - This adjusts the System() class to first try local settings of the - supplied value, fall back to global settings, and then the supplied - default, before finally erroring. This corrects an issue where the - VideoGrabber() child class did not properly pull the global settings for - TelevisionGrabber and MovieGrabber, and thus just used the internal - defaults. - (cherry picked from commit 4e072b2de29c32c4d00fe62849feadd80d2c0c02) + (cherry picked from commit 548aaf78373cf0360b759b633df10c3690e3f06b) -commit 5b917e8d6548c40f3c6df0dcd18a090d90995306 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Wed Sep 18 23:24:45 2013 +0200 +commit 3b0f5790c9081a17a019ded726ae497bd5c6f62c +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sun Jul 6 01:25:21 2014 +1000 - Update the Swedish translation. + Don’t attempt to play the video streams for mp3, flac, off and m4a container. - Update of the Swedish translation for mythfrontend and all plugins made - by me and Roger Mårtensson (thank you!). + 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. - (cherry picked from commit 246b2e6a2e496aa8f56c32d38d3997cbf5ff2b1c) - -commit abae25afb73f967421eb7797a868a9bdb187c18c -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Sep 12 21:40:14 2013 -0400 - - Enable --debug flag in test application. + Fixes #11597 + + (cherry picked from commit 9df8bb364ba56cc34d34af40e5980110193bd334) -commit 0d91e6fc4184c17c5a9d39e1b2a264602a47747d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Sep 12 21:35:05 2013 -0400 +commit 418deb69b5f299f18840d55be878714bcefb57a0 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 5 23:37:35 2014 +1000 - Have pager return Nones if the server returns null. + Ignore IPv6 settings value if it’s invalid + + This would otherwise cause the backend to always believe the requested host was local - This temporarily resolves an issue where the TheMovieDb server returns - nulls in searches when a movie has been deleted but not yet flushed out - of the cache. This prevents the error internally, but does not attempt - to re-order to remove the nulls, so is merely passing the issue onto the - application using this library. + Fixes #12172 - Refs #29 + (cherry picked from commit de991d98754bd50045d65080592828631786e161) mythtv-0.27-fixes.patch: mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 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 mythtv/external/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 mythtv/external/FFmpeg/libavcodec/x86/idct_sse2_xvid.c | 2 mythtv/external/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 mythtv/external/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/libmythmetadata/libmythmetadata.pro | 4 mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 mythtv/libs/libmythmetadata/metadatacommon.h | 51 mythtv/libs/libmythmetadata/metadatadownload.cpp | 211 mythtv/libs/libmythmetadata/metadatafactory.cpp | 2 mythtv/libs/libmythmetadata/metadatagrabber.cpp | 584 + mythtv/libs/libmythmetadata/metadatagrabber.h | 100 mythtv/libs/libmythmetadata/metadataimagedownload.cpp | 148 mythtv/libs/libmythmetadata/metadataimagedownload.h | 1 mythtv/libs/libmythmetadata/videometadata.cpp | 17 mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp | 3 mythtv/libs/libmythtv/avformatdecoder.cpp | 12 mythtv/libs/libmythtv/cc608decoder.cpp | 2 mythtv/libs/libmythtv/lzoconf.h | 219 mythtv/libs/libmythtv/lzodefs.h | 2527 ++++-- mythtv/libs/libmythtv/minilzo.cpp | 4191 +++++++--- mythtv/libs/libmythtv/minilzo.h | 20 mythtv/libs/libmythtv/mythplayer.cpp | 10 mythtv/libs/libmythtv/openglvideo.cpp | 2 mythtv/libs/libmythtv/ringbuffer.cpp | 7 mythtv/libs/libmythtv/subtitlescreen.cpp | 58 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/mythfrontend/grabbersettings.cpp | 125 mythtv/programs/mythfrontend/grabbersettings.h | 7 mythtv/programs/mythmetadatalookup/main.cpp | 12 mythtv/programs/mythtranscode/mpeg2fix.cpp | 17 mythtv/programs/mythtranscode/mpeg2fix.h | 4 mythtv/themes/classic/tv_schedule.xml | 2 92 files changed, 6321 insertions(+), 2577 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 mythtv-0.27-fixes.patch Index: mythtv-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-20/mythtv-0.27-fixes.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythtv-0.27-fixes.patch 14 May 2014 19:42:24 -0000 1.5 +++ mythtv-0.27-fixes.patch 28 Jul 2014 12:38:03 -0000 1.6 @@ -1,68996 +1,13104 @@ - mythplugins/configure | 18 +- - mythplugins/mytharchive/i18n/mytharchive_sv.qm | Bin 34033 -> 35218 bytes - mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +- - .../mytharchive/mytharchive/archiveutil.cpp | 4 +- - mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 +- - .../mytharchive/mythburn/scripts/mythburn.py | 19 +- - mythplugins/mythbrowser/i18n/mythbrowser_sv.qm | Bin 7139 -> 7616 bytes - mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 +- - mythplugins/mythgallery/i18n/mythgallery_sv.qm | Bin 18827 -> 24405 bytes - mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 +- - mythplugins/mythgame/i18n/mythgame_sv.qm | Bin 16378 -> 16696 bytes - mythplugins/mythgame/i18n/mythgame_sv.ts | 136 +- - mythplugins/mythmusic/i18n/mythmusic_sv.qm | Bin 60650 -> 61545 bytes - mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 +- - mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9 +- - mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34 +- - mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 +- - mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 +- - mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 +- - mythplugins/mythmusic/mythmusic/musicplayer.cpp | 101 +- - mythplugins/mythmusic/mythmusic/musicplayer.h | 4 +- - mythplugins/mythmusic/mythmusic/playersettings.cpp | 1 + - mythplugins/mythmusic/mythmusic/playlist.cpp | 2 +- - .../mythmusic/mythmusic/playlisteditorview.cpp | 19 +- - mythplugins/mythmusic/mythmusic/searchview.cpp | 15 +- - mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 +- - mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 4 +- - mythplugins/mythmusic/mythmusic/streamview.cpp | 7 +- - .../mythmusic/mythmusic/visualizationsettings.cpp | 4 +- - mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes - mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 +- - .../mythnetvision/mythnetvision/mythnetvision.pro | 5 +- - mythplugins/mythnews/i18n/mythnews_sv.qm | Bin 4604 -> 4965 bytes - mythplugins/mythnews/i18n/mythnews_sv.ts | 76 +- - mythplugins/mythweather/i18n/mythweather_sv.qm | Bin 22243 -> 23197 bytes - mythplugins/mythweather/i18n/mythweather_sv.ts | 62 +- - .../mythzoneminder/i18n/mythzoneminder_sv.qm | Bin 7032 -> 7267 bytes - .../mythzoneminder/i18n/mythzoneminder_sv.ts | 183 +- - mythplugins/mythzoneminder/mythzmserver/main.cpp | 13 +- - .../mythzoneminder/mythzmserver/zmserver.cpp | 655 +- - mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101 +- - .../mythzoneminder/mythzoneminder/zmclient.cpp | 25 +- - .../mythzoneminder/mythzoneminder/zmconsole.cpp | 8 +- - .../mythzoneminder/mythzoneminder/zmconsole.h | 2 - - .../mythzoneminder/mythzoneminder/zmdefines.h | 11 +- - .../mythzoneminder/mythzoneminder/zmevents.cpp | 64 +- - .../mythzoneminder/mythzoneminder/zmevents.h | 1 + - .../mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64 +- - .../mythzoneminder/mythzoneminder/zmplayer.cpp | 21 +- - .../mythzoneminder/mythzoneminder/zmplayer.h | 3 +- - .../theme/default-wide/zoneminder-ui.xml | 244 +- - .../mythzoneminder/theme/default/zoneminder-ui.xml | 203 + - mythtv/bindings/python/MythTV/dataheap.py | 1 + - mythtv/bindings/python/MythTV/system.py | 11 +- - .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 - - .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 - - mythtv/bindings/python/MythTV/tmdb/__init__.py | 0 - mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 - - .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - - mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 - - .../python/MythTV/wikiscripts/wikiscripts.py | 2 +- - mythtv/bindings/python/scripts/mythpython | 4 +- - mythtv/bindings/python/setup.py | 6 +- - mythtv/bindings/python/tmdb3/README | 86 +- - .../python/tmdb3/scripts/populate_locale.py | 5 +- - mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1 - - mythtv/bindings/python/tmdb3/setup.py | 15 +- - mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3 +- - mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18 +- - mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24 +- - mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26 +- - mythtv/bindings/python/tmdb3/tmdb3/request.py | 59 +- - mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652 +- - mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35 +- - .../bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90 +- - mythtv/bindings/python/tmdb3/tmdb3/util.py | 201 +- - mythtv/configure | 18 +- - mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +- - mythtv/external/FFmpeg/libavformat/mpeg.c | 10 +- - mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes - mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- - mythtv/libs/libmyth/libmyth.pro | 6 +- - mythtv/libs/libmyth/mythconfiggroups.cpp | 1 - - mythtv/libs/libmyth/mythconfiggroups.h | 2 +- - mythtv/libs/libmyth/programinfo.cpp | 295 +- - mythtv/libs/libmyth/programinfo.h | 17 + - mythtv/libs/libmyth/programtypes.h | 2 +- - mythtv/libs/libmyth/remoteutil.h | 2 + - mythtv/libs/libmythbase/bonjourregister.cpp | 40 + - mythtv/libs/libmythbase/bonjourregister.h | 4 + - mythtv/libs/libmythbase/housekeeper.cpp | 22 +- - mythtv/libs/libmythbase/housekeeper.h | 2 + - mythtv/libs/libmythbase/libmythbase.pro | 6 +- - mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +- - mythtv/libs/libmythbase/mythcorecontext.cpp | 138 +- - mythtv/libs/libmythbase/mythcorecontext.h | 4 + - mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 - - mythtv/libs/libmythbase/mythmiscutil.h | 1 + - mythtv/libs/libmythbase/mythsingledownload.cpp | 86 + - mythtv/libs/libmythbase/mythsingledownload.h | 49 + - mythtv/libs/libmythbase/mythsocket.cpp | 12 + - mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +- - mythtv/libs/libmythbase/mythsystemlegacy.h | 1 + - mythtv/libs/libmythbase/mythtimer.cpp | 2 + - mythtv/libs/libmythbase/mythtimezone.cpp | 1 + - mythtv/libs/libmythbase/mythversion.h | 2 +- - mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 +- - mythtv/libs/libmythbase/threadedfilewriter.h | 1 + - mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 + - mythtv/libs/libmythmetadata/metadatacommon.cpp | 29 +- - mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 +- - mythtv/libs/libmythmetadata/metaio.cpp | 8 + - mythtv/libs/libmythmetadata/metaio.h | 2 + - mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 - - mythtv/libs/libmythmetadata/metaioid3.cpp | 15 +- - .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 151 +- - mythtv/libs/libmythtv/AirPlay/mythairplayserver.h | 25 +- - mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +- - mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 +- - mythtv/libs/libmythtv/cardutil.cpp | 22 + - mythtv/libs/libmythtv/cardutil.h | 8 + - mythtv/libs/libmythtv/dbcheck.cpp | 6 +- - mythtv/libs/libmythtv/eitcache.cpp | 60 +- - mythtv/libs/libmythtv/eitcache.h | 2 + - mythtv/libs/libmythtv/fileringbuffer.cpp | 53 +- - mythtv/libs/libmythtv/libmythtv.pro | 15 +- - mythtv/libs/libmythtv/livetvchain.cpp | 230 +- - mythtv/libs/libmythtv/livetvchain.h | 9 +- - mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 6 +- - mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 +- - mythtv/libs/libmythtv/mythplayer.cpp | 97 +- - mythtv/libs/libmythtv/mythplayer.h | 4 + - mythtv/libs/libmythtv/previewgenerator.cpp | 6 +- - mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +- - .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140 + - .../libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 + - mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392 + - mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162 + - mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70 + - mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55 + - mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193 + - mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103 + - .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103 + - .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38 + - mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 +- - .../libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12 + - mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 +- - .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 96 +- - mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 +- - mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +- - mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 +- - mythtv/libs/libmythtv/recorders/iptvchannel.h | 20 +- - mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17 +- - mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 - - .../libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 +- - .../libs/libmythtv/recorders/iptvsignalmonitor.h | 3 +- - .../libs/libmythtv/recorders/iptvstreamhandler.cpp | 28 +- - mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4 +- - mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 +- - mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 + - mythtv/libs/libmythtv/recorders/streamhandler.h | 1 + - mythtv/libs/libmythtv/recordinginfo.cpp | 143 +- - mythtv/libs/libmythtv/ringbuffer.cpp | 82 +- - mythtv/libs/libmythtv/tv_play.cpp | 86 +- - mythtv/libs/libmythtv/tv_play.h | 1 + - mythtv/libs/libmythtv/tv_rec.cpp | 69 +- - mythtv/libs/libmythtv/tv_rec.h | 1 + - mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +- - mythtv/libs/libmythtv/videooutbase.cpp | 2 +- - mythtv/libs/libmythtv/videosource.cpp | 2 +- - mythtv/libs/libmythtv/vsync.cpp | 8 +- - mythtv/libs/libmythui/AppleRemote.cpp | 10 + - mythtv/libs/libmythui/mythgesture.cpp | 1 + - mythtv/libs/libmythui/mythmainwindow.cpp | 57 +- - mythtv/libs/libmythui/mythnotificationcenter.cpp | 1 + - mythtv/libs/libmythui/mythpainter.cpp | 1 + - mythtv/libs/libmythui/mythrender_opengl.cpp | 2 + - mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 +- - mythtv/libs/libmythupnp/httprequest.cpp | 3 +- - mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 + - mythtv/libs/libmythupnp/upnpcds.cpp | 28 +- - mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 +- - mythtv/programs/mythbackend/backendhousekeeper.h | 1 + - mythtv/programs/mythbackend/encoderlink.cpp | 117 +- - mythtv/programs/mythbackend/encoderlink.h | 9 +- - mythtv/programs/mythbackend/main.cpp | 13 + - mythtv/programs/mythbackend/mainserver.cpp | 47 +- - mythtv/programs/mythbackend/mainserver.h | 2 +- [...81317 lines suppressed...] -+ <area>35,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-2" from="name1-1"> -+ <area>450,50,215,30</area> -+ <value>Monitor 2</value> -+ </textarea> -+ -+ <textarea name="status4-2" from="status1-1"> -+ <area>670,50,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-2"> -+ <area>450,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-3" from="name1-1"> -+ <area>865,50,215,30</area> -+ <value>Monitor 3</value> -+ </textarea> -+ -+ <textarea name="status4-3" from="status1-1"> -+ <area>1085,50,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-3"> -+ <area>865,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-4" from="name1-1"> -+ <area>35,370,215,30</area> -+ <value>Monitor 4</value> -+ </textarea> -+ -+ <textarea name="status4-4" from="status1-1"> -+ <area>255,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-4"> -+ <area>35,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-5" from="name1-1"> -+ <area>450,370,215,30</area> -+ <value>Monitor 5</value> -+ </textarea> -+ -+ <textarea name="status4-5" from="status1-1"> -+ <area>670,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-5"> -+ <area>450,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-6" from="name1-1"> -+ <area>865,370,215,30</area> -+ <value>Monitor 6</value> -+ </textarea> -+ -+ <textarea name="status4-6" from="status1-1"> -+ <area>1085,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-6"> -+ <area>865,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+  -+ <textarea name="name5-1" from="name1-1"> -+ <area>20,110,160,30</area> -+ <value>Monitor 1</value> -+ </textarea> -+ -+ <textarea name="status5-1" from="status1-1"> -+ <area>185,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-1"> -+ <area>20,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-2" from="name1-1"> -+ <area>335,110,160,30</area> -+ <value>Monitor 2</value> -+ </textarea> -+ -+ <textarea name="status5-2" from="status1-1"> -+ <area>500,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-2"> -+ <area>335,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-3" from="name1-1"> -+ <area>650,110,160,30</area> -+ <value>Monitor 3</value> -+ </textarea> -+ -+ <textarea name="status5-3" from="status1-1"> -+ <area>815,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-3"> -+ <area>650,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-4" from="name1-1"> -+ <area>965,110,160,30</area> -+ <value>Monitor 4</value> -+ </textarea> -+ -+ <textarea name="status5-4" from="status1-1"> -+ <area>1130,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-4"> -+ <area>965,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-5" from="name1-1"> -+ <area>20,395,160,30</area> -+ <value>Monitor 5</value> -+ </textarea> -+ -+ <textarea name="status5-5" from="status1-1"> -+ <area>185,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-5"> -+ <area>20,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-6" from="name1-1"> -+ <area>335,395,160,30</area> -+ <value>Monitor 6</value> -+ </textarea> -+ -+ <textarea name="status5-6" from="status1-1"> -+ <area>500,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-6"> -+ <area>335,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-7" from="name1-1"> -+ <area>650,395,160,30</area> -+ <value>Monitor 7</value> -+ </textarea> -+ -+ <textarea name="status5-7" from="status1-1"> -+ <area>815,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-7"> -+ <area>650,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-8" from="name1-1"> -+ <area>965,395,160,30</area> -+ <value>Monitor 8</value> -+ </textarea> -+ -+ <textarea name="status5-8" from="status1-1"> -+ <area>1130,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-8"> -+ <area>965,425,295,220</area> - <filename>mz_testcard.png</filename> - </imagetype> - -diff --git a/mythtv/themes/MythCenter/notification-ui.xml b/mythtv/themes/MythCenter/notification-ui.xml -index 95699af..a92c5ad 100644 ---- a/mythtv/themes/MythCenter/notification-ui.xml -+++ b/mythtv/themes/MythCenter/notification-ui.xml -@@ -262,7 +262,7 @@ - <preserveaspect>true</preserveaspect> - </imagetype> - -- <shape name="textbackground"> -+ <shape name="textbackground" depends="description|description_noprogress|extra|title|origin"> - <area>85,100%-260,-85,-55</area> - <fill color="#000000" alpha="100" /> - </shape> Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-20/mythtv.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- mythtv.spec 28 May 2014 02:25:58 -0000 1.138 +++ mythtv.spec 28 Jul 2014 12:38:03 -0000 1.139 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27.1 +%define vers_string v0.27.3-109-g0dd5ab3 %define branch fixes/0.27 # Git revision and branch ID @@ -74,7 +74,7 @@ URL: http://www.mythtv.org/ # Version/Release info -Version: 0.27.1 +Version: 0.27.3 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else @@ -468,7 +468,7 @@ Requires: libvorbis-devel >= 1.0 Requires: mjpegtools-devel >= 1.6.1 Requires: taglib-devel >= 1.5 -Requires: transcode >= 0.6.8 +#Requires: transcode >= 0.6.8 Requires: x264-devel Requires: xvidcore-devel >= 0.9.1 @@ -1435,6 +1435,9 @@ %changelog +* Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 +- Update to new upstream release. + * Mon May 26 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.1-1 - Update to new upstream release.

10 years, 3 months

1
0
0 / 0

rpms/VirtualBox-kmod/F-20 VirtualBox-kmod.spec,1.62,1.63

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7476 Modified Files: VirtualBox-kmod.spec Log Message: * Mon Jul 28 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.14-1 - New upstream release and also build akmods Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/F-20/VirtualBox-kmod.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- VirtualBox-kmod.spec 18 Jul 2014 15:53:21 -0000 1.62 +++ VirtualBox-kmod.spec 28 Jul 2014 05:09:29 -0000 1.63 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +#global buildforkernels newest # In prerelease builds (such as betas), this package has the same # major version number, while the kernel module abi is not guarranteed @@ -19,8 +19,8 @@ %bcond_with hardening Name: VirtualBox-kmod -Version: 4.3.12 -Release: 1%{?prerel:.%{prerel}}%{?dist}.9 +Version: 4.3.14 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -98,6 +98,9 @@ %changelog +* Mon Jul 28 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.14-1 +- New upstream release and also build akmods + * Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.12-1.9 - Rebuilt for kernel

10 years, 3 months

1
0
0 / 0

rpms/mythtv/devel .cvsignore, 1.14, 1.15 ChangeLog, 1.16, 1.17 mythtv-0.27-fixes.patch, 1.5, 1.6 mythtv.spec, 1.143, 1.144 sources, 1.59, 1.60

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31911 Modified Files: .cvsignore ChangeLog mythtv-0.27-fixes.patch mythtv.spec sources Log Message: * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 - Update to new upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 28 May 2014 02:16:56 -0000 1.14 +++ .cvsignore 28 Jul 2014 02:16:15 -0000 1.15 @@ -1 +1 @@ -mythtv-0.27.1.tar.gz +mythtv-0.27.3.tar.gz View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.16 -r 1.17 ChangeLog Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 11 May 2014 14:42:22 -0000 1.16 +++ ChangeLog 28 Jul 2014 02:16:16 -0000 1.17 @@ -1,2297 +1,1329 @@ -commit 583f44855ff80e032a6175939b1917a54337ccac -Author: Klass De Waal <klaas.de.waal(a)gmail.com> -Date: Tue May 6 11:23:16 2014 +0100 +commit 0dd5ab38982619af18f99c4032c1010d68991047 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Tue Jul 22 06:40:49 2014 -0700 - Remove old entries from in-memory EIT cache + Subtitles: Avoid trying to draw empty text or background objects. - Closes #12130. + Cherry-picked / adapted from 203db78ed2c8e9d59159d970b1eb89b5764a79f3. - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net> - (cherry picked from commit d0e25acac0cd671cb1eee4bb965bbcd35ffd88da) - -commit e2acf0d940009b2b240d52e9b53a123e1309a134 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Fri Jan 3 15:05:08 2014 +0100 + Refs #12056 - Always force program type to series if it has an onscreen episode number - (cherry picked from commit cda7494f7931ebfaacc328c66782e4536489e714) - -commit aa603f1a554d4d30cc22482ed69c4809862c977c -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Sat Jan 11 20:05:11 2014 +0100 +commit 57699052e6eb16293a5954ad4312331448d9ef10 +Author: Jim Stichnoth <jstichnoth(a)mythtv.org> +Date: Wed Jul 16 13:54:46 2014 -0700 - consider the last segment when determining the aspect ratio + Subtitles: Fix cc608 indents. - Use the very last mark of the recording (likely a key frame) instead - of the beginning of the segment when it is the last aspect ratio mark. - (cherry picked from commit 433b72111df8aec1e97145a8c1100537a523ab0f) + The original code was trying to be clever and indent one character + less than intended presumably to account the extra space character + that control codes also imply, but it's not clear that was ever an + appropriate thing to do. + + Thanks to faginbagin@ for identifying the problem and the fix. + Refs #12051. + (cherry picked from commit 7d60440b2d790208a25ce707480f5b01657410f1) -commit 3dfc6fad394190eec86d2f0e3b849b2324ee5db2 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Sat Jan 11 14:05:37 2014 +0100 +commit f91e18d652a5057b2e40f14a6afbda6b4abc128d +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 23:56:21 2014 +1000 - consider all aspect ratio changes when looking for the next change + Revert "mythtranscode: fix incorrect memory allocation" - When determining the dominant aspect ratio we must consider the next - mark of *any* aspect ratio instead of the next mark of the *same* - aspect ratio. + Causes memory corruption on some system, need to investigate - The last segment is ignored as of now. - (cherry picked from commit 6c1af4b12367fcf9de7d3bbae3282cfe63c18013) + This reverts commit 4630430b110dc173963c53d2bc0e7d15e6115d3e. -commit 07288849888d0678bf2b50a130da24097df3b861 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Sun Jan 19 23:00:18 2014 +0100 +commit 302dde18b440a52f8c53744129a4c9adfee3ef71 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 15:13:21 2014 +1000 - let mythwikiscripts find the categories again when scraping script + mythtranscode: always check if audio stream still exists - But it still needs more TLC. - (cherry picked from commit 58ebc60632ebcdba90d15db8272cd03208d2e77e) - -commit e50af7d5d1c119b8a7cb3fb9d7444de4b7e270dc -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Fri Jan 31 16:15:13 2014 +0100 - - make parameter names consistently lowercase + This doesn’t cater for when there’s a change in audio format or new audio stream, but it prevents the crash when that occurs. - Since [3d9155909f] the parameter names used inconsistent upper and lower case. + Fixes #12207 - There are two places in libmythupnp where the incoming packets are decoded, in - one place they are converted to lowercase, in the other place they are not. - This commit had made it lowercase in both places but did not change the code - that accessed the data, the caused serious discombobulation and the end of UPNP - watching through out the world. + (cherry picked from commit 43eed00660447d327b8dc13f3daa38e8e5ae8038) + +commit 4630430b110dc173963c53d2bc0e7d15e6115d3e +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Sat Jul 19 16:20:05 2014 +1000 + + mythtranscode: fix incorrect memory allocation - Patch by Steve Beinicke + Use proper FFmpeg API to allocate AVPacket + Fixes #12213 - Fixes #12006 - (cherry picked from commit e9a22c587713f2933402232b15daf82d4272dd2d) + (cherry picked from commit 09ed2c69354f6870667880aee16257b9600b01d8) -commit 55e7ed5e16221e9042b68b335ed11dd8dd0c6703 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Mon Mar 3 23:39:27 2014 +0100 +commit 39b73bcc3bb0f7f9cc1e6ed5e895d0949b51c4cd +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Mon Jul 7 18:04:49 2014 +0100 - Make metadata title matching more permissive + MythUIWebBrowser: silence a warning when we can't find the parent window - From the ticket: Not sure why it was comparing the first char of both - strings, also think it shouldn't be case sensitive at all. + Base widgets don't necessarily have a window as a parent so don't log + an error in this case. - I think so, too - - Fixes #11088 - Patch by Daniel Ribeiro - (cherry picked from commit 18f6412f73cffc751931dc688d57ea3d7708c7f1) + Signed-off-by: Paul Harrison <pharrison(a)mythtv.org> + (cherry picked from commit 25dd4944996e746f1aee73bcbba4889f48e7ef9f) -commit 5268cd19760b123fa142773b56e40a98858d48d4 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Wed Apr 23 19:58:38 2014 +0200 +commit 9511b67b9a411d675bdb7c0d43d021aa0bdabd54 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Fri Jul 18 03:36:24 2014 +1000 - let mythtranscode --help hint at the optional cutlist - (cherry picked from commit 24be3436d75f5947ef6e7d444daee50666832ac6) + protoserver: fixes QUERY_FILE_HASH hanging + + same as 933b61ffbe9af3cc6a69df001463fd2141c36b60 -commit 27668b7280a3d55bf1c5540ae5b44f623f4d1892 -Author: Cédric Schieli <cschieli(a)gmail.com> -Date: Tue Dec 31 18:04:37 2013 +0100 +commit 4e199fcb24e4ed811fa225310144826613af26e1 +Author: Lawrence Rust <lvr(a)softsystem.co.uk> +Date: Wed Jan 15 14:47:30 2014 +0000 - Protect pbs with proper (aka locked) refcounting. + BE: Fix 'MythSocket: Programmer error, QEventLoop isn't running...' during BE exit - The PlaybackSock must not be immediatly deleted on connectionClosed() - if some other requests are still using it. This leads to segfaults in - the MBE when the SBE disconnects (#11306). - (cherry picked from commit 7b305848b0584bcebc55d6fe5a670ef7d2f55360) - - Refs #11306 - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net> - - (cherry picked from commit 6f246c0d1567bd84e1d9d30de7def724fc75e8f6) + Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> + Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> + (cherry picked from commit f8614bb8eea8428a558f257a8c4a7f04af807c94) -commit 46a146c5bd02d571b6941d69183ac6c8b5d610df +commit ccc5aef96d4c729ee3f3e7a7253e265815c04345 Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Mon Apr 28 08:57:51 2014 +1000 +Date: Fri Jul 18 02:23:10 2014 +1000 - Fix null dereference + metadata: fix wrong test leading to incorrect hash calculation - Coverity ID 1061551 + This would have almost always returned true, meaning it would attempt to calculate the hash of a file unlikely to exist locally. + Simplify code + style - (cherry picked from commit 9635bc42da3de7616d2ab248694ee9ae7ec2b42e) + (cherry picked from commit 1c89d567b594af44eb18b28ebe1df5ae18f8b032) -commit b93fb14831a0ca8d59a7df5267c04cb6e52d9254 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Wed Apr 16 04:35:43 2014 -0400 +commit 933b61ffbe9af3cc6a69df001463fd2141c36b60 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> +Date: Fri Jul 18 03:17:36 2014 +1000 [...2863 lines suppressed...] - - More robust check before using mfdb run time as wakeup time - (cherry picked from commit d9f5a172d3024216b5c7b6d3e8b8ccc8e40ed3e2) - -commit 89fb9d45b6584ce948c26eece0494ac6614becd9 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Thu Oct 3 13:35:37 2013 +0100 - - Wakeup the backend to run mythfilldatabase - - This uses MythFillSuggestedRunTime, for xmltv sources (+24 hours), for - datadirect whatever time was suggested by TMS to ensure that we always - wake up the backend to collect guide data (xmltv, DD only, EIT is not - yet supported). Using MythFillSuggestedRunTime is a bit of a hack, but - it's already set for Schedules Direct so this was the simplest - solution. - - For now the "Run guide data program at time suggested by the grabber" - setting MUST be enabled for this to work as intended. - - Without this fix the backend won't wake up to grab guide data from - xmltv/SD sources and that may result in it eventually running out of data - entirely. - (cherry picked from commit b27bba2921b6aed801173de8ae2707dd958b75f3) - -commit 6ff9ea0dc2d977c013e6fbdafc5ba2ad24d68248 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Wed Oct 2 19:37:29 2013 +0100 - - Replace usage of direct queries on the settings table with SaveSetting() in MythFillDatabase - (cherry picked from commit 4629d336e30a62945a557fc8aa1602634aa09f24) - -commit 7ae9f17e658f37cd46ef5c44d1ce579369dc34ca -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Wed Oct 2 03:20:26 2013 +1000 - - Revert "Properly propagate quiet log option" - - This reverts commit a74baed2bbf3a72f2af58fe684398d3fdd01f256. - - (cherry picked from commit 445a73793de9f21a512232a8a82c34372aac379b) - -commit 74356081e9271845f7b212cddfde29c229b33bc3 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Wed Oct 2 03:20:01 2013 +1000 - - Remove unnecessary command option, all we are doing is adding —nologserver twice - - (cherry picked from commit 996f652f0f143513bdbe9e5510714f776c9cd44f) - -commit 79208f2c937a7211a19d9985154ad0ce280dde92 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Tue Oct 1 06:34:54 2013 -0700 - - Fix an apparent copy&paste error. Refs #11885 - (cherry picked from commit ba7d683767140a2ddf31664454da40ea4e63d6d3) - -commit a179aae608c7aa0ee80620267df7773c5fa4b75f -Author: Paul Harrison <pharrison(a)mythtv.org> -Date: Wed Sep 25 10:58:21 2013 +0100 - - MythZoneMinder: fix the grabbing of the live stream images - - * Add a missing field to the ShareData struct added it later ZM versions - * Change the minimum supported ZM version to 1.24.0. - * Remove the v4l2 hack - - Note: this bumps the MythZoneMinder protocol version so both the FE plugin - and mythzmserver need to be updated. - - Refs #8182 - - (cherry picked from commit b1867bd45765157432f5598aa26377fb922ed116) - -commit d9561055abeec11fba234c9bdfbde5e79e695803 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Tue Sep 24 06:38:25 2013 -0700 - - Clear duration and framecount flags with mythutil --clearseektable. - - Otherwise those flags are hard to get rid of when mythcommflag - --rebuild doesn't produce a correct seektable for some reason. - (cherry picked from commit c4f0c0c57c87c4bfe2e9d143648df2a02c44d578) - -commit b6a657478df796c810c788922a545d84f36e7129 -Author: David Engel <dengel(a)mythtv.org> -Date: Mon Sep 23 13:26:45 2013 -0500 - - Fix startts copy & paste error in previous ForgetHistory() change. - - Also, do use subtitle & description semantics when the original - information is no longer available, but do it in a way that can be - easily detected and works in all code paths. - - (cherry picked from commit d2231e90b3f581c69e12cd376324a6b8cdf9ac65) - -commit 2ccd08f72b3d445b9a768bf72da25749326821d9 -Author: David Engel <dengel(a)mythtv.org> -Date: Mon Sep 23 12:29:09 2013 -0500 - - Change RI::ForgetHistory() to use dupmethod when available. - - Previously, ForgetHistory() implicily used subtitle and description as - the duplicate check method. Consequently, it doesn't always match - correctly when other methods are used and there are guide changes in - data that should be ignored. In addition, don't assume any dupmethod - in the Previously Recorded screen to avoid being to overzealous when - called from there. - - (cherry picked from commit 567cba3184db0e5801dc1ae7736d5d778ec2d96c) - -commit 4ae99828b0b82a8498eb0af986dfbceb626f739c -Author: Paul Harrison <pharrison(a)mythtv.org> -Date: Sun Sep 22 23:45:54 2013 +0100 - - MythMusic: fix playback of ogg radio streams - - Peek the probe data from the stream buffer rather than read the data otherwise - ffmpeg fails to open the stream because the magic it is looking for has already - been read from the stream. - - Also increase the probe buffer to 16K this seems to be required for some ogg - streams to be probed properly. - - (cherry picked from commit 6b09d7c629e4efac81276eee9f4b7cbe3bc661ef) - -commit b2486bae6d57bdd8aa78301da7f43982ae5dba73 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:43:51 2013 -0400 - - Update Python bindings version. - -commit 3d7ac5c2d71f91990bdf73eab2299bc4caf5f278 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:42:35 2013 -0400 - - Remove more tmdb bits. - (cherry picked from commit a5d54217962a706c4cedc33012e9e7049d4877f6) - -commit 6d4572a88c1c785cf5b6e6a38256b82d6fded148 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:38:33 2013 -0400 - - Remove tmdb library from python installer script. - (cherry picked from commit 9c0dfbc9f6b753a5b3d6f2e294baaf9577519a91) - -commit db4167ec3d1396c81d00d3fe71b6ca104880136d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 17:23:05 2013 -0400 - - Remove tmdb.py and associated library. - (cherry picked from commit 53c272dc4ffe2f5392ff54fb3e446801395274fb) - -commit adcda83028125dd6a26f69513ee99da2e7302be3 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Sep 21 16:59:06 2013 -0400 - - Allow system calls to pull global settings from the database. - - This adjusts the System() class to first try local settings of the - supplied value, fall back to global settings, and then the supplied - default, before finally erroring. This corrects an issue where the - VideoGrabber() child class did not properly pull the global settings for - TelevisionGrabber and MovieGrabber, and thus just used the internal - defaults. - (cherry picked from commit 4e072b2de29c32c4d00fe62849feadd80d2c0c02) - -commit 5b917e8d6548c40f3c6df0dcd18a090d90995306 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Wed Sep 18 23:24:45 2013 +0200 - - Update the Swedish translation. - - Update of the Swedish translation for mythfrontend and all plugins made - by me and Roger Mårtensson (thank you!). - - (cherry picked from commit 246b2e6a2e496aa8f56c32d38d3997cbf5ff2b1c) - -commit abae25afb73f967421eb7797a868a9bdb187c18c -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Sep 12 21:40:14 2013 -0400 - - Enable --debug flag in test application. - -commit 0d91e6fc4184c17c5a9d39e1b2a264602a47747d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Sep 12 21:35:05 2013 -0400 - - Have pager return Nones if the server returns null. + This would otherwise cause the backend to always believe the requested host was local - This temporarily resolves an issue where the TheMovieDb server returns - nulls in searches when a movie has been deleted but not yet flushed out - of the cache. This prevents the error internally, but does not attempt - to re-order to remove the nulls, so is merely passing the issue onto the - application using this library. + Fixes #12172 - Refs #29 + (cherry picked from commit de991d98754bd50045d65080592828631786e161) mythtv-0.27-fixes.patch: mythplugins/mythmusic/mythmusic/importmusic.cpp | 2 mythplugins/mythmusic/mythmusic/musicplayer.cpp | 6 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 mythtv/external/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 mythtv/external/FFmpeg/libavcodec/x86/idct_sse2_xvid.c | 2 mythtv/external/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 mythtv/external/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/libmythmetadata/libmythmetadata.pro | 4 mythtv/libs/libmythmetadata/metadatacommon.cpp | 95 mythtv/libs/libmythmetadata/metadatacommon.h | 51 mythtv/libs/libmythmetadata/metadatadownload.cpp | 211 mythtv/libs/libmythmetadata/metadatafactory.cpp | 2 mythtv/libs/libmythmetadata/metadatagrabber.cpp | 584 + mythtv/libs/libmythmetadata/metadatagrabber.h | 100 mythtv/libs/libmythmetadata/metadataimagedownload.cpp | 148 mythtv/libs/libmythmetadata/metadataimagedownload.h | 1 mythtv/libs/libmythmetadata/videometadata.cpp | 17 mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp | 3 mythtv/libs/libmythtv/avformatdecoder.cpp | 12 mythtv/libs/libmythtv/cc608decoder.cpp | 2 mythtv/libs/libmythtv/lzoconf.h | 219 mythtv/libs/libmythtv/lzodefs.h | 2527 ++++-- mythtv/libs/libmythtv/minilzo.cpp | 4191 +++++++--- mythtv/libs/libmythtv/minilzo.h | 20 mythtv/libs/libmythtv/mythplayer.cpp | 10 mythtv/libs/libmythtv/openglvideo.cpp | 2 mythtv/libs/libmythtv/ringbuffer.cpp | 7 mythtv/libs/libmythtv/subtitlescreen.cpp | 58 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/mythfrontend/grabbersettings.cpp | 125 mythtv/programs/mythfrontend/grabbersettings.h | 7 mythtv/programs/mythmetadatalookup/main.cpp | 12 mythtv/programs/mythtranscode/mpeg2fix.cpp | 17 mythtv/programs/mythtranscode/mpeg2fix.h | 4 mythtv/themes/classic/tv_schedule.xml | 2 92 files changed, 6321 insertions(+), 2577 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythtv-0.27-fixes.patch 11 May 2014 14:42:22 -0000 1.5 +++ mythtv-0.27-fixes.patch 28 Jul 2014 02:16:16 -0000 1.6 @@ -1,68996 +1,13104 @@ - mythplugins/configure | 18 +- - mythplugins/mytharchive/i18n/mytharchive_sv.qm | Bin 34033 -> 35218 bytes - mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 +- - .../mytharchive/mytharchive/archiveutil.cpp | 4 +- - mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 +- - .../mytharchive/mythburn/scripts/mythburn.py | 19 +- - mythplugins/mythbrowser/i18n/mythbrowser_sv.qm | Bin 7139 -> 7616 bytes - mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 +- - mythplugins/mythgallery/i18n/mythgallery_sv.qm | Bin 18827 -> 24405 bytes - mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 +- - mythplugins/mythgame/i18n/mythgame_sv.qm | Bin 16378 -> 16696 bytes - mythplugins/mythgame/i18n/mythgame_sv.ts | 136 +- - mythplugins/mythmusic/i18n/mythmusic_sv.qm | Bin 60650 -> 61545 bytes - mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 +- - mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9 +- - mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34 +- - mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 +- - mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 +- - mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 +- - mythplugins/mythmusic/mythmusic/musicplayer.cpp | 101 +- - mythplugins/mythmusic/mythmusic/musicplayer.h | 4 +- - mythplugins/mythmusic/mythmusic/playersettings.cpp | 1 + - mythplugins/mythmusic/mythmusic/playlist.cpp | 2 +- - .../mythmusic/mythmusic/playlisteditorview.cpp | 19 +- - mythplugins/mythmusic/mythmusic/searchview.cpp | 15 +- - mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 +- - mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 4 +- - mythplugins/mythmusic/mythmusic/streamview.cpp | 7 +- - .../mythmusic/mythmusic/visualizationsettings.cpp | 4 +- - mythplugins/mythnetvision/i18n/mythnetvision_sv.qm | Bin 11838 -> 14109 bytes - mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 +- - .../mythnetvision/mythnetvision/mythnetvision.pro | 5 +- - mythplugins/mythnews/i18n/mythnews_sv.qm | Bin 4604 -> 4965 bytes - mythplugins/mythnews/i18n/mythnews_sv.ts | 76 +- - mythplugins/mythweather/i18n/mythweather_sv.qm | Bin 22243 -> 23197 bytes - mythplugins/mythweather/i18n/mythweather_sv.ts | 62 +- - .../mythzoneminder/i18n/mythzoneminder_sv.qm | Bin 7032 -> 7267 bytes - .../mythzoneminder/i18n/mythzoneminder_sv.ts | 183 +- - mythplugins/mythzoneminder/mythzmserver/main.cpp | 13 +- - .../mythzoneminder/mythzmserver/zmserver.cpp | 655 +- - mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101 +- - .../mythzoneminder/mythzoneminder/zmclient.cpp | 25 +- - .../mythzoneminder/mythzoneminder/zmconsole.cpp | 8 +- - .../mythzoneminder/mythzoneminder/zmconsole.h | 2 - - .../mythzoneminder/mythzoneminder/zmdefines.h | 11 +- - .../mythzoneminder/mythzoneminder/zmevents.cpp | 64 +- - .../mythzoneminder/mythzoneminder/zmevents.h | 1 + - .../mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64 +- - .../mythzoneminder/mythzoneminder/zmplayer.cpp | 21 +- - .../mythzoneminder/mythzoneminder/zmplayer.h | 3 +- - .../theme/default-wide/zoneminder-ui.xml | 244 +- - .../mythzoneminder/theme/default/zoneminder-ui.xml | 203 + - mythtv/bindings/python/MythTV/dataheap.py | 1 + - mythtv/bindings/python/MythTV/system.py | 11 +- - .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 - - .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 - - mythtv/bindings/python/MythTV/tmdb/__init__.py | 0 - mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 - - .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - - mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 - - .../python/MythTV/wikiscripts/wikiscripts.py | 2 +- - mythtv/bindings/python/scripts/mythpython | 4 +- - mythtv/bindings/python/setup.py | 6 +- - mythtv/bindings/python/tmdb3/README | 86 +- - .../python/tmdb3/scripts/populate_locale.py | 5 +- - mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1 - - mythtv/bindings/python/tmdb3/setup.py | 15 +- - mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3 +- - mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54 +- - mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18 +- - mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24 +- - mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26 +- - mythtv/bindings/python/tmdb3/tmdb3/request.py | 59 +- - mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652 +- - mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35 +- - .../bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90 +- - mythtv/bindings/python/tmdb3/tmdb3/util.py | 201 +- - mythtv/configure | 18 +- - mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 +- - mythtv/external/FFmpeg/libavformat/mpeg.c | 10 +- - mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes - mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- - mythtv/libs/libmyth/libmyth.pro | 6 +- - mythtv/libs/libmyth/mythconfiggroups.cpp | 1 - - mythtv/libs/libmyth/mythconfiggroups.h | 2 +- - mythtv/libs/libmyth/programinfo.cpp | 295 +- - mythtv/libs/libmyth/programinfo.h | 17 + - mythtv/libs/libmyth/programtypes.h | 2 +- - mythtv/libs/libmyth/remoteutil.h | 2 + - mythtv/libs/libmythbase/bonjourregister.cpp | 40 + - mythtv/libs/libmythbase/bonjourregister.h | 4 + - mythtv/libs/libmythbase/housekeeper.cpp | 22 +- - mythtv/libs/libmythbase/housekeeper.h | 2 + - mythtv/libs/libmythbase/libmythbase.pro | 6 +- - mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 +- - mythtv/libs/libmythbase/mythcorecontext.cpp | 138 +- - mythtv/libs/libmythbase/mythcorecontext.h | 4 + - mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 - - mythtv/libs/libmythbase/mythmiscutil.h | 1 + - mythtv/libs/libmythbase/mythsingledownload.cpp | 86 + - mythtv/libs/libmythbase/mythsingledownload.h | 49 + - mythtv/libs/libmythbase/mythsocket.cpp | 12 + - mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 +- - mythtv/libs/libmythbase/mythsystemlegacy.h | 1 + - mythtv/libs/libmythbase/mythtimer.cpp | 2 + - mythtv/libs/libmythbase/mythtimezone.cpp | 1 + - mythtv/libs/libmythbase/mythversion.h | 2 +- - mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 +- - mythtv/libs/libmythbase/threadedfilewriter.h | 1 + - mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 + - mythtv/libs/libmythmetadata/metadatacommon.cpp | 29 +- - mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 +- - mythtv/libs/libmythmetadata/metaio.cpp | 8 + - mythtv/libs/libmythmetadata/metaio.h | 2 + - mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 - - mythtv/libs/libmythmetadata/metaioid3.cpp | 15 +- - .../libs/libmythtv/AirPlay/mythairplayserver.cpp | 151 +- - mythtv/libs/libmythtv/AirPlay/mythairplayserver.h | 25 +- - mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 +- - mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 +- - mythtv/libs/libmythtv/cardutil.cpp | 22 + - mythtv/libs/libmythtv/cardutil.h | 8 + - mythtv/libs/libmythtv/dbcheck.cpp | 6 +- - mythtv/libs/libmythtv/eitcache.cpp | 60 +- - mythtv/libs/libmythtv/eitcache.h | 2 + - mythtv/libs/libmythtv/fileringbuffer.cpp | 53 +- - mythtv/libs/libmythtv/libmythtv.pro | 15 +- - mythtv/libs/libmythtv/livetvchain.cpp | 230 +- - mythtv/libs/libmythtv/livetvchain.h | 9 +- - mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 6 +- - mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 +- - mythtv/libs/libmythtv/mythplayer.cpp | 97 +- - mythtv/libs/libmythtv/mythplayer.h | 4 + - mythtv/libs/libmythtv/previewgenerator.cpp | 6 +- - mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 +- - .../libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140 + - .../libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 + - mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392 + - mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162 + - mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70 + - mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55 + - mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193 + - mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103 + - .../libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103 + - .../libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38 + - mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 +- - .../libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12 + - mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 +- - .../libs/libmythtv/recorders/hlsstreamhandler.cpp | 96 +- - mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 +- - mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 +- - mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 +- - mythtv/libs/libmythtv/recorders/iptvchannel.h | 20 +- - mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17 +- - mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 - - .../libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 +- - .../libs/libmythtv/recorders/iptvsignalmonitor.h | 3 +- - .../libs/libmythtv/recorders/iptvstreamhandler.cpp | 28 +- - mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4 +- - mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 +- - mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 + - mythtv/libs/libmythtv/recorders/streamhandler.h | 1 + - mythtv/libs/libmythtv/recordinginfo.cpp | 143 +- - mythtv/libs/libmythtv/ringbuffer.cpp | 82 +- - mythtv/libs/libmythtv/tv_play.cpp | 86 +- - mythtv/libs/libmythtv/tv_play.h | 1 + - mythtv/libs/libmythtv/tv_rec.cpp | 69 +- - mythtv/libs/libmythtv/tv_rec.h | 1 + - mythtv/libs/libmythtv/tvremoteutil.cpp | 2 +- - mythtv/libs/libmythtv/videooutbase.cpp | 2 +- - mythtv/libs/libmythtv/videosource.cpp | 2 +- - mythtv/libs/libmythtv/vsync.cpp | 8 +- - mythtv/libs/libmythui/AppleRemote.cpp | 10 + - mythtv/libs/libmythui/mythgesture.cpp | 1 + - mythtv/libs/libmythui/mythmainwindow.cpp | 57 +- - mythtv/libs/libmythui/mythnotificationcenter.cpp | 1 + - mythtv/libs/libmythui/mythpainter.cpp | 1 + - mythtv/libs/libmythui/mythrender_opengl.cpp | 2 + - mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 +- - mythtv/libs/libmythupnp/httprequest.cpp | 3 +- - mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 + - mythtv/libs/libmythupnp/upnpcds.cpp | 28 +- - mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 +- - mythtv/programs/mythbackend/backendhousekeeper.h | 1 + - mythtv/programs/mythbackend/encoderlink.cpp | 117 +- - mythtv/programs/mythbackend/encoderlink.h | 9 +- - mythtv/programs/mythbackend/main.cpp | 13 + - mythtv/programs/mythbackend/mainserver.cpp | 47 +- - mythtv/programs/mythbackend/mainserver.h | 2 +- [...81317 lines suppressed...] -+ <area>35,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-2" from="name1-1"> -+ <area>450,50,215,30</area> -+ <value>Monitor 2</value> -+ </textarea> -+ -+ <textarea name="status4-2" from="status1-1"> -+ <area>670,50,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-2"> -+ <area>450,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-3" from="name1-1"> -+ <area>865,50,215,30</area> -+ <value>Monitor 3</value> -+ </textarea> -+ -+ <textarea name="status4-3" from="status1-1"> -+ <area>1085,50,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-3"> -+ <area>865,80,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-4" from="name1-1"> -+ <area>35,370,215,30</area> -+ <value>Monitor 4</value> -+ </textarea> -+ -+ <textarea name="status4-4" from="status1-1"> -+ <area>255,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-4"> -+ <area>35,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-5" from="name1-1"> -+ <area>450,370,215,30</area> -+ <value>Monitor 5</value> -+ </textarea> -+ -+ <textarea name="status4-5" from="status1-1"> -+ <area>670,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-5"> -+ <area>450,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name4-6" from="name1-1"> -+ <area>865,370,215,30</area> -+ <value>Monitor 6</value> -+ </textarea> -+ -+ <textarea name="status4-6" from="status1-1"> -+ <area>1085,370,160,30</area> -+ </textarea> -+ -+ <imagetype name="frame4-6"> -+ <area>865,400,380,285</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+  -+ <textarea name="name5-1" from="name1-1"> -+ <area>20,110,160,30</area> -+ <value>Monitor 1</value> -+ </textarea> -+ -+ <textarea name="status5-1" from="status1-1"> -+ <area>185,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-1"> -+ <area>20,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-2" from="name1-1"> -+ <area>335,110,160,30</area> -+ <value>Monitor 2</value> -+ </textarea> -+ -+ <textarea name="status5-2" from="status1-1"> -+ <area>500,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-2"> -+ <area>335,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-3" from="name1-1"> -+ <area>650,110,160,30</area> -+ <value>Monitor 3</value> -+ </textarea> -+ -+ <textarea name="status5-3" from="status1-1"> -+ <area>815,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-3"> -+ <area>650,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-4" from="name1-1"> -+ <area>965,110,160,30</area> -+ <value>Monitor 4</value> -+ </textarea> -+ -+ <textarea name="status5-4" from="status1-1"> -+ <area>1130,110,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-4"> -+ <area>965,140,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-5" from="name1-1"> -+ <area>20,395,160,30</area> -+ <value>Monitor 5</value> -+ </textarea> -+ -+ <textarea name="status5-5" from="status1-1"> -+ <area>185,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-5"> -+ <area>20,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-6" from="name1-1"> -+ <area>335,395,160,30</area> -+ <value>Monitor 6</value> -+ </textarea> -+ -+ <textarea name="status5-6" from="status1-1"> -+ <area>500,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-6"> -+ <area>335,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-7" from="name1-1"> -+ <area>650,395,160,30</area> -+ <value>Monitor 7</value> -+ </textarea> -+ -+ <textarea name="status5-7" from="status1-1"> -+ <area>815,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-7"> -+ <area>650,425,295,220</area> -+ <filename>mz_testcard.png</filename> -+ </imagetype> -+ -+ <textarea name="name5-8" from="name1-1"> -+ <area>965,395,160,30</area> -+ <value>Monitor 8</value> -+ </textarea> -+ -+ <textarea name="status5-8" from="status1-1"> -+ <area>1130,395,130,30</area> -+ </textarea> -+ -+ <imagetype name="frame5-8"> -+ <area>965,425,295,220</area> - <filename>mz_testcard.png</filename> - </imagetype> - -diff --git a/mythtv/themes/MythCenter/notification-ui.xml b/mythtv/themes/MythCenter/notification-ui.xml -index 95699af..a92c5ad 100644 ---- a/mythtv/themes/MythCenter/notification-ui.xml -+++ b/mythtv/themes/MythCenter/notification-ui.xml -@@ -262,7 +262,7 @@ - <preserveaspect>true</preserveaspect> - </imagetype> - -- <shape name="textbackground"> -+ <shape name="textbackground" depends="description|description_noprogress|extra|title|origin"> - <area>85,100%-260,-85,-55</area> - <fill color="#000000" alpha="100" /> - </shape> Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- mythtv.spec 28 May 2014 02:16:56 -0000 1.143 +++ mythtv.spec 28 Jul 2014 02:16:16 -0000 1.144 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27.1 +%define vers_string v0.27.3-109-g0dd5ab3 %define branch fixes/0.27 # Git revision and branch ID @@ -74,7 +74,7 @@ URL: http://www.mythtv.org/ # Version/Release info -Version: 0.27.1 +Version: 0.27.3 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else @@ -468,7 +468,7 @@ Requires: libvorbis-devel >= 1.0 Requires: mjpegtools-devel >= 1.6.1 Requires: taglib-devel >= 1.5 -Requires: transcode >= 0.6.8 +#Requires: transcode >= 0.6.8 Requires: x264-devel Requires: xvidcore-devel >= 0.9.1 @@ -1435,6 +1435,9 @@ %changelog +* Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.3-1 +- Update to new upstream release. + * Mon May 26 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.27.1-1 - Update to new upstream release. Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 28 May 2014 02:16:56 -0000 1.59 +++ sources 28 Jul 2014 02:16:16 -0000 1.60 @@ -1 +1 @@ -4a2cb795658295051d01dd1f87b2c0cb mythtv-0.27.1.tar.gz +23d6be12fc7d6b70dfef6a7170e5dabd mythtv-0.27.3.tar.gz

10 years, 3 months

1
0
0 / 0

rpms/x264/devel .cvsignore, 1.34, 1.35 sources, 1.34, 1.35 x264.spec, 1.71, 1.72

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/x264/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9296 Modified Files: .cvsignore sources x264.spec Log Message: * Mon Jul 28 2014 Sérgio Basto <sergio(a)serjux.com> - 0.142-5.20140728gitaf8e768 - Update x264-0.142 to git af8e768 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 23 Apr 2014 03:05:54 -0000 1.34 +++ .cvsignore 27 Jul 2014 23:34:12 -0000 1.35 @@ -1 +1 @@ -x264-0.142-20140423-e260ea5.tar.bz2 +x264-0.142-20140728-af8e768.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 23 Apr 2014 03:05:54 -0000 1.34 +++ sources 27 Jul 2014 23:34:12 -0000 1.35 @@ -1 +1 @@ -987fe1cc7027f9539e1ba262fe60160e x264-0.142-20140423-e260ea5.tar.bz2 +50c4351b4d304a713ce2b1a2b6b37a80 x264-0.142-20140728-af8e768.tar.bz2 Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- x264.spec 23 Apr 2014 03:04:31 -0000 1.71 +++ x264.spec 27 Jul 2014 23:34:12 -0000 1.72 @@ -1,6 +1,6 @@ %global api 142 -%global gitdate 20140423 -%global gitversion e260ea5 +%global gitdate 20140728 +%global gitversion af8e768 %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable @@ -24,7 +24,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 4%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -189,6 +189,9 @@ %{_libdir}/libx26410b.so %changelog +* Mon Jul 28 2014 Sérgio Basto <sergio(a)serjux.com> - 0.142-5.20140728gitaf8e768 +- Update x264-0.142 to git af8e768 + * Wed Apr 23 2014 Sérgio Basto <sergio(a)serjux.com> - 0.142-4.20140423gite260ea5 - Update to git e260ea5 (stable branch)

10 years, 3 months

1
0
0 / 0

rpms/VirtualBox/F-20 VirtualBox.spec,1.60,1.61

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5425 Modified Files: VirtualBox.spec Log Message: add comment to changelog and restore Buildrequires for device-mapper. - Unbunble kBuild, since KBuild from fedora is working again. Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- VirtualBox.spec 27 Jul 2014 19:30:30 -0000 1.60 +++ VirtualBox.spec 27 Jul 2014 19:40:26 -0000 1.61 @@ -83,7 +83,7 @@ BuildRequires: libxml2-devel BuildRequires: libpng-devel BuildRequires: zlib-devel -BuildRequires: device-mapper-devel device-mapper-libs +BuildRequires: device-mapper-devel BuildRequires: libvpx-devel BuildRequires: makeself @@ -618,6 +618,7 @@ %changelog * Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.14-1 - New upstream release . +- Unbunble kBuild, since KBuild from fedora is working again. * Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1 - New upstream release .

10 years, 3 months

1
0
0 / 0

rpms/VirtualBox/devel VirtualBox.spec,1.63,1.64

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5385 Modified Files: VirtualBox.spec Log Message: add comment to changelog and restore Buildrequires for device-mapper. - Unbunble kBuild, since KBuild from fedora is working again. Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- VirtualBox.spec 15 Jul 2014 23:15:22 -0000 1.63 +++ VirtualBox.spec 27 Jul 2014 19:39:51 -0000 1.64 @@ -83,7 +83,7 @@ BuildRequires: libxml2-devel BuildRequires: libpng-devel BuildRequires: zlib-devel -BuildRequires: device-mapper-devel device-mapper-libs +BuildRequires: device-mapper-devel BuildRequires: libvpx-devel BuildRequires: makeself @@ -618,6 +618,7 @@ %changelog * Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.14-1 - New upstream release . +- Unbunble kBuild, since KBuild from fedora is working again. * Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1 - New upstream release .

10 years, 3 months

1
0
0 / 0

rpms/VirtualBox/F-20 .cvsignore, 1.54, 1.55 VirtualBox-4.3.0-libcxx.patch, 1.3, 1.4 VirtualBox.spec, 1.59, 1.60 sources, 1.54, 1.55

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3462 Modified Files: .cvsignore VirtualBox-4.3.0-libcxx.patch VirtualBox.spec sources Log Message: * Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.14-1 - New upstream release . Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 17 May 2014 00:54:26 -0000 1.54 +++ .cvsignore 27 Jul 2014 19:30:30 -0000 1.55 @@ -1 +1 @@ -VirtualBox-4.3.12.tar.bz2 +VirtualBox-4.3.14.tar.bz2 VirtualBox-4.3.0-libcxx.patch: ./src/VBox/Runtime/Makefile.kmk | 2 +- ./src/VBox/Storage/testcase/Makefile.kmk | 4 ++-- ./src/libs/kStuff/Makefile.kmk | 2 +- Config.kmk | 2 +- b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +- b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- configure | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- 13 files changed, 19 insertions(+), 21 deletions(-) Index: VirtualBox-4.3.0-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox-4.3.0-libcxx.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- VirtualBox-4.3.0-libcxx.patch 31 Mar 2014 01:23:06 -0000 1.3 +++ VirtualBox-4.3.0-libcxx.patch 27 Jul 2014 19:30:30 -0000 1.4 @@ -23,15 +23,6 @@ # # SDKs for external libraries. -@@ -3784,7 +3776,7 @@ endif - # Unlike VBOXR3STATIC, this is strict wrt warnings and includes IPRT. - # - TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC --TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC -+TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE - TEMPLATE_VBoxR3Static_EXTENDS_BY = appending - TEMPLATE_VBoxR3Static_SDKS += VBOX_OPENSSL - TEMPLATE_VBoxR3Static_SDKS.win += VBOX_NTDLL --- a/configure +++ b/configure @@ -2582,7 +2582,7 @@ fi @@ -67,17 +58,6 @@ ifdef VBOX_X11_SEAMLESS_GUEST VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE VBoxClient_SOURCES += \ ---- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100 -+++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100 -@@ -94,7 +94,7 @@ SUPR3_SOURCES = \ - # - # Static version of SUPR3. - # --SUPR3Static_TEMPLATE = VBOXR3STATIC -+SUPR3Static_TEMPLATE = VBOXR3EXE - SUPR3Static_EXTENDS = SUPR3 - - # --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100 +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100 @@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet @@ -209,17 +189,6 @@ VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) ---- ./src/VBox/Runtime/Makefile.kmk.libcxx 2013-10-15 12:13:19.000000000 +0100 -+++ ./src/VBox/Runtime/Makefile.kmk 2013-10-28 03:08:32.053146036 +0000 -@@ -232,7 +232,7 @@ endif - # - # RuntimeR3 - Static Runtime for Ring-3 executables. - # --RuntimeR3_TEMPLATE = VBoxR3Static -+RuntimeR3_TEMPLATE = VBOXR3EXE - RuntimeR3_SDKS = VBOX_OPENSSL VBOX_LIBXML2 - RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK) - RuntimeR3_DEFS = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP --- ./src/libs/kStuff/Makefile.kmk.orig 2012-12-27 18:36:01.629728244 +0000 +++ ./src/libs/kStuff/Makefile.kmk 2012-12-27 18:36:11.876827415 +0000 @@ -75,7 +75,7 @@ VBox-kStuff_SOURCES = \ @@ -231,3 +200,14 @@ VBox-kStuffStatic_EXTENDS = VBox-kStuff +--- ./src/VBox/Runtime/Makefile.kmk.libcxx 2014-07-15 23:08:58.294017830 +0100 ++++ ./src/VBox/Runtime/Makefile.kmk 2014-07-15 23:12:41.365417070 +0100 +@@ -221,7 +221,7 @@ endif + # + # RuntimeR3 - Static Runtime for Ring-3 executables. + # +-RuntimeR3_TEMPLATE = VBoxR3Static ++RuntimeR3_TEMPLATE = VBOXR3EXE + RuntimeR3_SDKS = VBOX_OPENSSL VBOX_LIBXML2 + RuntimeR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK) + RuntimeR3_DEFS = \ Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- VirtualBox.spec 17 May 2014 00:54:26 -0000 1.59 +++ VirtualBox.spec 27 Jul 2014 19:30:30 -0000 1.60 @@ -26,7 +26,7 @@ #endif Name: VirtualBox -Version: 4.3.12 +Version: 4.3.14 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -54,9 +54,7 @@ Patch26: VirtualBox-4.3.0-no-bundles.patch Patch27: VirtualBox-4.3.10-gcc.patch -%if 0%{?fedora} < 16 -BuildRequires: kBuild >= 0.1.98 -%endif +BuildRequires: kBuild >= 0.1.9998 BuildRequires: SDL-devel xalan-c-devel BuildRequires: openssl-devel BuildRequires: libcurl-devel @@ -85,7 +83,7 @@ BuildRequires: libxml2-devel BuildRequires: libpng-devel BuildRequires: zlib-devel -BuildRequires: device-mapper-devel +BuildRequires: device-mapper-devel device-mapper-libs BuildRequires: libvpx-devel BuildRequires: makeself @@ -202,9 +200,7 @@ find -name '*.py[co]' -delete # Remove prebuilt binary tools -%if 0%{?fedora} < 16 rm -rf kBuild -%endif rm -rf tools # Remove bundle X11 sources and some lib sources, before patching. mv src/VBox/Additions/x11/x11include/mesa-7.2 . @@ -234,7 +230,7 @@ %patch23 -p1 -b .xserver_guest %patch24 -p1 -b .guestlib %patch26 -p1 -b .nobundles -%patch27 -p1 -b .gcc +#patch27 -p1 -b .gcc # CRLF->LF sed -i 's/\r//' COPYING @@ -620,6 +616,9 @@ %changelog +* Tue Jul 15 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.14-1 +- New upstream release . + * Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1 - New upstream release . - Rename and split X11 and mesa (for guest) patches . Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-20/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 17 May 2014 00:54:26 -0000 1.54 +++ sources 27 Jul 2014 19:30:30 -0000 1.55 @@ -1 +1 @@ -b31908e98f6c271c59b97ce8154e31da VirtualBox-4.3.12.tar.bz2 +407099867bd9786e23619b5c11611e53 VirtualBox-4.3.14.tar.bz2

10 years, 3 months

1
0
0 / 0

rpms/mjpegtools/devel mjpegtools-2.1.0-no_format.patch, NONE, 1.1 mjpegtools-2.1.0-pic.patch, NONE, 1.1 mjpegtools-2.1.0-sdl-cflags.patch, NONE, 1.1 mjpegtools.spec, 1.18, 1.19

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/mjpegtools/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2827 Modified Files: mjpegtools.spec Added Files: mjpegtools-2.1.0-no_format.patch mjpegtools-2.1.0-pic.patch mjpegtools-2.1.0-sdl-cflags.patch Log Message: * Sat Jul 26 2014 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-4 - Rebuild for new libSDL_gfx, need by mjpegtools-gui - Fix FTBFS for errors "format not a string literal and no format arguments" because FESCO decided Enable "-Werror=format-security" by default https://fedorahosted.org/fesco/ticket/1185 - Bring and add two patches from Gentoo: mjpegtools-2.1.0-pic.patch and mjpegtools-2.1.0-sdl-cflags.patch mjpegtools-2.1.0-no_format.patch: lavtools/jpeg2yuv.c | 2 +- lavtools/lav_io.c | 2 +- lavtools/lavtrans.c | 2 +- mplex/main.cpp | 2 +- yuvfilters/yuvfilters.h | 6 +++--- yuvfilters/yuvkineco.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE mjpegtools-2.1.0-no_format.patch --- --- ./lavtools/lav_io.c.orig 2014-07-27 17:48:21.474622974 +0100 +++ ./lavtools/lav_io.c 2014-07-27 17:48:48.838881166 +0100 @@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi strcat(errmsg, ", quicktime"); #endif strcat(errmsg, ").\n"); - fprintf(stderr, errmsg); + fprintf(stderr, "%s", errmsg); free(lav_fd); internal_error = ERROR_FORMAT; /* Format not recognized */ return 0; --- ./lavtools/lavtrans.c.orig 2014-07-27 17:58:09.410282056 +0100 +++ ./lavtools/lavtrans.c 2014-07-27 17:59:24.769016140 +0100 @@ -275,7 +275,7 @@ int main(int argc, char ** argv) if (process_image_frame != -1) { nv = el_get_video_frame(vbuff, process_image_frame, &el); - sprintf(imgfname,outfile); + sprintf(imgfname, "%s", outfile); imgfd = fopen(imgfname,"wb"); if (imgfd==0) system_error("opening image file","fopen"); res = fwrite(vbuff,nv,1,imgfd); --- ./lavtools/jpeg2yuv.c.orig 2014-07-27 18:00:55.600900476 +0100 +++ ./lavtools/jpeg2yuv.c 2014-07-27 18:01:36.848301893 +0100 @@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_ if (firstjpeg) { p = firstjpeg; - sprintf(jpegname, firstjpeg); + sprintf(jpegname, "%s", firstjpeg); firstjpeg = NULL; } else { --- ./mplex/main.cpp.orig 2014-07-27 18:11:38.282143657 +0100 +++ ./mplex/main.cpp 2014-07-27 18:06:40.352252415 +0100 @@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun if( flag_table[flag].longname != 0 ) message += sep; } - mjpeg_error( message.c_str() ); + mjpeg_error( "%s", message.c_str() ); return false; } --- ./yuvfilters/yuvkineco.c.orig 2014-07-27 18:15:01.476097522 +0100 +++ ./yuvfilters/yuvkineco.c 2014-07-27 18:15:29.540366245 +0100 @@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha } else { #ifdef MJPEGTOOLS buf[n] = '\0'; - mjpeg_debug(buf); + mjpeg_debug("%s", buf); #else fputs(buf, stderr); #endif --- ./yuvfilters/yuvfilters.h.orig 2014-07-27 18:37:02.712645244 +0100 +++ ./yuvfilters/yuvfilters.h 2014-07-27 19:13:28.156101800 +0100 @@ -34,9 +34,9 @@ extern "C" { #ifdef MJPEGTOOLS # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno)) -# define WERROR(MSG) mjpeg_error(MSG) -# define WERRORL(MSG) mjpeg_error(MSG) -# define WWARN(MSG) mjpeg_warn(MSG) +# define WERROR(MSG) mjpeg_error("%s", MSG) +# define WERRORL(MSG) mjpeg_error("%s", MSG) +# define WWARN(MSG) mjpeg_warn("%s", MSG) #else # define WERROR(MSG) write(2, MSG "\n", sizeof MSG) # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0) mjpegtools-2.1.0-pic.patch: y4mdenoise/Makefile.am | 4 ++-- y4munsharp/Makefile.am | 2 +- y4mutils/Makefile.am | 2 +- yuvscaler/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE mjpegtools-2.1.0-pic.patch --- Index: y4mdenoise/Makefile.am =================================================================== RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 +++ y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 @@ -4,8 +4,8 @@ EXTRA_DIST = implementation.html -AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ -AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ +AM_CFLAGS = -DNDEBUG -finline-functions +AM_CXXFLAGS = -DNDEBUG -finline-functions INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils Index: y4munsharp/Makefile.am =================================================================== RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 +++ y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 @@ -4,7 +4,7 @@ INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir) -y4munharp_CFLAGS=@PROGRAM_NOPIC@ +y4munharp_CFLAGS= bin_PROGRAMS = y4munsharp Index: y4mutils/Makefile.am =================================================================== RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 +++ y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CFLAGS = @PROGRAM_NOPIC@ +AM_CFLAGS = AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la Index: yuvscaler/Makefile.am =================================================================== RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 +++ yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 @@ -18,6 +18,6 @@ EXTRA_DIST = yuvscaler_implementation.txt -yuvscaler_CFLAGS=@PROGRAM_NOPIC@ +yuvscaler_CFLAGS= yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) mjpegtools-2.1.0-sdl-cflags.patch: Makefile.am | 1 + 1 file changed, 1 insertion(+) --- NEW FILE mjpegtools-2.1.0-sdl-cflags.patch --- diff a/y4mutils/Makefile.am b/y4mutils/Makefile.am --- a/y4mutils/Makefile.am +++ b/y4mutils/Makefile.am @@ -44,6 +44,7 @@ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) y4mhist_SOURCES = y4mhist.c y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS) +y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS) y4mblack_SOURCES = y4mblack.c y4mblack_LDADD = $(LIBMJPEGUTILS) Index: mjpegtools.spec =================================================================== RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mjpegtools.spec 26 Jul 2014 17:42:24 -0000 1.18 +++ mjpegtools.spec 27 Jul 2014 18:54:37 -0000 1.19 @@ -6,6 +6,10 @@ License: GPLv2 URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz +Patch0: mjpegtools-2.1.0-sdl-cflags.patch +Patch1: mjpegtools-2.1.0-no_format.patch +Patch2: mjpegtools-2.1.0-pic.patch + BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel @@ -96,6 +100,10 @@ %prep %setup -q +%patch0 -p1 -b .sdl +%patch1 -p1 -b .format +%patch2 -p0 -b .fpic + sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -183,6 +191,10 @@ %changelog * Sat Jul 26 2014 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-4 - Rebuild for new libSDL_gfx, need by mjpegtools-gui +- Fix FTBFS for errors "format not a string literal and no format arguments" because + FESCO decided Enable "-Werror=format-security" by default + https://fedorahosted.org/fesco/ticket/1185 +- Bring and add two patches from Gentoo: mjpegtools-2.1.0-pic.patch and mjpegtools-2.1.0-sdl-cflags.patch * Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-3 - Better obsoletes/provides for y4mscaler.

10 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits July 2014