Author: hobbes1069 Update of /cvs/free/rpms/mythtv/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3884 Modified Files: ChangeLog mythtv-0.27-fixes.patch mythtv.spec Added Files: mythtv-0.27-ffmpeg.patch Log Message: * Wed May 7 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-7 - Update to latest fixes, v0.27-222-g583f448. mythtv-0.27-ffmpeg.patch: dca.h | 75 +++++++++++++++++++++++++++++++----------------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) --- NEW FILE mythtv-0.27-ffmpeg.patch --- diff --git mythtv-0.27.orig/mythtv/extrernal/FFmpeg/libavcodec/arm/dca.h mythtv-0.27/mythtv/external/FFmpeg/libavcodec/arm/dca.h index 2cfd18a..431b62e 100644 --- mythtv-0.27.orig/mythtv/external/FFmpeg/libavcodec/arm/dca.h +++ mythtv-0.27/mythtv/external/FFmpeg/libavcodec/arm/dca.h @@ -34,46 +34,44 @@ static inline int decode_blockcodes(int code1, int code2, int levels, { int v0, v1, v2, v3, v4, v5; - __asm__ ("smmul %8, %14, %18 \n" - "smmul %11, %15, %18 \n" - "smlabb %14, %8, %17, %14 \n" - "smlabb %15, %11, %17, %15 \n" - "smmul %9, %8, %18 \n" - "smmul %12, %11, %18 \n" - "sub %14, %14, %16, lsr #1 \n" - "sub %15, %15, %16, lsr #1 \n" - "smlabb %8, %9, %17, %8 \n" - "smlabb %11, %12, %17, %11 \n" - "smmul %10, %9, %18 \n" - "smmul %13, %12, %18 \n" - "str %14, %0 \n" - "str %15, %4 \n" - "sub %8, %8, %16, lsr #1 \n" - "sub %11, %11, %16, lsr #1 \n" - "smlabb %9, %10, %17, %9 \n" - "smlabb %12, %13, %17, %12 \n" - "smmul %14, %10, %18 \n" - "smmul %15, %13, %18 \n" - "str %8, %1 \n" - "str %11, %5 \n" - "sub %9, %9, %16, lsr #1 \n" - "sub %12, %12, %16, lsr #1 \n" - "smlabb %10, %14, %17, %10 \n" - "smlabb %13, %15, %17, %13 \n" - "str %9, %2 \n" - "str %12, %6 \n" - "sub %10, %10, %16, lsr #1 \n" - "sub %13, %13, %16, lsr #1 \n" - "str %10, %3 \n" - "str %13, %7 \n" - : "=m"(values[0]), "=m"(values[1]), - "=m"(values[2]), "=m"(values[3]), - "=m"(values[4]), "=m"(values[5]), - "=m"(values[6]), "=m"(values[7]), - "=&r"(v0), "=&r"(v1), "=&r"(v2), + __asm__ ("smmul %0, %6, %10 \n" + "smmul %3, %7, %10 \n" + "smlabb %6, %0, %9, %6 \n" + "smlabb %7, %3, %9, %7 \n" + "smmul %1, %0, %10 \n" + "smmul %4, %3, %10 \n" + "sub %6, %6, %8, lsr #1 \n" + "sub %7, %7, %8, lsr #1 \n" + "smlabb %0, %1, %9, %0 \n" + "smlabb %3, %4, %9, %3 \n" + "smmul %2, %1, %10 \n" + "smmul %5, %4, %10 \n" + "str %6, [%11, #0] \n" + "str %7, [%11, #16] \n" + "sub %0, %0, %8, lsr #1 \n" + "sub %3, %3, %8, lsr #1 \n" + "smlabb %1, %2, %9, %1 \n" + "smlabb %4, %5, %9, %4 \n" + "smmul %6, %2, %10 \n" + "smmul %7, %5, %10 \n" + "str %0, [%11, #4] \n" + "str %3, [%11, #20] \n" + "sub %1, %1, %8, lsr #1 \n" + "sub %4, %4, %8, lsr #1 \n" + "smlabb %2, %6, %9, %2 \n" + "smlabb %5, %7, %9, %5 \n" + "str %1, [%11, #8] \n" + "str %4, [%11, #24] \n" + "sub %2, %2, %8, lsr #1 \n" + "sub %5, %5, %8, lsr #1 \n" + "str %2, [%11, #12] \n" + "str %5, [%11, #28] \n" + : "=&r"(v0), "=&r"(v1), "=&r"(v2), "=&r"(v3), "=&r"(v4), "=&r"(v5), "+&r"(code1), "+&r"(code2) - : "r"(levels - 1), "r"(-levels), "r"(ff_inverse[levels])); + : "r"(levels - 1), "r"(-levels), + "r"(ff_inverse[levels]), "r"(values) + : "memory"); return code1 | code2; } -- 1.9.1 Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 11 Mar 2014 10:30:19 -0000 1.15 +++ ChangeLog 11 May 2014 14:42:22 -0000 1.16 @@ -1,3 +1,504 @@ +commit 583f44855ff80e032a6175939b1917a54337ccac +Author: Klass De Waal <klaas.de.waal(a)gmail.com&gt; +Date: Tue May 6 11:23:16 2014 +0100 + + Remove old entries from in-memory EIT cache + + Closes #12130. + + Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; + (cherry picked from commit d0e25acac0cd671cb1eee4bb965bbcd35ffd88da) + +commit e2acf0d940009b2b240d52e9b53a123e1309a134 +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Fri Jan 3 15:05:08 2014 +0100 + + 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&gt; +Date: Sat Jan 11 20:05:11 2014 +0100 + + consider the last segment when determining the aspect ratio + + 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) + +commit 3dfc6fad394190eec86d2f0e3b849b2324ee5db2 +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Sat Jan 11 14:05:37 2014 +0100 + + consider all aspect ratio changes when looking for the next change + + 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. + + The last segment is ignored as of now. + (cherry picked from commit 6c1af4b12367fcf9de7d3bbae3282cfe63c18013) + +commit 07288849888d0678bf2b50a130da24097df3b861 +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Sun Jan 19 23:00:18 2014 +0100 + + let mythwikiscripts find the categories again when scraping script + + But it still needs more TLC. + (cherry picked from commit 58ebc60632ebcdba90d15db8272cd03208d2e77e) + +commit e50af7d5d1c119b8a7cb3fb9d7444de4b7e270dc +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Fri Jan 31 16:15:13 2014 +0100 + + make parameter names consistently lowercase + + Since [3d9155909f] the parameter names used inconsistent upper and lower case. + + 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. + + Patch by Steve Beinicke + + Fixes #12006 + (cherry picked from commit e9a22c587713f2933402232b15daf82d4272dd2d) + +commit 55e7ed5e16221e9042b68b335ed11dd8dd0c6703 +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Mon Mar 3 23:39:27 2014 +0100 + + Make metadata title matching more permissive + + 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. + + I think so, too + + Fixes #11088 + Patch by Daniel Ribeiro + (cherry picked from commit 18f6412f73cffc751931dc688d57ea3d7708c7f1) + +commit 5268cd19760b123fa142773b56e40a98858d48d4 +Author: Karl Dietz <dekarl(a)mythtv.org&gt; +Date: Wed Apr 23 19:58:38 2014 +0200 + + let mythtranscode --help hint at the optional cutlist + (cherry picked from commit 24be3436d75f5947ef6e7d444daee50666832ac6) + +commit 27668b7280a3d55bf1c5540ae5b44f623f4d1892 +Author: Cédric Schieli <cschieli(a)gmail.com&gt; +Date: Tue Dec 31 18:04:37 2013 +0100 + + Protect pbs with proper (aka locked) refcounting. + + 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&gt; + + (cherry picked from commit 6f246c0d1567bd84e1d9d30de7def724fc75e8f6) + +commit 46a146c5bd02d571b6941d69183ac6c8b5d610df +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Mon Apr 28 08:57:51 2014 +1000 + + Fix null dereference + + Coverity ID 1061551 + + (cherry picked from commit 9635bc42da3de7616d2ab248694ee9ae7ec2b42e) + +commit b93fb14831a0ca8d59a7df5267c04cb6e52d9254 +Author: Raymond Wagner <rwagner(a)mythtv.org&gt; +Date: Wed Apr 16 04:35:43 2014 -0400 + + Remove file check for pytmdb3.cache + + This is a partial roll back of 2c50a824b and remove the check for the + pytmdb3.cache file, allowing the library to simply create the file if + necessary. + + Fixes #11876 + + (cherry picked from commit ec084b39099d2ea43a736ac46caffad90272ef9d) + + Conflicts: + mythtv/programs/scripts/metadata/Movie/tmdb3.py + +commit ad2f1ffebde4fcb05856584a3411a45487cc4cf5 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Thu Mar 27 21:19:16 2014 +1100 + + Fix crashes when pressing menu key during channel change + + There’s a short amount of time when changing channel during which there are no video output defined. + + (cherry picked from commit 400f35aa8de2a6e29ec8e98bf173deb95e724adc) + +commit d17c9064d7033c410a576988945e5b81882e42f1 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Mon Apr 7 21:02:38 2014 +1000 + + Should first Apple Remote listening fail, don’t attempt to use apple remote. + + This would only happen on a mac with no remote receiver + + (cherry picked from commit 42c2278813687d1d0bded1e0164b0a64e4407365) + +commit cfa3260ecd71adf2dedcd58187a57d973715846b +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Mon Apr 7 13:55:55 2014 +1000 + + Fixes Video Playback Profile Editor. + + Two corrected issues: + 1- Adding or Editing an existing profile, did nothing visually, but would actually update the database. Regression was introduced in 9686f034ac54 + 2- When deleting a profile, the newly selected one wasn’t actually saved as default + + (cherry picked from commit c2b22cb99313cbcd496cdbd7593edc853bac41df) + + Conflicts: + mythtv/libs/libmyth/mythconfiggroups.h + +commit cba166380086de37fc22dab460746c805a5c5f6c +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Sun Apr 6 01:55:04 2014 +1100 + + Fix linking issues. + + Spotted by Craig Treleaven, freetype linking parameters were added twice and too early, causing general linking with installed system libraries first, and then local tree ones. + Configure also automatically adds all libraries checked for to EXTRALIBS define + + (cherry picked from commit 4f15d4449a31d551d61d0a00362089d8d7d8a763) + + Conflicts: + mythtv/libs/libmythtv/libmythtv.pro + mythtv/settings.pro + +commit 1b68d626f44818ccf55ed603fe799487ba8f75bb +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Sun Apr 6 00:15:04 2014 +1100 + + My analysis for the problem in 96ecd539de8e76a880f0013b4b8854da216e17b1 was wrong. + The actual issue is that QPalette inheritance appears broken on a mac; if you set the palette to the top widget container, it doesn’t do anything on its children. However, setting the palette to the main application itself does. + + Now things look exactly the same between mac and linux for better or worse. Including font sizes and colors. + A downside, is that the selection color appears to be misused in most themes including the default. So you can't tell if a text is selected or simply having focus + Qt bug: QTBUG-32067, QTBUG-26144 (over 224 bugs related to palette use in Qt as of 2014-04-05) + + (cherry picked from commit 103d4651e68215e661c843ca5862d7d64c052f93) + +commit 0ba4d68afbbdfcf375ca1af66b338e6a1146a944 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Thu Apr 10 18:01:37 2014 +0700 + + Revert "Fix settings display on macs" + + This reverts commit 829a0986edc2ab695273ec5c8038842c243f36f3. + +commit 39686c6c6800053fe25764d2f27cfdfc2dd21fab +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Thu Apr 3 23:20:54 2014 +1100 + + Fix old Qt setting screens preventing them from accepting keyboard inputs + + Hopefully this is the final fix… + The issue seems to only have occurred on macs. When opening two MythDialogs (that includes MythPopup) in a row, often the 2nd one would not accept any used input anymore, only causing a “beep”; making it impossible to even exit that window. + + The existing logic (and there was nothing wrong with it) was to simply disable the current MythDialog and put the new one on top of it. However, when doing so, somehow key events are now ignored. + So instead, we now disable all widgets within that MythDialog, without disabling the dialog itself. + + When doing so, the newly created MythDialog is always working as expected. + This code should not be necessary, it is a workaround to what appears to be a Qt bug. + + Fixes #11990. + + (cherry picked from commit 9edb6d6c4aa0ed930be222ddd32cfc008d709d9f) + +commit 829a0986edc2ab695273ec5c8038842c243f36f3 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Fri Apr 4 20:49:22 2014 +1100 + + Fix settings display on macs + + My analysis for the problem in 96ecd539de8e76a880f0013b4b8854da216e17b1 was wrong. + The actual issue is that QPalette inheritance appears broken on a mac; if you set the palette to the top widget container, it doesn’t do anything on its children. However, setting the palette to the main application itself does. + + Now things look exactly the same between mac and linux for better or worse. Including font sizes and colors. + A downside, is that the selection color appears to be misused in most themes including the default. So you can't tell if a text is selected or simply having focus + + (cherry picked from commit 15425cb53e643a8c00975c1ef0ea7674464fdca2) + +commit 5bc3ba4fb335862be3b8f2c66736800abe68b1a4 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Fri Apr 4 20:52:32 2014 +1100 + + Revert "Fix settings display on macs" + + This reverts commit dca8f922a25e2ddd881ed0666f9cd9b3925c28e2. + +commit 74033e798c02be5522c9bb7adf772991097624b7 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Fri Apr 4 20:52:12 2014 +1100 + + Revert "Bump API version" + + This reverts commit c54c89865d430e2d106696695064ccd50bb88489. + +commit b10d885ed6450d22ad3449fdc9fef1f186a4ef90 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Wed Apr 2 21:54:27 2014 +1100 + + Fix MythVideo general settings page not working + + How long that one has been broken ??? + + The new MythUI screen is always on top, so it must be hidden when starting on old Qt screen… + Hopefully there are no more like this + + (cherry picked from commit d7de3ff15162c6ce08ede065b5902bda31d1435f) + +commit fadcd738fdf4c6419ad0d5600843f6b70f2745a9 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Wed Apr 2 20:17:10 2014 +1100 + + Make python bindings work on mac + + We play with the environment variable PYTHONPATH at run time so it points to the current location where the application bundle is located. + It assumes —with-python=python2.6 has been provided to configure (which the mac perl packager will do from now on) + + (cherry picked from commit 66e6b5b7906eca45ae481df3c5911a6283eb225b) + +commit a745119cd936a7cd8efec3c9d3c92c08019263b4 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Wed Apr 2 20:14:31 2014 +1100 + + Fix AppleRemote thread not being killed when exiting the application + + I’ve been seeing the error about the AppleRemote thread still running when quitting for years… had enough + + (cherry picked from commit 42dd0a3470b401a59c36d22e9b0982a17db26a77) + +commit c54c89865d430e2d106696695064ccd50bb88489 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Tue Apr 1 13:12:43 2014 +1100 + + Bump API version + + Following dca8f922a25e2ddd881ed0666f9cd9b3925c28e2, a full recompile is required + +commit dca8f922a25e2ddd881ed0666f9cd9b3925c28e2 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Tue Apr 1 02:51:41 2014 +1100 + + Fix settings display on macs + + Qt widgets uses a default style that varies between platforms. On Linux, the default text is white, on mac its black. + The color of the text in the old settings aren’t configurable as it is (wouldn’t be difficult to do so) + + Most themes are using a dark background, so on mac, using the old type settings is proving difficult as mostly unreadable. + + So we redefine the style of most QWidget objects so it looks more similar to Linux. + This is done using Qt stylesheets. Where Qt stylesheets do not provided the intended behavior, we use QPalettes instead + + (cherry picked from commit 96ecd539de8e76a880f0013b4b8854da216e17b1) + + Conflicts: + mythtv/libs/libmyth/mythwidgets.cpp + +commit 3ca3f6d0fd3f2d2f559f56175ba5806917d0c640 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Tue Mar 25 01:18:38 2014 +1100 + + Improve AirPlay photosharing + + Make the AirPlay photo sharing’s behavior closer to what an Apple TV does: + - Make the photo disappear whenever you exit the photo application + - Allows to play music while showing photos + - Improve transition between photos and videos + - Only make the photo disappear once video playback has started + + (cherry picked from commit 9cba5e278763bb6d18603cf9f916ef7c75157953) + +commit d723f0ff1fbc7efeaff89d5a7acd5567adcef715 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Mon Mar 24 19:17:18 2014 +1100 + + No need to add randomisation to bonjour first registration + + (cherry picked from commit bdc75ddcec79e631149d3d42d373694c0fb1ca7b) + +commit 152e5b7dcbb1b99a9e9fb926fac47166b1946293 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Mon Mar 24 13:14:28 2014 +1100 + + Make AirPlay photo sharing works with iOS 7.1 + + (cherry picked from commit dc99ee7ca11f6dad18a93a4ab959ca4cae16ffd2) + +commit 8ee257cf970c2a304e746524ef43aebe4043331d +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Sun Mar 23 20:50:15 2014 +1100 + + Fix AirPlay occasionally only showing as an audio device on iOS 7.x + + We re-announce the AirPlay video service 2s after the first registration followed by every 10s. + This forces the video service to be registered after the RAOP Service. Since the release of iOS 7, AirPlay has been very much unusable. + + Thanks to Memphiz from the XBMC team to figuring the cause. + + Fixes #11901 + + (cherry picked from commit 5d2d30bc6af71d06230c6c3d1871dc665d12737c) + +commit 63a3ce6cdcd075524366583d3b7bc7416cb60d12 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Sun Mar 23 21:08:23 2014 +1100 + + Bump API version following 00739e7019e4a14b320022279595da1bc214f4c2 + +commit 00739e7019e4a14b320022279595da1bc214f4c2 +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Sun Mar 23 20:37:37 2014 +1100 + + Add BonjourRegister::ReAnnounceService() + + This allows to force re-announcing an already published service + + (cherry picked from commit 9712943f6d2a1add95e3ecfefd0d3150eb2880e0) + +commit fe66cf3a41b5608e5ec905d390b2c57ed8e3eb2a +Author: Jean-Yves Avenard <jyavenard(a)mythtv.org&gt; +Date: Sun Mar 23 20:42:20 2014 +1100 + + Advertise RAOP service before AirPlay service. + + This helps having the AirPlay device being recognised as a full service + + (cherry picked from commit 590f336feffe68eb89ce6996eac95ae6a8309930) + +commit 583395f5a376637efcd408a102fa64d0f188c12f +Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net&gt; +Date: Fri Mar 21 10:07:07 2014 +0000 + + Fixes #12098 Only dynamically load the libGLESv2 library if OpenGL ES is enabled. + + The nvidia driver version 334.21 has included the libGLESv2 library. + Users upgrading to the newer drivers were seeing mythfrontend segfault + because it was dynamically loading this library and then using it + incorrectly (because mythtv had been build with opengles disabled) + + (cherry picked from commit 5c7bd7f127e9ef2cb91de2bf0f82a35b7262d423) + + Distro maintainers can you pull this in immediately please. + +commit 036a33652708c9e7b5fc93877db310989aa997bb +Author: Andreas Mayer <and.mayer(a)aon.at&gt; +Date: Thu Mar 20 22:44:44 2014 +0000 + + MythMusic: fix mixed up smart playlist "starts with" and "ends with" criteria + + Fixes #12097 + + Signed-off-by: Paul Harrison <pharrison(a)mythtv.org&gt; + (cherry picked from commit b582bd009a24954884832866f6b27499d1b553e8) + +commit 30d86b13385743ffb83ed5bbb34e08b9e0114a11 +Author: Paul Harrison <pharrison(a)mythtv.org&gt; +Date: Sat Mar 15 16:56:55 2014 +0000 + + MythMusic: fix the playlist editor adding duplicate tracks to the playlist + + Selecting some nodes more than once in the playlist editor tree would add + duplicate tracks to the active playlist and the tree because we wasn't checking + if we had already added the tracks for the selected node. + + (cherry picked from commit c907a46d2604382b3bad6e44d4574b91e7692bf7) + +commit 480589a8108efd6b932480bcbac7976f12b9a7f6 +Author: John Poet <jpoet(a)mythtv.org&gt; +Date: Wed Mar 12 16:05:00 2014 -0600 + + Revert 7abf18a16 + +commit 7abf18a16523cf98c5c86d34d96349da05b086c9 +Author: John Poet <jpoet(a)mythtv.org&gt; +Date: Mon Mar 10 11:40:21 2014 -0600 + + DTVRecorder::FindH264Keyframes: Only account for Adaptation Field Control + Offset if payloadStart is set. + + (cherry picked from commit 6c6c0cbd4d95957c107e0e7e37b6b4cf70b04de5) + +commit 642c55801b559d55416c63edaad203cb296388fc +Author: John Poet <jpoet(a)mythtv.org&gt; +Date: Mon Mar 10 10:42:07 2014 -0600 + + H264Parser::decode_Header: pic_order_present_flag is not required, so don't + insist on it. + + (cherry picked from commit faf7487bd3db2f01d273e1bd7a44cf64f7762181) + +commit 0b216643d2334f84a6ca8600db88a3c58f3c74d6 +Author: Paul Harrison <pharrison(a)mythtv.org&gt; +Date: Sun Mar 9 13:29:15 2014 +0000 + + MythCenter-wide: fix some clipping on the playlist editor screen + + (cherry picked from commit a75cd556aaa602d5e16c4f8e001de9e5a7e669a2) + +commit 2d9a3d553afd681b01c3e824f493c41fdd83a23a +Author: Paul Harrison <pharrison(a)mythtv.org&gt; +Date: Sun Mar 9 11:30:09 2014 +0000 + + MythCenter-wide: fix some clipping on the music playlist editor + + When using the Qt painter the playlist progress bar appeared to not be + updating because it was being clipped. + + (cherry picked from commit e7a9bd0f4d32215f4cf5d26f01244dec42e44249) + +commit e0bbc835b60429679987bc42a18a316cc3c8cf92 +Author: Paul Harrison <pharrison(a)mythtv.org&gt; +Date: Sun Mar 9 11:09:28 2014 +0000 + + MythCenter-wide: fix some clipping on the music playlist editor + + When using the Qt painter the time text was being clipped in the small info + panel. + + (cherry picked from commit da505d91987e2d3a832288038510971d31c3c4e0) + +commit 3bfe4968488610983abc122bcfa1ce06c9421a8a +Author: Paul Harrison <pharrison(a)mythtv.org&gt; +Date: Sat Mar 8 18:43:02 2014 +0000 + + MythMusic: missed a git add in [385011e307c] + + (cherry picked from commit 632c4f875a081dd37d3ed2d49e0722293d2146e8) + +commit 2ffd9fb80993a9cd831e2a7a2ab65b855ac9c34b +Author: Paul Harrison <pharrison(a)mythtv.org&gt; +Date: Sat Mar 8 18:27:59 2014 +0000 + + MythMusic: add a 'First' resume mode and make 'Off' never resume + + This fixes the resume playback feature so that 'Off' never starts playback and + adds a new 'First' mode which starts at the first track in the active playlist. + + 'Track' and 'Exact' modes remain the same and resume playback at the start of + the track or exact position within the track that was playing when MythMusic + was last exited. + + (cherry picked from commit 385011e307c2d5f9d5d6a65663143f27189d1b17) + commit 6b14852a6a3750e1d5c1bf7d461a5338ef535cbb Author: David Engel <dengel(a)mythtv.org&gt; Date: Thu Mar 6 15:50:52 2014 -0600 mythtv-0.27-fixes.patch: b/mythplugins/configure | 18 b/mythplugins/mytharchive/i18n/mytharchive_sv.qm |binary b/mythplugins/mytharchive/i18n/mytharchive_sv.ts | 1197 b/mythplugins/mytharchive/mytharchive/archiveutil.cpp | 4 b/mythplugins/mytharchive/mytharchive/mythburn.cpp | 4 b/mythplugins/mytharchive/mythburn/scripts/mythburn.py | 19 b/mythplugins/mythbrowser/i18n/mythbrowser_sv.qm |binary b/mythplugins/mythbrowser/i18n/mythbrowser_sv.ts | 126 b/mythplugins/mythgallery/i18n/mythgallery_sv.qm |binary b/mythplugins/mythgallery/i18n/mythgallery_sv.ts | 965 b/mythplugins/mythgame/i18n/mythgame_sv.qm |binary b/mythplugins/mythgame/i18n/mythgame_sv.ts | 136 b/mythplugins/mythmusic/i18n/mythmusic_sv.qm |binary b/mythplugins/mythmusic/i18n/mythmusic_sv.ts | 1902 b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp | 9 b/mythplugins/mythmusic/mythmusic/editmetadata.cpp | 34 b/mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 b/mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 b/mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 b/mythplugins/mythmusic/mythmusic/musicplayer.cpp | 101 b/mythplugins/mythmusic/mythmusic/musicplayer.h | 4 b/mythplugins/mythmusic/mythmusic/playersettings.cpp | 1 b/mythplugins/mythmusic/mythmusic/playlist.cpp | 2 b/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp | 19 b/mythplugins/mythmusic/mythmusic/searchview.cpp | 15 b/mythplugins/mythmusic/mythmusic/shoutcast.cpp | 4 b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp | 4 b/mythplugins/mythmusic/mythmusic/streamview.cpp | 7 b/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp | 4 b/mythplugins/mythnetvision/i18n/mythnetvision_sv.qm |binary b/mythplugins/mythnetvision/i18n/mythnetvision_sv.ts | 279 b/mythplugins/mythnetvision/mythnetvision/mythnetvision.pro | 5 b/mythplugins/mythnews/i18n/mythnews_sv.qm |binary b/mythplugins/mythnews/i18n/mythnews_sv.ts | 76 b/mythplugins/mythweather/i18n/mythweather_sv.qm |binary b/mythplugins/mythweather/i18n/mythweather_sv.ts | 62 b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.qm |binary b/mythplugins/mythzoneminder/i18n/mythzoneminder_sv.ts | 183 b/mythplugins/mythzoneminder/mythzmserver/main.cpp | 13 b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp | 655 b/mythplugins/mythzoneminder/mythzmserver/zmserver.h | 101 b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp | 25 b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp | 8 b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.h | 2 b/mythplugins/mythzoneminder/mythzoneminder/zmdefines.h | 11 b/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp | 64 b/mythplugins/mythzoneminder/mythzoneminder/zmevents.h | 1 b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp | 64 b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp | 21 b/mythplugins/mythzoneminder/mythzoneminder/zmplayer.h | 3 b/mythplugins/mythzoneminder/theme/default-wide/zoneminder-ui.xml | 244 b/mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml | 203 b/mythtv/bindings/python/MythTV/dataheap.py | 1 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/MythTV/wikiscripts/wikiscripts.py | 2 b/mythtv/bindings/python/scripts/mythpython | 4 b/mythtv/bindings/python/setup.py | 6 b/mythtv/bindings/python/tmdb3/README | 86 b/mythtv/bindings/python/tmdb3/scripts/populate_locale.py | 5 b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 1 b/mythtv/bindings/python/tmdb3/setup.py | 15 b/mythtv/bindings/python/tmdb3/tmdb3/__init__.py | 3 b/mythtv/bindings/python/tmdb3/tmdb3/cache.py | 40 b/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py | 30 b/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py | 54 b/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py | 18 b/mythtv/bindings/python/tmdb3/tmdb3/locales.py | 24 b/mythtv/bindings/python/tmdb3/tmdb3/pager.py | 26 b/mythtv/bindings/python/tmdb3/tmdb3/request.py | 59 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 652 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py | 35 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py | 90 b/mythtv/bindings/python/tmdb3/tmdb3/util.py | 201 b/mythtv/configure | 18 b/mythtv/external/FFmpeg/libavcodec/mpeg12.c | 8 b/mythtv/external/FFmpeg/libavformat/mpeg.c | 10 b/mythtv/i18n/mythfrontend_sv.qm |binary b/mythtv/i18n/mythfrontend_sv.ts |28897 +++++----- b/mythtv/libs/libmyth/libmyth.pro | 6 b/mythtv/libs/libmyth/mythconfiggroups.cpp | 1 b/mythtv/libs/libmyth/mythconfiggroups.h | 2 b/mythtv/libs/libmyth/programinfo.cpp | 295 b/mythtv/libs/libmyth/programinfo.h | 17 b/mythtv/libs/libmyth/programtypes.h | 2 b/mythtv/libs/libmyth/remoteutil.h | 2 b/mythtv/libs/libmythbase/bonjourregister.cpp | 40 b/mythtv/libs/libmythbase/bonjourregister.h | 4 b/mythtv/libs/libmythbase/housekeeper.cpp | 22 b/mythtv/libs/libmythbase/housekeeper.h | 2 b/mythtv/libs/libmythbase/libmythbase.pro | 6 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 3 b/mythtv/libs/libmythbase/mythcorecontext.cpp | 138 b/mythtv/libs/libmythbase/mythcorecontext.h | 4 b/mythtv/libs/libmythbase/mythdownloadmanager.cpp | 1 b/mythtv/libs/libmythbase/mythmiscutil.h | 1 b/mythtv/libs/libmythbase/mythsingledownload.cpp | 86 b/mythtv/libs/libmythbase/mythsingledownload.h | 49 b/mythtv/libs/libmythbase/mythsocket.cpp | 12 b/mythtv/libs/libmythbase/mythsystemlegacy.cpp | 8 b/mythtv/libs/libmythbase/mythsystemlegacy.h | 1 b/mythtv/libs/libmythbase/mythtimer.cpp | 2 b/mythtv/libs/libmythbase/mythtimezone.cpp | 1 b/mythtv/libs/libmythbase/mythversion.h | 2 b/mythtv/libs/libmythbase/threadedfilewriter.cpp | 72 b/mythtv/libs/libmythbase/threadedfilewriter.h | 1 b/mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 1 b/mythtv/libs/libmythmetadata/metadatacommon.cpp | 29 b/mythtv/libs/libmythmetadata/metadatafactory.cpp | 6 b/mythtv/libs/libmythmetadata/metaio.cpp | 8 b/mythtv/libs/libmythmetadata/metaio.h | 2 b/mythtv/libs/libmythmetadata/metaioavfcomment.cpp | 2 b/mythtv/libs/libmythmetadata/metaioid3.cpp | 15 b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp | 151 b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.h | 25 b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp | 3 b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 5 b/mythtv/libs/libmythtv/cardutil.cpp | 22 b/mythtv/libs/libmythtv/cardutil.h | 8 b/mythtv/libs/libmythtv/dbcheck.cpp | 6 b/mythtv/libs/libmythtv/eitcache.cpp | 60 b/mythtv/libs/libmythtv/eitcache.h | 2 b/mythtv/libs/libmythtv/fileringbuffer.cpp | 53 b/mythtv/libs/libmythtv/libmythtv.pro | 15 b/mythtv/libs/libmythtv/livetvchain.cpp | 230 b/mythtv/libs/libmythtv/livetvchain.h | 9 b/mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 6 b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 2 b/mythtv/libs/libmythtv/mythplayer.cpp | 97 b/mythtv/libs/libmythtv/mythplayer.h | 4 b/mythtv/libs/libmythtv/previewgenerator.cpp | 6 b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp | 2 b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.cpp | 140 b/mythtv/libs/libmythtv/recorders/HLS/HLSPlaylistWorker.h | 32 b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.cpp | 1392 b/mythtv/libs/libmythtv/recorders/HLS/HLSReader.h | 162 b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp | 70 b/mythtv/libs/libmythtv/recorders/HLS/HLSSegment.h | 55 b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.cpp | 193 b/mythtv/libs/libmythtv/recorders/HLS/HLSStream.h | 103 b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.cpp | 103 b/mythtv/libs/libmythtv/recorders/HLS/HLSStreamWorker.h | 38 b/mythtv/libs/libmythtv/recorders/channelbase.cpp | 4 b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp | 12 b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp | 6 b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.cpp | 96 b/mythtv/libs/libmythtv/recorders/hlsstreamhandler.h | 5 b/mythtv/libs/libmythtv/recorders/importrecorder.cpp | 2 b/mythtv/libs/libmythtv/recorders/iptvchannel.cpp | 105 b/mythtv/libs/libmythtv/recorders/iptvchannel.h | 20 b/mythtv/libs/libmythtv/recorders/iptvrecorder.cpp | 17 b/mythtv/libs/libmythtv/recorders/iptvrecorder.h | 1 b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.cpp | 46 b/mythtv/libs/libmythtv/recorders/iptvsignalmonitor.h | 3 b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp | 28 b/mythtv/libs/libmythtv/recorders/recorderbase.cpp | 4 b/mythtv/libs/libmythtv/recorders/signalmonitor.cpp | 3 b/mythtv/libs/libmythtv/recorders/streamhandler.cpp | 2 b/mythtv/libs/libmythtv/recorders/streamhandler.h | 1 b/mythtv/libs/libmythtv/recordinginfo.cpp | 143 b/mythtv/libs/libmythtv/ringbuffer.cpp | 82 b/mythtv/libs/libmythtv/tv_play.cpp | 86 b/mythtv/libs/libmythtv/tv_play.h | 1 b/mythtv/libs/libmythtv/tv_rec.cpp | 69 b/mythtv/libs/libmythtv/tv_rec.h | 1 b/mythtv/libs/libmythtv/tvremoteutil.cpp | 2 b/mythtv/libs/libmythtv/videooutbase.cpp | 2 b/mythtv/libs/libmythtv/videosource.cpp | 2 b/mythtv/libs/libmythtv/vsync.cpp | 8 b/mythtv/libs/libmythui/AppleRemote.cpp | 10 b/mythtv/libs/libmythui/mythgesture.cpp | 1 b/mythtv/libs/libmythui/mythmainwindow.cpp | 57 b/mythtv/libs/libmythui/mythnotificationcenter.cpp | 1 b/mythtv/libs/libmythui/mythpainter.cpp | 1 b/mythtv/libs/libmythui/mythrender_opengl.cpp | 2 b/mythtv/libs/libmythui/mythuibuttonlist.cpp | 8 b/mythtv/libs/libmythupnp/httprequest.cpp | 3 b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h | 4 b/mythtv/libs/libmythupnp/upnpcds.cpp | 28 b/mythtv/programs/mythbackend/backendhousekeeper.cpp | 52 b/mythtv/programs/mythbackend/backendhousekeeper.h | 1 b/mythtv/programs/mythbackend/encoderlink.cpp | 117 b/mythtv/programs/mythbackend/encoderlink.h | 9 b/mythtv/programs/mythbackend/main.cpp | 13 b/mythtv/programs/mythbackend/mainserver.cpp | 47 b/mythtv/programs/mythbackend/mainserver.h | 2 b/mythtv/programs/mythbackend/playbacksock.cpp | 6 b/mythtv/programs/mythbackend/playbacksock.h | 3 b/mythtv/programs/mythbackend/scheduler.cpp | 79 b/mythtv/programs/mythbackend/services/dvr.cpp | 2 b/mythtv/programs/mythbackend/services/guide.cpp | 61 b/mythtv/programs/mythbackend/services/serviceUtil.cpp | 6 b/mythtv/programs/mythcommflag/main.cpp | 6 b/mythtv/programs/mythfilldatabase/filldata.cpp | 81 b/mythtv/programs/mythfilldatabase/filldata.h | 7 b/mythtv/programs/mythfilldatabase/main.cpp | 12 b/mythtv/programs/mythfilldatabase/xmltvparser.cpp | 8 b/mythtv/programs/mythfrontend/globalsettings.cpp | 26 b/mythtv/programs/mythfrontend/grabbersettings.cpp | 3 b/mythtv/programs/mythfrontend/guidegrid.cpp | 450 b/mythtv/programs/mythfrontend/guidegrid.h | 50 b/mythtv/programs/mythfrontend/main.cpp | 17 b/mythtv/programs/mythfrontend/scheduleeditor.cpp | 18 b/mythtv/programs/mythfrontend/videolist.cpp | 7 b/mythtv/programs/mythfrontend/viewscheduled.cpp | 4 b/mythtv/programs/mythtranscode/commandlineparser.cpp | 3 b/mythtv/programs/mythtranscode/main.cpp | 3 b/mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 b/mythtv/programs/mythtranscode/transcode.cpp | 7 b/mythtv/programs/mythtv-setup/importicons.cpp | 107 b/mythtv/programs/mythtv-setup/importicons.h | 1 b/mythtv/programs/mythutil/commandlineparser.cpp | 35 b/mythtv/programs/mythutil/markuputils.cpp | 157 b/mythtv/programs/mythutil/mythutil.cpp | 6 b/mythtv/programs/mythwelcome/welcomedialog.cpp | 30 b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 15 b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 30 b/mythtv/settings.pro | 1 b/mythtv/themes/MythCenter-wide/music-base.xml | 2 b/mythtv/themes/MythCenter-wide/notification-ui.xml | 2 b/mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 b/mythtv/themes/MythCenter/notification-ui.xml | 2 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 mythtv/bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 227 files changed, 26390 insertions(+), 19606 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythtv-0.27-fixes.patch 11 Mar 2014 10:30:19 -0000 1.4 +++ mythtv-0.27-fixes.patch 11 May 2014 14:42:22 -0000 1.5 @@ -17,12 +17,14 @@ mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp | 33 +- mythplugins/mythmusic/mythmusic/importmusic.cpp | 4 +- mythplugins/mythmusic/mythmusic/musiccommon.cpp | 102 +- - mythplugins/mythmusic/mythmusic/musicplayer.cpp | 94 +- - mythplugins/mythmusic/mythmusic/musicplayer.h | 3 +- + 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 | 16 +- + .../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 @@ -56,6 +58,7 @@ 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 +- @@ -80,10 +83,14 @@ mythtv/i18n/mythfrontend_sv.qm | Bin 630266 -> 670910 bytes mythtv/i18n/mythfrontend_sv.ts | 28897 ++++++++++--------- mythtv/libs/libmyth/libmyth.pro | 6 +- - mythtv/libs/libmyth/programinfo.cpp | 283 +- + 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 +- @@ -103,23 +110,26 @@ 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 | 23 +- + 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 | 14 +- + .../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 | 14 + + mythtv/libs/libmythtv/libmythtv.pro | 15 +- mythtv/libs/libmythtv/livetvchain.cpp | 230 +- mythtv/libs/libmythtv/livetvchain.h | 9 +- - mythtv/libs/libmythtv/mpeg/H264Parser.cpp | 2 +- + 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 + @@ -154,7 +164,7 @@ 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 | 84 +- + 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 + @@ -162,13 +172,21 @@ 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 +- mythtv/programs/mythbackend/playbacksock.cpp | 6 +- @@ -181,12 +199,16 @@ mythtv/programs/mythfilldatabase/filldata.cpp | 81 +- mythtv/programs/mythfilldatabase/filldata.h | 7 +- mythtv/programs/mythfilldatabase/main.cpp | 12 +- + mythtv/programs/mythfilldatabase/xmltvparser.cpp | 8 +- + mythtv/programs/mythfrontend/globalsettings.cpp | 26 +- mythtv/programs/mythfrontend/grabbersettings.cpp | 3 +- mythtv/programs/mythfrontend/guidegrid.cpp | 450 +- mythtv/programs/mythfrontend/guidegrid.h | 50 +- + mythtv/programs/mythfrontend/main.cpp | 17 +- mythtv/programs/mythfrontend/scheduleeditor.cpp | 18 +- mythtv/programs/mythfrontend/videolist.cpp | 7 +- mythtv/programs/mythfrontend/viewscheduled.cpp | 4 +- + .../programs/mythtranscode/commandlineparser.cpp | 3 +- mythtv/programs/mythtranscode/main.cpp | 3 +- mythtv/programs/mythtranscode/mpeg2fix.cpp | 2 + mythtv/programs/mythtranscode/transcode.cpp | 7 +- @@ -198,11 +220,13 @@ mythtv/programs/mythwelcome/welcomedialog.cpp | 30 +- .../distros/mythtv_data/data_mythtv.py | 15 +- mythtv/programs/scripts/metadata/Movie/tmdb.py | 647 - - mythtv/programs/scripts/metadata/Movie/tmdb3.py | 33 +- + mythtv/programs/scripts/metadata/Movie/tmdb3.py | 30 +- + mythtv/settings.pro | 1 - + mythtv/themes/MythCenter-wide/music-base.xml | 2 + mythtv/themes/MythCenter-wide/notification-ui.xml | 2 +- mythtv/themes/MythCenter-wide/zoneminder-ui.xml | 242 +- mythtv/themes/MythCenter/notification-ui.xml | 2 +- - 204 files changed, 25919 insertions(+), 19472 deletions(-) + 228 files changed, 26390 insertions(+), 19606 deletions(-) diff --git a/mythplugins/configure b/mythplugins/configure index bda1fbc..b9086ba 100755 @@ -8844,7 +8868,7 @@ { m_currentTrack = x; diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp -index 5a0e414..2f23efb 100644 +index 5a0e414..3fa93a2 100644 --- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp +++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp @@ -57,7 +57,6 @@ MusicPlayer::MusicPlayer(QObject *parent) @@ -8855,7 +8879,16 @@ m_currentTrack = -1; m_currentTime = 0; -@@ -408,7 +407,7 @@ void MusicPlayer::next(void) +@@ -224,6 +223,8 @@ void MusicPlayer::loadSettings(void ) + QString resumestring = gCoreContext->GetSetting("ResumeMode", "off"); + if (resumestring.toLower() == "off") + m_resumeMode = RESUME_OFF; ++ else if (resumestring.toLower() == "first") ++ m_resumeMode = RESUME_FIRST; + else if (resumestring.toLower() == "track") + m_resumeMode = RESUME_TRACK; + else +@@ -408,7 +409,7 @@ void MusicPlayer::next(void) { int currentTrack = m_currentTrack; @@ -8864,7 +8897,7 @@ return; if (m_oneshotMetadata) -@@ -419,7 +418,7 @@ void MusicPlayer::next(void) +@@ -419,7 +420,7 @@ void MusicPlayer::next(void) else currentTrack++; @@ -8873,7 +8906,7 @@ { if (m_repeatMode == REPEAT_ALL) { -@@ -445,7 +444,7 @@ void MusicPlayer::previous(void) +@@ -445,7 +446,7 @@ void MusicPlayer::previous(void) { int currentTrack = m_currentTrack; @@ -8882,7 +8915,7 @@ return; if (m_oneshotMetadata) -@@ -474,7 +473,7 @@ void MusicPlayer::previous(void) +@@ -474,7 +475,7 @@ void MusicPlayer::previous(void) void MusicPlayer::nextAuto(void) { @@ -8891,7 +8924,7 @@ [...1847 lines suppressed...] ++ { + LOG(VB_GENERAL, LOG_ERR, QString("edit #%1").arg(i) + " rejected"); +- +- InitLabel(i); +- needs_save = true; ++ } ++ else ++ { ++ InitLabel(i); ++ needs_save = true; ++ } + } + else if (cmd.startsWith("del")) + { +@@ -1099,11 +1103,15 @@ void PlaybackProfileConfig::pressed(QString cmd) + PlaybackProfileItemConfig itemcfg(item); + + if (itemcfg.exec() != kDialogCodeAccepted) ++ { + LOG(VB_GENERAL, LOG_ERR, "addentry rejected"); +- +- items.push_back(item); +- InitUI(); +- needs_save = true; ++ } ++ else ++ { ++ items.push_back(item); ++ InitUI(); ++ needs_save = true; ++ } + } + + repaint(); +@@ -1335,6 +1343,10 @@ void PlaybackProfileConfigs::btnPress(QString cmd) + removeTarget(name); + VideoDisplayProfile::DeleteProfileGroup( + name, gCoreContext->GetHostName()); ++ // This would be better done in TriggeredConfigurationGroup::removeTarget ++ // however, as removeTarget is used elsewhere, limit the changes to this ++ // case only ++ grouptrigger->setValue(grouptrigger->getSelectionLabel()); + } + } + diff --git a/mythtv/programs/mythfrontend/grabbersettings.cpp b/mythtv/programs/mythfrontend/grabbersettings.cpp index 1d526cc..146c32f 100644 --- a/mythtv/programs/mythfrontend/grabbersettings.cpp @@ -65523,6 +67017,66 @@ int m_changrpid; ChannelGroupList m_changrplist; +diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp +index 5204303..f416a99 100644 +--- a/mythtv/programs/mythfrontend/main.cpp ++++ b/mythtv/programs/mythfrontend/main.cpp +@@ -2,6 +2,7 @@ + #include <fcntl.h> + #include <signal.h> + #include <cerrno> ++#include <stdlib.h> + + #include <iostream> + using namespace std; +@@ -16,6 +17,9 @@ using namespace std; + #include <QWidget> + #include <QApplication> + #include <QTimer> ++#ifdef Q_OS_MAC ++#include <QProcessEnvironment> ++#endif + + #include "previewgeneratorqueue.h" + #include "referencecounter.h" +@@ -795,7 +799,7 @@ static void TVMenuCallback(void *data, QString &selection) + (void)data; + QString sel = selection.toLower(); + +- if (sel.startsWith("settings ")) ++ if (sel.startsWith("settings ") || sel == "video_settings_general") + { + GetMythUI()->AddCurrentLocation("Setup"); + gCoreContext->ActivateSettingsCache(false); +@@ -1485,6 +1489,15 @@ int main(int argc, char **argv) + new QApplication(argc, argv); + QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHFRONTEND); + ++#ifdef Q_OS_MAC ++ QString path = QCoreApplication::applicationDirPath(); ++ setenv("PYTHONPATH", ++ QString("%1/../Resources/lib/python2.6/site-packages:%2") ++ .arg(path) ++ .arg(QProcessEnvironment::systemEnvironment().value("PYTHONPATH")) ++ .toUtf8().constData(), 1); ++#endif ++ + #ifndef _WIN32 + QList<int> signallist; + signallist << SIGINT << SIGTERM << SIGSEGV << SIGABRT << SIGBUS << SIGFPE +@@ -1636,11 +1649,11 @@ int main(int argc, char **argv) + #ifdef USING_AIRPLAY + if (gCoreContext->GetNumSetting("AirPlayEnabled", true)) + { ++ MythRAOPDevice::Create(); + if (!gCoreContext->GetNumSetting("AirPlayAudioOnly", false)) + { + MythAirplayServer::Create(); + } +- MythRAOPDevice::Create(); + } + #endif + diff --git a/mythtv/programs/mythfrontend/scheduleeditor.cpp b/mythtv/programs/mythfrontend/scheduleeditor.cpp index d8013b7..725c12c 100644 --- a/mythtv/programs/mythfrontend/scheduleeditor.cpp @@ -65596,6 +67150,20 @@ (m_showAll || recstatus <= rsWillRecord || recstatus == rsDontRecord || +diff --git a/mythtv/programs/mythtranscode/commandlineparser.cpp b/mythtv/programs/mythtranscode/commandlineparser.cpp +index 70d313b..4528341 100644 +--- a/mythtv/programs/mythtranscode/commandlineparser.cpp ++++ b/mythtv/programs/mythtranscode/commandlineparser.cpp +@@ -57,7 +57,8 @@ void MythTranscodeCommandLineParser::LoadArguments(void) + ->SetRequires("fifodir"); + + add(QStringList( QStringList() << "-l" << "--honorcutlist" ), "usecutlist", +- "", "Specifies whether to use the cutlist.", ++ "", "Specifies whether to use the cutlist. " ++ "(Takes an optional cutlist as argument when used with -i)", + "Specifies whether transcode should honor the cutlist and " + "remove the marked off commercials. Optionally takes a " + "a cutlist as an argument when used with --infile.") diff --git a/mythtv/programs/mythtranscode/main.cpp b/mythtv/programs/mythtranscode/main.cpp index 8993042..de5c2e9 100644 --- a/mythtv/programs/mythtranscode/main.cpp @@ -66993,7 +68561,7 @@ -if __name__ == '__main__': - main() diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py -index 9e4edcb..5374ab1 100755 +index 9e4edcb..0b5cbff 100755 --- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py +++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py @@ -11,7 +11,7 @@ @@ -67044,7 +68612,7 @@ continue m = VideoMetadata() -@@ -254,7 +267,19 @@ def main(): +@@ -254,7 +267,16 @@ def main(): MythTV.tmdb3.request.DEBUG = True set_cache(engine='null') else: @@ -67058,13 +68626,42 @@ + sys.exit(1) + confdir = os.path.join(confdir, '.mythtv') + confpath = os.path.join(confdir, 'pytmdb3.cache') -+ if not os.access(confpath, os.F_OK|os.W_OK|os.R_OK): -+ print "Unable to access cache file: "+confpath -+ sys.exit(1) + set_cache(engine='file', filename=confpath) if opts.language: set_locale(language=opts.language, fallthrough=True) +diff --git a/mythtv/settings.pro b/mythtv/settings.pro +index ae47ca6..4a68831 100644 +--- a/mythtv/settings.pro ++++ b/mythtv/settings.pro +@@ -158,7 +158,6 @@ QMAKE_LIBDIR_OPENGL = + } + EXTRA_LIBS = $$EXTRALIBS + +-EXTRA_LIBS += $$FREETYPE_LIBS + EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS + + EXTRA_LIBS += $$LOCAL_LIBDIR_OGL +diff --git a/mythtv/themes/MythCenter-wide/music-base.xml b/mythtv/themes/MythCenter-wide/music-base.xml +index fab0157..ee46aee 100644 +--- a/mythtv/themes/MythCenter-wide/music-base.xml ++++ b/mythtv/themes/MythCenter-wide/music-base.xml +@@ -759,6 +759,7 @@ + </group> + + <group name="baseplayliststatusgroup"> ++ <area>0,0,1280,60</area> + <textarea name="playlistposition" from="basetextarea"> + <area>40,0,170,30</area> + <font>basesmall</font> +@@ -785,6 +786,7 @@ + </group> + + <group name="basesmallinfopanel"> ++ <area>0,0,1260,50</area> + <shape name="trackinfo_background" from="basebackground"> + <area>15,0,1250,50</area> + <fill color="#000000" alpha="50" /> diff --git a/mythtv/themes/MythCenter-wide/notification-ui.xml b/mythtv/themes/MythCenter-wide/notification-ui.xml index 5afeab6..49b60af 100644 --- a/mythtv/themes/MythCenter-wide/notification-ui.xml Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- mythtv.spec 22 Mar 2014 12:19:28 -0000 1.140 +++ mythtv.spec 11 May 2014 14:42:22 -0000 1.141 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # MythTV Version string -- preferably the output from git --describe -%define vers_string v0.27-178-g6b14852 +%define vers_string v0.27-222-g583f448 %define branch fixes/0.27 # Git revision and branch ID @@ -77,9 +77,9 @@ # Version/Release info Version: 0.27 %if "%{branch}" == "master" -Release: 0.2.git.%{_gitrev}%{?dist} +Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -143,6 +143,8 @@ # http://code.mythtv.org/trac/ticket/11338 # Offset required for 0.27, patch was for 0.26.1 Patch2: mythtv-0.27-libcec2.patch +# Patch to fix ffmpeg build for arm. +Patch3: mythtv-0.27-ffmpeg.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -176,7 +178,6 @@ BuildRequires: desktop-file-utils BuildRequires: freetype-devel >= 2 BuildRequires: libpng-devel -BuildRequires: bzip2-devel BuildRequires: gcc-c++ %if 0%{?fedora} >= 19 BuildRequires: mariadb-devel >= 5 @@ -845,6 +846,7 @@ %patch0 -p1 -b .mythtv %patch1 -p1 -b .types_h %patch2 -p1 -b .libcec2 +%patch3 -p1 -b .ffmpeg # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -1473,6 +1475,9 @@ %changelog +* Wed May 7 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-7 +- Update to latest fixes, v0.27-222-g583f448. + * Sat Mar 22 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 0.27-6 - Rebuilt for x264 and add BR: bzip2-devel