Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18019 Modified Files: .cvsignore ChangeLog mythtv-0.27-fixes.patch mythtv.spec sources Added Files: mythdb-optimize.service mythdb-optimize.timer Removed Files: mythtv-sd_fix.patch Log Message: * Mon Jul 6 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27.5-1 - Update to latest upstream release. - Move udisks requirement to the libs package where it's actually used. - Add systemd mythtv database optimization service and timer. --- NEW FILE mythdb-optimize.service --- # Do not edit this file, it will be replaced on update # If you need to make modifications to this unit file first make a copy in # /etc/systemd/system # This file is part of the packaging of MythTV # # MythTV is free software; view http://www.mythtv.org # for more information. # # Do not enable both this unit and the timer. # Enable this unit to optimize on boot, enable the timer to optimize on a # regulat basis (daily, weekly, monthly, etc.) [Unit] Description=MythTV Database Optimization After=mariadb.service mysqld.service [Service] Type=oneshot # Default setting assumes a system wide install. Otherwise it should be set to # the folder containing the .mythtv subfolder containing the config.xml file Environment=MYTHCONFDIR=/etc/mythtv # systemd changes execution from the calling user (possibly root) to this user # if you have permissions problems or obscure errors try logging in as mythtv User=mythtv ExecStart=/bin/optimizie_mythdb [Install] WantedBy=multi-user.target --- NEW FILE mythdb-optimize.timer --- # Do not edit this file, it will be replaced on update # If you need to make modifications to this unit file first make a copy in # /etc/systemd/system # This file is part of the packaging of MythTV # # MythTV is free software; view http://www.mythtv.org # for more information. # # This should only be enabled on the system containing the mythtv database. [Unit] Description=Timer for MythTV database optimizer After=mariadb.service Requires=mariadb.service [Timer] # See http://www.freedesktop.org/software/systemd/man/systemd.time.html for # methods of specifying the frequency, some examples below are: # daily → *-*-* 00:00:00 # monthly → *-*-01 00:00:00 # weekly → Mon *-*-* 00:00:00 # By default, run about midnight: OnCalendar=daily [Install] WantedBy=basic.target Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 3 Nov 2014 19:15:51 -0000 1.16 +++ .cvsignore 21 Jul 2015 19:38:41 -0000 1.17 @@ -1 +1 @@ -mythtv-0.27.4.tar.gz +mythtv-0.27.5.tar.gz Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ChangeLog 27 May 2015 13:17:05 -0000 1.22 +++ ChangeLog 21 Jul 2015 19:38:41 -0000 1.23 @@ -1,721 +1,44 @@ -commit 8fd277bb1ecab938e57059dc9472b6f922d5fca7 -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Wed May 20 23:40:17 2015 +0100 +commit 9498257571e8158926b60a0eefc74568c4436823 +Author: Mario Limonciello <superm1(a)ubuntu.com&gt; +Date: Wed Oct 9 07:21:38 2013 -0500 - MythDownloadManager: fix a bug when downloading URL's with percent encoding + Internet Content: Replace precompiled vimeo_data.pyc with the source vimeo_data.py. - This avoids converting a url to a QUrl only to later use its toString() method - which was causing problems with percent encoded URL's not being removed from the - download queue because we ended up comparing a human readable URL with a percent - encoded one. + vimeo_data.pyc was byte-compiled for python 2.6 and didn't work with any other + python versions. - Refs #12356 + vimeo_data.py holds the API key for connecting to vimeo. It it obfuscated, + however other projects do keep their key in the open. - (cherry picked from commit d620cb9e1b19a5fa1e693a91d9ea6271e03640b4) - -commit e7af3a08c6b6f385d9d4b93948c812a394110a4a -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Wed May 20 23:30:13 2015 +0100 - - MythDownloadManager: put the lock around m_downloadInfos when removing a url - - Also log an error if we fail to remove a download url from m_downloadInfos after - a download completes. - - Refs #12356 - - (cherry picked from commit 58694eb41a528467c7d54b85c211479204ee24ac) - -commit 8332919c43b51ab06db9516150a2762498713c86 -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Tue May 19 12:17:34 2015 +0200 - - Make sure the PCR PID is not discarded if it is not listed in the PMT (i.e. the PCR PID contains only PCR packets). - - Fixes #12422 - (cherry picked from commit 98c47b5c70014e741d4a9fd964ef1d0f5fe2a4f3) - -commit 1983b6b97983619a2e0c9905fb1da9a6ce4f63e1 -Author: David Matthews <dm(a)prolingua.co.uk&gt; -Date: Mon Jan 5 18:22:14 2015 +0000 - - Apply UK EIT fix-up on additional transports. - - (cherry picked from commit 7ee28ce83d9cf41b797f40f095a1572c89f36fa2) - (cherry picked from commit ef2895ea02197c1cce4026203387bd9bb17107de) - -commit a14b34bf706f11ba5d2af11bc92d1f9a5e82c550 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Wed Jan 7 23:02:13 2015 +0000 - - Fix PCR packets being stripped from transport stream following [0f0e6787] - - (cherry picked from commit d947e91eedf73a43dde79446b87e0095e54bf628) - - Refs #12422 - -commit 6b7397699b5a356ecfb78497a26094b0fbbd334e -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Wed May 13 10:43:41 2015 +0100 - - MythDownloadManager: add some logging to try to track down the 100% cpu bug - - This also allows the theme checker to be run once a minute rather than the - usual once an hour to try to trigger the bug quicker. Setting the - MYTHTV_DEBUGMDM environment variable will run the checker every minute. - - So for 0.27.4-fixes use :- - MYTHTV_DEBUGMDM="1" mythfrontend -v file --loglevel=debug + discussion: + http://irc.mythtv.org/ircLog/channel/4/2013-10-08:21:50:00/2013-10-08:22:... - Refs #12356 + Fixes #11907 - (cherry picked from commit 7e0441c38166ded77b3a1b3a869e40a5af389fa0) + Signed-off-by: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; + (cherry picked from commit 6fb78ae1c77c7ad29a68fcf5c27b771eb92f8739) -commit 45d2d5173aa1cd27ef15180b4afe3e4779d26019 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Tue May 5 21:12:59 2015 -0700 - - Subtitles: Fix cc608 preamble indents. Fixes #12051. - - Cherry-picked from 366c428708682420bbf53a301d145ca441aedbdd . - - Thanks to Helen (faginbagin) for the analysis and patch. - - As Helen points out in the ticket, it would be all-around better if we - took an approach like the cc708 captions and rendered everything onto - an internal grid of characters and then converted that to strings to - draw on the screen, but that's a lot of work for a mostly deprecated - caption format. - -commit 8b6d4da2a185e7b07c432267dc9fb80075f9565c +commit 2142e0813ca8af41f848317d2a275d1fcd2a4fcf Author: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; -Date: Sun Apr 19 23:41:00 2015 +0200 - - Video output: Fix OpenGL 1 output after b9971146 - - (cherry picked from commit 2b01ed3894be8374b6c143449fa563fbd945da5a) - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; - - Refs #12421 - -commit a848edd7a4450db1c0eb839cc41ebdd6c6b2dbb6 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; -Date: Mon Mar 23 23:46:13 2015 +0100 - - Video output: Add default fragment shader for OpenGL 2 - - When there were no color conversions with the YUV->RGB shader, there was no - other fragment shader active and because of that the video was black. - - (cherry picked from commit b997114683759562dbaf6b80a651070d099195ac) - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; - - Refs #12421 - -commit 974d1ae9b6fe2f12b8cfc48aafcf10fc730e414e -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Mon May 4 22:38:58 2015 -0700 - - Reduce "Watch Recordings" sluggishness by caching jobqueue state. - - Refs #8962, refs #7990. - - This is essentially a cherry-pick of b43b11ca. - -commit d7e08d2d228809e47e8b40c42dfc966b6a17ba6d -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Mon Nov 10 11:19:09 2014 +0000 - - UI: Optimize updates to MythUIButtonList when an item's state changes - - This patch checks if a MythUIButtonListItem is visible and only calls - the parent's Update() if it is visible thus speeding up the update - and also reduces flicker when updating buttonlists with a large number of - items. - - Based on a patch by Lawrence Rust. - - (cherry picked from commit 4e5ce7fe25faf3df617b4f633b0e6c58afa34912) - -commit 7962008be23de99d3bd69e1603d69749f4678a3c -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Sat Apr 25 06:56:51 2015 -0700 - - Subtitles: Yet another state calculation fix. - - 0925cc05806a057b6549a3471ee043d68948d0bd doesn't count AV subtitles as - "text" subtitles, but it should. - - (cherry picked from commit 017cc5c8bb66109500e2c4ff771abcac4f87c034) - -commit 74dba3599fd7fa042b253dce1a6742d553c0e54c -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Thu Apr 23 17:35:29 2015 -0700 - - Subtitles: Fix state calculation in EnableCaptions/DisableCaptions. - - 26f6437b874d84c87a52df6d33e449c0d5d9a4bc was too aggressive in - assuming that EnableCaptions would actually enable text subtitles, and - DisableCaptions would actually disable text subtitles. They only - enable/disable a particular type of subtitles (which may have already - been enabled/disabled), so we need to check the overall state after - the operation is performed. - - (cherry picked from commit 0925cc05806a057b6549a3471ee043d68948d0bd) - -commit bcdaa8865ef8700ccbb7214ec39dcbcd8392b2af -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Wed Apr 22 05:19:14 2015 -0700 - - Subtitles: Allow transitions between ATSC and SCTE captions. - - In changeset d526385aa4c1466b064e9544cdb663f357007e35 (refs #9829), - code was added such that the first time ATSC caption data is seen, any - future SCTE caption data is explicitly ignored. This was to deal with - broadcasts containing duplicate caption data. - - This policy causes problems when the recording switches back and forth - between the two sources of caption data, such as when the broadcaster - splices in commercials. - - The updated solution continues to favor ATSC data, but allows a switch - back to SCTE after SCTE data is seen 10 times in a row (a somewhat - arbitrarily chosen number) without intervening ATSC data. - - Refs #12054. - - (cherry picked from commit 68bd03ffe5b7bb6456519639caac77486ea0941c) - -commit 8f14d3d1e8c798f8a45b3338a33bb71aec877dc7 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Wed Apr 22 15:05:18 2015 -0700 - - Send REC_STARTED_WRITING event for NuppelVideoRecorder. - - This recorder doesn't go through the usual path of the other - recorders, where keyframes are identified (and where frames prior to - the first keyframe are discarded) and the event is sent after the - first keyframe is found. - - Refs #12328. - - (cherry picked from commit c07c21e6c5b7f1380cf7e36e7cbcc8763a5cb225) - -commit 5d5eb048e9356ed43bcbb87294c0c1030ddc8c8e -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Sat Apr 18 13:02:34 2015 +0200 - - Make MythWelcome spawn MythFrontend in the UI thread again due to problems with LIRC but allow events to be processed. This prevents extra key presses being queued and allows them to be ignored until MythFrontend has returned. - -commit 554046a5ccdf81e66d6cf3a8be2a080bf7505ffe -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Sun Apr 19 12:10:29 2015 -0700 - - Subtitles: Don't reset subtitle state after seeking. - - After a seek, ac3a988 caused the subtitle-enabled state to be reset to - the desired state at playback start, rather than left unchanged. - - (cherry picked from commit 26f6437b874d84c87a52df6d33e449c0d5d9a4bc) - -commit 7860e917d2c264f160f14b56b0d49530467d31dc -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Thu Apr 16 20:33:25 2015 -0700 - - Network control: Handle "space" key properly. - - Fixes #12361. - - (cherry picked from commit 72c4abdc6a80add3035be8bdb1f31e20c4cc3b28) - -commit 65ada0cff0b1a5c8c06846303cf2dad51980d1aa -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Tue Apr 14 23:44:53 2015 +0200 - - Spawn MythFrontend from a separate thread in MythWelcome to avoid multiple key events being queued and restarting MythFrontend as soon as it exits. - - Problem discussed here: http://www.gossamer-threads.com/lists/mythtv/users/585218 - (cherry picked from commit 72de5f444fa094564ec6c2a136ef79c74bf2650b with a minor change to an include file to compile with QT4) - -commit e4c6d162627be8bc30548f9b59f719d4f645c057 -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Mon Apr 13 20:14:06 2015 +0200 - - Don't show the miniplayer in MythMusic when starting the next track if we're not playing any more. - - This makes playback stop correctly when 'Repeat mode' is off and we've reached the end of the playlist. Otherwise showing the miniplayer causes playback to start again. - (cherry picked from commit bc1ffba7e48db13db589082968422d02ba0c1fda) - -commit bcf888fdd4034997c2f2a5d0d877da0e1f463c2e -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Sun Apr 12 07:30:55 2015 -0700 - - Subtitles: Fix automatic display of captions/subtitles. - - There was something of a race condition in the previous code. At - startup of playback, the decoder thread runs ahead and updates track - lists as it encounters them, including audio, cc608, cc708, etc. If - no subtitle tracks are found before the UI thread gets to a certain - point, the UI thread commits to keeping subtitles disabled, regardless - of the "automatically display subtitles" setting. - - In the new version, at startup of playback, the UI thread keeps the - original intention alive so that subtitles will automatically start - displaying when they eventually arrive. - - Note that this fix doesn't address the problem where the player ought - to switch to a "better" subtitle track type when it comes along, such - as switching from cc608 to cc708. - - Refs #10740 (only because this fixes a fix with that ref) - - (cherry picked from commit ac3a988f2e9140322b1a15c34d6ac87071c69d7e) - -commit 483f8dd5674acd127bcf342900ea18230b9c2ce3 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Sun Jul 13 08:38:30 2014 -0700 - - Subtitles: Avoid changing subtitle state in the decoder thread. - - This addresses the clearing of stale subtitles after a seek. - Refs #10740. - - (cherry picked from commit 438d29a4a64b38ac239f61208262e35a3e486d91) - -commit 628183a01b66a010e9cf510b9d1d08a348ed5889 -Author: Warren Falk <warren(a)warrenfalk.com&gt; -Date: Tue Mar 3 12:57:58 2015 -0500 - - fix SSDP thread using 100% CPU on zero byte datagrams - - Refs #12395 - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org&gt; - -commit f1115fcd2b5cef93e870f926f53bf32cf546da9d -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; -Date: Wed Mar 4 21:44:19 2015 +0000 - - Try to use qmake-qt4 in preference to qmake-qt5 - -commit 6b550fcf084aba085909efc2d4e0b2fac465a28a -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Mon Mar 2 14:21:08 2015 +0000 - - Fix a segfault in the EIT cache - - (cherry picked from commit 2e8c5f84c63e806272b474e08c2de4c8c10c13d1) - -commit 56acf7cb6d2b891f1ed11dc8aff818528dfc6e34 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Sun Mar 1 08:26:16 2015 +0000 - - Don't try to listen on addresses which are no longer available. - - (cherry picked from commit 5f64cabf8fdf21026212c17a64275e92601a8385) - -commit a2563e13062298467480cd8465153cdc7e851f05 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Wed Feb 25 23:49:31 2015 +0000 - - Revert "Fix metadata fanart selection." - - The fix for this issue was addressed at a lower level in another - commit as a result this code path was reversing the list again. - - Fixes #12246 - - This reverts commit da8ac305c3dbe955459a6a12e646b81109552836. - - Conflicts: - mythtv/libs/libmythmetadata/metadatafactory.cpp - - (cherry picked from commit 09422c5508a74c0d052a78ee14fb4a20ce9ca058) - -commit 4e4a78541d9ab632552eafb35dce827f86994d88 -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; -Date: Mon Feb 23 16:42:45 2015 +0000 - - Add 29.5Msys/s to the preset list of possible symbol rates. Found on several dvb-s2 multiplexes across Europe - - (cherry picked from commit e26980483f392e7f13c614201a757a74af25112c) - -commit 6b8357105da9c84385b43102a76055ca0ae628f1 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Wed Apr 30 11:36:21 2014 +0100 - - Add 23Msys/s to the preset list of possible symbol rates. This one is used for several DVB-S2 multiplexes in the UK. - - (cherry picked from commit 8d11d72f570aa52d7cd8a102e7ac4fa90c77ab16) - -commit 5aeccac88f424f000a11d1a648a8b9b6b659fef2 -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; -Date: Mon Feb 23 15:54:39 2015 +0000 - - Fixes #12221. When setting a dvb_tuning_delay, save the value the user enters - - (cherry picked from commit 267c890baf1d06cb0ed7e2454da6784881b65b99) - -commit ca4a2d68aab8723e4424cd808d6865bad2b950f1 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Fri Feb 13 12:15:38 2015 +0000 - - Fix mythtranscode segfault - - (cherry picked from commit cce890a85ba0a06575a287d67ba53539fd496517) - -commit 05dbcee65c501f4fc669e7d97f14ae3dda7491f6 -Merge: 7c48b79 aa256d1 -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; -Date: Thu Feb 12 18:14:45 2015 +0000 - - Merge branch 'fixes/0.27' of code.mythtv.org:mythtv into fixes/0.27 - -commit 7c48b799e92e0e0a8160e4ab1da146afc583b97c -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; -Date: Wed Feb 11 16:58:49 2015 +0000 - - Enable pic by default on linux systems. - Should fix building on 32bit based systems with Qt5 - - (cherry picked from commit 0e5961e41dd6867772b74c051a96dc219181c6a5) - -commit aa256d1f7f96aa8afadd5bb070adfb8a9b2cb6b8 -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Sun Feb 8 19:43:26 2015 +0100 - - Added missing support for JUMPTODVDCHAPTERMENU and JUMPTODVDTITLEMENU actions. - (cherry picked from commit 19e8d7fb65a766f16881d0143fcd09f7691c5818) - -commit 3b4390396bf09dfe3741508ecf7fc71a004abd01 -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; -Date: Fri Jan 2 11:52:58 2015 +0000 - - Add missing QObject include. Should resolve Qt5 build error - - (cherry picked from commit f063b19facd153c2b2844e9643d570b9466b4b6f) - -commit 03eaf3b9bdf7ce04f1285d08ee74af63ca8fd46b -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Wed Jan 14 23:10:58 2015 +0000 - - Icon Downloader: Fix improper escaping of search string that broke proper matching and sorting with some searches - - (cherry picked from commit 93f4b96128c454aac728301282259df6734eb771) - -commit edc162bdfcdc95a68b4dc49d778dfedd3adcff8f -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Mon Jan 12 12:08:00 2015 +0000 - - Null pointer check in MainServer::customEvent. - - There are a few backtraces from ubuntu users appearing to show a crash here with - a null event pointer. It's not possible to work backwards and see how a null - event managed to end up being posted in the first place, and this - change won't necessarily prevent all variations of this crash but it's - the best I can do for now without a full audit of all code using the - events system. - - (cherry picked from commit 84619a0c3c2e043a61317836362bd0e31ae989c4) - -commit 40506c2ba7d81fa8e65bf8bb783c998ffe65c7af -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Thu Dec 11 15:49:35 2014 +0000 - - SSDP: Missed changes when reverting [52cb0b5] - - Fixes #12333 - - (cherry picked from commit 3461b407b0dd0f4188108395709eb129ec32e652) - -commit ea73ed3989d210efbaf822d3cee029b0c8d6b553 -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Tue Dec 9 20:50:00 2014 +0000 - - MythUIImage: extend the random image feature to reload if a delay is used - - If the <filename> is set to a directory and the <delay> is set to a value > 0 - then keep reloading a random image from the directory after <delay> - milliseconds has passed. - - For example this will display a random image from the themes 'background' - directory changing the image every minute (60000ms) :- - - <imagetype name="background"> - <area>0,0,1280,720</area> - <filename>backgrounds/</filename> - <delay>60000</delay> - </imagetype> - - (cherry picked from commit 78a827b8fdbf0d4fab4525a8007c2c8c7deb4cc1) - -commit 86ff53a7a178f5da5e2858f0ffd889cf2eab301b -Author: Karl Dietz <dekarl(a)mythtv.org&gt; -Date: Fri Apr 25 15:49:24 2014 +0200 - - draft patch to add support for private data specifiers and upc private data - - Fixes #12091 - (cherry picked from commit 30df98ce5d11b69d0b5c5114a9007cdfc79a7e9b) - - Conflicts: - - mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.h - -commit c32f254cd6aefdc5138e504afdf829c290878437 -Author: Karl Dietz <dekarl(a)mythtv.org&gt; -Date: Thu Jul 10 00:41:00 2014 +0200 - - Don't use the CRIDs from the authority eventis.nl - - they are not fit for our scheduler (multiple IDs per series/episode - and multiple series/episodes per ID) - (cherry picked from commit 494dfa6eef01aabe1ed7bf3d0f3139f20a8b7678) - -commit 141b4f3e0ac970a185be60a81bc64f88f0ccd563 -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Thu Dec 4 23:16:54 2014 +0000 - - MythDownloadManager: unlock m_infoLock before continuing after an error condition - - Problem spotted by nouglywires on the forums. - - (cherry picked from commit 8e6678a00f81fffcd8a3bf71947066db1fffbd30) - -commit 70653f18a203680d5bff5b8d6ceff12b5e39fd4c -Author: Karl Dietz <dekarl(a)mythtv.org&gt; -Date: Sun Nov 30 23:41:58 2014 +0100 - - fix braino in c12af87 - (cherry picked from commit 0f7d7ff0660a12022b76cdb8d6d6bceda032f540) - -commit 6fdb2d1a02e0867483e9025a8ab9477f2444af06 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Sat Nov 29 22:53:27 2014 +0000 - - SSDP: Disable reflection attack mitigation for now, it's triggering false positives. - - (cherry picked from commit 02e92a265c1e9825bb58806156fbf31bd740515a) +Date: Sun Jun 21 23:45:52 2015 +0200 -commit bd762efd166f3969e5acc0ac0f7a11770a44a9d3 -Author: Karl Dietz <dekarl(a)mythtv.org&gt; -Date: Tue Nov 25 23:37:30 2014 +0100 - - Properly translate star ratings in XMLTV parser. - - Convert from zero based star-ratings in XMLTV to one based star-ratings - in MythTV. - (cherry picked from commit c12af87629629295975fdb1ede28072ad2fc1247) - -commit 65d92fd36ecf796d8e8a18b3196286d31b28501e -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Wed Nov 19 12:32:59 2014 +0000 - - SSDP: Check that the peer address is available before doing the local network check. - - Refs #12305 - - (cherry picked from commit d20c163ee82c38f9d8fe4652b7a811af61925de7) - -commit 9a72d02cb7e9a89135b5044e9179f148a45b0cf6 -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Wed Nov 19 12:47:47 2014 +0000 - - Revert "Prevent --syslog, --logpath and --enable-dblog if --nologserver is used" + Internet Content: Tidy up some formatting in the YouTube grabber - Seems those options are valid for --nologserver. That option just means don't run - the external mythlogserver but do the logging internally. - - Refs #11992. - - This reverts commit ec06dfba8e22008ac97af81f997e9b521eca62ae. - -commit 4572a55538303df215d28c02dae24bde757a7fde -Author: David Engel <dengel(a)mythtv.org&gt; -Date: Tue Nov 18 13:27:45 2014 -0600 - - Fix missed cases in earlier channel-specific rules change. - - Refs #12267 - - (cherry picked from commit d3f5031e08c0a9e0fa783310afa4d293bacf6ce0) - -commit 99688ed2df3e17b2776fc951dc1bc33c12e1a359 -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Thu Nov 13 16:17:36 2014 +0000 + (cherry picked from commit 8e8aabb5d3f0e051e6b6812726f62aa1115c9206) - Add support for explicitly recognising QAM-256 with DVB-T2. This _may_ help with scanning on devices that don't support 'auto' modulation detection. - - (cherry picked from commit 864d985786a6f0f0fe2b93b4539c12ee2b0e09e2) - (cherry picked from commit 376955a091dbf69f7cc233fa1bf3255401e80367) - -commit 76da983bb8aec8a91e8d897150e85d3a5256596d -Author: David Engel <dengel(a)mythtv.org&gt; -Date: Tue Nov 11 16:18:37 2014 -0600 - - Properly identify channel-specific rules in Recording Rules. - - This was broken when channel rules were converted to all rules using - the this channel filter. Based on a patch from lomion(a)aon.at. - - Refs #12267 - - (cherry picked from commit a397b94ffb5cf201aef4fdd9ccd2b28780713bed) - -commit ec06dfba8e22008ac97af81f997e9b521eca62ae -Author: Bill Meek <keemllib(a)gmail.com&gt; -Date: Tue Nov 11 00:07:53 2014 +0000 - - Prevent --syslog, --logpath and --enable-dblog if --nologserver is used - - Fixes #11992. - - Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; - (cherry picked from commit be72636b9e34b1b9fb032a1da578a742d562d0b9) - -commit be0005e12cd65ee5e3311c3511a80e7e2a8159f0 -Author: Rebecca Sutton Koeser <rlskoeser(a)gmail.com&gt; -Date: Mon Nov 10 22:31:07 2014 +0000 - - Python bindings: fix typo in MythXML getPreviewImage() - - Fixes #11515. - - Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; - (cherry picked from commit e42e1d8351703798e3dc08cb01597577794bab32) - -commit 6eb4afbd48652a99a2ec4cddd774de2101aacc83 +commit 26bb9cb71fb134ffb96d9330d837e7abc355328e Author: Jonatan Lindblad <jlindblad(a)mythtv.org&gt; -Date: Mon Nov 10 15:17:57 2014 +0000 +Date: Sat Jun 20 14:27:27 2015 +0200 - Fix using ##x## for season and episode in templated text + Internet Content: Adapt the YouTube grabber to the v3 API - Fixes #12003. + It is possible to set two optional parameters in ~/.mythtv/MythNetvision/userGrabberPrefs/youtube.xml: + * API key + * Region code used for retrieving the categories in the tree view - Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; - (cherry picked from commit acdc9f86988379b842f56b89089f4e8d029dec37) - -commit 4cea476f411f5a2f146398ca20bd0b1046cb1f72 -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Mon Nov 10 12:41:52 2014 +0000 - - mythfilldatabase: remove the redundant assign to userid - - Refs #12300. - - (cherry picked from commit 2f2261d6e3bb78f029dbb38e4746314d6ca0a2b6) - -commit ee025527aec0f1bed588664d3061c69fb97a642b -Author: Bill Meek <keemllib(a)gmail.com&gt; -Date: Mon Nov 10 12:03:41 2014 +0000 - - mythfilldatabase: remove Schedules Direct userid from temporary file names - - This removes the userid from the file name so it wont be exposed in any logs. - - Fixes #12300. - - Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; - (cherry picked from commit 6750b358ec33c09bd651507ed57eb993ae5e5a39) - -commit a1096aa9fa4177a66a0cc45196c9e8179944efbd -Author: faginbagin <mythtv(a)hbuus.com&gt; -Date: Mon Nov 10 11:33:22 2014 +0000 - - DTVRecorder: Fix 32 to 64 bit integer arithmetic in FindPSKeyFrames() - - This is reported to fix commercial flagging of PVR-150/300/500 recordings - possibly only affecting 32 bit O/Ss due to a bad conversion from a 32 bit - unsigned int to a 64 bit signed int. - - Fixes #12313. - - Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; - (cherry picked from commit eb0e5050a4af098b9c9dd392c324e1993b2c590e) - -commit 0f0e67871b38abc9de21e588a1a9670d7d7603e5 -Author: Richard Hulme <peper03(a)mythtv.org&gt; -Date: Thu Oct 30 22:43:05 2014 +0100 - - Make PID filtering work properly by removing the streams and not just the entries from the PAT. - (cherry picked from commit 61f9ac9a8d7f6eb5cf1fac74376245e8b82e42f1) - -commit f01bd1d9607bfcad8049515592b4fda0f7a9274c -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Sat Sep 7 17:02:32 2013 +0100 - - Add a setting to control MHEG interaction channel, patch by Lawrence Rust - - This also disables the interaction channel (and iplayer) by default as - it appears that this is currently broken, possibly by an upstream - change at the BBC. - - (cherry picked from commit 03c11f466a9cd8960a17e5d2d2c2c54b6bf42cc9) - -commit e0b002787e32d2e21ec57d9686ec4a8411c0fa60 -Author: lomion <lomion(a)aon.at&gt; -Date: Sun Oct 26 17:50:57 2014 -0400 - - New locle file for Austria from lomion(a)aon.at - - Thank you! - - Closes #12265 - - Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org&gt; - -commit c4de5c5e173de69e238e627b37b33ae94a3c7873 -Author: Yianni Vidalis <yiannividalis(a)hotmail.com&gt; -Date: Thu Oct 23 07:35:24 2014 -0400 - - New virtual Greek keyboard from Yianni Vidalis - - Thank you Yianni! - - Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org&gt; - -commit b305eb5b7fc662146e74983fa3754d622695cdeb -Author: Stuart Morgan <smorgan(a)mythtv.org&gt; -Date: Fri Oct 17 17:32:02 2014 +0100 - - Security: Disallow SSDP device discovery from non-local addresses. - - Protection against MythTV's use in SSDP Reflection attacks. - - https://www.prolexic.com/knowledge-center-ddos-threat-advisory-ssdp-refle... - https://www.prolexic.com/kcresources/prolexic-threat-advisories/prolexic-... - - No CVE assigned yet. - - (cherry picked from commit 52cb0b5679a5b20a55ba5cbe6b1064b72c66576f) - -commit e830993e89fc3b7244e9614c2384ab074c449d1f -Author: Paul Harrison <pharrison(a)mythtv.org&gt; -Date: Thu Oct 16 18:57:07 2014 +0100 - - Bump the ABI version after [6b3984106b] - -commit 6b3984106bed87e3392eb8842353916da32a5891 -Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; -Date: Wed Oct 8 14:06:44 2014 +0100 - - DataDirectProcessor: Use random temporary filenames for downloads - - Fixes #12253. - - Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; - (cherry picked from commit 299141e0a69b706239beb35b096df9ed2cea8a7b) - - Conflicts: - mythtv/libs/libmythtv/datadirect.cpp - -commit aad702d8e0e1cd5d04241bedc5477380f06167f4 -Author: Gary Buhrmaster <gary.buhrmaster(a)gmail.com&gt; -Date: Wed Oct 8 13:55:48 2014 +0100 - - DataDirectProcessor: Add logging when file opens fail + Some changes were also required in libmyth and MythNetvision due to the way + paging is handled. - Fixes #12251. + This bumps the ABI version. - Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; - (cherry picked from commit f4634d2ea524baf2e7c2d99995b7b565e635cd07) + (cherry picked from commit 9527d3d0c9b71bb088b3869319a11f5c1ea9bb57) mythtv-0.27-fixes.patch: mythplugins/mythnetvision/mythnetvision/netcommon.cpp | 4 mythplugins/mythnetvision/mythnetvision/netcommon.h | 2 mythplugins/mythnetvision/mythnetvision/netsearch.cpp | 23 mythplugins/mythnetvision/mythnetvision/netsearch.h | 3 mythtv/libs/libmyth/netgrabbermanager.cpp | 26 mythtv/libs/libmyth/netgrabbermanager.h | 7 mythtv/libs/libmythbase/mythversion.h | 2 mythtv/programs/mythbackend/internetContent.cpp | 10 mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_api.py | 9 mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XML/defaultUserPrefs/youtube.xml | 10 mythtv/programs/scripts/internetcontent/nv_python_libs/mainProcess.py | 17 mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_data.py | 21 mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py | 734 +++------- mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_data.py | 20 mythtv/programs/scripts/internetcontent/youtube.py | 31 15 files changed, 349 insertions(+), 570 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mythtv-0.27-fixes.patch 27 May 2015 13:17:05 -0000 1.11 +++ mythtv-0.27-fixes.patch 21 Jul 2015 19:38:41 -0000 1.12 @@ -1,2883 +1,1376 @@ - mythplugins/configure | 10 +- - mythplugins/mythmusic/mythmusic/musicplayer.cpp | 2 +- - mythtv/bindings/python/MythTV/methodheap.py | 2 +- - mythtv/configure | 11 +- - mythtv/libs/libmyth/programtypes.cpp | 1 + - mythtv/libs/libmythbase/mythdownloadmanager.cpp | 26 +- + .../mythnetvision/mythnetvision/netcommon.cpp | 4 +- + .../mythnetvision/mythnetvision/netcommon.h | 2 +- + .../mythnetvision/mythnetvision/netsearch.cpp | 23 +- + .../mythnetvision/mythnetvision/netsearch.h | 3 + + mythtv/libs/libmyth/netgrabbermanager.cpp | 26 +- + mythtv/libs/libmyth/netgrabbermanager.h | 7 +- mythtv/libs/libmythbase/mythversion.h | 2 +- - mythtv/libs/libmythbase/serverpool.cpp | 3 +- - mythtv/libs/libmythmetadata/metadatafactory.cpp | 8 +- - mythtv/libs/libmythtv/avformatdecoder.cpp | 18 +- - mythtv/libs/libmythtv/avformatdecoder.h | 2 +- - mythtv/libs/libmythtv/cc608decoder.cpp | 4 +- - .../channelscan/channelscanmiscsettings.h | 2 + - mythtv/libs/libmythtv/datadirect.cpp | 56 ++- - mythtv/libs/libmythtv/datadirect.h | 2 + - mythtv/libs/libmythtv/eitcache.cpp | 15 +- - mythtv/libs/libmythtv/eitcache.h | 2 +- - mythtv/libs/libmythtv/eithelper.cpp | 40 +- - mythtv/libs/libmythtv/jobqueue.cpp | 26 +- - mythtv/libs/libmythtv/jobqueue.h | 2 + - mythtv/libs/libmythtv/mhegic.cpp | 9 +- - mythtv/libs/libmythtv/mpeg/dvbdescriptors.h | 50 ++- - mythtv/libs/libmythtv/mpeg/mpegdescriptors.h | 16 + - mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 14 +- - mythtv/libs/libmythtv/mythplayer.cpp | 12 +- - mythtv/libs/libmythtv/mythplayer.h | 2 + - mythtv/libs/libmythtv/openglvideo.cpp | 19 +- - .../libmythtv/recorders/NuppelVideoRecorder.cpp | 4 + - mythtv/libs/libmythtv/recorders/dtvrecorder.cpp | 13 +- - mythtv/libs/libmythtv/subtitlescreen.cpp | 7 - - .../test/test_mpegtables/test_mpegtables.h | 52 +++ - .../test/test_mpegtables/test_mpegtables.pro | 4 + - mythtv/libs/libmythtv/transporteditor.cpp | 2 + - mythtv/libs/libmythtv/tv_play.cpp | 14 + - mythtv/libs/libmythtv/videosource.cpp | 1 + - mythtv/libs/libmythui/mythuibuttonlist.cpp | 28 +- - mythtv/libs/libmythui/mythuibuttonlist.h | 4 + - mythtv/libs/libmythui/mythuiimage.cpp | 122 +++--- - mythtv/libs/libmythui/mythuiimage.h | 5 + - mythtv/libs/libmythui/mythuitext.cpp | 2 +- - mythtv/libs/libmythupnp/msocketdevice.h | 4 +- - mythtv/libs/libmythupnp/msocketdevice_unix.cpp | 27 +- - mythtv/libs/libmythupnp/ssdp.cpp | 28 +- - mythtv/locales/de_at.xml | 37 ++ - mythtv/programs/mythbackend/mainserver.cpp | 3 + - mythtv/programs/mythfilldatabase/xmltvparser.cpp | 19 +- - mythtv/programs/mythfrontend/globalsettings.cpp | 13 + - mythtv/programs/mythfrontend/networkcontrol.cpp | 1 + - mythtv/programs/mythfrontend/playbackbox.cpp | 68 +++- - mythtv/programs/mythfrontend/playbackbox.h | 27 ++ - .../programs/mythfrontend/programrecpriority.cpp | 69 ++-- - mythtv/programs/mythfrontend/themechooser.cpp | 12 +- - mythtv/programs/mythtranscode/transcode.cpp | 2 +- - mythtv/programs/mythtv-setup/importicons.cpp | 6 +- - mythtv/programs/mythwelcome/welcomedialog.cpp | 2 +- - mythtv/themes/default/keyboard/el.xml | 270 ++++++++++++++ - mythtv/themes/default/keyboard/el_ui.xml | 410 +++++++++++++++++++++ - 57 files changed, 1398 insertions(+), 214 deletions(-) + mythtv/programs/mythbackend/internetContent.cpp | 10 +- + .../nv_python_libs/common/common_api.py | 9 +- + .../configs/XML/defaultUserPrefs/youtube.xml | 10 + + .../internetcontent/nv_python_libs/mainProcess.py | 17 +- + .../nv_python_libs/vimeo/vimeo_data.py | 21 + + .../nv_python_libs/youtube/youtube_api.py | 734 +++++++-------------- + .../nv_python_libs/youtube/youtube_data.py | 20 + + mythtv/programs/scripts/internetcontent/youtube.py | 31 +- + 16 files changed, 349 insertions(+), 570 deletions(-) -diff --git a/mythplugins/configure b/mythplugins/configure -index b9086ba..f14a405 100755 ---- a/mythplugins/configure -+++ b/mythplugins/configure -@@ -561,14 +561,14 @@ OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes") - EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=") - EXTRALIBS=${EXTRALIBS#EXTRALIBS=} - --if is_qmake5 $qmake || is_qmake5 qmake-qt5; then -- if is_qmake5 qmake-qt5; then -- qmake=qmake-qt5 -- fi --elif is_qmake4 $qmake || is_qmake4 qmake-qt4; then -+if is_qmake4 $qmake || is_qmake4 qmake-qt4; then - if is_qmake4 qmake-qt4; then - qmake=qmake-qt4 - fi -+elif is_qmake5 $qmake || is_qmake5 qmake-qt5; then -+ if is_qmake5 qmake-qt5; then -+ qmake=qmake-qt5 -+ fi - else - die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake=" - fi -diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp -index 867c765..713408d 100644 ---- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp -+++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp -@@ -504,7 +504,7 @@ void MusicPlayer::nextAuto(void) - } - - // if we don't already have a gui attached show the miniplayer if configured to do so -- if (m_isAutoplay && m_canShowPlayer && m_autoShowPlayer) -+ if (m_isAutoplay && m_canShowPlayer && m_autoShowPlayer && m_isPlaying) - { - MythScreenStack *popupStack = - GetMythMainWindow()->GetStack("popup stack"); -diff --git a/mythtv/bindings/python/MythTV/methodheap.py b/mythtv/bindings/python/MythTV/methodheap.py -index d598b2f..b41b2da 100644 ---- a/mythtv/bindings/python/MythTV/methodheap.py -+++ b/mythtv/bindings/python/MythTV/methodheap.py -@@ -1202,7 +1202,7 @@ class MythXML( XMLConnection ): - if height: args['Height'] = height - if secsin: args['SecsIn'] = secsin - -- return self._result('Content/GetPreviewImage', **args).read() -+ return self._request('Content/GetPreviewImage', **args).read() - - class MythMusic( MusicSchema, DBCache ): - """ -diff --git a/mythtv/configure b/mythtv/configure -index f8c1f2f..d95a3a3 100755 ---- a/mythtv/configure -+++ b/mythtv/configure -@@ -4250,6 +4250,7 @@ case $target_os in - ! disabled joystick_menu && enable joystick_menu - enable libudev - enable libuuid -+ enable pic - ;; - irix*) - target_os=irix -@@ -4467,15 +4468,15 @@ is_qmake4(){ - $1 --version 2>&1 | egrep -q -e "Qt version 4\.[8-9]\.[0-9]" +diff --git a/mythplugins/mythnetvision/mythnetvision/netcommon.cpp b/mythplugins/mythnetvision/mythnetvision/netcommon.cpp +index 1397347..296d923 100644 +--- a/mythplugins/mythnetvision/mythnetvision/netcommon.cpp ++++ b/mythplugins/mythnetvision/mythnetvision/netcommon.cpp +@@ -48,9 +48,9 @@ QString GetMythXMLURL(void) } --if is_qmake5 $qmake || is_qmake5 qmake-qt5; then -+if is_qmake4 $qmake || is_qmake4 qmake-qt4; then -+ if is_qmake4 qmake-qt4; then -+ qmake=qmake-qt4 -+ fi -+elif is_qmake5 $qmake || is_qmake5 qmake-qt5; then - if is_qmake5 qmake-qt5; then - qmake=qmake-qt5 - fi - check_cxxflags -DQT_DISABLE_DEPRECATED_BEFORE --elif is_qmake4 $qmake || is_qmake4 qmake-qt4; then -- if is_qmake4 qmake-qt4; then -- qmake=qmake-qt4 -- fi - else - die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake=" - fi -diff --git a/mythtv/libs/libmyth/programtypes.cpp b/mythtv/libs/libmyth/programtypes.cpp -index 3167e81..c1253c5 100644 ---- a/mythtv/libs/libmyth/programtypes.cpp -+++ b/mythtv/libs/libmyth/programtypes.cpp -@@ -2,6 +2,7 @@ - - #include <QDateTime> - #include <QMutex> -+#include <QObject> - - #include "programtypes.h" - #include "mythdate.h" -diff --git a/mythtv/libs/libmythbase/mythdownloadmanager.cpp b/mythtv/libs/libmythbase/mythdownloadmanager.cpp -index 02d27a0..dbf061f 100644 ---- a/mythtv/libs/libmythbase/mythdownloadmanager.cpp -+++ b/mythtv/libs/libmythbase/mythdownloadmanager.cpp -@@ -11,6 +11,7 @@ - #include <QTextStream> - #include <QNetworkProxy> - #include <QMutexLocker> -+#include <QUrl> - - #include "stdlib.h" - -@@ -27,7 +28,6 @@ - - #include "mythdownloadmanager.h" - #include "mythlogging.h" --#include <QUrl> [...3808 lines suppressed...] -+ <char normal="φ" shift="Φ" alt="f" altshift="F"></char> -+ <move left="key29" right="key31" up="key18" down="key41"></move> -+ </key> -+ <key name="key31" type="char" draworder="1"> -+ <position>176,79</position> -+ <char normal="γ" shift="Γ" alt="g" altshift="G"></char> -+ <move left="key30" right="key32" up="key19" down="key42"></move> -+ </key> -+ <key name="key32" type="char" draworder="1"> -+ <position>213,79</position> -+ <char normal="η" shift="Η" alt="h" altshift="ή"></char> -+ <move left="key31" right="key33" up="key20" down="key43"></move> -+ </key> -+ <key name="key33" type="char" draworder="1"> -+ <position>250,79</position> -+ <char normal="ξ" shift="Ξ" alt="j" altshift="J"></char> -+ <move left="key32" right="key34" up="key21" down="key44"></move> -+ </key> -+ <key name="key34" type="char" draworder="1"> -+ <position>287,79</position> -+ <char normal="κ" shift="Κ" alt="k" altshift="K"></char> -+ <move left="key33" right="key35" up="key22" down="key45"></move> -+ </key> -+ <key name="key35" type="char" draworder="1"> -+ <position>324,79</position> -+ <char normal="λ" shift="Λ" alt="l" altshift="L"></char> -+ <move left="key34" right="key36" up="key23" down="key46"></move> -+ </key> -+ <key name="key36" type="char" draworder="1"> -+ <position>361,79</position> -+ <char normal="" shift="" alt=";" altshift=":"></char> -+ <move left="key35" right="key37" up="key24" down="key47"></move> -+ </key> -+ <key name="key37" type="char" draworder="1"> -+ <position>398,79</position> -+ <char normal="'" shift="0x0022" alt="'" altshift="0x0022"></char> -+ <move left="key36" right="key57" up="key25" down="key55"></move> -+ </key> -+ -+ <!-- row 4 --> -+ <key name="key38" type="char" draworder="1"> -+ <position>42,116</position> -+ <char normal="ζ" shift="Ζ" alt="z" altshift="Z"></char> -+ <move left="key56" right="key39" up="key27" down="key49"></move> -+ </key> -+ <key name="key39" type="char" draworder="1"> -+ <position>79,116</position> -+ <char normal="χ" shift="Χ" alt="x" altshift="X"></char> -+ <move left="key38" right="key40" up="key28" down="key50"></move> -+ </key> -+ <key name="key40" type="char" draworder="1"> -+ <position>116,116</position> -+ <char normal="ψ" shift="Ψ" alt="c" altshift="C"></char> -+ <move left="key39" right="key41" up="key29" down="key50"></move> -+ </key> -+ <key name="key41" type="char" draworder="1"> -+ <position>153,116</position> -+ <char normal="ω" shift="Ω" alt="v" altshift="ώ"></char> -+ <move left="key40" right="key42" up="key30" down="key50"></move> -+ </key> -+ <key name="key42" type="char" draworder="1"> -+ <position>190,116</position> -+ <char normal="β" shift="Β" alt="b" altshift="B"></char> -+ <move left="key41" right="key43" up="key31" down="key48"></move> -+ </key> -+ <key name="key43" type="char" draworder="1"> -+ <position>227,116</position> -+ <char normal="ν" shift="Ν" alt="n" altshift="N"></char> -+ <move left="key42" right="key44" up="key32" down="key48"></move> -+ </key> -+ <key name="key44" type="char" draworder="1"> -+ <position>264,116</position> -+ <char normal="μ" shift="Μ" alt="m" altshift="M"></char> -+ <move left="key43" right="key45" up="key33" down="key48"></move> -+ </key> -+ <key name="key45" type="char" draworder="1"> -+ <position>301,116</position> -+ <char normal="," shift="0x003c" alt="," altshift="0x003c"></char> -+ <move left="key44" right="key46" up="key34" down="key48"></move> -+ </key> -+ <key name="key46" type="char" draworder="1"> -+ <position>338,116</position> -+ <char normal="." shift=">" alt="." altshift=">"></char> -+ <move left="key45" right="key47" up="key35" down="key51"></move> -+ </key> -+ <key name="key47" type="char" draworder="1"> -+ <position>375,116</position> -+ <char normal="/" shift="?" alt="/" altshift="?"></char> -+ <move left="key46" right="key55" up="key36" down="key51"></move> -+ </key> -+ -+ <!-- row 5 --> -+ <key name="key48" type="char" draworder="1"> -+ <position>205,153</position> -+ <char normal=" " shift=" " alt=" " altshift=" "></char> -+ <move left="key50" right="key51" up="key43" down="key7"></move> -+ <image function="normal" filename="keyboard/key_normal_space.png"></image> -+ <image function="focused" filename="keyboard/key_focused_space.png"></image> -+ <image function="down" filename="keyboard/key_down_space.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_space.png"></image> -+ </key> -+ -+ <!-- special keys --> -+ <key name="key49" type="shift" draworder="1"> -+ <position>5,153</position> -+ <char normal="Shift" shift="Shift" alt="Shift" altshift="Shift"></char> -+ <move left="key53" right="key50" up="key38" down="key1"></move> -+ <image function="normal" filename="keyboard/key_normal_shift.png"></image> -+ <image function="focused" filename="keyboard/key_focused_shift.png"></image> -+ <image function="down" filename="keyboard/key_down_shift.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_shift.png"></image> -+ </key> -+ <key name="key50" type="lock" draworder="1"> -+ <position>85,153</position> -+ <char normal="Lock" shift="Lock" alt="Lock" altshift="Lock"></char> -+ <move left="key49" right="key48" up="key40" down="key4"></move> -+ <image function="normal" filename="keyboard/key_normal_shift.png"></image> -+ <image function="focused" filename="keyboard/key_focused_shift.png"></image> -+ <image function="down" filename="keyboard/key_down_shift.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_shift.png"></image> -+ </key> -+ <key name="key51" type="moveleft" draworder="1"> -+ <position>350,153</position> -+ <char normal="0x003c-" shift="0x003c-" alt="0x003c-" altshift="0x003c-"></char> -+ <move left="key48" right="key52" up="key47" down="key10"></move> -+ <image function="normal" filename="keyboard/key_normal_move.png"></image> -+ <image function="focused" filename="keyboard/key_focused_move.png"></image> -+ <image function="down" filename="keyboard/key_down_move.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_move.png"></image> -+ </key> -+ <key name="key52" type="moveright" draworder="1"> -+ <position>405,153</position> -+ <char normal="->" shift="->" alt="->" altshift="->"></char> -+ <move left="key51" right="key53" up="key55" down="key12"></move> -+ <image function="normal" filename="keyboard/key_normal_move.png"></image> -+ <image function="focused" filename="keyboard/key_focused_move.png"></image> -+ <image function="down" filename="keyboard/key_down_move.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_move.png"></image> -+ </key> -+ <key name="key53" type="shift" draworder="1"> -+ <position>460,153</position> -+ <char normal="Shift" shift="Shift" alt="Shift" altshift="Shift"></char> -+ <move left="key52" right="key49" up="key56" down="key14"></move> -+ <image function="normal" filename="keyboard/key_normal_back.png"></image> -+ <image function="focused" filename="keyboard/key_focused_back.png"></image> -+ <image function="down" filename="keyboard/key_down_back.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_back.png"></image> -+ </key> -+ <key name="key54" type="back" draworder="1"> -+ <position>460,42</position> -+ <char normal="Back" shift="Back" alt="Back" altshift="Back"></char> -+ <move left="key26" right="key15" up="key14" down="key57"></move> -+ <image function="normal" filename="keyboard/key_normal_back.png"></image> -+ <image function="focused" filename="keyboard/key_focused_back.png"></image> -+ <image function="down" filename="keyboard/key_down_back.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_back.png"></image> -+ </key> -+ <key name="key55" type="comp" draworder="1"> -+ <position>412,116</position> -+ <char normal="Comp" shift="Comp" alt="Comp" altshift="Comp"></char> -+ <move left="key47" right="key56" up="key37" down="key52"></move> -+ <image function="normal" filename="keyboard/key_normal_back.png"></image> -+ <image function="focused" filename="keyboard/key_focused_back.png"></image> -+ <image function="down" filename="keyboard/key_down_back.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_back.png"></image> -+ </key> -+ <key name="key56" type="del" draworder="1"> -+ <position>486,116</position> -+ <char normal="Del" shift="Del" alt="Del" altshift="Del"></char> -+ <move left="key55" right="key38" up="key57" down="key53"></move> -+ <image function="normal" filename="keyboard/key_normal_del.png"></image> -+ <image function="focused" filename="keyboard/key_focused_del.png"></image> -+ <image function="down" filename="keyboard/key_down_del.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_del.png"></image> -+ </key> -+ <key name="key57" type="done" draworder="1"> -+ <position>435,79</position> -+ <char normal="Done" shift="Done" alt="Done" altshift="Done"></char> -+ <move left="key37" right="key27" up="key54" down="key56"></move> -+ <image function="normal" filename="keyboard/key_normal_done.png"></image> -+ <image function="focused" filename="keyboard/key_focused_done.png"></image> -+ <image function="down" filename="keyboard/key_down_done.png"></image> -+ <image function="downfocused" filename="keyboard/key_downfocused_done.png"></image> -+ </key> -+ -+ </keyboard> -+ -+ </container> -+ -+ </window> -+ -+</mythuitheme> + if __name__ == '__main__': +- # No api key is required + apikey = "" ++ # Set the base processing directory that the grabber is installed ++ target.baseProcessingDir = os.path.dirname( os.path.realpath(__file__)) + main = process.mainProcess(target, apikey, ) + main.grabberInfo = {} + main.grabberInfo['title'] = __title__ Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- mythtv.spec 27 May 2015 13:17:06 -0000 1.151 +++ mythtv.spec 21 Jul 2015 19:38:42 -0000 1.152 @@ -2,6 +2,7 @@ # # by: Chris Petersen <cpetersen(a)mythtv.org&gt; # Jarod Wilson <jarod(a)wilsonet.com&gt; +# Richard Shaw <hobbes1069(a)gmail.com&gt; # # Modified/Extended from the great work of: # Axel Thimm <Axel.Thimm(a)ATrpms.net&gt; @@ -59,13 +60,16 @@ # The vendor name we should attribute the aforementioned entries to %define desktop_vendor RPMFusion -# MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27.4-64-g8fd277b +# MythTV Version string -- preferably the output from git describe +%define vers_string v0.27.5-3-g9498257 %define branch fixes/0.27 # Git revision and branch ID %define _gitrev g5b917e8 +# Harden build as mythbackend is long running. +%global _hardened_build 1 + # # Basic descriptive tags for this package: # @@ -74,11 +78,11 @@ URL: http://www.mythtv.org/ # Version/Release info -Version: 0.27.4 +Version: 0.27.5 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 6%{?dist} +Release: 1%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -150,6 +154,8 @@ Source109: mythtv-setup.desktop Source111: 99-mythbackend.rules Source112: mythjobqueue.service +Source113: mythdb-optimize.service +Source114: mythdb-optimize.timer # Global MythTV and Shared Build Requirements @@ -352,11 +358,6 @@ Requires: mythffmpeg = %{version}-%{release} Requires: mariadb-server >= 5, mariadb >= 5 Requires: xmltv -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 22 -Requires: udisks2 -%else -Requires: udisks -%endif # Generate the required mythtv-frontend-api version string here so we only # have to do it once. @@ -399,13 +400,16 @@ %package libs Summary: Library providing mythtv support -Provides: libmyth = %{version}-%{release} -Obsoletes: libmyth < %{version}-%{release} Requires: freetype >= 2 Requires: lame Requires: qt4 >= 4.6 Requires: qt4-MySQL +%if 0%{?rhel} >= 7 || 0%{?fedora} >= 22 +Requires: udisks2 +%else +Requires: udisks +%endif %description libs Common library code for MythTV and add-on modules (development) @@ -416,8 +420,6 @@ %package devel Summary: Development files for mythtv -Provides: libmyth-devel = %{version}-%{release} -Obsoletes: libmyth-devel < %{version}-%{release} Requires: mythtv-libs = %{version}-%{release} @@ -499,10 +501,6 @@ %package base-themes Summary: Core user interface themes for mythtv -# Replace an old ATRMS package -Provides: mythtv-theme-gant -Obsoletes: mythtv-theme-gant - %description base-themes MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv-docs package for more information. @@ -567,9 +565,6 @@ %package common Summary: Common components needed by multiple other MythTV components -# mythpmovies is now DOA, but we need this for upgrade path preservation. -Provides: mythmovies = %{version}-%{release} -Obsoletes: mythmovies < %{version}-%{release} %description common MythTV provides a unified graphical interface for recording and viewing @@ -806,6 +801,9 @@ find \( -name 'configure' -o -name '*pro' -o -name 'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+ fi +# Remove compiled python file +find -name *.pyc -exec rm -f {} \; + %patch0 -p1 -b .mythtv %patch1 -p1 -b .types_h %patch2 -p1 -b .libcec2 @@ -1042,6 +1040,12 @@ # Systemd unit file for mythjobqueue only backends. install -p -m 0644 %{SOURCE112} %{buildroot}%{_unitdir}/ + # Systemd unit files for database optimization + install -p -m 0644 %{SOURCE113} %{buildroot}%{_unitdir}/ + install -p -m 0644 %{SOURCE114} %{buildroot}%{_unitdir}/ + install -p -m 0755 contrib/maintenance/optimize_mythdb.pl \ + %{buildroot}%{_bindir}/optimize_mythdb + ### SysV based setup. ### %else install -p -m 0755 %{SOURCE102} %{buildroot}%{_sysconfdir}/init.d/mythbackend @@ -1147,6 +1151,7 @@ %if %{with_systemd} %systemd_post mythbackend.service %systemd_post mythjobqueue.service + %systemd_post mythdb-optimize.service %else /sbin/chkconfig --add mythbackend %endif @@ -1156,6 +1161,7 @@ %if %{with_systemd} %systemd_preun mythbackend.service %systemd_preun mythjobqueue.service + %systemd_preun mythdb-optimize.service %else if [ $1 = 0 ]; then /sbin/service mythbackend stop > /dev/null 2>&1 @@ -1167,6 +1173,7 @@ %if %{with_systemd} %systemd_postun_with_restart mythbackend.service %systemd_postun_with_restart mythjobqueue.service + %systemd_postun_with_restart mythdb-optimize.service %else if [ "$1" -ge "1" ] ; then /sbin/service mythbackend condrestart >/dev/null 2>&1 || : @@ -1199,7 +1206,6 @@ %{_bindir}/mythwikiscripts %{_bindir}/mythmetadatalookup %{_bindir}/mythutil -#{_bindir}/mythlogserver %{_datadir}/mythtv/mythconverg*.pl %{_datadir}/mythtv/locales/ %{_datadir}/mythtv/metadata/ @@ -1214,6 +1220,7 @@ %{_bindir}/mythmediaserver %{_bindir}/mythreplex %{_bindir}/mythhdhomerun_config +%{_bindir}/mythdb_optimize %{_datadir}/mythtv/MXML_scpd.xml %{_datadir}/mythtv/backend-config/ %attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv @@ -1221,6 +1228,8 @@ %if %{with_systemd} %{_unitdir}/mythbackend.service %{_unitdir}/mythjobqueue.service +%{_unitdir}/mythdb-optimize.service +%{_unitdir}/mythdb-optimize.timer /lib/udev/rules.d/99-mythbackend.rules %else %{_sysconfdir}/init.d/mythbackend @@ -1417,6 +1426,11 @@ %changelog +* Mon Jul 6 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27.5-1 +- Update to latest upstream release. +- Move udisks requirement to the libs package where it's actually used. +- Add systemd mythtv database optimization service and timer. + * Tue May 26 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27.4-6 - Update to latest bugfix release. - Add conditional for udisks for Fedora 22+ (BZ#3660). Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 3 Nov 2014 19:15:52 -0000 1.61 +++ sources 21 Jul 2015 19:38:42 -0000 1.62 @@ -1 +1 @@ -c158d039a35823741e136799ede7957d mythtv-0.27.4.tar.gz +345e5e1c1a653e6fc40db670d7a7e2b7 mythtv-0.27.5.tar.gz --- mythtv-sd_fix.patch DELETED ---