October 2013 - rpmfusion-commits

rpms/VirtualBox/F-18 changeset_trunk_48529.diff, NONE, 1.1 .cvsignore, 1.47, 1.48 VirtualBox.spec, 1.36, 1.37 sources, 1.47, 1.48

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31208 Modified Files: .cvsignore VirtualBox.spec sources Added Files: changeset_trunk_48529.diff Log Message: * Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2 - Additions/linux: fix shared folders for Linux 3.11 changeset_trunk_48529.diff: dirops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- NEW FILE changeset_trunk_48529.diff --- Index: trunk/src/VBox/Additions/linux/sharedfolders/dirops.c =================================================================== --- trunk/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 47588) +++ trunk/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 48529) @@ -283,8 +283,11 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) - err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN); + if (!dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN)) + { + LogFunc(("dir_emit failed\n")); + return 0; + } #else err = filldir(opaque, d_name, strlen(d_name), dir->f_pos, fake_ino, DT_UNKNOWN); -#endif if (err) { @@ -294,4 +297,5 @@ return 0; } +#endif dir->f_pos += 1; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 6 Jul 2013 02:37:59 -0000 1.47 +++ .cvsignore 3 Oct 2013 19:37:50 -0000 1.48 @@ -1 +1 @@ -VirtualBox-4.2.16.tar.bz2 +VirtualBox-4.2.18.tar.bz2 Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- VirtualBox.spec 6 Jul 2013 02:37:59 -0000 1.36 +++ VirtualBox.spec 3 Oct 2013 19:37:50 -0000 1.37 @@ -26,8 +26,8 @@ #endif Name: VirtualBox -Version: 4.2.16 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Version: 4.2.18 +Release: 2%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -54,6 +54,7 @@ Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch Patch25: VirtualBox-4.2.0-xorg111.patch Patch26: VirtualBox-4.2.4-no-bundles.patch +Patch27: changeset_trunk_48529.diff %if 0%{?fedora} < 16 BuildRequires: kBuild >= 0.1.98 @@ -232,6 +233,7 @@ %patch25 -p1 -b .xorg111 %endif %patch26 -p1 -b .nobundles +%patch27 -p1 -b .fix_shared_folders_for_Linux_3.11 # CRLF->LF sed -i 's/\r//' COPYING @@ -615,6 +617,18 @@ %changelog +* Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2 +- Additions/linux: fix shared folders for Linux 3.11 + +* Fri Sep 20 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-1 +- New upstream release. + +* Sun Sep 01 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-2 +- fixes for Kernel 3.11: + https://www.virtualbox.org/changeset/47484/vbox/trunk + and + https://www.virtualbox.org/changeset/47588/vbox/trunk + * Fri Jul 05 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 6 Jul 2013 02:37:59 -0000 1.47 +++ sources 3 Oct 2013 19:37:50 -0000 1.48 @@ -1 +1 @@ -c4a36e2099a317f4715cd3861cdae238 VirtualBox-4.2.16.tar.bz2 +99cdf054b5e36aa83b60bd49fb50f943 VirtualBox-4.2.18.tar.bz2

10 years, 7 months

1
0
0 / 0

rpms/mythtv/EL-6 sources,1.55,1.56

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23703 Modified Files: sources Log Message: Update to lastest source. Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/EL-6/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 10 Dec 2012 14:42:39 -0000 1.55 +++ sources 3 Oct 2013 13:02:05 -0000 1.56 @@ -1 +1 @@ -5a89c1afe1fdd7584786e7bd8bbf756a MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz +07aeba952c7adb7fdc553d82fe739deb mythtv-0.26.1.tar.gz

10 years, 7 months

1
0
0 / 0

rpms/mythtv/EL-6 mythtv-0.26.1-libva_121.patch,NONE,1.1

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23315 Added Files: mythtv-0.26.1-libva_121.patch Log Message: Add missing patch. mythtv-0.26.1-libva_121.patch: vaapicontext.h | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE mythtv-0.26.1-libva_121.patch --- Index: mythtv/libs/libmythtv/vaapicontext.h =================================================================== --- a/mythtv/libs/libmythtv/vaapicontext.h +++ b/mythtv/libs/libmythtv/vaapicontext.h @@ -5,4 +5,8 @@ #include "libavcodec/vaapi.h" } +#include "va/va_version.h" +#if VA_CHECK_VERSION(0,34,0) +#include "va/va_compat.h" +#endif #include "va/va_x11.h" #include "va/va_glx.h"

10 years, 7 months

1
0
0 / 0

rpms/mythtv/EL-6 mythtv-0.26-libcec2.patch, NONE, 1.1 ChangeLog, 1.6, 1.7 mythtv-0.26-fixes.patch, 1.4, 1.5 mythtv.spec, 1.93, 1.94

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20804 Modified Files: ChangeLog mythtv-0.26-fixes.patch mythtv.spec Added Files: mythtv-0.26-libcec2.patch Log Message: * Tue Oct 1 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-4 - Update to latest bugfix release. - Add patch for libcec 2. - Update to latest bugfix release. - Add udisks as a requirement as it is required for ejecting cd/dvds. mythtv-0.26-libcec2.patch: configure | 4 libs/libmythui/cecadapter.cpp | 267 +++++++++++++++++++++++++++++++----------- libs/libmythui/cecadapter.h | 1 3 files changed, 205 insertions(+), 67 deletions(-) --- NEW FILE mythtv-0.26-libcec2.patch --- diff --git a/mythtv/configure b/mythtv/configure index 7ab8aa7..7d5e39d 100755 --- a/mythtv/configure +++ b/mythtv/configure @@ -5178,10 +5178,12 @@ using namespace std; using namespace CEC; #include <libcec/cecloader.h> int main(void) { + if (CEC_LIB_VERSION_MAJOR == 2) + return 1; if (CEC_LIB_VERSION_MAJOR < 1 || (CEC_LIB_VERSION_MAJOR == 1 && CEC_LIB_VERSION_MINOR < 5)) return 0; - return (long) LibCecInit; + return 1; } EOF fi diff --git a/mythtv/libs/libmythui/cecadapter.cpp b/mythtv/libs/libmythui/cecadapter.cpp index edad8f6..5987d5d 100644 --- a/mythtv/libs/libmythui/cecadapter.cpp +++ b/mythtv/libs/libmythui/cecadapter.cpp @@ -14,9 +14,28 @@ #include "cecadapter.h" #include <vector> -#define MIN_LIBCEC_VERSION 1 +#ifdef CEC_CLIENT_VERSION_CURRENT // 2.0.3 and up +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_CURRENT; +#else +#ifdef LIBCEC_VERSION_CURRENT // 1.6.2 and up +#define CEC_CONFIG_VERSION LIBCEC_VERSION_CURRENT; +#else +#define CEC_CONFIG_VERSION 0; +#endif +#endif + #define MAX_CEC_DEVICES 10 #define LOC QString("CECAdapter: ") +#define OSDNAME "MythTv" + +// TODO remove if we have a ui. +// hard code logical and physical address +#define CEC_DEFAULT_DEVICE_TYPE CEC_DEVICE_TYPE_RECORDING_DEVICE +#undef CEC_DEFAULT_HDMI_PORT +#define CEC_DEFAULT_HDMI_PORT 2 +#undef CEC_DEFAULT_BASE_DEVICE +#define CEC_DEFAULT_BASE_DEVICE CECDEVICE_AUDIOSYSTEM +#define CEC_DEFAULT_PHYSICALADDRESS (quint16)0x2200 #include <libcec/cec.h> #include <iostream> @@ -25,17 +44,26 @@ using namespace std; #include <libcec/cecloader.h> QMutex* CECAdapter::gLock = new QMutex(QMutex::Recursive); +bool resetSafe = false; class CECAdapterPriv { public: CECAdapterPriv() - : adapter(NULL), defaultDevice("auto"), defaultHDMIPort(1), - defaultDeviceID(CECDEVICE_PLAYBACKDEVICE1), timer(NULL), valid(false), + : adapter(NULL), defaultDevice("auto"), defaultHDMIPort(CEC_DEFAULT_HDMI_PORT), + defaultDeviceID(CEC_DEFAULT_DEVICE_TYPE), timer(NULL), valid(false), powerOffTV(false), powerOffTVAllowed(false), powerOffTVOnExit(false), powerOnTV(false), powerOnTVAllowed(false), powerOnTVOnStart(false), switchInput(false), switchInputAllowed(true) { + callbacks.Clear(); + callbacks.CBCecLogMessage = LogMessages; + callbacks.CBCecKeyPress = HandleKeyPresses; + callbacks.CBCecCommand = HandleCommands; + callbacks.CBCecConfigurationChanged = HandleConfigurationChanged; + callbacks.CBCecAlert = HandleAlerts; + callbacks.CBCecMenuStateChanged = HandleMenuStateChanged; + callbacks.CBCecSourceActivated = HandleSourceActivated; } static QString addressToString(enum cec_logical_address addr, bool source) @@ -69,14 +97,15 @@ class CECAdapterPriv static QStringList GetDeviceList(void) { QStringList results; - cec_device_type_list list; - list.Clear(); - list.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); - ICECAdapter *adapter = LibCecInit("MythTV", list); + libcec_configuration configuration; + configuration.Clear(); + ICECAdapter *adapter = LibCecInitialise(&configuration); if (!adapter) return results; cec_adapter *devices = new cec_adapter[MAX_CEC_DEVICES]; uint8_t num_devices = adapter->FindAdapters(devices, MAX_CEC_DEVICES, NULL); + LOG(VB_GENERAL, LOG_INFO, LOC + QString("GetDeviceList() found %1 devices(s).") + .arg(num_devices)); if (num_devices < 1) return results; for (uint8_t i = 0; i < num_devices; i++) @@ -89,39 +118,112 @@ class CECAdapterPriv { // get settings // N.B. these do not currently work as there is no UI + + // There is no way current CEC adapters can find their physical address + // on their own. The are only connected to the CEC pin of the HDMI connector. + // To construct a valid physical address libCEC needs: + // - the HDMI port (number) Myth is connected to + // - the HDMI device (TV, Receiver) Myth is connected to (the logical address) + + //The CEC adapter we want to connect to defaultDevice = gCoreContext->GetSetting(LIBCEC_DEVICE, "auto").trimmed(); + // The number of the HDMI port Myth is connected to QString hdmi_port = gCoreContext->GetSetting(LIBCEC_PORT, "auto"); + // The logical address of the HDMI device Myth is connected to + QString base_dev = gCoreContext->GetSetting(LIBCEC_BASE, "auto"); + // Device type we want Myth to use QString device_id = gCoreContext->GetSetting(LIBCEC_DEVICEID, "auto"); powerOffTVAllowed = (bool)gCoreContext->GetNumSetting(POWEROFFTV_ALLOWED, 1); powerOffTVOnExit = (bool)gCoreContext->GetNumSetting(POWEROFFTV_ONEXIT, 1); powerOnTVAllowed = (bool)gCoreContext->GetNumSetting(POWERONTV_ALLOWED, 1); powerOnTVOnStart = (bool)gCoreContext->GetNumSetting(POWERONTV_ONSTART, 1); - defaultHDMIPort = 1; if ("auto" != hdmi_port) { defaultHDMIPort = hdmi_port.toInt(); - if (defaultHDMIPort < 1 || defaultHDMIPort > 3) - defaultHDMIPort = 1; + if (defaultHDMIPort < CEC_MIN_HDMI_PORTNUMBER || defaultHDMIPort > CEC_MAX_HDMI_PORTNUMBER) + defaultHDMIPort = CEC_DEFAULT_HDMI_PORT; + } + else + { + defaultHDMIPort = CEC_DEFAULT_HDMI_PORT; } - defaultHDMIPort = defaultHDMIPort << 12; - defaultDeviceID = CECDEVICE_PLAYBACKDEVICE1; if ("auto" != device_id) { int id = device_id.toInt(); - if (id < 1 || id > 3) - id = 1; - defaultDeviceID = (id == 1) ? CECDEVICE_PLAYBACKDEVICE1 : - ((id == 2) ? CECDEVICE_PLAYBACKDEVICE2 : - CECDEVICE_PLAYBACKDEVICE3); + switch (id) + { + case CEC_DEVICE_TYPE_TV: + case CEC_DEVICE_TYPE_RECORDING_DEVICE: + case CEC_DEVICE_TYPE_RESERVED: + case CEC_DEVICE_TYPE_TUNER: + case CEC_DEVICE_TYPE_PLAYBACK_DEVICE: + case CEC_DEVICE_TYPE_AUDIO_SYSTEM: + defaultDeviceID = (cec_device_type)id; + break; + default: + defaultDeviceID = CEC_DEFAULT_DEVICE_TYPE; + break; + } + } + else + { + defaultDeviceID = CEC_DEFAULT_DEVICE_TYPE; } + LOG(VB_GENERAL, LOG_INFO, LOC + QString("base_dev= %1.") + .arg(base_dev)); + if ("auto" != base_dev) + { + base_device = (cec_logical_address)base_dev.toInt(); + LOG(VB_GENERAL, LOG_INFO, LOC + QString("base_device= %1.") + .arg(base_device)); + switch (base_device) + { + case CECDEVICE_TV: + case CECDEVICE_RECORDINGDEVICE1: + case CECDEVICE_RECORDINGDEVICE2: + case CECDEVICE_TUNER1: + case CECDEVICE_PLAYBACKDEVICE1: + case CECDEVICE_AUDIOSYSTEM: + case CECDEVICE_TUNER2: + case CECDEVICE_TUNER3: + case CECDEVICE_PLAYBACKDEVICE2: + case CECDEVICE_RECORDINGDEVICE3: + case CECDEVICE_TUNER4: + case CECDEVICE_PLAYBACKDEVICE3: + case CECDEVICE_FREEUSE: + break; + case CECDEVICE_UNKNOWN: + case CECDEVICE_RESERVED1: + case CECDEVICE_RESERVED2: + case CECDEVICE_BROADCAST: + default: + base_device = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE; + break; + } + } + else + { + base_device = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE; + } + // create adapter interface - cec_device_type_list list; - list.Clear(); - list.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); - adapter = LibCecInit("MythTV", list); + libcec_configuration configuration; + configuration.Clear(); + configuration.clientVersion = LIBCEC_VERSION_CURRENT; + snprintf(configuration.strDeviceName, 13, "MythTV"); + configuration.deviceTypes.Add(defaultDeviceID); + configuration.iPhysicalAddress = CEC_DEFAULT_PHYSICALADDRESS; + configuration.iHDMIPort = defaultHDMIPort; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("using HDMI port %1.") + .arg(defaultHDMIPort)); + configuration.baseDevice = base_device; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("using base device %1.") + .arg(configuration.baseDevice)); + configuration.callbacks = &callbacks; + ICECAdapter *adapter = LibCecInitialise(&configuration); if (!adapter) { @@ -129,12 +231,12 @@ class CECAdapterPriv return false; } - if (adapter->GetMinLibVersion() > MIN_LIBCEC_VERSION) + if ((configuration.serverVersion >> 12) > CEC_MIN_LIB_VERSION) { LOG(VB_GENERAL, LOG_ERR, LOC + QString("The installed libCEC supports version %1 and above. " "This version of MythTV only supports version %2.") - .arg(adapter->GetMinLibVersion()).arg(MIN_LIBCEC_VERSION)); + .arg(configuration.serverVersion).arg(CEC_MIN_LIB_VERSION)); return false; } @@ -185,12 +287,6 @@ class CECAdapterPriv // get the vendor ID (for non-standard implementations) adapter->GetDeviceVendorId(CECDEVICE_TV); - // set the physical address - adapter->SetPhysicalAddress(defaultHDMIPort); - - // set the logical address - adapter->SetLogicalAddress(defaultDeviceID); - // switch input (if configured) switchInput = true; HandleActions(); @@ -210,7 +306,6 @@ class CECAdapterPriv // delete adapter adapter->Close(); - LogMessages(); UnloadLibCec(adapter); LOG(VB_GENERAL, LOG_INFO, LOC + "Closing down CEC."); @@ -219,14 +314,12 @@ class CECAdapterPriv adapter = NULL; } - void LogMessages(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int LogMessages(void *, const cec_log_message &message) + #else + static int LogMessages(void *, const cec_log_message message) + #endif { - if (!adapter || !valid) - return; - - cec_log_message message; - while (adapter->GetNextLogMessage(&message)) - { QString msg(message.message); int lvl = LOG_UNKNOWN; switch (message.level) @@ -237,19 +330,15 @@ class CECAdapterPriv case CEC_LOG_DEBUG: lvl = LOG_DEBUG; break; } LOG(VB_GENERAL, lvl, LOC + QString("%1").arg(msg)); - } + return 0; } - void HandleCommands(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleCommands(void * /*cbParam*/, const cec_command &command) + #else + static int HandleCommands(void * /*cbParam*/, const cec_command command) + #endif { - if (!adapter || !valid) - return; - - LogMessages(); - - cec_command command; - while (adapter->GetNextCommand(&command)) - { LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Command %1 from '%2' (%3) - destination '%4' (%5)") .arg(command.opcode) @@ -260,27 +349,76 @@ class CECAdapterPriv switch (command.opcode) { - // TODO + // TODO handle CEC commands. default: break; } - } + return 0; + } - LogMessages(); + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration &config) + #else + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration config) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + "Adapter configuration changed."); + return 1; } - void HandleKeyPresses(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter & /*param*/) + #else + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter /*param*/) + #endif { - if (!adapter || !valid) - return; + switch (type) // TODO Handle alerts. + { + case CEC_ALERT_CONNECTION_LOST: + LOG(VB_GENERAL, LOG_ERR, LOC + "Connection lost - TODO: need to handle this!"); + break; + default: + LOG(VB_GENERAL, LOG_ERR, LOC + "Received unknown alert."); + break; + } + return 0; + } - cec_keypress key; - if (!adapter->GetNextKeypress(&key)) - return; + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state &state) + #else + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state state) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("CEC menu state %1") + .arg(state == CEC_MENU_STATE_ACTIVATED ? "Activated" : "Deactivated")); + return 1; + } + #if CEC_LIB_VERSION_MAJOR < 2 + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address &address, const &uint8_t activated) + #else + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address address, const uint8_t activated) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("Source %1 %2") + .arg(address).arg(activated ? "Activated" : "Deactivated")); + + if (activated && resetSafe) + GetMythUI()->ResetScreensaver(); + else + resetSafe = true; + } + + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress &key) + #else + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress key) + #endif + { // Ignore key down events and wait for the key 'up' if (key.duration < 1) - return; + return 0; QString code; int action = 0; @@ -595,13 +733,12 @@ class CECAdapterPriv .arg(code).arg(0 == action ? "(Not actioned)" : "")); if (0 == action) - return; + return 0; GetMythUI()->ResetScreensaver(); QKeyEvent* ke = new QKeyEvent(QEvent::KeyPress, action, Qt::NoModifier); qApp->postEvent(GetMythMainWindow(), (QEvent*)ke); - - LogMessages(); + return 0; } void HandleActions(void) @@ -629,7 +766,7 @@ class CECAdapterPriv // HDMI input if (switchInput && switchInputAllowed) { - if (adapter->SetActiveView()) + if (adapter->SetActiveSource()) LOG(VB_GENERAL, LOG_INFO, LOC + "Asked TV to switch to this input."); else LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to switch to this input."); @@ -638,14 +775,14 @@ class CECAdapterPriv powerOffTV = false; powerOnTV = false; switchInput = false; - - LogMessages(); } ICECAdapter *adapter; + ICECCallbacks callbacks; QString defaultDevice; int defaultHDMIPort; - cec_logical_address defaultDeviceID; + cec_device_type defaultDeviceID; + cec_logical_address base_device; QTimer *timer; bool valid; bool powerOffTV; @@ -728,8 +865,6 @@ void CECAdapter::Action(const QString &action) void CECAdapter::Process(void) { gLock->lock(); - m_priv->HandleCommands(); - m_priv->HandleKeyPresses(); m_priv->HandleActions(); gLock->unlock(); } diff --git a/mythtv/libs/libmythui/cecadapter.h b/mythtv/libs/libmythui/cecadapter.h index e9cf6d6..bb5eba8 100644 --- a/mythtv/libs/libmythui/cecadapter.h +++ b/mythtv/libs/libmythui/cecadapter.h @@ -7,6 +7,7 @@ #define LIBCEC_ENABLED QString("libCECEnabled") #define LIBCEC_DEVICE QString("libCECDevice") #define LIBCEC_PORT QString("libCECPort") +#define LIBCEC_BASE QString("libCECBase") #define LIBCEC_DEVICEID QString("libCECDeviceID") #define POWEROFFTV_ALLOWED QString("PowerOffTVAllowed") #define POWEROFFTV_ONEXIT QString("PowerOffTVOnExit") Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/EL-6/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 8 May 2013 02:44:06 -0000 1.6 +++ ChangeLog 3 Oct 2013 12:20:46 -0000 1.7 @@ -1,1644 +1,36 @@ -commit b02d25a46a2f5f3457bb9249f6071a16a9e771ee -Author: Paul Harrison <pharrison(a)mythtv.org> -Date: Wed May 1 15:23:31 2013 +0100 +commit 33f0177459ded1ed3ca63c319bb825e3ee3a6d56 +Author: Martin Bene <myth(a)bene.priv.at> +Date: Sat Sep 14 16:27:22 2013 -0400 - mythmusic: Save playlists to DB when changed not at frontend exit + Fix MythWeb's date/time handling - This changes things so any changes to playlists are saved to the database - immediately rather than cached and saved when the frontend exits. + The code in question has partially changed so I am applying part of Martin's patch + (the section that clears to session variables) to fix the problem. - This fixes a problem were you could lose edits to a playlist if the FE is not - shutdown cleanly like when using the idle timer to shutdown or if you shutdown - the computer from the FE exit menu. - (cherry picked from commit 70143c30dfb67812ecd6cb29e66a10353579054f) + Thank you Martin! - Fixes #11228 - -commit da89ee585f417584d74cbaee42467dabdc758261 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Wed Apr 24 12:49:56 2013 +0200 - - add NULL check missed in [a9b90652] - - found by Jim Stichnoth - - Refs #2077 - (cherry picked from commit f04a8e42b) - -commit 61174b20ebba8f1ac595960fffc39f9dad7e4610 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Mon Apr 22 13:17:22 2013 +0200 - - update mythtranscode to work with ac3 with newer ffmpeg - - ffmpeg has moved the duration/size of the audio frame to another place, so look - there - - links used to figure it out how to move forward - http://ffmpeg.org/trac/ffmpeg/ticket/1240 - http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=364c71c80e9124a2624e... - http://code.mythtv.org/trac/ticket/2077#comment:42 - - thanks to Nicolas Pöhlmann for finding the commit that broke it - - Refs: #2077 - (cherry picked from commit a9b906528) - -commit 2ed4e2931a120ba1e2d1a642d074b3e258f015ce -Author: Paul Harrison <pharrison(a)mythtv.org> -Date: Tue Apr 30 20:47:29 2013 +0100 - - MythNews: improve media:content parsing in rss feeds - - * use the medium or type attributes to determine whether the content is an - image or video. Previously we ignored the type and ended up trying to play - an image. - - * if we haven't found any thumbnail image then use any images found in the - media:content as the thumbnail. Fixes #11161. - - * parse all the media:content items not just the first one we find. - (cherry picked from commit 7d9c51eb75ae37f39a57eb969c0ad7e532738e8a) - -commit 5f45c0bd684c875f19d59974a5fe51a56731bf16 -Author: tycholursen <tycholursen(a)gmail.com> -Date: Mon Apr 22 07:42:22 2013 -0400 - - New Netherlands locale file - from tycholursen(a)gmail.com - - Thank you! - - closes #11502 - - Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> - -commit 762a613ee4ee26ff385f20025e4c21b6609d4dda -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Fri Apr 19 08:27:59 2013 +1000 - - minor code cleanup. - - Following 8aca90207ffffc9dd512fa11cd9d88d1f4b5884f, remove useless test and tidy-up - (cherry picked from commit 4e23172d774cf36a45b7b7f382797a9887fa6de6) - -commit 7a70ac13a46d95bee874ce9c4e5d1bbd5e0bdac8 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Fri Apr 19 02:22:27 2013 +1000 - - Avoid un-necessary video mode changes. - - Fixes #11494 - (cherry picked from commit 8aca90207ffffc9dd512fa11cd9d88d1f4b5884f) - -commit 0af65f783516afc2072fefc1220202193b90785f -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Fri Apr 19 08:31:25 2013 +1000 - - Revert "Avoid un-necessary video mode changes." - - This reverts commit 3c763fdca88075f8ba7667f5096583d66307b2cd. - -commit 3c763fdca88075f8ba7667f5096583d66307b2cd -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Fri Apr 19 02:22:27 2013 +1000 - - Avoid un-necessary video mode changes. - - Fixes #11494 - (cherry picked from commit 8aca90207ffffc9dd512fa11cd9d88d1f4b5884f) - -commit c5bd828c77c5dcc141c622c3b4bc72844e00cbd6 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Mon Apr 15 14:51:41 2013 +0100 - - Warn about reliance on the XMLTV 'TimeOffset' setting which has been - removed in 0.27 - - The XMLTV specification states that dates and times must be either in - GMT/UTC or specify an offset from GMT/UTC in ISO8601 format. Since the - 'offset' setting has caused so much confusion over the years we're - removing it and requiring all xmltv input to follow the specs. - - This change also sets the default for this setting to 'Auto' which it - should have been from the beginning. - -commit 3870ce00bad53de5e81c3536839e27f4dd50b847 -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Mon Jan 7 23:43:30 2013 +0100 - - make "Universal (Europe)" the default LNB type - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit 0556cdb6e40486ae3d1abb84e4c876d5cb1b30e6) - -commit d574cbc193cec0e30007de9fe0462c8e7a721111 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Fri Mar 29 00:06:14 2013 +0000 - - Make DVB the first target in the CaptureCardGroup triggered configuration. - (cherry picked from commit 801028a3cc56db5c658bf81fd0f5a862d3bcf272) - -commit b45f71246d6dc1e59f286efcdaa2f265ef71b809 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Thu Mar 28 21:51:08 2013 +0000 - - Reorder and rename the choices in the capture card combo box - - To try and reduce some confusion and common mis-configuration the descriptions and order of the options has been changed. The most commonly used options are listed first, through to the least used and similar or related choices are grouped together. Incorrect descriptions such as 'DVB Capture' are replaced by more descriptive strings e.g. 'DVB-T/S/C, ATSC or ISDB-T tuner card' - (cherry picked from commit 536b7c1a02639c4ee8fa8bb53a511a2e751ed461) - -commit af1d6951ae44122af9dac56591af9f2db022ab66 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Mon Apr 15 09:15:39 2013 +0100 - - Fix categorytype for Dish & Bell EIT. The wrong values were being set, in particular causing news to be marked as 'sports' and sports as 'series' which would affect certain scheduling decisions. - -commit 5f11bda1994c0dad45ff29e3fc8836eb83f98116 -Author: Kevin Ross <kevin(a)familyross.net> -Date: Mon Apr 15 14:18:23 2013 +1000 - - Fix audio sync. - - Fixes #11440 - - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> - (cherry picked from commit 9ec7421138adef73ef9cb83b74e046092fecdd6a) - -commit 69cd78b4028b7b585d238713151b684c291158e7 -Author: John Patrick Poet <jpoet(a)mythtv.org> -Date: Tue Mar 26 15:07:56 2013 -0600 - - Allow multiple keyframes per payload - -commit 5fe87ed902ec4d8c218de3d399bd5caf89d251ac -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Mon Mar 25 19:59:41 2013 +1100 - - Add E-AC3 support in ATSC and DVB-T stream - - Fixes #11444 - (cherry picked from commit 93bc3d4f3a3d6a785b860a1783ff7915c71a372f) - - Conflicts: - mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c - -commit a399d7f04287310a32c011b42353fab995f0846e -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sun Mar 3 17:23:26 2013 +0000 - - MythMusic: Fix segfault on visualization settings page if a widget is missing - (cherry picked from commit 9ec05b1e0da40456830afcc10c7ec51b2ac94f79) - -commit 7f3f13b04335cae72b854f5995bc097cd9834cf6 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sun Mar 3 17:04:57 2013 +0000 - - MythMusic: Tweak the text areas on the trackinfo_popup - (cherry picked from commit 747248929431e5193abcd57de8189e9e55d1617e) - -commit 13dfcc2e5e9211759966b7a6033c645f653c3110 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sun Mar 24 11:56:17 2013 +0000 - - mytharchivehelper: Remove an unneeded include added in 854cb0c3b6 - -commit 854cb0c3b663d6aa37d9ea4484964bd1c899ec81 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sat Jan 5 23:18:55 2013 +0000 - - MythArchive: fix the import/export of recordings to the native archive format - - * This updates the native import/export to work with the current DB table - fields. Fixes #10871 - - * Add storage group support so the FE running MythArchive no longer needs - local access to the recordings. Fixes #8657. - (cherry picked from commit 003f3023f2483f88f84df73b41fe2f976bb119d0) - -commit 5e06d2a15b6e242d407899ada1ca2a0026c5e9fb -Author: Paul Harrison <mythtv(a)sky.com> -Date: Fri Jan 4 20:14:44 2013 +0000 - - MythArchive: fix the missing logs when doing a native archive import/export - - The new logging stuff was causing both the export and import of native archives - logging to not be shown in the log viewer this fixes that and also makes the - log viewer wait a while for the logs before giving up which should fix the - logs not always showing the first time. - - Fixes #10505. - (cherry picked from commit 52a7c118aedc747bbea3a92d178eabf8566818ad) - -commit edb10af43dba4f46194ce998c5967c067b35a8de -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sat Jan 5 23:01:16 2013 +0000 - - MythMusic: Fix typo preventing the autoplaycd setting loading correctly - (cherry picked from commit 84c44dd3f69d473dbe11c56e83da269111fae9c1) - -commit d6de041b35358184841200da19ab160e15a287e1 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Fri Jan 4 11:58:02 2013 +0000 - - MythArchive: fix a filename quoted twice bug introduced in b85f5bba72 - - Fixes #10071. - (cherry picked from commit 146b49029d82e6ad92ac36ef66fe14d5c4c998e0) - -commit 571e9c4d96189279e3b936a583df645b5153bb27 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sat Dec 29 11:35:14 2012 +0000 - - MythMusic: use QSettings for the pls parser - - This refactors the playlist parsing to use QSettings for the pls parser instead - of our custom one which has problems with windows style line endings. - - Fixes #11208. - (cherry picked from commit 8d2d9e92f15653928d9abdf831ecb30eb314b52e) - -commit bc7cfb61f762b659c90db7d9cba33b5430d8a851 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Tue Dec 11 13:11:52 2012 +0000 - - MythMusic: fix the notracks text not always showing/hiding when it should - - This fixes a problem with the "You haven't selected any tracks to play" text - not updating properly when adding or removing single tracks from the active - playlist. - - Also work around a bug in MythUIButtonlist not removing the last item properly. - (cherry picked from commit 088d684558a3197b022695e39b3c50d89bca92f7) - -commit 2748747959fc43815d727edb45fe757c2ccd22f4 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Tue Dec 11 10:53:52 2012 +0000 - - MythMusic: add the notracks text area to the playlist editor screen - -commit 6ae394bc1b3e4a559f88c670e58e01c65f1bbc01 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sun Dec 2 12:54:27 2012 +0000 - - MythCenter-wide: Fix the width of the priority text on the channelrecpriority screen - - Fixes #10643. Thanks to Rick Scott for the original patch. - -commit f1fdf1f334d83fc7aaabab467593b05672d03abd -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sun Dec 2 11:09:44 2012 +0000 - - MythCenter/MythCenter-wide: Tidy up the 'Program Details' screen - - Fix the position of the browser in MythCenter. - Make sure the font used in the browser is sans-serif to better match the theme. - - Fixes #10614. - -commit ee98ece5de4b0e12079c70e06172161c0937bc95 -Author: David Engel <dengel(a)mythtv.org> -Date: Fri Mar 22 19:26:24 2013 -0500 - - Change PlaybackBox group and password popup handling to be more sane. - - Backport from master to fixes/0.26. - - If an invalid password is entered, the password popup is reshown. If - the password popup is aborted and was entered from the group popup or - is the initial group, the group popup is reshown. If the group popup - is aborted and was entered because of the QueryInitialFilter setting, - the PlaybackBox screen is closed. - - Refs #11231 - -commit a17d3f453b2528ec7d8da49c92b71f478f25f4a3 -Author: Chris Pinkham <cpinkham(a)mythtv.org> -Date: Fri Mar 22 11:01:34 2013 -0700 - - Fix auto-width calculation in mythtranscode. - - Issue discovered, corrected, and tested by 'rich0' in IRC. Thanks. - (cherry picked from commit effae2211cea71bf9e954d7e99cbce39b3d38f0c) - -commit 6be8c10b39dcbe0fe825d22fec70795d87972a25 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Fri Mar 22 06:43:09 2013 -0700 - - Enable proper display of elapsed time when paused with VAAPI. - - Make sure av_pause_frame is updated so that the player can pick up the - current frame number while paused. Refs #10962 - (cherry picked from commit 841ff3a359ce668eb51ef1da917ffab5a0932302) - - Conflicts: - - mythtv/libs/libmythtv/videoout_openglvaapi.cpp - -commit 750a579240c76d8921dc0a6fc24cc18860bc6817 -Author: David Engel <dengel(a)mythtv.org> -Date: Thu Mar 21 16:08:21 2013 -0500 - - Change MythDate::toString() to return an empty string for invalid inputs. - - Cherry picked from master for fixes/0.26. - - It's possible a "0000-00-00 00:00:00" might be somewhat acceptable in - some rare cases because the all 0s value obviously represents a - special value. The UTC to local conversions added in 0.26, however, - now causes it to change to a less obviously special, and perhaps even - misledaing, not all 0s value. Since MythDate::toString() was a - Myth-specific replacement for QDateTime::toString() and - QDate::toString() and those functions return an empty string for - invalid inputs, we probably should too. - - Refs #11405 . - -commit 65e6136a72017826fa58a2e2ae6ebc1578cf17a4 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Sun Mar 3 16:18:23 2013 +0000 - - MythMusic: Add missing default 4:3 stream-ui.xml theme file - - Fixes #11369. - -commit c0419cd1759f299a4232c12cf62dbea8b30180f2 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Tue Mar 19 23:39:50 2013 +0100 - - MythUI: Fix use after free in MythUIEditBar - - The call to ReleaseImages() in MythUIEditBar's dtor caused a free memory read - since SetRedraw() accesses its parent whose dtor has already been called. - - Calling ReleaseImages() from MythUIEditBar's dtor also isn't necessary since the - images in m_images are children of MythUIEditBar and are automatically deleted - by Qt. - - Fixes #11458, Refs #11402 - (cherry picked from commit 6e0f69dca6a554f4baf0fe8f9226458d36c459c7) - -commit f1715d057f42d22a08002fa69790cc08a7306dbc -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Tue Mar 19 23:39:18 2013 +0100 - - OpenGLVideo: Fix a double free in AddFilter() when OptimiseFilters() fails - - Fixes #11430 - (cherry picked from commit 5769dca4c4ed442b62741e9abeeb2e3490d9b909) - -commit 25aa598fda8fce1d1ed36c68b9da75ebfd1c7476 -Author: Joey Morris <rjmorris.list(a)zoho.com> -Date: Mon Mar 18 21:35:53 2013 -0700 - - Use the correct index for program.previouslyshown in the query result. - - Signed-off-by: Jim Stichnoth <jstichnoth(a)mythtv.org> - -commit de5dd3b5181869d234b67abc8a5fb112830f3f94 -Author: Richard <peper03(a)yahoo.com> -Date: Tue Feb 19 19:33:36 2013 +0100 - - Sync libdvdnav up to R1251. - - * Fix failed assertion when there's no menu. - * Make sure we get nav packets for all cells in multi angle features - * Fix strict aliasing warnings. - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - -commit 6ea48f0d0017661b4684d68ae61bb0ed137d85d8 -Author: Richard <peper03(a)yahoo.com> -Date: Tue Feb 19 19:40:53 2013 +0100 - - Sync libdvdread to R1250: - - * Accommodate duplicate language units and pgcs (avoid potentially consuming large amounts of memory) - * Fix a segmentation fault by preventing a read/write beyond end of an array due to using a length value taken from the DVD, which can exceed the allocated size. - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit 15a062f5ef22be1f8eefa9e8d300d18f8a54996b) - -commit 29bce5c4af609e5b8f7acce2bbe0ca7a01e5defc -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Wed Mar 13 17:08:49 2013 -0700 - - Apply the pixel aspect ratio, if available, to aspect ratio calculation. - - This only applies to mpeg2 video. Refs #11406. - -commit e2901d9f94f67d8a9c1b5e141937799cfba1aeab -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Tue Mar 12 20:29:01 2013 +0000 - - Fix missing copyrightlogo widget in Terra. No-one noticed mythweather was broken with Terra for over 6 months ... - (cherry picked from commit 23c0f7435df1cf8f146459b18a45955fc32da3b6) - -commit 77259c5a504d1edb79d8c9d4c6f45265b365a818 -Author: John Poet <jpoet(a)mythtv.org> -Date: Thu Mar 7 15:24:34 2013 -0700 - - dtvrecorder: Don't try to buffer frames for audio-only streams. - (cherry picked from commit 0d9312df1dd3ed2a2da40edce1bbaae5b90c9944) - - Fixes #11442 - -commit 3944ca9ad0f8df1a0240c5812e5b3b04431e7eac -Author: John Poet <jpoet(a)mythtv.org> -Date: Wed Feb 13 15:39:46 2013 -0700 - - Cleanup some useless "discontinuity detected" messages following 87a15e1ce - - Closes #11328 - (cherry picked from commit efc1e46a8a2d913a8070483178ca46293f0a4423) - -commit e54b9b6fd635df024f81c1d2f33956996c95c379 -Author: John Poet <jpoet(a)mythtv.org> -Date: Tue Feb 12 10:26:30 2013 -0700 - - DTVRecorder: buffer up each payload until we know if the payload is a - keyframe. - - Especially with H.264, we can be several packets into a payload before we - know if it is a keyframe or just a frame or something else. Always buffer - the packets of a payload until we know what we are doing with the payload. - - If we need to switch ringbuffers, we now do it so the new file will start at - the beginning of the payload holding a keyframe. Each file will also start - with a PAT/PMT if the "recorder" calls for it. - (cherry picked from commit 87a15e1ce40d81058ff221308d666d73b1517ff2) - - Conflicts: - mythtv/libs/libmythtv/dtvrecorder.cpp - mythtv/libs/libmythtv/recorders/iptvrecorder.cpp - mythtv/libs/libmythtv/recorders/iptvrecorder.h - -commit 12c443eb1cd22cecd257ea61984fa2dfb31d4992 -Author: John Poet <jpoet(a)mythtv.org> -Date: Tue Feb 5 13:56:45 2013 -0700 - - SignalMonitor: Timeout if we don't get a lock in a reasonable amount of time. - (cherry picked from commit 6bae400b0bbeb539e6e9390517e1a90f8f6f13d4) - -commit fdcc9c202b85c7d00b13aa5ee1232113382110fa -Author: Thomas Joiner <thomas.b.joiner(a)gmail.com> -Date: Sun Feb 10 19:41:06 2013 -0600 - - fix issue #10222: mythcommflag segfaulting - - The problem in issue #10222 is that it is adding the CODEC_FLAG2_FAST flag. This causes unsafe functions to be used, causing a segfault. The proper way to fix this would probably be to figure out how to test for the "experimental speedups" flag, however I don't know the codebase well enough for this. - - I tested how this would affect the speed of mythcommflag on one of my recordings. The results: - - Before removing flag: - real 2m13.123s - user 2m16.713s - sys 0m3.502s - - After removing flag: - real 2m13.021s - user 2m15.446s - sys 0m3.758s - - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net> - (cherry-picked from 0026dda883ef50ab7f2fda7f2d2218bc56f094a7) - -commit e39b4d5b45155320bc1b62296560dab6c1705e73 -Merge: 43bb6d9 75fa1eb -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net> -Date: Tue Feb 26 20:37:20 2013 +0000 - - Add AAC and AAC_LATM tages to mythtranscode info output - - Pull request: https://github.com/MythTV/mythtv/pull/33 - Merge remote-tracking branch 'glidos/fixes/0.26' into fixes/0.26 - - Refs #11380 and e78e59c6b2d71631e18027b9b9c84212744472bf - - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net> - -commit 43bb6d9541578631182c54d4d944fc7d94dd8cb6 -Author: Stuart Auchterlonie <stuarta(a)squashedfrog.net> -Date: Tue Feb 26 00:16:32 2013 +0000 - - Make comparisons consistent - - Refs #11299 - -commit 093bc647f4b8ca0b9e4bb85f2a336d95a734d122 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Fri Jan 4 11:38:11 2013 +0000 - - MythArchive: update mythburn.py to work with the new mpeg2video codec name - - Refs #11299. - - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net> - - (cherry picked from 13c3035d1fed13a37c42d872b1f8dafb2e6f556f) - -commit ca24c0c3246e70c16846771bb1480154043059d2 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Fri Jan 4 11:03:35 2013 +0000 - - MythArchive: update mythburn.py to work with the updated encoding profiles - - Refs #11299. - - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net> - - (cherry picked from a784b93f1d1c6edbc0b47ac578def5d3275171a8) - -commit 5bd998931ce84a31f462c28fda3c3af243b51777 -Author: Paul Harrison <mythtv(a)sky.com> -Date: Fri Jan 4 10:50:26 2013 +0000 - - MythArchive: update the encoding profiles to work with the current mythffmpeg - - Refs #11299. - - Signed-off-by: Stuart Auchterlonie <stuarta(a)squashedfrog.net> - - (cherry picked from 5a0e83a20e8f75612b86fb56039b7803a11afd1b) - -commit 7a2e60f90081771de6efd495590e3ec461885319 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Mon Feb 25 06:08:35 2013 -0800 - - Bump binary version after cherry picking 86c22ed3d5c522bcecb88ecacd58104fc0dd6d8d - -commit 7bd6221e17f605d88df3e160075be903ad50508b -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Wed Feb 20 14:14:41 2013 -0800 - - Fix h.264 frame/keyframe identification in the player. - - If a NAL unit that determines a frame start appears as the last NAL - unit in the packet, then the frame start is not identified until the - start of the next packet. If this new packet has its own NAL unit - that determines a frame start, and that NAL unit is not at the end of - the packet, then only one frame start would be counted rather than - two. This is fixed by returning the total number of frame starts, - rather than a bool. - - In theory, the same problem could exist in the recorder, but it - appears that the packets in the original recording may have some - trailing NAL units that are stripped by the ffmpeg libraries when - assembling the packet for the player, causing the situation not to - occur. - (cherry picked from commit 86c22ed3d5c522bcecb88ecacd58104fc0dd6d8d) - -commit 75fa1eb44ac97c4dbc1f46497b0631bbee45b130 -Author: Paul Gardiner <paul(a)glidos.site> -Date: Sat Apr 21 08:52:46 2012 +0100 - - Have mythtranscode report aac_latm - -commit c3fff6e88c1ab3c9e39483ef5101f83da38acff1 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Wed Feb 20 13:22:06 2013 -0500 - - Called methods against wrong object in destructor. - - Refs #11412 - (cherry picked from commit e1f14a5380886c6ddf95379341aa0f56481b7587) - -commit 060094b10462c9c5494e66c31f4ad80d4dde6990 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Wed Feb 20 13:09:14 2013 -0500 - - Make sure forked process has stopped when deleting MythSystem - - This forces a termination in a forked MythSystem process when the - MythSystem object is destroyed, preventing a situation where the private - internal object tries to access resources from the no-longer-existent - parent object. - - Fixes #11412 - (cherry picked from commit 9c51ad39a65eee7a3f985a127700fbc8473ffb4e) - -commit f20555091f7ad9cfc7ace955aab59d468156af11 -Author: Kenni Lund <klund(a)mythtv.org> -Date: Sat Feb 16 23:11:00 2013 +0100 - - Update the Danish translation of mythfrontend. - -commit 87f6f2c12e101f515cefc733bf944936be16174c -Author: Kenni Lund <klund(a)mythtv.org> -Date: Sat Feb 16 23:07:44 2013 +0100 - - Make the string "Record at any time on any channel" translatable in 0.26-fixes. - -commit 64f0e4ec24eb52bbbd4318365b3252f9b462ade1 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Sun Feb 10 09:35:52 2013 -0800 - - Improved cropping of the bottom 8 lines of 1088-line video. - - Refs #11358. Reverts 9d9de7b75d5354c9130526311a0c74d7172ebe6d and - cleans up the bottom 8 lines by applying a crop filter to the source. - This is tested for the XVideo output method. - - The VDPAU output method does not use the standard filter mechanism, - but it works fine on 1088-line video until the h.264 parser thinks the - resolution has changed from 1080 to 1088 lines. To compensate, we - don't acknowledge a resolution change when this happens. - (cherry picked from commit c0bc92822fe63221ad8fc5cf52a6e661b37b6f21) - - Note: the hard-coding of 1088->1080 is not the best way to handle - this. It will be cleaned up in Master. - -commit 9aaccb0e199a21311d0200b7787b705e4a67ca87 -Author: Michael Niedermayer <michaelni(a)gmx.at> -Date: Wed Feb 13 22:36:07 2013 +0100 - - h264: Reset last_pocs in case of reference or frame number inconsistencies - - This prevents faulty increasing of has_b_frames - Should fix Ticket 2062 - - Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> - (cherry picked from commit c230af9bccc3cadb373f9007ba14fffb6c2acc75) - Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org> - (cherry picked from commit 1c1076385f01619f0d0933f9f4fb8f5d1e80435b) - - Conflicts: - mythtv/external/FFmpeg/libavcodec/h264_refs.c - -commit a1b9b1f94a774710443637de034c661618e5baa3 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Fri Feb 1 06:27:27 2013 -0800 - - Fix Live TV startup, particularly for analog PVR-xxx tuners. - - At the start of playback, ffmpeg scans the start of the file for - stream info. While reading packets, it uses ffio_limit() to truncate - packets during attempts to read past the size of the file. The file - size is cached at the start of playback, and may be inordinately small - for live TV files, triggering a storm of packet truncation and failure - to start playback. We fix this by faking a large file size for live - TV playback during the initial call to avformat_find_stream_info(). - (cherry picked from commit 5758c2a1d8ce448fce51fd5af3ce1a95494a3408) - -commit fd43ad10c97eb71ed557db2062e740434f5c372b -Author: David Engel <dengel(a)mythtv.org> -Date: Fri Feb 1 13:19:48 2013 -0600 - - Fix StatusBox to account for template recording rules. - - Cherry-pick part of SHA1:22c5dbff from master. - -commit 856d121b0100cdd8cffa21a5503685ccd45d9bb9 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Thu Jan 31 16:25:40 2013 -0800 - - Enable more ffmpeg logging at startup of playback. - - Allow logging in avformat_find_stream_info() if - "-v libav --loglevel debug" is specified. - This proves useful for live TV debugging among others. - (cherry picked from commit ae0dcaf6dfbbef1ac0bcc0cec1c684262ea9ee5c) - -commit 28144cd1c59c9eb5d639f616e544dcd2a5cfb5ed -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Wed Jan 30 09:04:51 2013 +1100 - - Revert "Temporary fix for #11159: Fix playback of HD-PVR recording" - - This reverts commit 3c8d88ac55c2b2c1bc652076d7824529254829a4. - - It breaks BBC-HD playback consistently. - -commit 14aa70771e85e401c68cac78a49b8ef344cce873 -Author: David Engel <dengel(a)mythtv.org> -Date: Fri Jan 25 17:59:34 2013 -0600 - - Fix issues which sometimes prevente scheduling around live TV. - - Backport of SHA1:b05ecd46 to fixes/0.26. - - There are some cases where we don't attempt to schedule around live - TV. This change cleans up the logic which determines when to do that - and fixes some of the bugs found in the process. - - NB: the case where a user enters live TV immediately before a - recording is scheduled to start is still not handled gracefully. - Fixing that is a lot tougher and will likely mean involving the - scheduler in choosing which input to use for live TV. - - Refs #11207 - -commit 3587b8240a5b136df1b454b6b4e2d44294e7ed0a -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Wed Jan 23 21:13:11 2013 -0800 - - Rescale 1088-row videos to avoid showing trailing garbage. - - Refs #11358. 1080i videos may present themselves as 1088 rows - (divisible by 16). The HD-PVR in particular may contain garbage in - those last rows. Specifically, the last two rows may form an annoying - green line. We add a scaling pass to shift the bottom 4 rows (4 to be - on the safe side) off the bottom of the display area. - (cherry picked from commit 9d9de7b75d5354c9130526311a0c74d7172ebe6d) - -commit c86a3d78953ac1e3ffa10f670c73c836cfb1235d -Author: Daniel Thor Kristjansson <danielk(a)cuymedia.net> -Date: Mon Jan 21 10:48:39 2013 -0500 - - Add DCX-3200 as a supported Firewire recorder STB. - - Fixes #11296. - -commit 012ebe9de7e20a0bae1920cfc55199ad63937636 -Author: Richard <peper03(a)yahoo.com> -Date: Fri Dec 14 20:59:53 2012 +0100 - - Use the right highlight area in DVD menus when 'wide' is not the first in the list. - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - - Fixes #11291 - (cherry picked from commit 1eaecea6dd38db0c20b94f8ecb549b4c29491297) - -commit 512391ddecaa529bba374ed338e3ce170fecfd3f -Author: Richard <peper03(a)yahoo.com> -Date: Sun Dec 9 20:24:01 2012 +0100 - - Always update the still frame timer whenever the timeout changes (including when it should be disabled) to ensure that it doesn't 'expire' accidentally and cause the next still frame (at whatever point in time that may be) to be skipped. - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit d9b022eceab5f979717b6d66335b4d1e7f398b55) - -commit 2d710a70ba68fa5139fb2fc4936e167db69637dc -Author: Richard <peper03(a)yahoo.com> -Date: Wed Dec 5 19:40:04 2012 +0100 - - kDecodeAudio is now re-enabled if an audio stream becomes available - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit b082334c82bfb9caa513c29f5f9da44e282c973b) - -commit c1929686fd424b51c9725100e2e326525c879b0d -Author: Richard <peper03(a)yahoo.com> -Date: Sat Jan 19 14:50:31 2013 +0000 - - Simplify DVD startup to improve playback reliability - - The startup code for DVD playback jumps around somewhat trying to find - a playable title, which is then used to create audio/video decoders - before playback is restarted at firstplay. - - This doesn't always work as it can leave the DVDs VM in an - inconsistent state and, depending on the DVD, looks ugly as playback - starts and then restarts or appears to jump somewhere else after a - couple of seconds. Because the VM can be left in an inconsistent - state, menu navigation/selection issues can arise, which can make it - difficult to start playback. - - The attached patch attempts to clean up the startup code. The - DVDRingBuffer no longer tries to find a playable title in OpenFile??, - but rather just lets the VM get on with playback. AVFormatDecoder no - longer processes the initial frames more than is required to create - decoders. Once this has been achieved, any cached data is flushed - before jumping back to 'firstplay' (and cleanly resetting the VM). By - not displaying the initial frames used to determine the decoders and - flushing the cached data, the ugly jump at the start of some DVDs is - no longer visible. - - Fixes #11288 - - Backport from master [414de880b] - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - -commit 8f8274aa90a5caa37e0cf16c20938a8d73782f02 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Thu Jan 17 14:51:40 2013 -0800 - - Fixes #10829. Handle aspect ratio changes when seeking while paused. - (cherry picked from commit 0db9bf4999ab06e0451d57f43af59cee53648559) - -commit 91e93155fbeca2c7eaaf061aad91126c8f6a76a1 -Author: Wayne McDougall <waynemcdougall(a)gmail.com> -Date: Wed Jan 16 00:45:58 2013 -0500 - - Remove references to --hogcpu from mythcommflag readme. - - Fixes #11134 - - Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org> - (cherry picked from commit 0a94fc03e31dc6e17c5a6155ecaa71b2a255ca3e) - -commit 8ca4caf0c0ed3debd0659c4170970a37fb7dc916 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Tue Jan 15 06:30:32 2013 -0800 - - Allow seeking back through the live TV chain. - - Fixes a regression introduced in 0.25. Refs #11174. - -commit 3c8d88ac55c2b2c1bc652076d7824529254829a4 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Wed Dec 26 13:02:15 2012 +1100 - - Temporary fix for #11159: Fix playback of HD-PVR recording - - This revert FFmpeg commit bfca35114ae174bbabd88526379d95d4022a98b1 - (ref https://ffmpeg.org/trac/ffmpeg/ticket/2062) - (cherry picked from commit d34833f2eeab06bc17338e4d5a8bc33589f41506) - - Conflicts: - mythtv/external/FFmpeg/libavcodec/h264.c - -commit f35f899c79fa4769c7206948ea9612cc1d9adbd7 -Author: Richard <peper03(a)yahoo.com> -Date: Sun Jan 13 07:52:38 2013 -0800 - - Fix transitions from a DVD still frame into video. Fixes #11347. - - Signed-off-by: Jim Stichnoth <jstichnoth(a)mythtv.org> - (cherry picked from commit fcf176db6e06928364f35f32aa022696fb19edf6) - -commit 430900f7bce45d031ec948d867f0903e20544750 -Author: Bradley Baetz <bbaetz(a)gmail.com> -Date: Sun Jan 13 07:30:58 2013 -0800 - - Fix a memory leak introduced in 92016b949. Fixes #11329. - - Signed-off-by: Jim Stichnoth <jstichnoth(a)mythtv.org> - -commit adb65cc236d40b3a99a74f95718de3eee4c9a602 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Sat Jan 12 06:29:19 2013 -0800 - - Fix "mythcommflag --rebuild" for non-HDPVR recordings. - - By default, only identify IDR keyframes for h.264 recordings. - However, since DVB-S recordings may lack IDR frames, we check after - 1000 frames whether any keyframes have been found, and if not, back up - and restart using the more lenient setting. - - Adapted from 802e32ba4dc8852da56db170893e95cbc28637e3 and - 77bf3275ef3133d81fc979ae40d9728523ff9974. - -commit eca41c857ef9618a2e8335b90e97583e08858107 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Fri Jan 11 22:45:11 2013 -0800 - - Subtitles: fix missing CEA-708 closed captions. - - This is a quick hack version of - 7d9bf3193e0f3d1795c1ead6f16aa386ab7de587, which fixes a CEA-708 - decoding bug exposed by recent changes to NBC's CEA-708 encoding. - -commit 72bca07f09deb4f6fbce6219b6d5aaaa2548bc35 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Thu Jan 3 19:32:21 2013 +0100 - - mythccextractor: Skip teletext page headers - (cherry picked from commit 9519a103da6ad8dc589042fbda4fdfe4e1a2fca8) - -commit 1b055c0eae7cd63f627591a5607eb4703a46f360 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Thu Jan 3 20:52:10 2013 +0100 - - mythccextractor: Fix teletext subtitle duration - - Previously ProcessTeletext() didn't leave one subtitle behind. This caused the - length calculation in IngestSubtitle() to never be performed, which meant that - the length was always set to the default value 750 ms. - - Fixes #11081. - (cherry picked from commit 08ad6cef707456e959b48d5e48c09929e023fc49) - (cherry picked from commit 018691f04687321f90ef2938455824065bcf674e) - -commit 28846f87db59efa28ce20c9309089a49520227bb -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Thu Jan 3 09:01:37 2013 -0800 - - Configure the h.264 parser to identify only IDR keyframes. - - This makes keyframes identified by "mythcommflag --rebuild" and - mythtranscode much closer to reality, though there are still - discrepancies compared to the recorder and raw ffmpeg. - (cherry picked from commit 590f161b1d5ff8c7e08b0beae480ece7a185d3ab) - -commit bcc459fa2893f65c1debe9a7f976d3c23e865531 -Author: Chris Pinkham <cpinkham(a)mythtv.org> -Date: Wed Jan 2 10:36:24 2013 -0800 - - Bump MDM::downloadNow() timeout up to 60 seconds. - - The previous 10-second timeout was causing issues when trying to - download large lineups from Schedules Direct. This commit bumps - the downloadNow() timeout to 60 seconds. This is a blocking call, - so if the caller doesn't want to potentially block for that long, - they should be use one of the non-blocking methods. - - References #11287. - - (cherry picked from commit afa03f27a2fb442800f148fb28da1f7585a2f02f) - -commit ff4edc7e61e6f1f14161f67ab865b6e4d14ff80b -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Tue Jan 1 06:17:48 2013 -0800 - - Fix an issue with keyframe positions produced by mythcommflag --rebuild. - - The seeking code in DecoderBase assumes there is a keyframe at frame - 0, otherwise it shifts all keyframe numbers by the value of the first - keyframe number in the map. This causes problems for recordings with - variable keyframe distances. To correct this, make sure mythcommflag - --rebuild creates an explicit entry for frame 0. - - Note: this does not fix the issue of mythcommflag --rebuild adding - bogus keyframes to the seektable for h.264 recordings. - - Cherry-picked from a small part of - 49dbed5be0729b04a5f0fd0426a32fceb2dd7935 . - -commit 12f0d5deb4b5bacffbdc3bca4772a2ecc66f79c0 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sun Dec 30 13:03:15 2012 -0500 - - Fix typo in tmdb3.py that returns invalid crew IDs. - (cherry picked from commit f4bb17ff2b964c001df376337aa29323615cf790) - -commit feffc6907bfb4047ef73102c53e3540cd00917d8 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sun Dec 30 02:07:12 2012 -0500 - - Allow posixtzinfo to use the TZ environmental variable. - - This adds a check for the TZ environmental variable, and uses that to - define the local timezone if available, rather than always using - /etc/localtime. This resolves an issue on Debian-based systems that - always use the TZ variable, rather than defining the localtime file. - (cherry picked from commit 0bffe0648d7b19ff2b2ca289699982c23a12f455) - -commit edba581f7347baa060e1ab75095a57f935ac281d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sun Dec 30 02:02:14 2012 -0500 - - Remove incorrect selection of DST offset. - - This makes the default offsettzinfo just use the standard timezone - offset from the time module, rather than incorrectly using the existence - of a DST offset as indication that the system is currently in DST. - (cherry picked from commit 4dd0bf8014bf8261c8ed347517ef8197ac7f942e) - -commit b563d7f01b3dc3c40abc430150f3f00deb7d6a1d -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Fri Dec 28 20:37:04 2012 +1100 - - Fix playback of HLS encrypted streams. - - The allows ABC iView on iPad to stream to Myth - (cherry picked from commit c5a4229401b2c224640cda2a31e9339fcd8157de) - -commit a4d2dd12c7f9143dc31be4005e1d437adebd9646 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Thu Dec 27 21:27:51 2012 +1100 - - URI is RFC3986 and is escape encoded. Must decode it before using it. - - Fixes #11307 - (cherry picked from commit a99e92c8173fb1887a9b3c116b72edf119fbfd5b) - -commit 637d6d87d20aa8b17247fedf87b6c78ef091f08c -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Tue Dec 18 16:07:53 2012 +0000 - - Fix copy/paste error in MythUIType::SetMinArea(). Coverity 746771 - -commit 190279b50307cd5b53d4ae9c8f4dc70b13eeeed5 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Tue Dec 18 16:06:30 2012 +0000 - - Fix copy/paste error in MythUIType::AdjustMinArea(). Coverity 746772 - -commit 3d7a20ce1008b1a84127f17dea7c75e05cacb4aa -Author: Karl Dietz <dekarl(a)mythtv.org> -Date: Mon Dec 17 00:32:42 2012 +0100 - - Speed up and reduce temporary space of time search a lot. - - By factoring out the description into a super query the performance can - be greatly improved (e.g. from 2 minutes to 2 seconds) - - Thanks to sphery for inspiration by [d9fb21853f] and justinh for testing - and fixing my braino with the column order. - - Fixes #10023 - (cherry picked from commit c0c47344879d3467cfea62938a33e70278252b36) - - Conflicts: - - mythtv/libs/libmyth/programinfo.cpp - -commit cd0212131d67c21c1f346fbb659cf268e76a4454 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Mon Dec 17 01:01:03 2012 +1100 - - Revert "Revert "Temporary fix for stuttery playback of AVI files over Storage Group."" - - This reverts commit f1cc7e3e4410195aeb6c7da3bba7dc44830bdc4e. - Was never supposed to commit this revert - -commit f1cc7e3e4410195aeb6c7da3bba7dc44830bdc4e -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Sat Dec 15 20:02:44 2012 +1100 - - Revert "Temporary fix for stuttery playback of AVI files over Storage Group." - - This reverts commit c21e9beb16583f640e7457e798c047b3af05cf15. - -commit c21e9beb16583f640e7457e798c047b3af05cf15 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Sat Dec 15 18:53:49 2012 +1100 - - Temporary fix for stuttery playback of AVI files over Storage Group. - - This is a reverse of ffmpeg SHA1:8df774be88c347c40f1b2411ed9e391dfec0ebb7 - http://git.videolan.org/?p=ffmpeg.git;a=commit;h=8df774be88c347c40f1b2411... - - This is not a proper fix. It only reveals an issue with myth Storage Group file ring buffer. - With this ffmpeg change, some AVI files are detected as non-interleaved and the readahead thread starts to pull MB of data which saturates 100Mbit/s link causing the video playback to stutter. - (cherry picked from commit f1540fe05ee15d1f53fe30e137931b185b791821) - -commit b8998fc41b1cb23d816354c211e8fa96ab316db3 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Wed Dec 5 09:08:32 2012 -0800 - - Cutlist editor: Trigger a redraw of the editbar when changes are made. - - Otherwise, cut/keep marks may incorrectly stay visible when changes to - cut/keep regions are made. - (cherry picked from commit 1241485d5d2ec81deddf2c5ab8deb21b7d796248) - -commit 1ecfe64da85dad6be51174e139b7ed9c4f85b3f6 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Wed Dec 5 08:53:51 2012 -0800 - - Properly initialize the MythPlayer::video_aspect field. - - The MythPlayer constructor unconditionally initializes video_aspect to - 4.0/3.0. In some configurations, pressing EDIT during the "Please - Wait" screen before the start of playback of a non-4:3 recording, will - bring up the cutlist editor locked into 4:3 mode. Explicitly - initializing video_aspect earlier fixes this. - (cherry picked from commit 192e850ad9a87b7ff457d30cf8308b568cc18299) - -commit 2baece97462dc411cbf9f45f11667b2e4f186730 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Wed Dec 12 13:39:32 2012 +0000 - - Don't setup to decode every video stream found, just the first. - - Fixes playback of certain video files containing multiple video streams. - -commit 09ac5b2226b8e6d855dbfc9c24fdfd2cf9075687 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Wed Dec 5 16:34:52 2012 +0000 - - Fix use after free in MediaMonitor::RemoveDevice(), found by cppcheck - -commit 93204a3747db4219833cdd24eaa41146fdc6b8d5 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Wed Dec 5 10:35:24 2012 +0000 - - Fix .empty() being called when .clear() was meant in cddb.cpp. Spotted by cppcheck - -commit b28041a11711a2ddd9eb63f8eee0c1ce3009c4ac -Author: Daniel Thor Kristjansson <danielk(a)cuymedia.net> -Date: Wed Nov 21 10:27:31 2012 -0500 - - Fix #10995. Default to local time for mythshutdown --setwakeup. - -commit 3c359636b261409a9cf0761bdbb82092b93a0306 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Mon Nov 26 19:16:49 2012 -0800 - - Subtitles: Don't use a persistent DB setting to control forced subtitles. - - Instead, always allow forced subtitles when playback starts, and allow - the user to disable/enable forced subtitles during the current - playback. - (cherry picked from commit 0b7e9027cbc4d4b0b15533b2701077733f62162c) - -commit ed7b577702442c62b5d0f43b434fcb5494d0a8d8 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Sat Dec 1 17:07:09 2012 +1100 - - Fix cross-compilation on mac. - - Depending on the version of Qt you are using QMAKE_OBJECTIVE_CXXFLAGS may be ignored and QMAKE_OBJECTIVE_CFLAGS is used instead. - So define both. - - [cherry-picked from 75e47c5989248aebe5c0d2b41b11c6465b2b4ebc] - -commit b62198ffcada256ebf3c40c9c6c4be1615ae17ea -Author: Chris Pinkham <cpinkham(a)mythtv.org> -Date: Fri Nov 30 20:58:26 2012 -0800 - - Fix mythfrontend services API /Frontend/PlayRecording call. - - We don't need to convert the specified starttime toLocalTime() anymore. - - Copies 3eef99e from master. - - Fixes #11236 and #11152 I believe. - -commit 6313659aba17e992b726fcf6edc613518d3c0205 -Author: Chris Petersen <cpetersen(a)mythtv.org> -Date: Sun Nov 25 13:59:46 2012 -0800 - - Patch to fix UTC issues - - Closes #11079 - - http://code.mythtv.org/trac/ticket/11079 - -commit 57396ed6cfe4195a6ab4ef1087e233ba66ce402c -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Fri Nov 30 20:13:54 2012 +1100 - - Fix AirTunes so it works with iTunes 11 - - iTunes used to only send an AES-128 challenge once, and myth was expecting that the challenge came during the OPTIONS packet. - The challenge is now sent with more packet, including during the ANNOUNCE one. - So we move the handling of the challenge so it will work no matter which packet it comes with. - - Tested with iTunes 11, iTunes 10 and iOS 6.01 - - [cherry-picked from 06be92206c772509875dbde313769bfae9a2adf7] - -commit bfa76a2f924af04327afcf4b04177a2fd6870f24 -Author: Richard <peper03(a)yahoo.com> -Date: Thu Nov 29 20:54:55 2012 +0100 - - Set palette correctly when DVD menu highlight changes to ensure highlights are the right colour/have the correct transparency. - - Fixes #11265 - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit 5df1322ae0f73566766bcde0c7948292877fd443) - -commit 84cc4bb95a6496428221981a18013f8846617924 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Thu Nov 29 19:31:49 2012 +0000 - - Fix playback of DVDs which feature an empty audio stream - (cherry picked from commit 20baa43b4b0313900dec05c11e6054760123cb9d) - -commit 8a7892b1ca1ec307d32a78153b57e012a721e9d3 -Author: Ian Dall <ian(a)beware.dropbear.id.au> -Date: Thu Nov 29 19:00:10 2012 +0000 - - Fix deletes on Slave backends. Remove references to deleted_set and - initialise dont_expire_set properly which conflicted with 'deleted' - recgroup behaviour since 0.25. Fixes #10704 - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit e150a19030a81e3c099eff76b280b886122529b1) - -commit cd9f7eb68642f9052de40e68d544ccd40fc112a1 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Thu Nov 29 17:54:00 2012 +0000 - - Treat POLLHUP as EOF not an error, fixes IVTV (PVR-) recorders failing. Based on patch from ltskinol(a)gmail.com Fixes #10732 - (cherry picked from commit 3d13d795b2ae4a66f4bd3e5bdfd4168c66474282) - -commit 793814e81ae7f0b2e54df6adf9b64d43b0f52df3 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Thu Nov 29 17:15:15 2012 +0000 - - Don't strip unnecessary white space from title when creating the title list. Fixes #11200 - (cherry picked from commit b47711179612a12d8e4f888c426cb5b268893797) - -commit 10479af5e68010d0b25982323cd3b743bd353d88 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Fri Nov 23 22:21:53 2012 -0800 - - Reduce the amount of "Build background buttonlist" logging. - (cherry picked from commit d1243e25eba64b1e20e6c1ea901eaaa6b3044049) - -commit ca8f5e75dd4d222599c48ad3c849356e31042bd4 -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Fri Nov 23 07:45:23 2012 -0800 - - Subtitles: Add support for forced text subtitle tracks. - - Fixes #11242. - - If there is a forced text subtitle track (which is possible in e.g. a - .mkv container), and forced subtitles are allowed, then start playback - with that subtitle track selected. Otherwise, use the frontend - settings to decide which captions/subtitles (if any) to enable at - startup. - - Background on the mythtv-users mailing list - - http://www.gossamer-threads.com/lists/mythtv/users/532845 . - (cherry picked from commit 64a3cd08752a07ea7928df2d1c713f75a8181f58) - -commit b45c98aded5223ab77de7a2be3603878f7f6cec1 -Author: Paul Harrison <pharrison(a)mythtv.org> -Date: Thu Nov 1 21:34:11 2012 +0000 - - mythmusic: Fix streaming radio not being able to connect to some streams - - This fixes a couple of errors with creating the stream GET request header. - If the path part of the the URI is empty the HTTP/1.1 spec says it should be - specified as "/" and not be empty and the Host request-header field should - contain the port if it is non standard. - - Fixes #11214 - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit fe22adc5c485b8b19969b0e1804a84f652227577) - -commit 17c0c77ddbb2e6f085be6b08bac31a9361b682ab -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Wed Nov 21 14:05:54 2012 +0000 - - Fix Audio Description and Commentary track filtering when auto-selecting audio track - - Fixes #9878 - Fixes #3260 - Fixes #10963 - (cherry picked from commit ee375344e4ac309917fb85f51c9e05ca2b4761c2) - -commit b0a1d7298b3d26a805de2535957eab2c80e87f3c -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Mon Nov 19 13:29:52 2012 +0000 - - Have EDIT open the metadata editor in the CD ripping screen - (cherry picked from commit 0e281107a8254c77317f9997625b6e3c04097742) - -commit 340b5d4099068fc1fe72548e2d98ac4733c51e55 -Author: Richard <peper03(a)yahoo.com> -Date: Sat Nov 17 14:38:36 2012 +0100 - - Changed DVD angle handling to be 1-based throughout (as they are on DVDs). This also affects the SWITCHTOANGLE action via the Services API. - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit 3e01436a867332ae2aaa24b89b1c5b8ec35480e0) - -commit 8c68560fd05ed4c9f99b207f22bb58306cb6ce2d -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Fri Nov 16 18:37:07 2012 +0000 - - Don't treat unknown text display modes as audio tracks. Fixes - TOGGLE_SUBTITLES not working with DVDs after leaving a menu, although a better fix specifically for this problem may be added later. - (cherry picked from commit 2653de8643929aeaaaae3dd5e2a8aa3b86220c47) - -commit 81e8fa5175436ab2487944cc66de95c509e8cbc5 -Author: David Engel <dengel(a)mythtv.org> -Date: Tue Nov 13 10:31:05 2012 -0600 - - Reschedule when a recording is undeleted. - - Note: an unwitting user could unintentionally bypass this change by - changing the recording group directly from "Deleted" to something - else. Possibly fix this in the future by moving all releated fixups - into RecordingInfo::ApplyRecordRecGroupChange() instead of having - every caller do them. - - Refs #11224 - (cherry picked from commit 5e1c14e8c295fb00a3f2e359021be026104863db) - -commit c57b92740ac15e708bd8a68eb767b484d8b26f4a -Author: David Engel <dengel(a)mythtv.org> -Date: Tue Nov 13 09:47:48 2012 -0600 - - Fix a possible reace condition when a recording finishes. - - There was a slight, albeit very unlikely, possibility the scheduler - could run before the recorded table was updated. This avoids it by - updating the database before notifying the scheduler. - - Refs #11224 - (cherry picked from commit 729e3d56d3e984d35b4fecd249da7c3e1bdcbfb9) - -commit 1618035441204b0a0f58e8b1f87f369c04df5527 -Author: David Engel <dengel(a)mythtv.org> -Date: Tue Nov 13 09:44:38 2012 -0600 - - Fix multiple database bindings issue in Scheduler::ResetDuplicates(). - - This causesd the duplicate status of programs without programids or - findids to not get updated properly. - - Fixes #11224 - (cherry picked from commit 6a147ecf09aea985f95d8dcbe4edacc9e18f4a38) - -commit 5d8e8e17df880b362ed2305b65fd5d1cd18c426f -Author: Richard <peper03(a)yahoo.com> -Date: Mon Nov 12 00:28:05 2012 +0100 - - When processing frames from DVD/Blu-ray ringbuffer, menu frames are now buffered as necessary to ensure stutter-free playback. - - Refs #11233 - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit 62816805dbbce996bd8ee61da3bdfca1bb1bcef9) - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - -commit cd2e061f999d336a87fad9c3eace6fd3c0d01dd4 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Wed Nov 7 09:49:33 2012 -0500 - - Bump internal bindings versions. - -commit d988d0fc496b7ebfb5c5dedf1f3cc3f6607b030c -Author: R.D. Vaughan <r.d.vaughan(a)rogers.com> -Date: Mon Nov 5 12:18:27 2012 -0500 - - Fix timezone issue with custom SQL queries. - - Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org> - (cherry picked from commit ee42f13d12721b7566bbb0ec013abff1938f48aa) - -commit bcd34da31f2cd6c5a3a489b942c5ded0414d9aa5 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Mon Nov 5 00:06:20 2012 -0500 - - Use translated title rather than original title for results, if available. - (cherry picked from commit e13600c833eff1919479ecefca5ad18945777c70) - -commit e3087dda66175a6b7308ad5a5e80a35ff7d72fd3 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Sun Oct 28 21:59:38 2012 +0100 - - Internet Content: Remove deprecated YouTube categories - - Fixes #11193 - (cherry picked from commit 7c903d2a90d7962fa6e1ee856d506539ce17c1c8) - -commit 0de21aa876e3117ff98499c5a502affc52b5277e -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Oct 25 15:16:38 2012 -0400 - - Tweak DictData behavior to properly function with Properties. - (cherry picked from commit 662b5e83cfa103fc3aed86c194b2fa2c6b9424d8) - -commit 5e0099555dac1c16f7a76f46996675fa99c7a6b7 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Oct 25 15:14:27 2012 -0400 - - Correct handling of Artwork when database field is set to NULL. - (cherry picked from commit 4646e7f56fc97f62d05d42b5896e8eceb361492e) - -commit 744a595db2273affca4030f4e8879860d72d4683 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Tue Oct 23 15:51:05 2012 -0400 - - Use 'unicode' rather than 'str' for UTF8 compatibility. - (cherry picked from commit 0bc83db48ec08b8df576c6ecbf1049567d34ab7a) - -commit 35389d8f177c94a7b6381b5a63cfcb997d22dc66 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Tue Oct 23 15:42:31 2012 -0400 - - Fix immutable methods in Artwork class. - - This fixes an issue with several immutable methods in the Artwork class, - inherited from the parent UserString class. As the Artwork class is - modified for use as a property, and not intended to be called directly - for storage of a string, the inherited UserString methods that returned - a new instance using the __class__ attribute would fail. This adds a - __new__ method that detects such uses and forces the call to return a - standard str type instead. - (cherry picked from commit 9f66fa0f9a4d9d759b9fdb44f411a4dc1a0748cb) - -commit 163e0e629095401268cf67309d16987ded6a0d72 -Author: Bill <billstuff2001(a)sbcglobal.net> -Date: Fri Oct 12 13:47:27 2012 -0400 - - Fixes #11061. Speed up TFW recovery after falling behind on writes. - - Signed-off-by: Daniel Thor Kristjansson <danielk(a)cuymedia.net> - -commit 143e2de7da6c88d8c9f736e700df2e71130f0882 -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Sun Oct 21 17:30:38 2012 +0200 - - MythUI: Fix double rendering of fading screens - (cherry picked from commit da065e42b2cfa3ea875df1b5c36ce34422f379a0) - -commit 2870590667b4b3b3e13b171c5e81a805d30512ce -Author: Jonatan Lindblad <jlindblad(a)mythtv.org> -Date: Sun Oct 21 13:29:12 2012 +0200 - - MythUI: Fix potential use after free when leaving a web page - - It's not safe to delete a QNetworkAccessManager before the QWebPage it is being - used with since any outstanding QNetworkReplys will be deleted, causing - QWebPage to potentially access free memory. - - Fixes #11168. - (cherry picked from commit 83e88bc0abe21f54daace479ac921c352710c9de) - -commit 8b7f6ce5cb97702718d69bea8e582f5dc26746c9 -Author: Jean-Yves Avenard <jyavenard(a)mythtv.org> -Date: Fri Oct 19 20:47:32 2012 +1100 - - Fix OS X compilation - - Signal SIGRTMIN doesn't exist under OS X so make all this code conditional. - - [cherry-picked from 9f65a657827790687b8ac24daf7a4c581e7535a3] - -commit fdfd45035d322bba1c537546dcf0c392dc1b35d5 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Fri Oct 19 12:12:51 2012 -0400 - - Add -a parameter to tmdb3.py. - (cherry picked from commit 150e57259794084ae6d819ff72cb9977b7cf20bf) - -commit bfc3dfc12d67104f37adafc9d5ad148a13db83c1 -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Fri Oct 19 02:40:57 2012 -0400 - - Add -t parameter to tmdb3.py. - (cherry picked from commit 144c4f5142ad783b5fce7814716816576ee232a7) - -commit 474107b04853831df6e7a0a3ca869a64097602bb -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Thu Oct 18 15:20:35 2012 -0400 - - Fix setting of values to Artwork property. - - This makes the Artwork property derived from a MutableString rather than - a unicode type, allowing the setting of values to work properly, rather - than merely by chance, and correcting an issue where importMetadata - would not apply a coverart value to Video Library entries. - (cherry picked from commit e4b46f0cdc1a18ee5dca94e29229531d928a6dc1) - -commit bff8eb1a1893335f6b96eb6eb8ebd1d567feb9cb -Author: Antonio Marcos Lopez Alonso <amlopezalonso(a)gmail.com> -Date: Tue Oct 16 06:50:16 2012 -0400 - - Updated Spanish/Spain MythFrontend, MythArchive and MythWeather - translation from Antonio Marcos Lopez Alonso. - - Backport of af9d36763 to 0.26-fixes - - Thank you Antonio! - - Closes #11179 + Refs #9833 Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> -commit fd6e25bfe3074507a5f27133dddf34ccd7dbb988 -Author: Nicolas Riendeau <nriendeau(a)mythtv.org> -Date: Mon Oct 15 19:31:32 2012 -0400 +commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff +Author: Scott Shawcroft <scott.shawcroft(a)gmail.com> +Date: Tue Aug 27 22:34:55 2013 -0400 - Updated Polish Mythfrontend and MythWeather translation - from Warpme - - Thank you Warpme and porbas! - - Refs #11178 - -commit 280e7efd82fe2daccee8d5fa542e4610af36124a -Author: Jim Stichnoth <jstichnoth(a)mythtv.org> -Date: Sat Oct 13 16:30:23 2012 -0700 - - Fixes #11151 by correcting a float-to-integer truncation problem. - (cherry picked from commit 4a09ca11c47137a88355a961efd5131c2157d4d7) - -commit aae34c428d30413b6f62aa2279a9189e399ed430 -Author: Morris Cavestro <morriscavestro(a)yahoo.it> -Date: Mon Oct 8 13:51:39 2012 -0400 - - Updated Italian MythMusic translation - from Morris Cavestro - - (Backport to 0.26-fixes) - - Thank you Morris! + Fix the problem of MythWeb failing to load translations - Closes #11167 + Refs #11513 Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> -commit 90ba02c17dd993792f29fb4ac5d2d71fce9670b3 -Merge: ff922bb 624ad5a -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Wed Oct 10 11:01:53 2012 -0400 - - Merge branch 'fixes/0.26' of code.mythtv.org:mythtv into fixes/0.26 - -commit ff922bb074b425d086324b7d89db348f90d623dd -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Wed Oct 10 10:52:24 2012 -0400 - - Add reporting of logging volume to Smolt. - - This reports the logging volume as a percentage of the total amount - stored in the database, for each urgency level. This is intended as a - simple metric to determine stability of MythTV, as higher counts of - higher urgency levels will indicate an increase in problems seen by the - user base. - (cherry picked from commit 5f90b1d62c4d692a6c23ae22ab2047db85e6572e) - -commit 624ad5a3533ba34033debb37f0058da0670cf4e1 -Author: Jesse Crews <jcrews(a)gridlox.net> -Date: Tue Oct 9 10:59:27 2012 +0100 - - Fix mythbackend not exiting after network initialization failure. Fixes #11163 - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - -commit 2d2932ac11ed6d01f05f502a8e373455774ba46a -Author: Lawrence Rust <lvr(a)softsystem.co.uk> -Date: Sun May 6 12:33:35 2012 +0200 - - libmythui: Fix a redraw bug in MythUIType - - While evaluating the ATI Catalyst 'TearFree Desktop' option I noticed - that sometimes a keypress was apparently being held up until the time - on the main menu was updated. Initially I thought that this was a lirc - or fglrx issue, but on investigation it turned out that MythMainWindow::animate - was requesting updates for empty repaint regions. Delving further - showed that MythUIType::Draw was resetting m_DirtyRegion to empty - even if the clipRect was smaller, thus leaving unpainted regions. - - m_DirtyRegion may be extended by HandleMovementPulse, SetRedraw - or SetChildNeedsRedraw etc AFTER GetDirtyArea is called. - So when MythUIType::Draw is called, clipRect may not include the whole - of m_DirtyRegion. - - This patch subtracts the Draw clipRect from m_DirtyRegion instead of - simply emtying it. - - Fixes #10695 - - Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk> - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit 39984eb579369f6cb25cd8f57acb8b23ebcccfc6) - -commit 52c48f983ca3175be983bdaa8c0072b736315d3c -Author: Xavier Hervy <xavier.hervy(a)gmail.com> -Date: Sun Oct 7 19:19:54 2012 +0100 - - Allow adding a channel to an empty channel group from the guide. Update the cached channel group list after adding or removing a channel. Fixes #10411 - - Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org> - (cherry picked from commit 9d5aabc1ed42156bf23a9d0afac0b31fdaedc5e1) - -commit 4c67cedbea9e4b18d7688f30af02bd46e65cd07d -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Oct 6 13:42:21 2012 -0400 +commit 5d8ffe109286269ada87390a2b74e142ec36e364 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Aug 26 22:39:35 2013 +0200 - Read in dbPingHost value from config.xml. + fix merge in schedule templates added in f97529656 - Fixes #11148 - (cherry picked from commit 65a720c9b830ab77bbd2931e03fb428e05dee6f9) - -commit ad5bb8b0929d546ac91324ccee5e7f7f2a49742e -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Sat Oct 6 12:40:36 2012 +0100 - - Only set the BackendServerIP6 setting to ::1 by default if that address is available, otherwise leave it blank - -commit 6b541e74da22ff4daa28dd13425bcc9ffe2c7303 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Sat Oct 6 11:36:59 2012 +0100 - - Log an error if we are unable to find IPv4 or IPv6 addresses, only - exit if we are unable to find any address to bind to - -commit dd0521ec029f5e5413592e93b3beff946fb5499f -Author: Raymond Wagner <rwagner(a)mythtv.org> -Date: Sat Oct 6 04:28:48 2012 -0400 - - Fix single episode grabber for season 0 specials. + if (!$this->$name) ends up as if(!0)... - This makes the check for arguments to grabInetref() look specifically - for None, rather than boolean False, to prevent false positives when - dealing with specials that have a season of 0. - (cherry picked from commit 7da754ad0d350988f324c239477a6587bf88ba1c) - -commit c744347675573dfc690cb263353b3ccc4a950a1a -Author: R.D. Vaughan <r.d.vaughan(a)rogers.com> -Date: Tue Oct 2 13:29:55 2012 -0400 - - Adjust to datetime issues with MythTV v0.26's move to UTC datetimes in DB + Fixes #11775 - Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org> - (cherry picked from commit fcf6da5608cc5621a7bee48120d988352f34189f) - -commit a49c750cfc1a2d3f0b8a46f98e75a0e79b3a79fc -Author: Gavin Hurlbut <ghurlbut(a)mythtv.org> -Date: Tue Oct 2 13:53:03 2012 -0700 - - Force a commit to fixes/0.26 to test the tagging - -commit b4deb185994d6388b55cea18aa3e861c71541101 -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Tue Oct 2 12:05:20 2012 +0100 - - Prevent a segfault in MythUIImage, this doesn't fix the root cause of the problem but at least we won't crash. Refs #11047 + (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560) mythtv-0.26-fixes.patch: b/mythtv/bindings/python/MythTV/database.py | 2 b/mythtv/bindings/python/MythTV/dataheap.py | 6 b/mythtv/bindings/python/MythTV/logging.py | 6 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/setup.py | 4 b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 7 b/mythtv/bindings/python/tmdb3/tmdb3/pager.py | 5 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 2 b/mythtv/i18n/mythfrontend_de.qm |binary b/mythtv/i18n/mythfrontend_de.ts | 22 b/mythtv/libs/libmythbase/logging.cpp | 4 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 6 b/mythtv/libs/libmythmetadata/metadatadownload.cpp | 8 b/mythtv/libs/libmythtv/avformatdecoder.cpp | 2 b/mythtv/libs/libmythtv/decoderbase.cpp | 5 b/mythtv/libs/libmythtv/eithelper.cpp | 29 b/mythtv/programs/mythfrontend/commandlineparser.cpp | 2 b/mythtv/programs/scripts/hardwareprofile/config.py | 5 b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 16 b/mythtv/programs/scripts/hardwareprofile/os_detect.py | 5 b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 8 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 | 640 ---- 27 files changed, 114 insertions(+), 2565 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 mythtv-0.26-fixes.patch Index: mythtv-0.26-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv-0.26-fixes.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mythtv-0.26-fixes.patch 8 May 2013 02:44:06 -0000 1.4 +++ mythtv-0.26-fixes.patch 3 Oct 2013 12:20:50 -0000 1.5 @@ -1,33006 +1,3098 @@ - README.rst | 1 + - mythplugins/mytharchive/i18n/mytharchive_es_es.qm | Bin 36188 -> 36136 bytes - mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45 +- - .../mytharchive/mytharchive/exportnative.cpp | 13 +- - .../mytharchive/mytharchive/importnative.cpp | 12 +- - mythplugins/mytharchive/mytharchive/logviewer.cpp | 53 +- - mythplugins/mytharchive/mytharchive/mythburn.cpp | 5 +- - mythplugins/mytharchive/mytharchivehelper/main.cpp | 421 +-- - .../mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml | 24 +- - .../mythburn/encoder_profiles/ffmpeg_dvd_pal.xml | 24 +- - .../mytharchive/mythburn/scripts/mythburn.py | 17 +- - mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4 +- - mythplugins/mythgame/i18n/mythgame_es_es.ts | 4 +- - mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68 +- - mythplugins/mythmusic/i18n/mythmusic_it.qm | Bin 55341 -> 67158 bytes - mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++++++++++----- - mythplugins/mythmusic/mythmusic/cddb.cpp | 6 +- - mythplugins/mythmusic/mythmusic/cdrip.cpp | 2 +- - mythplugins/mythmusic/mythmusic/decoderhandler.cpp | 9 +- - mythplugins/mythmusic/mythmusic/main.cpp | 73 +- - mythplugins/mythmusic/mythmusic/metadata.cpp | 5 +- - mythplugins/mythmusic/mythmusic/musiccommon.cpp | 13 +- - mythplugins/mythmusic/mythmusic/playersettings.cpp | 2 +- - mythplugins/mythmusic/mythmusic/playlist.cpp | 76 +- - mythplugins/mythmusic/mythmusic/playlist.h | 11 +- - .../mythmusic/mythmusic/playlistcontainer.cpp | 256 +- - .../mythmusic/mythmusic/playlistcontainer.h | 48 +- - mythplugins/mythmusic/mythmusic/pls.cpp | 209 +- - mythplugins/mythmusic/mythmusic/pls.h | 14 +- - mythplugins/mythmusic/mythmusic/shoutcast.cpp | 20 +- - .../mythmusic/mythmusic/visualizationsettings.cpp | 6 + - .../mythmusic/theme/default-wide/music-base.xml | 7 + - .../mythmusic/theme/default-wide/music-ui.xml | 6 +- - mythplugins/mythmusic/theme/default/music-base.xml | 7 + - mythplugins/mythmusic/theme/default/stream-ui.xml | 450 +++ - mythplugins/mythnews/mythnews/newssite.cpp | 66 +- - mythplugins/mythweather/i18n/mythweather_es_es.qm | Bin 23630 -> 23631 bytes - mythplugins/mythweather/i18n/mythweather_es_es.ts | 3 +- - mythplugins/mythweather/i18n/mythweather_pl.qm | Bin 23846 -> 23847 bytes - mythplugins/mythweather/i18n/mythweather_pl.ts | 3 +- - mythtv/bindings/perl/Makefile.PL | 1 - - mythtv/bindings/perl/MythTV.pm | 20 +- - mythtv/bindings/python/MythTV/altdict.py | 2 +- - mythtv/bindings/python/MythTV/dataheap.py | 58 +- - mythtv/bindings/python/MythTV/static.py | 2 +- - mythtv/bindings/python/MythTV/system.py | 4 +- - mythtv/bindings/python/MythTV/utility/dt.py | 12 +- - mythtv/bindings/python/setup.py | 2 +- - mythtv/contrib/imports/mirobridge/mirobridge.py | 101 +- - mythtv/external/FFmpeg/libavcodec/h264.c | 3 + - mythtv/external/FFmpeg/libavcodec/h264_refs.c | 3 + - mythtv/external/FFmpeg/libavcodec/pcm.c | 5 +- - mythtv/external/FFmpeg/libavformat/avidec.c | 9 + - mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c | 1 + - mythtv/external/FFmpeg/libavformat/utils.c | 4 +- - mythtv/i18n/mythfrontend_da.qm | Bin 611287 -> 611700 bytes - mythtv/i18n/mythfrontend_da.ts | 1208 ++++--- - mythtv/i18n/mythfrontend_es_es.qm | Bin 669897 -> 672530 bytes - mythtv/i18n/mythfrontend_es_es.ts | 2180 +++++------ - mythtv/i18n/mythfrontend_pl.qm | Bin 350611 -> 354449 bytes - mythtv/i18n/mythfrontend_pl.ts | 2733 +++++++------- - mythtv/libs/libmyth/audio/audiooutputbase.cpp | 2 +- - mythtv/libs/libmyth/mythcontext.cpp | 2 +- - mythtv/libs/libmyth/mythmediamonitor.cpp | 2 +- - mythtv/libs/libmyth/programinfo.cpp | 22 +- - mythtv/libs/libmythbase/mythdate.cpp | 6 + - mythtv/libs/libmythbase/mythdownloadmanager.cpp | 2 +- - mythtv/libs/libmythbase/mythsystem.cpp | 5 + - mythtv/libs/libmythbase/mythversion.h | 2 +- - mythtv/libs/libmythbase/signalhandling.cpp | 8 +- - mythtv/libs/libmythdvdnav/dvdnav/dvd_types.h | 11 + - mythtv/libs/libmythdvdnav/dvdnav/dvdnav.c | 15 +- - mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h | 9 +- - mythtv/libs/libmythdvdnav/dvdnav/dvdnav_internal.h | 8 + - mythtv/libs/libmythdvdnav/dvdnav/highlight.c | 60 + - mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c | 3 +- - mythtv/libs/libmythdvdnav/dvdread/ifo_read.c | 141 +- - mythtv/libs/libmythdvdnav/dvdread/ifo_types.h | 2 + - .../libs/libmythtv/AirPlay/mythraopconnection.cpp | 153 +- - mythtv/libs/libmythtv/Bluray/bdringbuffer.h | 6 +- - mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp | 4 +- - mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp | 6 + - mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h | 1 + - mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp | 74 +- - mythtv/libs/libmythtv/DVD/dvdringbuffer.h | 6 +- - mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp | 23 +- - mythtv/libs/libmythtv/DeviceReadBuffer.cpp | 7 +- - mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp | 35 +- - mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2 +- - mythtv/libs/libmythtv/analogsignalmonitor.cpp | 6 +- - mythtv/libs/libmythtv/analogsignalmonitor.h | 1 + - mythtv/libs/libmythtv/asirecorder.cpp | 15 +- - mythtv/libs/libmythtv/asirecorder.h | 1 + - mythtv/libs/libmythtv/asisignalmonitor.cpp | 6 +- - mythtv/libs/libmythtv/asisignalmonitor.h | 1 + - mythtv/libs/libmythtv/avformatdecoder.cpp | 230 +- - mythtv/libs/libmythtv/avformatdecoder.h | 6 +- - mythtv/libs/libmythtv/avfringbuffer.cpp | 4 + - mythtv/libs/libmythtv/avfringbuffer.h | 6 +- - mythtv/libs/libmythtv/cc708window.cpp | 2 +- - mythtv/libs/libmythtv/cetonrecorder.cpp | 14 +- - mythtv/libs/libmythtv/cetonrecorder.h | 1 + - mythtv/libs/libmythtv/cetonsignalmonitor.cpp | 6 +- - mythtv/libs/libmythtv/cetonsignalmonitor.h | 1 + - mythtv/libs/libmythtv/decoderbase.h | 6 +- - mythtv/libs/libmythtv/diseqcsettings.cpp | 4 +- - mythtv/libs/libmythtv/dtvrecorder.cpp | 342 +- - mythtv/libs/libmythtv/dtvrecorder.h | 8 +- - mythtv/libs/libmythtv/dvbrecorder.cpp | 14 +- - mythtv/libs/libmythtv/dvbrecorder.h | 1 + - mythtv/libs/libmythtv/dvbsignalmonitor.cpp | 6 +- - mythtv/libs/libmythtv/dvbsignalmonitor.h | 1 + - mythtv/libs/libmythtv/eithelper.cpp | 15 +- - mythtv/libs/libmythtv/filtermanager.cpp | 38 + - mythtv/libs/libmythtv/firewiredevice.cpp | 1 + - mythtv/libs/libmythtv/firewiresignalmonitor.cpp | 6 +- - mythtv/libs/libmythtv/firewiresignalmonitor.h | 1 + - mythtv/libs/libmythtv/hdhrrecorder.cpp | 14 +- - mythtv/libs/libmythtv/hdhrrecorder.h | 1 + - mythtv/libs/libmythtv/hdhrsignalmonitor.cpp | 6 +- - mythtv/libs/libmythtv/hdhrsignalmonitor.h | 1 + - mythtv/libs/libmythtv/iptvsignalmonitor.cpp | 6 +- - mythtv/libs/libmythtv/iptvsignalmonitor.h | 1 + - mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp | 8 +- - mythtv/libs/libmythtv/mpeg/streamlisteners.h | 5 +- - mythtv/libs/libmythtv/mpegrecorder.cpp | 11 +- - mythtv/libs/libmythtv/mythccextractorplayer.cpp | 12 +- - mythtv/libs/libmythtv/mythccextractorplayer.h | 2 +- - mythtv/libs/libmythtv/mythcommflagplayer.cpp | 21 + - mythtv/libs/libmythtv/mythplayer.cpp | 43 +- - mythtv/libs/libmythtv/openglvideo.cpp | 1 + - mythtv/libs/libmythtv/recordingprofile.cpp | 2 +- - mythtv/libs/libmythtv/ringbuffer.h | 4 +- - mythtv/libs/libmythtv/signalmonitor.cpp | 1 + - mythtv/libs/libmythtv/signalmonitor.h | 1 + - mythtv/libs/libmythtv/tv_play.cpp | 13 +- - mythtv/libs/libmythtv/tv_rec.cpp | 6 +- - mythtv/libs/libmythtv/videoout_openglvaapi.cpp | 1 + - mythtv/libs/libmythtv/videosource.cpp | 87 +- - mythtv/libs/libmythui/DisplayRes.cpp | 36 +- - mythtv/libs/libmythui/DisplayResScreen.h | 6 + - mythtv/libs/libmythui/DisplayResX.cpp | 4 +- - mythtv/libs/libmythui/libmythui.pro | 1 + - mythtv/libs/libmythui/mythscreenstack.cpp | 2 +- - mythtv/libs/libmythui/mythuibuttonlist.cpp | 2 +- - mythtv/libs/libmythui/mythuieditbar.cpp | 2 +- - mythtv/libs/libmythui/mythuiimage.cpp | 3 +- - mythtv/libs/libmythui/mythuitype.cpp | 11 +- - mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 +- - mythtv/locales/nl_nl.xml | 37 + - mythtv/programs/mythavtest/main.cpp | 5 +- - mythtv/programs/mythbackend/autoexpire.cpp | 4 +- - mythtv/programs/mythbackend/autoexpire.h | 1 - - mythtv/programs/mythbackend/main.cpp | 5 +- - mythtv/programs/mythbackend/main_helpers.cpp | 4 +- - mythtv/programs/mythbackend/mainserver.cpp | 18 +- - mythtv/programs/mythbackend/scheduler.cpp | 72 +- - mythtv/programs/mythccextractor/main.cpp | 5 +- - mythtv/programs/mythcommflag/README.txt | 10 +- - mythtv/programs/mythcommflag/main.cpp | 5 +- - mythtv/programs/mythfilldatabase/main.cpp | 5 +- - mythtv/programs/mythfilldatabase/xmltvparser.cpp | 12 + - mythtv/programs/mythfrontend/guidegrid.cpp | 17 +- - mythtv/programs/mythfrontend/main.cpp | 5 +- - mythtv/programs/mythfrontend/playbackbox.cpp | 51 +- - mythtv/programs/mythfrontend/playbackbox.h | 6 + - mythtv/programs/mythfrontend/scheduleeditor.cpp | 2 +- - mythtv/programs/mythfrontend/services/frontend.cpp | 2 +- - mythtv/programs/mythfrontend/statusbox.cpp | 8 +- - mythtv/programs/mythjobqueue/main.cpp | 5 +- - mythtv/programs/mythlcdserver/main.cpp | 5 +- - mythtv/programs/mythlogserver/main.cpp | 5 +- - mythtv/programs/mythmediaserver/main.cpp | 5 +- - mythtv/programs/mythmetadatalookup/main.cpp | 5 +- - mythtv/programs/mythpreviewgen/main.cpp | 5 +- - mythtv/programs/mythshutdown/commandlineparser.cpp | 14 +- - mythtv/programs/mythshutdown/main.cpp | 55 +- - mythtv/programs/mythtranscode/main.cpp | 5 +- - mythtv/programs/mythtranscode/mpeg2fix.cpp | 7 +- - mythtv/programs/mythtranscode/mpeg2fix.h | 4 + - mythtv/programs/mythtranscode/transcode.cpp | 6 + - mythtv/programs/mythtv-setup/backendsettings.cpp | 20 +- - mythtv/programs/mythtv-setup/main.cpp | 5 +- - mythtv/programs/mythutil/main.cpp | 6 +- - mythtv/programs/mythwelcome/main.cpp | 5 +- - .../distros/mythtv_data/data_mythtv.py | 20 +- - .../nv_python_libs/youtube/youtube_api.py | 27 +- - mythtv/programs/scripts/metadata/Movie/tmdb3.py | 109 +- - .../MythCenter-wide/htmls/progdetails_page1.html | 4 +- - .../MythCenter-wide/htmls/progdetails_page2.html | 4 +- - mythtv/themes/MythCenter-wide/music-base.xml | 7 + [...35678 lines suppressed...] -- <area>180,15,415,34</area> -+ <area>180,15,800,34</area> - <font>baselarge</font> - </textarea> - - <textarea name="artist" from="basetextarea"> -- <area>180,50,415,35</area> -+ <area>180,50,800,35</area> - <font>basemedium</font> - </textarea> - - <textarea name="album" from="basetextarea"> -- <area>180,80,415,35</area> -+ <area>180,80,800,35</area> - <font>basemedium</font> - </textarea> - -diff --git a/mythtv/themes/MythCenter-wide/schedule-ui.xml b/mythtv/themes/MythCenter-wide/schedule-ui.xml -index e20bfd2..4232de8 100644 ---- a/mythtv/themes/MythCenter-wide/schedule-ui.xml -+++ b/mythtv/themes/MythCenter-wide/schedule-ui.xml -@@ -630,10 +630,10 @@ - <area>220,2,250,24</area> - </textarea> - <textarea name="channelname" from="chanstr"> -- <area>570,2,500,24</area> -+ <area>570,2,550,24</area> - </textarea> - <textarea name="priority" from="chanstr"> -- <area>1140,2,30,24</area> -+ <area>1130,2,40,24</area> - <align>right</align> - </textarea> - </state> -diff --git a/mythtv/themes/MythCenter/htmls/progdetails_page1.html b/mythtv/themes/MythCenter/htmls/progdetails_page1.html -index ef70612..d31c75d 100644 ---- a/mythtv/themes/MythCenter/htmls/progdetails_page1.html -+++ b/mythtv/themes/MythCenter/htmls/progdetails_page1.html -@@ -3,8 +3,8 @@ - <html> - <head> - <style type="text/css"> -- h1 {font-size:15pt;font-style: normal;color:#33FF33} -- p {font-size:15pt;font-style: normal;color:#FFFFFF;margin-top: -10pt} -+ h1 {font-size:15pt;font-style: normal;font-family: sans-serif;color:#33FF33} -+ p {font-size:15pt;font-style: normal;font-family: sans-serif;color:#FFFFFF;margin-top: -10pt} - </style> - </head> - -diff --git a/mythtv/themes/MythCenter/htmls/progdetails_page2.html b/mythtv/themes/MythCenter/htmls/progdetails_page2.html -index a1b2e02..3619729 100644 ---- a/mythtv/themes/MythCenter/htmls/progdetails_page2.html -+++ b/mythtv/themes/MythCenter/htmls/progdetails_page2.html -@@ -3,8 +3,8 @@ - <html> - <head> - <style type="text/css"> -- h1 {font-size:15pt;font-style: normal;color:#33FF33} -- p {font-size:15pt;font-style: normal;color:#FFFFFF;margin-top: -10pt} -+ h1 {font-size:15pt;font-style: normal;font-family: sans-serif;color:#33FF33} -+ p {font-size:15pt;font-style: normal;font-family: sans-serif;color:#FFFFFF;margin-top: -10pt} - </style> - </head> - -diff --git a/mythtv/themes/MythCenter/schedule-ui.xml b/mythtv/themes/MythCenter/schedule-ui.xml -index 68d57fe..7e273f4 100644 ---- a/mythtv/themes/MythCenter/schedule-ui.xml -+++ b/mythtv/themes/MythCenter/schedule-ui.xml -@@ -1327,7 +1327,7 @@ - </shape> - - <webbrowser name="browser"> -- <area>40,65,710,490</area> -+ <area>50,70,700,480</area> - <zoom>1.0</zoom> - <background color="#131564"/> - </webbrowser> -diff --git a/mythtv/themes/Terra/weather-ui.xml b/mythtv/themes/Terra/weather-ui.xml -index ac55fb6..0b78f27 100644 ---- a/mythtv/themes/Terra/weather-ui.xml -+++ b/mythtv/themes/Terra/weather-ui.xml -@@ -156,10 +156,15 @@ - </textarea> - - <textarea name="copyright" from="basetextarea"> -- <area>70,640,1140,40</area> -+ <area>70,640,850,40</area> - <align>left,vcenter</align> - <font>basesmaller</font> - </textarea> -+ -+ <imagetype name="copyrightlogo"> -+ <area>940,617,240,60</area> -+ <preserveaspect>true</preserveaspect> -+ </imagetype> - </window> - - <window name="Three Day Forecast"> -@@ -265,10 +270,15 @@ - </textarea> - - <textarea name="copyright" from="basetextarea"> -- <area>70,640,1140,40</area> -+ <area>70,640,850,40</area> - <align>left,vcenter</align> - <font>basesmaller</font> - </textarea> -+ -+ <imagetype name="copyrightlogo"> -+ <area>940,617,240,60</area> -+ <preserveaspect>true</preserveaspect> -+ </imagetype> - </window> - - <window name="Six Day Forecast"> -@@ -428,10 +438,15 @@ - </textarea> - - <textarea name="copyright" from="basetextarea"> -- <area>70,640,1140,40</area> -+ <area>70,640,850,40</area> - <align>left,vcenter</align> - <font>basesmaller</font> - </textarea> -+ -+ <imagetype name="copyrightlogo"> -+ <area>940,617,240,60</area> -+ <preserveaspect>true</preserveaspect> -+ </imagetype> - </window> - - <window name="Static Map"> -@@ -447,10 +462,15 @@ - </imagetype> - - <textarea name="copyright" from="basetextarea"> -- <area>70,640,1140,40</area> -+ <area>70,640,850,40</area> - <align>left,vcenter</align> - <font>basesmaller</font> - </textarea> -+ -+ <imagetype name="copyrightlogo"> -+ <area>940,617,240,60</area> -+ <preserveaspect>true</preserveaspect> -+ </imagetype> - </window> - - <window name="Animated Map"> -@@ -467,10 +487,15 @@ - </imagetype> - - <textarea name="copyright" from="basetextarea"> -- <area>70,640,1140,40</area> -+ <area>70,640,850,40</area> - <align>left,vcenter</align> - <font>basesmaller</font> - </textarea> -+ -+ <imagetype name="copyrightlogo"> -+ <area>940,617,240,60</area> -+ <preserveaspect>true</preserveaspect> -+ </imagetype> - </window> - - <window name="Severe Weather Alerts"> -@@ -488,10 +513,15 @@ - </textarea> - - <textarea name="copyright" from="basetextarea"> -- <area>70,640,1140,40</area> -+ <area>70,640,850,40</area> - <align>left,vcenter</align> - <font>basesmaller</font> - </textarea> -+ -+ <imagetype name="copyrightlogo"> -+ <area>940,617,240,60</area> -+ <preserveaspect>true</preserveaspect> -+ </imagetype> - </window> - - <window name="18 Hour Forecast"> -@@ -652,10 +682,15 @@ - </textarea> - - <textarea name="copyright" from="basetextarea"> -- <area>70,640,1140,40</area> -+ <area>70,640,850,40</area> - <align>left,vcenter</align> - <font>basesmaller</font> - </textarea> -+ -+ <imagetype name="copyrightlogo"> -+ <area>940,617,240,60</area> -+ <preserveaspect>true</preserveaspect> -+ </imagetype> - </window> - - <window name="global-setup"> Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/EL-6/mythtv.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- mythtv.spec 8 May 2013 02:44:06 -0000 1.93 +++ mythtv.spec 3 Oct 2013 12:20:52 -0000 1.94 @@ -60,13 +60,9 @@ %define desktop_vendor RPMFusion # Git revision and branch ID -%define _gitrev v0.26.0-153-gb02d25a +%define _gitrev v0.26.1-24-g9fd7c61 %define branch fixes/0.26 -# Mythtv and plugins from github.com -%global githash1 g6c3ae81 -%global githash2 d2f9798 - # # Basic descriptive tags for this package: # @@ -76,11 +72,11 @@ Group: Applications/Multimedia # Version/Release info -Version: 0.26.0 +Version: 0.26.1 %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 9%{?dist} +Release: 4%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -106,10 +102,12 @@ %if 0%{?rhel} %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} %define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0} +%define with_vpx %{?_without_vpx: 1} %{?!_without_vpx: 0} %else %define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1} %define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1} +%define with_vpx %{?_without_vpx: 0} %{?!_without_vpx: 1} %endif %define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} @@ -135,13 +133,16 @@ ################################################################################ # https://github.com/MythTV/mythtv/tarball/v0.26 -Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz +Source0: %{name}-%{version}.tar.gz # From the mythtv git repository with the appropriate branch checked out: # git diff -p --stat v0.26.0 > mythtv-0.26-fixes.patch Patch0: mythtv-0.26-fixes.patch Patch1: mythlogserver-segv.patch Patch2: mythtv-0.26.0-types_h.patch +Patch3: mythtv-0.26.1-libva_121.patch +# http://code.mythtv.org/trac/ticket/11338 +Patch4: mythtv-0.26-libcec2.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -184,6 +185,10 @@ BuildRequires: qt-devel >= 4.6 BuildRequires: phonon-devel phonon-backend-gstreamer BuildRequires: libuuid-devel +%if 0%{?fedora} +BuildRequires: libcec-devel +BuildRequires: libvpx-devel +%endif BuildRequires: lm_sensors-devel BuildRequires: lirc-devel @@ -362,6 +367,7 @@ Requires: mysql-server >= 5, mysql >= 5 %endif Requires: xmltv +Requires: udisks # Generate the required mythtv-frontend-api version string here so we only # have to do it once. @@ -826,7 +832,7 @@ ################################################################################ %prep -%setup -q -n MythTV-%{name}-%{githash2} +%setup -q # Replace static lib paths with %{_lib} so we build properly on x86_64 # systems, where the libs are actually in lib64. @@ -837,6 +843,8 @@ %patch0 -p1 -b .mythtv %patch1 -p1 -b .mythlogserver %patch2 -p1 -b .types_h +%patch3 -p1 -b .libva +%patch4 -p1 -b .libcec # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -909,6 +917,9 @@ --enable-libx264 \ --enable-libtheora --enable-libvorbis \ --enable-libxvid \ +%if %{with_vpx} + --enable-libvpx \ +%endif %if %{with_vdpau} --enable-vdpau \ %endif @@ -947,9 +958,11 @@ %endif --enable-debug -# Insert rpm version-release for mythbackend --version output - echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION - echo 'BRANCH="%{branch}"' >> VERSION +# Set the mythtv --version string + cat > VERSION <<EOF +SOURCE_VERSION=%{_gitrev} +BRANCH=%{branch} +EOF # Make make %{?_smp_mflags} @@ -1167,6 +1180,7 @@ usermod -a -G audio,video mythtv exit 0 +%if %{with_mythmusic} %pre -n mythmusic # Add the "mythtv" user, with membership in the audio and video group getent group mythtv >/dev/null || groupadd -r mythtv @@ -1177,6 +1191,7 @@ # or new installs. usermod -a -G audio,video mythtv exit 0 +%endif %post backend %if %{with_systemd} @@ -1391,7 +1406,7 @@ %{_libdir}/mythtv/plugins/libmythgame.so %dir %{_datadir}/mythtv/games %{_datadir}/mythtv/games/* -%dir %{_datadir}/mame/screens +%{_datadir}/mame/screens %dir %{_datadir}/mame/flyers %{_datadir}/mythtv/game_settings.xml %{_datadir}/mythtv/i18n/mythgame_*.qm @@ -1458,6 +1473,22 @@ %changelog +* Tue Oct 1 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-4 +- Update to latest bugfix release. +- Add patch for libcec 2. +- Update to latest bugfix release. +- Add udisks as a requirement as it is required for ejecting cd/dvds. + +* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.1-2 +- Rebuilt + +* Thu Aug 22 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1 +- Update to latest bugfix release. +- Add patch for new libva 1.2.1 version in rawhide. + +* Sat Jul 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.0-10 +- Rebuilt for x264 + * Mon May 06 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-9 - Update to latest fixes/0.26, v0.26.0-153-gb02d25a. - Fixes long standing issue with transcoding on EL.

10 years, 7 months

1
0
0 / 0

rpms/mythtv/F-18 mythtv-0.26-libcec2.patch, NONE, 1.1 ChangeLog, 1.8, 1.9 mythtv-0.26-fixes.patch, 1.5, 1.6 mythtv.spec, 1.111, 1.112

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18463 Modified Files: ChangeLog mythtv-0.26-fixes.patch mythtv.spec Added Files: mythtv-0.26-libcec2.patch Log Message: * Tue Oct 1 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-4 - Update to latest bugfix release. - Add patch for libcec 2. - Update to latest bugfix release. - Add udisks as a requirement as it is required for ejecting cd/dvds. mythtv-0.26-libcec2.patch: configure | 4 libs/libmythui/cecadapter.cpp | 267 +++++++++++++++++++++++++++++++----------- libs/libmythui/cecadapter.h | 1 3 files changed, 205 insertions(+), 67 deletions(-) --- NEW FILE mythtv-0.26-libcec2.patch --- diff --git a/mythtv/configure b/mythtv/configure index 7ab8aa7..7d5e39d 100755 --- a/mythtv/configure +++ b/mythtv/configure @@ -5178,10 +5178,12 @@ using namespace std; using namespace CEC; #include <libcec/cecloader.h> int main(void) { + if (CEC_LIB_VERSION_MAJOR == 2) + return 1; if (CEC_LIB_VERSION_MAJOR < 1 || (CEC_LIB_VERSION_MAJOR == 1 && CEC_LIB_VERSION_MINOR < 5)) return 0; - return (long) LibCecInit; + return 1; } EOF fi diff --git a/mythtv/libs/libmythui/cecadapter.cpp b/mythtv/libs/libmythui/cecadapter.cpp index edad8f6..5987d5d 100644 --- a/mythtv/libs/libmythui/cecadapter.cpp +++ b/mythtv/libs/libmythui/cecadapter.cpp @@ -14,9 +14,28 @@ #include "cecadapter.h" #include <vector> -#define MIN_LIBCEC_VERSION 1 +#ifdef CEC_CLIENT_VERSION_CURRENT // 2.0.3 and up +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_CURRENT; +#else +#ifdef LIBCEC_VERSION_CURRENT // 1.6.2 and up +#define CEC_CONFIG_VERSION LIBCEC_VERSION_CURRENT; +#else +#define CEC_CONFIG_VERSION 0; +#endif +#endif + #define MAX_CEC_DEVICES 10 #define LOC QString("CECAdapter: ") +#define OSDNAME "MythTv" + +// TODO remove if we have a ui. +// hard code logical and physical address +#define CEC_DEFAULT_DEVICE_TYPE CEC_DEVICE_TYPE_RECORDING_DEVICE +#undef CEC_DEFAULT_HDMI_PORT +#define CEC_DEFAULT_HDMI_PORT 2 +#undef CEC_DEFAULT_BASE_DEVICE +#define CEC_DEFAULT_BASE_DEVICE CECDEVICE_AUDIOSYSTEM +#define CEC_DEFAULT_PHYSICALADDRESS (quint16)0x2200 #include <libcec/cec.h> #include <iostream> @@ -25,17 +44,26 @@ using namespace std; #include <libcec/cecloader.h> QMutex* CECAdapter::gLock = new QMutex(QMutex::Recursive); +bool resetSafe = false; class CECAdapterPriv { public: CECAdapterPriv() - : adapter(NULL), defaultDevice("auto"), defaultHDMIPort(1), - defaultDeviceID(CECDEVICE_PLAYBACKDEVICE1), timer(NULL), valid(false), + : adapter(NULL), defaultDevice("auto"), defaultHDMIPort(CEC_DEFAULT_HDMI_PORT), + defaultDeviceID(CEC_DEFAULT_DEVICE_TYPE), timer(NULL), valid(false), powerOffTV(false), powerOffTVAllowed(false), powerOffTVOnExit(false), powerOnTV(false), powerOnTVAllowed(false), powerOnTVOnStart(false), switchInput(false), switchInputAllowed(true) { + callbacks.Clear(); + callbacks.CBCecLogMessage = LogMessages; + callbacks.CBCecKeyPress = HandleKeyPresses; + callbacks.CBCecCommand = HandleCommands; + callbacks.CBCecConfigurationChanged = HandleConfigurationChanged; + callbacks.CBCecAlert = HandleAlerts; + callbacks.CBCecMenuStateChanged = HandleMenuStateChanged; + callbacks.CBCecSourceActivated = HandleSourceActivated; } static QString addressToString(enum cec_logical_address addr, bool source) @@ -69,14 +97,15 @@ class CECAdapterPriv static QStringList GetDeviceList(void) { QStringList results; - cec_device_type_list list; - list.Clear(); - list.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); - ICECAdapter *adapter = LibCecInit("MythTV", list); + libcec_configuration configuration; + configuration.Clear(); + ICECAdapter *adapter = LibCecInitialise(&configuration); if (!adapter) return results; cec_adapter *devices = new cec_adapter[MAX_CEC_DEVICES]; uint8_t num_devices = adapter->FindAdapters(devices, MAX_CEC_DEVICES, NULL); + LOG(VB_GENERAL, LOG_INFO, LOC + QString("GetDeviceList() found %1 devices(s).") + .arg(num_devices)); if (num_devices < 1) return results; for (uint8_t i = 0; i < num_devices; i++) @@ -89,39 +118,112 @@ class CECAdapterPriv { // get settings // N.B. these do not currently work as there is no UI + + // There is no way current CEC adapters can find their physical address + // on their own. The are only connected to the CEC pin of the HDMI connector. + // To construct a valid physical address libCEC needs: + // - the HDMI port (number) Myth is connected to + // - the HDMI device (TV, Receiver) Myth is connected to (the logical address) + + //The CEC adapter we want to connect to defaultDevice = gCoreContext->GetSetting(LIBCEC_DEVICE, "auto").trimmed(); + // The number of the HDMI port Myth is connected to QString hdmi_port = gCoreContext->GetSetting(LIBCEC_PORT, "auto"); + // The logical address of the HDMI device Myth is connected to + QString base_dev = gCoreContext->GetSetting(LIBCEC_BASE, "auto"); + // Device type we want Myth to use QString device_id = gCoreContext->GetSetting(LIBCEC_DEVICEID, "auto"); powerOffTVAllowed = (bool)gCoreContext->GetNumSetting(POWEROFFTV_ALLOWED, 1); powerOffTVOnExit = (bool)gCoreContext->GetNumSetting(POWEROFFTV_ONEXIT, 1); powerOnTVAllowed = (bool)gCoreContext->GetNumSetting(POWERONTV_ALLOWED, 1); powerOnTVOnStart = (bool)gCoreContext->GetNumSetting(POWERONTV_ONSTART, 1); - defaultHDMIPort = 1; if ("auto" != hdmi_port) { defaultHDMIPort = hdmi_port.toInt(); - if (defaultHDMIPort < 1 || defaultHDMIPort > 3) - defaultHDMIPort = 1; + if (defaultHDMIPort < CEC_MIN_HDMI_PORTNUMBER || defaultHDMIPort > CEC_MAX_HDMI_PORTNUMBER) + defaultHDMIPort = CEC_DEFAULT_HDMI_PORT; + } + else + { + defaultHDMIPort = CEC_DEFAULT_HDMI_PORT; } - defaultHDMIPort = defaultHDMIPort << 12; - defaultDeviceID = CECDEVICE_PLAYBACKDEVICE1; if ("auto" != device_id) { int id = device_id.toInt(); - if (id < 1 || id > 3) - id = 1; - defaultDeviceID = (id == 1) ? CECDEVICE_PLAYBACKDEVICE1 : - ((id == 2) ? CECDEVICE_PLAYBACKDEVICE2 : - CECDEVICE_PLAYBACKDEVICE3); + switch (id) + { + case CEC_DEVICE_TYPE_TV: + case CEC_DEVICE_TYPE_RECORDING_DEVICE: + case CEC_DEVICE_TYPE_RESERVED: + case CEC_DEVICE_TYPE_TUNER: + case CEC_DEVICE_TYPE_PLAYBACK_DEVICE: + case CEC_DEVICE_TYPE_AUDIO_SYSTEM: + defaultDeviceID = (cec_device_type)id; + break; + default: + defaultDeviceID = CEC_DEFAULT_DEVICE_TYPE; + break; + } + } + else + { + defaultDeviceID = CEC_DEFAULT_DEVICE_TYPE; } + LOG(VB_GENERAL, LOG_INFO, LOC + QString("base_dev= %1.") + .arg(base_dev)); + if ("auto" != base_dev) + { + base_device = (cec_logical_address)base_dev.toInt(); + LOG(VB_GENERAL, LOG_INFO, LOC + QString("base_device= %1.") + .arg(base_device)); + switch (base_device) + { + case CECDEVICE_TV: + case CECDEVICE_RECORDINGDEVICE1: + case CECDEVICE_RECORDINGDEVICE2: + case CECDEVICE_TUNER1: + case CECDEVICE_PLAYBACKDEVICE1: + case CECDEVICE_AUDIOSYSTEM: + case CECDEVICE_TUNER2: + case CECDEVICE_TUNER3: + case CECDEVICE_PLAYBACKDEVICE2: + case CECDEVICE_RECORDINGDEVICE3: + case CECDEVICE_TUNER4: + case CECDEVICE_PLAYBACKDEVICE3: + case CECDEVICE_FREEUSE: + break; + case CECDEVICE_UNKNOWN: + case CECDEVICE_RESERVED1: + case CECDEVICE_RESERVED2: + case CECDEVICE_BROADCAST: + default: + base_device = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE; + break; + } + } + else + { + base_device = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE; + } + // create adapter interface - cec_device_type_list list; - list.Clear(); - list.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); - adapter = LibCecInit("MythTV", list); + libcec_configuration configuration; + configuration.Clear(); + configuration.clientVersion = LIBCEC_VERSION_CURRENT; + snprintf(configuration.strDeviceName, 13, "MythTV"); + configuration.deviceTypes.Add(defaultDeviceID); + configuration.iPhysicalAddress = CEC_DEFAULT_PHYSICALADDRESS; + configuration.iHDMIPort = defaultHDMIPort; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("using HDMI port %1.") + .arg(defaultHDMIPort)); + configuration.baseDevice = base_device; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("using base device %1.") + .arg(configuration.baseDevice)); + configuration.callbacks = &callbacks; + ICECAdapter *adapter = LibCecInitialise(&configuration); if (!adapter) { @@ -129,12 +231,12 @@ class CECAdapterPriv return false; } - if (adapter->GetMinLibVersion() > MIN_LIBCEC_VERSION) + if ((configuration.serverVersion >> 12) > CEC_MIN_LIB_VERSION) { LOG(VB_GENERAL, LOG_ERR, LOC + QString("The installed libCEC supports version %1 and above. " "This version of MythTV only supports version %2.") - .arg(adapter->GetMinLibVersion()).arg(MIN_LIBCEC_VERSION)); + .arg(configuration.serverVersion).arg(CEC_MIN_LIB_VERSION)); return false; } @@ -185,12 +287,6 @@ class CECAdapterPriv // get the vendor ID (for non-standard implementations) adapter->GetDeviceVendorId(CECDEVICE_TV); - // set the physical address - adapter->SetPhysicalAddress(defaultHDMIPort); - - // set the logical address - adapter->SetLogicalAddress(defaultDeviceID); - // switch input (if configured) switchInput = true; HandleActions(); @@ -210,7 +306,6 @@ class CECAdapterPriv // delete adapter adapter->Close(); - LogMessages(); UnloadLibCec(adapter); LOG(VB_GENERAL, LOG_INFO, LOC + "Closing down CEC."); @@ -219,14 +314,12 @@ class CECAdapterPriv adapter = NULL; } - void LogMessages(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int LogMessages(void *, const cec_log_message &message) + #else + static int LogMessages(void *, const cec_log_message message) + #endif { - if (!adapter || !valid) - return; - - cec_log_message message; - while (adapter->GetNextLogMessage(&message)) - { QString msg(message.message); int lvl = LOG_UNKNOWN; switch (message.level) @@ -237,19 +330,15 @@ class CECAdapterPriv case CEC_LOG_DEBUG: lvl = LOG_DEBUG; break; } LOG(VB_GENERAL, lvl, LOC + QString("%1").arg(msg)); - } + return 0; } - void HandleCommands(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleCommands(void * /*cbParam*/, const cec_command &command) + #else + static int HandleCommands(void * /*cbParam*/, const cec_command command) + #endif { - if (!adapter || !valid) - return; - - LogMessages(); - - cec_command command; - while (adapter->GetNextCommand(&command)) - { LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Command %1 from '%2' (%3) - destination '%4' (%5)") .arg(command.opcode) @@ -260,27 +349,76 @@ class CECAdapterPriv switch (command.opcode) { - // TODO + // TODO handle CEC commands. default: break; } - } + return 0; + } - LogMessages(); + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration &config) + #else + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration config) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + "Adapter configuration changed."); + return 1; } - void HandleKeyPresses(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter & /*param*/) + #else + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter /*param*/) + #endif { - if (!adapter || !valid) - return; + switch (type) // TODO Handle alerts. + { + case CEC_ALERT_CONNECTION_LOST: + LOG(VB_GENERAL, LOG_ERR, LOC + "Connection lost - TODO: need to handle this!"); + break; + default: + LOG(VB_GENERAL, LOG_ERR, LOC + "Received unknown alert."); + break; + } + return 0; + } - cec_keypress key; - if (!adapter->GetNextKeypress(&key)) - return; + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state &state) + #else + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state state) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("CEC menu state %1") + .arg(state == CEC_MENU_STATE_ACTIVATED ? "Activated" : "Deactivated")); + return 1; + } + #if CEC_LIB_VERSION_MAJOR < 2 + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address &address, const &uint8_t activated) + #else + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address address, const uint8_t activated) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("Source %1 %2") + .arg(address).arg(activated ? "Activated" : "Deactivated")); + + if (activated && resetSafe) + GetMythUI()->ResetScreensaver(); + else + resetSafe = true; + } + + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress &key) + #else + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress key) + #endif + { // Ignore key down events and wait for the key 'up' if (key.duration < 1) - return; + return 0; QString code; int action = 0; @@ -595,13 +733,12 @@ class CECAdapterPriv .arg(code).arg(0 == action ? "(Not actioned)" : "")); if (0 == action) - return; + return 0; GetMythUI()->ResetScreensaver(); QKeyEvent* ke = new QKeyEvent(QEvent::KeyPress, action, Qt::NoModifier); qApp->postEvent(GetMythMainWindow(), (QEvent*)ke); - - LogMessages(); + return 0; } void HandleActions(void) @@ -629,7 +766,7 @@ class CECAdapterPriv // HDMI input if (switchInput && switchInputAllowed) { - if (adapter->SetActiveView()) + if (adapter->SetActiveSource()) LOG(VB_GENERAL, LOG_INFO, LOC + "Asked TV to switch to this input."); else LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to switch to this input."); @@ -638,14 +775,14 @@ class CECAdapterPriv powerOffTV = false; powerOnTV = false; switchInput = false; - - LogMessages(); } ICECAdapter *adapter; + ICECCallbacks callbacks; QString defaultDevice; int defaultHDMIPort; - cec_logical_address defaultDeviceID; + cec_device_type defaultDeviceID; + cec_logical_address base_device; QTimer *timer; bool valid; bool powerOffTV; @@ -728,8 +865,6 @@ void CECAdapter::Action(const QString &action) void CECAdapter::Process(void) { gLock->lock(); - m_priv->HandleCommands(); - m_priv->HandleKeyPresses(); m_priv->HandleActions(); gLock->unlock(); } diff --git a/mythtv/libs/libmythui/cecadapter.h b/mythtv/libs/libmythui/cecadapter.h index e9cf6d6..bb5eba8 100644 --- a/mythtv/libs/libmythui/cecadapter.h +++ b/mythtv/libs/libmythui/cecadapter.h @@ -7,6 +7,7 @@ #define LIBCEC_ENABLED QString("libCECEnabled") #define LIBCEC_DEVICE QString("libCECDevice") #define LIBCEC_PORT QString("libCECPort") +#define LIBCEC_BASE QString("libCECBase") #define LIBCEC_DEVICEID QString("libCECDeviceID") #define POWEROFFTV_ALLOWED QString("PowerOffTVAllowed") #define POWEROFFTV_ONEXIT QString("PowerOffTVOnExit") Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/F-18/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ChangeLog 23 Aug 2013 18:30:50 -0000 1.8 +++ ChangeLog 3 Oct 2013 12:05:36 -0000 1.9 @@ -1,19 +1,36 @@ -commit 6a46ea014907ac0ee010bed9d8896cb2ee09bc2d -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Mon Aug 19 14:25:56 2013 +0100 +commit 33f0177459ded1ed3ca63c319bb825e3ee3a6d56 +Author: Martin Bene <myth(a)bene.priv.at> +Date: Sat Sep 14 16:27:22 2013 -0400 - Disable database logging by default. + Fix MythWeb's date/time handling - It can be re-enabled using --enable-dblog + The code in question has partially changed so I am applying part of Martin's patch + (the section that clears to session variables) to fix the problem. - Until we actually start using this data somewhere there is not much - point in storing it. Since it's already known that writing to the - database can affect I/O performance, especially where drives are - shared with recordings, this could potentially even cause a positive - feedback loop. The I/O starvation causes the backend to start logging - slow read/write warnings, which in turn increase the writes to the - database exacerbating the problems. - - The same problem is also true, to a greater or lesser extent with file - based logging but we actually need the file logs so there isn't much - we can do there. + Thank you Martin! + + Refs #9833 + + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> + +commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff +Author: Scott Shawcroft <scott.shawcroft(a)gmail.com> +Date: Tue Aug 27 22:34:55 2013 -0400 + + Fix the problem of MythWeb failing to load translations + + Refs #11513 + + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> + +commit 5d8ffe109286269ada87390a2b74e142ec36e364 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Aug 26 22:39:35 2013 +0200 + + fix merge in schedule templates added in f97529656 + + if (!$this->$name) ends up as if(!0)... + + Fixes #11775 + + (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560) mythtv-0.26-fixes.patch: b/mythtv/bindings/python/MythTV/database.py | 2 b/mythtv/bindings/python/MythTV/dataheap.py | 6 b/mythtv/bindings/python/MythTV/logging.py | 6 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/setup.py | 4 b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 7 b/mythtv/bindings/python/tmdb3/tmdb3/pager.py | 5 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 2 b/mythtv/i18n/mythfrontend_de.qm |binary b/mythtv/i18n/mythfrontend_de.ts | 22 b/mythtv/libs/libmythbase/logging.cpp | 4 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 6 b/mythtv/libs/libmythmetadata/metadatadownload.cpp | 8 b/mythtv/libs/libmythtv/avformatdecoder.cpp | 2 b/mythtv/libs/libmythtv/decoderbase.cpp | 5 b/mythtv/libs/libmythtv/eithelper.cpp | 29 b/mythtv/programs/mythfrontend/commandlineparser.cpp | 2 b/mythtv/programs/scripts/hardwareprofile/config.py | 5 b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 16 b/mythtv/programs/scripts/hardwareprofile/os_detect.py | 5 b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 8 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 | 640 ---- 27 files changed, 114 insertions(+), 2565 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 mythtv-0.26-fixes.patch Index: mythtv-0.26-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-18/mythtv-0.26-fixes.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mythtv-0.26-fixes.patch 23 Aug 2013 18:30:50 -0000 1.5 +++ mythtv-0.26-fixes.patch 3 Oct 2013 12:05:36 -0000 1.6 @@ -1,11 +1,2198 @@ - mythtv/libs/libmythbase/logging.cpp | 2 +- - mythtv/libs/libmythbase/mythcommandlineparser.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) + mythtv/bindings/python/MythTV/database.py | 2 +- + mythtv/bindings/python/MythTV/dataheap.py | 6 +- + mythtv/bindings/python/MythTV/logging.py | 6 +- + mythtv/bindings/python/MythTV/system.py | 11 +- + .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 -- + .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 --- + mythtv/bindings/python/MythTV/tmdb/__init__.py | 0 + mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 -------------------- + .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - + mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 ---- + mythtv/bindings/python/setup.py | 4 +- + mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 7 +- + mythtv/bindings/python/tmdb3/tmdb3/pager.py | 5 +- + mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 2 +- + mythtv/i18n/mythfrontend_de.qm | Bin 630506 -> 630506 bytes + mythtv/i18n/mythfrontend_de.ts | 22 +- + mythtv/libs/libmythbase/logging.cpp | 4 +- + mythtv/libs/libmythbase/mythcommandlineparser.cpp | 6 +- + mythtv/libs/libmythmetadata/metadatadownload.cpp | 8 +- + mythtv/libs/libmythtv/avformatdecoder.cpp | 2 +- + mythtv/libs/libmythtv/decoderbase.cpp | 5 +- + mythtv/libs/libmythtv/eithelper.cpp | 29 +- + mythtv/programs/mythfrontend/commandlineparser.cpp | 2 +- + mythtv/programs/scripts/hardwareprofile/config.py | 5 + + .../distros/mythtv_data/data_mythtv.py | 16 +- + .../programs/scripts/hardwareprofile/os_detect.py | 5 + + mythtv/programs/scripts/metadata/Movie/tmdb.py | 640 ---------- + mythtv/programs/scripts/metadata/Movie/tmdb3.py | 8 +- + 28 files changed, 114 insertions(+), 2565 deletions(-) +diff --git a/mythtv/bindings/python/MythTV/database.py b/mythtv/bindings/python/MythTV/database.py +index 525a213..368fb9e 100644 +--- a/mythtv/bindings/python/MythTV/database.py ++++ b/mythtv/bindings/python/MythTV/database.py +@@ -835,7 +835,7 @@ class DatabaseConfig( object ): + database = QuickProperty('_database', 'mythconverg') + + @QuickProperty('_profile', gethostname()) +- def profile(self, value): ++ def profile(value): + if value == 'my-unique-identifier-goes-here': + raise Exception + return value +diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py +index 4a17d6b..268d007 100644 +--- a/mythtv/bindings/python/MythTV/dataheap.py ++++ b/mythtv/bindings/python/MythTV/dataheap.py +@@ -1136,7 +1136,7 @@ class VideoGrabber( Grabber ): + def __init__(self, mode, lang='en', db=None): + dbvalue = {'tv':'TelevisionGrabber', 'movie':'MovieGrabber'} + path = {'tv':'metadata/Television/ttvdb.py', +- 'movie':'metadata/Movie/tmdb.py'} ++ 'movie':'metadata/Movie/tmdb3.py'} + self.mode = mode.lower() + try: + Grabber.__init__(self, setting=dbvalue[self.mode], db=db, +@@ -1144,6 +1144,10 @@ class VideoGrabber( Grabber ): + prefix=os.path.join(INSTALL_PREFIX, 'share/mythtv')) + except KeyError: + raise MythError('Invalid MythVideo grabber') ++ ++ if self.path[-7:] == 'tmdb.py': ++ self.path = self.path[:-7] + 'tmdb3.py' ++ + self.append('-l',lang) + + #### MYTHNETVISION #### +diff --git a/mythtv/bindings/python/MythTV/logging.py b/mythtv/bindings/python/MythTV/logging.py +index f27387f..45ace32 100644 +--- a/mythtv/bindings/python/MythTV/logging.py ++++ b/mythtv/bindings/python/MythTV/logging.py +@@ -409,11 +409,15 @@ class MythLog( LOGLEVEL, LOGMASK, LOGFACILITY ): + def _logdatabase(self, mask, level, message, detail): + if self.db and self._DBLOG: + with self.db.cursor(DummyLogger()) as cursor: ++ application = argv[0] ++ if '/' in application: ++ application = application.rsplit('/', 1)[1] ++ + cursor.execute("""INSERT INTO logging + (host, application, pid, thread, + msgtime, level, message) + VALUES (?, ?, ?, ?, ?, ?, ?)""", +- (self.db.gethostname(), argv[0].rsplit('/', 1)[1], ++ (self.db.gethostname(), application, + os.getpid(), self.module, self.time(), level, + message + (' -- {0}'.format(detail) if detail else ''))) + +diff --git a/mythtv/bindings/python/MythTV/system.py b/mythtv/bindings/python/MythTV/system.py +index f24c8a9..44803bd 100644 +--- a/mythtv/bindings/python/MythTV/system.py ++++ b/mythtv/bindings/python/MythTV/system.py +@@ -79,10 +79,17 @@ class System( DBCache ): + self.path = None + + if setting is not None: +- # pull setting from database, substitute from argument if needed ++ # pull local setting from database + host = self.gethostname() + self.path = self.settings[host][setting] +- if (self.path is None) and (path is None): ++ if self.path is None: ++ # see if that setting is applied globally ++ self.path = self.settings['NULL'][setting] ++ if self.path is None: ++ # not set globally either, use supplied default ++ self.path = path ++ if self.path is None: ++ # no default supplied, just error out + raise MythDBError(MythError.DB_SETTING, setting, host) + + if self.path is None: +diff --git a/mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl b/mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl +deleted file mode 100644 +index f87b72a..0000000 +--- a/mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl ++++ /dev/null +@@ -1,99 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8"?> +- +-<xsl:stylesheet version="1.0" +- xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +- xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" +- xmlns:tmdbXpath="http://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format"> +- +- <xsl:output method="xml" indent="yes" version="1.0" encoding="UTF-8" omit-xml-declaration="yes"/> +- +-  +- <xsl:template match="/"> +- <xsl:if test="not(string(opensearch:totalResults)='0')"> +- <metadata> +- <xsl:call-template name='movieQuery'/> +- </metadata> +- </xsl:if> +- </xsl:template> +- +- <xsl:template name="movieQuery"> +- <xsl:for-each select="//movie"> +- <item> +- <language><xsl:value-of select="normalize-space(language)"/></language> +- <xsl:for-each select="tmdbXpath:titleElement(string(name))"> +- <title><xsl:value-of select="normalize-space(./@title)"/></title> +- <xsl:if test="./@subtitle"> +- <subtitle><xsl:value-of select="normalize-space(./@subtitle)"/></subtitle> +- </xsl:if> +- </xsl:for-each> +- <inetref><xsl:value-of select="normalize-space(id)"/></inetref> +- <imdb><xsl:value-of select="normalize-space(substring-after(string(imdb_id), 'tt'))"/></imdb> +- <userrating><xsl:value-of select="normalize-space(rating)"/></userrating> +- <xsl:if test="./certification/text() != ''"> +- <certifications> +-  +- <xsl:for-each select=".//certification"> +- <xsl:element name="certification"> +- <xsl:attribute name="locale">us</xsl:attribute> +- <xsl:attribute name="name"><xsl:value-of select="normalize-space(.)"/></xsl:attribute> +- </xsl:element> +- </xsl:for-each> +- </certifications> +- </xsl:if> +- <description><xsl:value-of select="normalize-space(overview)"/></description> +- <releasedate><xsl:value-of select="normalize-space(released)"/></releasedate> +- <xsl:if test=".//image[@type='poster'] or .//image[@type='backdrop']"> +- <images> +- <xsl:if test=".//image[@type='poster']"> +- <xsl:element name="image"> +- <xsl:attribute name="type">coverart</xsl:attribute> +- <xsl:if test=".//image[@type='poster' and @size='original']"> +- <xsl:attribute name="url"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='original']/@url)"/></xsl:attribute> +- <xsl:if test=".//image[@type='poster' and @size='original']/@width != ''"> +- <xsl:attribute name="width"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='original']/@width)"/></xsl:attribute> +- </xsl:if> +- <xsl:if test=".//image[@type='poster' and @size='original']/@height != ''"> +- <xsl:attribute name="height"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='original']/@height)"/></xsl:attribute> +- </xsl:if> +- </xsl:if> +- <xsl:if test=".//image[@type='poster' and @size='cover']"> +- <xsl:attribute name="thumb"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='cover']/@url)"/></xsl:attribute> +- </xsl:if> [...2678 lines suppressed...] +- return +- sys.stdout.write(u'%s:%s\n' % (u'Name', data[u'name'])) +- keys = sorted(data.keys()) +- images = {} +- for key in keys: +- if key == u'name': +- continue +- if key in ['also_known_as', 'filmography', 'images' ]: +- if key == 'images': +- images = {} +- for k in data[key].keys(): +- images[k] = u'' +- if key == 'also_known_as': +- alias = u'' +- for k in data[key]: +- alias+=u'%s|' % k.replace(u'|', u' ') +- if alias: +- sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), alias[:-1])) +- continue +- for k in data[key]: +- if key == 'filmography': +- kys = sorted(k.keys()) +- filmography = u'' +- for c in kys: +- if c == u'name': +- continue +- filmography+=u'%s:%s|' % (self.camelcase(c.replace(u'|', u' ')), k[c].replace(u'|', u' ')) +- if filmography: +- sys.stdout.write(u'%s:%s|%s\n' % (self.camelcase(key), k[u'name'].replace(u'|', u' '), filmography[:-1])) +- elif key == 'images': +- sys.stdout.write(u'%s:%s\n' % (self.camelcase(k), data[key][k])) +- else: +- sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), data[key])) +- # end peopleData() +- +- def hashData(self, hash_value): +- '''Get Movie data by Hash value and display "key:value" pairs to stdout +- ''' +- try: +- self.displayMovieData(self.config['moviedb'].searchHash(hash_value)) +- except TmdbMovieOrPersonNotFound, msg: +- #sys.stderr.write(u"%s\n" % msg) +- return +- except TmdHttpError, msg: +- sys.stderr.write(self.error_messages['TmdHttpError'] % msg) +- sys.exit(1) +- except TmdXmlError, msg: +- sys.stderr.write(self.error_messages['TmdXmlError'] % msg) +- sys.exit(1) +- except TmdBaseError, msg: +- sys.stderr.write(self.error_messages['TmdBaseError'] % msg) +- sys.exit(1) +- except TmdbUiAbort, msg: +- sys.stderr.write(self.error_messages['TmdbUiAbort'] % msg) +- sys.exit(1) +- except Exception, e: +- sys.stderr.write(u"! Error: Unknown error during a Hash value Movie information display for (%s)\nError(%s)\n" % (hash_value, e)) +- sys.exit(1) +- # end hashData() +- +-# end Class moviedbQueries() +- +- +-def main(): +- """Gets movie details using an IMDB# and a TMDB# OR get People information using a name +- """ +- # themoviedb.org api key given by Travis Bell for Mythtv +- apikey = "c27cb71cff5bd76e1a7a009380562c62" +- +- parser = OptionParser(usage=u"%prog usage: tmdb -hdruviomMPFBDS [parameters]\n <series name or 'series and season number' or 'series and season number and episode number'>\n\nFor details on using tmdb with Mythvideo see the tmdb wiki page at:\nhttp://www.mythtv.org/wiki/tmdb.py") +- +- parser.add_option( "-d", "--debug", action="store_true", default=False, dest="debug", +- help=u"Show debugging info") +- parser.add_option( "-r", "--raw", action="store_true",default=False, dest="raw", +- help=u"Dump raw data only") +- parser.add_option( "-u", "--usage", action="store_true", default=False, dest="usage", +- help=u"Display examples for executing the tmdb script") +- parser.add_option( "-v", "--version", action="store_true", default=False, dest="version", +- help=u"Display version and author") +- parser.add_option( "-i", "--interactive", action="store_true", default=False, dest="interactive", +- help=u"Interaction mode (allows selection of a specific Movie or Person)") +- parser.add_option( "-l", "--language", metavar="LANGUAGE", default=u'en', dest="language", +- help=u"Select data that matches the specified language fall back to english if nothing found (e.g. 'es' Español, 'de' Deutsch ... etc)") +- parser.add_option( "-M", "--movielist", action="store_true", default=False, dest="movielist", +- help=u"Get matching Movie list") +- parser.add_option( "-D", "--moviedata", action="store_true", default=False, dest="moviedata", +- help=u"Get Movie metadata including graphic URLs") +- parser.add_option( "-H", "--moviehash", action="store_true", default=False, dest="moviehash", +- help=u"Get Movie metadata including graphic URLs using a Hash value.\nSee: http://api.themoviedb.org/2.1/methods/Hash.getInfo") +- parser.add_option( "-P", "--peoplelist", action="store_true", default=False, dest="peoplelist", +- help=u"Get matching People list") +- parser.add_option( "-I", "--peopleinfo", action="store_true", default=False, dest="peopleinfo", +- help=u"Get A Person's metadata including graphic URLs") +- parser.add_option( "-t", action="store_true", default=False, dest="test", +- help=u"Test for the availability of runtime dependencies") +- +- opts, args = parser.parse_args() +- +- # Test mode, if we've made it here, everything is ok +- if opts.test: +- print "Everything appears to be in order" +- sys.exit(0) +- +- # Make all command line arguments unicode utf8 +- for index in range(len(args)): +- args[index] = unicode(args[index], 'utf8') +- +- if opts.debug: +- sys.stdout.write("\nopts: %s\n" % opts) +- sys.stdout.write("\nargs: %s\n\n" % args) +- +- # Process version command line requests +- if opts.version: +- version = etree.XML(u'<grabber></grabber>') +- etree.SubElement(version, "name").text = __title__ +- etree.SubElement(version, "author").text = __author__ +- etree.SubElement(version, "thumbnail").text = 'tmdb.png' +- etree.SubElement(version, "command").text = 'tmdb.py' +- etree.SubElement(version, "type").text = 'movie' +- etree.SubElement(version, "description").text = 'Search and metadata downloads for themoviedb.org' +- etree.SubElement(version, "version").text = __version__ +- sys.stdout.write(etree.tostring(version, encoding='UTF-8', pretty_print=True)) +- sys.exit(0) +- +- # Process usage command line requests +- if opts.usage: +- sys.stdout.write(__usage_examples__) +- sys.exit(0) +- +- if not len(args) == 1: +- sys.stderr.write("! Error: There must be one value for any option. Your options are (%s)\n" % (args)) +- sys.exit(1) +- +- if args[0] == u'': +- sys.stderr.write("! Error: There must be a non-empty argument, yours is empty.\n") +- sys.exit(1) +- +- Queries = moviedbQueries(apikey, +- mythtv = True, +- interactive = opts.interactive, +- select_first = False, +- debug = opts.debug, +- custom_ui = None, +- language = opts.language, +- search_all_languages = False,) +- +- # Display in XML format +- # See: http://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format +- Queries.config['moviedb'].xml = True +- +- # Process requested option +- if opts.movielist: # Movie Search -M +- Queries.movieSearch(args[0]) +- elif opts.moviedata: # Movie metadata -D +- Queries.movieData(args[0]) +- elif opts.peoplelist: # People Search -P +- Queries.peopleSearch(args[0]) +- elif opts.peopleinfo: # Person metadata -I +- Queries.peopleData(args[0]) +- elif opts.moviehash: # Movie metadata using a hash value -H +- Queries.hashData(args[0]) +- +- sys.exit(0) +-# end main() +- +-if __name__ == '__main__': +- main() +diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py +index cc1ca16..9e4edcb 100755 +--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py ++++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py +@@ -11,7 +11,7 @@ + #----------------------- + __title__ = "TheMovieDB.org V3" + __author__ = "Raymond Wagner" +-__version__ = "0.3.5" ++__version__ = "0.3.6" + # 0.1.0 Initial version + # 0.2.0 Add language support, move cache to home directory + # 0.3.0 Enable version detection to allow use in MythTV +@@ -21,6 +21,9 @@ __version__ = "0.3.5" + # 0.3.3 Use translated title if available + # 0.3.4 Add support for finding by IMDB under -D (simulate previous version) + # 0.3.5 Add debugging mode ++# 0.3.6 Add handling for TMDB site and library returning null results in ++# search. This should only need to be a temporary fix, and should be ++# resolved upstream. + + from optparse import OptionParser + import sys +@@ -116,6 +119,9 @@ def buildList(query, opts): + + count = 0 + for res in results: ++ if res is None: ++ continue ++ + m = VideoMetadata() + for i,j in mapping: + if getattr(res, j): Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-18/mythtv.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- mythtv.spec 23 Aug 2013 18:30:52 -0000 1.111 +++ mythtv.spec 3 Oct 2013 12:05:36 -0000 1.112 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # Git revision and branch ID -%define _gitrev v0.26.1-1-g6a46ea0 +%define _gitrev v0.26.1-24-g9fd7c61 %define branch fixes/0.26 # @@ -76,7 +76,7 @@ %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 1%{?dist} +Release: 4%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -102,10 +102,12 @@ %if 0%{?rhel} %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} %define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0} +%define with_vpx %{?_without_vpx: 1} %{?!_without_vpx: 0} %else %define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1} %define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1} +%define with_vpx %{?_without_vpx: 0} %{?!_without_vpx: 1} %endif %define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} @@ -139,6 +141,8 @@ Patch1: mythlogserver-segv.patch Patch2: mythtv-0.26.0-types_h.patch Patch3: mythtv-0.26.1-libva_121.patch +# http://code.mythtv.org/trac/ticket/11338 +Patch4: mythtv-0.26-libcec2.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -181,8 +185,10 @@ BuildRequires: qt-devel >= 4.6 BuildRequires: phonon-devel phonon-backend-gstreamer BuildRequires: libuuid-devel +%if 0%{?fedora} BuildRequires: libcec-devel BuildRequires: libvpx-devel +%endif BuildRequires: lm_sensors-devel BuildRequires: lirc-devel @@ -361,6 +367,7 @@ Requires: mysql-server >= 5, mysql >= 5 %endif Requires: xmltv +Requires: udisks # Generate the required mythtv-frontend-api version string here so we only # have to do it once. @@ -837,6 +844,7 @@ %patch1 -p1 -b .mythlogserver %patch2 -p1 -b .types_h %patch3 -p1 -b .libva +%patch4 -p1 -b .libcec # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -909,7 +917,9 @@ --enable-libx264 \ --enable-libtheora --enable-libvorbis \ --enable-libxvid \ +%if %{with_vpx} --enable-libvpx \ +%endif %if %{with_vdpau} --enable-vdpau \ %endif @@ -948,9 +958,11 @@ %endif --enable-debug -# Insert rpm version-release for mythbackend --version output - echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION - echo 'BRANCH="%{branch}"' >> VERSION +# Set the mythtv --version string + cat > VERSION <<EOF +SOURCE_VERSION=%{_gitrev} +BRANCH=%{branch} +EOF # Make make %{?_smp_mflags} @@ -1168,6 +1180,7 @@ usermod -a -G audio,video mythtv exit 0 +%if %{with_mythmusic} %pre -n mythmusic # Add the "mythtv" user, with membership in the audio and video group getent group mythtv >/dev/null || groupadd -r mythtv @@ -1178,6 +1191,7 @@ # or new installs. usermod -a -G audio,video mythtv exit 0 +%endif %post backend %if %{with_systemd} @@ -1459,6 +1473,15 @@ %changelog +* Tue Oct 1 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-4 +- Update to latest bugfix release. +- Add patch for libcec 2. +- Update to latest bugfix release. +- Add udisks as a requirement as it is required for ejecting cd/dvds. + +* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.1-2 +- Rebuilt + * Thu Aug 22 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1 - Update to latest bugfix release. - Add patch for new libva 1.2.1 version in rawhide.

10 years, 7 months

1
0
0 / 0

rpms/mythtv/F-19 mythtv-0.26-libcec2.patch, NONE, 1.1 ChangeLog, 1.9, 1.10 mythtv-0.26-fixes.patch, 1.7, 1.8 mythtv.spec, 1.123, 1.124

by Richard Shaw

Author: hobbes1069 Update of /cvs/free/rpms/mythtv/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18322 Modified Files: ChangeLog mythtv-0.26-fixes.patch mythtv.spec Added Files: mythtv-0.26-libcec2.patch Log Message: * Tue Oct 1 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-4 - Update to latest bugfix release. - Add patch for libcec 2. - Update to latest bugfix release. - Add udisks as a requirement as it is required for ejecting cd/dvds. mythtv-0.26-libcec2.patch: configure | 4 libs/libmythui/cecadapter.cpp | 267 +++++++++++++++++++++++++++++++----------- libs/libmythui/cecadapter.h | 1 3 files changed, 205 insertions(+), 67 deletions(-) --- NEW FILE mythtv-0.26-libcec2.patch --- diff --git a/mythtv/configure b/mythtv/configure index 7ab8aa7..7d5e39d 100755 --- a/mythtv/configure +++ b/mythtv/configure @@ -5178,10 +5178,12 @@ using namespace std; using namespace CEC; #include <libcec/cecloader.h> int main(void) { + if (CEC_LIB_VERSION_MAJOR == 2) + return 1; if (CEC_LIB_VERSION_MAJOR < 1 || (CEC_LIB_VERSION_MAJOR == 1 && CEC_LIB_VERSION_MINOR < 5)) return 0; - return (long) LibCecInit; + return 1; } EOF fi diff --git a/mythtv/libs/libmythui/cecadapter.cpp b/mythtv/libs/libmythui/cecadapter.cpp index edad8f6..5987d5d 100644 --- a/mythtv/libs/libmythui/cecadapter.cpp +++ b/mythtv/libs/libmythui/cecadapter.cpp @@ -14,9 +14,28 @@ #include "cecadapter.h" #include <vector> -#define MIN_LIBCEC_VERSION 1 +#ifdef CEC_CLIENT_VERSION_CURRENT // 2.0.3 and up +#define CEC_CONFIG_VERSION CEC_CLIENT_VERSION_CURRENT; +#else +#ifdef LIBCEC_VERSION_CURRENT // 1.6.2 and up +#define CEC_CONFIG_VERSION LIBCEC_VERSION_CURRENT; +#else +#define CEC_CONFIG_VERSION 0; +#endif +#endif + #define MAX_CEC_DEVICES 10 #define LOC QString("CECAdapter: ") +#define OSDNAME "MythTv" + +// TODO remove if we have a ui. +// hard code logical and physical address +#define CEC_DEFAULT_DEVICE_TYPE CEC_DEVICE_TYPE_RECORDING_DEVICE +#undef CEC_DEFAULT_HDMI_PORT +#define CEC_DEFAULT_HDMI_PORT 2 +#undef CEC_DEFAULT_BASE_DEVICE +#define CEC_DEFAULT_BASE_DEVICE CECDEVICE_AUDIOSYSTEM +#define CEC_DEFAULT_PHYSICALADDRESS (quint16)0x2200 #include <libcec/cec.h> #include <iostream> @@ -25,17 +44,26 @@ using namespace std; #include <libcec/cecloader.h> QMutex* CECAdapter::gLock = new QMutex(QMutex::Recursive); +bool resetSafe = false; class CECAdapterPriv { public: CECAdapterPriv() - : adapter(NULL), defaultDevice("auto"), defaultHDMIPort(1), - defaultDeviceID(CECDEVICE_PLAYBACKDEVICE1), timer(NULL), valid(false), + : adapter(NULL), defaultDevice("auto"), defaultHDMIPort(CEC_DEFAULT_HDMI_PORT), + defaultDeviceID(CEC_DEFAULT_DEVICE_TYPE), timer(NULL), valid(false), powerOffTV(false), powerOffTVAllowed(false), powerOffTVOnExit(false), powerOnTV(false), powerOnTVAllowed(false), powerOnTVOnStart(false), switchInput(false), switchInputAllowed(true) { + callbacks.Clear(); + callbacks.CBCecLogMessage = LogMessages; + callbacks.CBCecKeyPress = HandleKeyPresses; + callbacks.CBCecCommand = HandleCommands; + callbacks.CBCecConfigurationChanged = HandleConfigurationChanged; + callbacks.CBCecAlert = HandleAlerts; + callbacks.CBCecMenuStateChanged = HandleMenuStateChanged; + callbacks.CBCecSourceActivated = HandleSourceActivated; } static QString addressToString(enum cec_logical_address addr, bool source) @@ -69,14 +97,15 @@ class CECAdapterPriv static QStringList GetDeviceList(void) { QStringList results; - cec_device_type_list list; - list.Clear(); - list.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); - ICECAdapter *adapter = LibCecInit("MythTV", list); + libcec_configuration configuration; + configuration.Clear(); + ICECAdapter *adapter = LibCecInitialise(&configuration); if (!adapter) return results; cec_adapter *devices = new cec_adapter[MAX_CEC_DEVICES]; uint8_t num_devices = adapter->FindAdapters(devices, MAX_CEC_DEVICES, NULL); + LOG(VB_GENERAL, LOG_INFO, LOC + QString("GetDeviceList() found %1 devices(s).") + .arg(num_devices)); if (num_devices < 1) return results; for (uint8_t i = 0; i < num_devices; i++) @@ -89,39 +118,112 @@ class CECAdapterPriv { // get settings // N.B. these do not currently work as there is no UI + + // There is no way current CEC adapters can find their physical address + // on their own. The are only connected to the CEC pin of the HDMI connector. + // To construct a valid physical address libCEC needs: + // - the HDMI port (number) Myth is connected to + // - the HDMI device (TV, Receiver) Myth is connected to (the logical address) + + //The CEC adapter we want to connect to defaultDevice = gCoreContext->GetSetting(LIBCEC_DEVICE, "auto").trimmed(); + // The number of the HDMI port Myth is connected to QString hdmi_port = gCoreContext->GetSetting(LIBCEC_PORT, "auto"); + // The logical address of the HDMI device Myth is connected to + QString base_dev = gCoreContext->GetSetting(LIBCEC_BASE, "auto"); + // Device type we want Myth to use QString device_id = gCoreContext->GetSetting(LIBCEC_DEVICEID, "auto"); powerOffTVAllowed = (bool)gCoreContext->GetNumSetting(POWEROFFTV_ALLOWED, 1); powerOffTVOnExit = (bool)gCoreContext->GetNumSetting(POWEROFFTV_ONEXIT, 1); powerOnTVAllowed = (bool)gCoreContext->GetNumSetting(POWERONTV_ALLOWED, 1); powerOnTVOnStart = (bool)gCoreContext->GetNumSetting(POWERONTV_ONSTART, 1); - defaultHDMIPort = 1; if ("auto" != hdmi_port) { defaultHDMIPort = hdmi_port.toInt(); - if (defaultHDMIPort < 1 || defaultHDMIPort > 3) - defaultHDMIPort = 1; + if (defaultHDMIPort < CEC_MIN_HDMI_PORTNUMBER || defaultHDMIPort > CEC_MAX_HDMI_PORTNUMBER) + defaultHDMIPort = CEC_DEFAULT_HDMI_PORT; + } + else + { + defaultHDMIPort = CEC_DEFAULT_HDMI_PORT; } - defaultHDMIPort = defaultHDMIPort << 12; - defaultDeviceID = CECDEVICE_PLAYBACKDEVICE1; if ("auto" != device_id) { int id = device_id.toInt(); - if (id < 1 || id > 3) - id = 1; - defaultDeviceID = (id == 1) ? CECDEVICE_PLAYBACKDEVICE1 : - ((id == 2) ? CECDEVICE_PLAYBACKDEVICE2 : - CECDEVICE_PLAYBACKDEVICE3); + switch (id) + { + case CEC_DEVICE_TYPE_TV: + case CEC_DEVICE_TYPE_RECORDING_DEVICE: + case CEC_DEVICE_TYPE_RESERVED: + case CEC_DEVICE_TYPE_TUNER: + case CEC_DEVICE_TYPE_PLAYBACK_DEVICE: + case CEC_DEVICE_TYPE_AUDIO_SYSTEM: + defaultDeviceID = (cec_device_type)id; + break; + default: + defaultDeviceID = CEC_DEFAULT_DEVICE_TYPE; + break; + } + } + else + { + defaultDeviceID = CEC_DEFAULT_DEVICE_TYPE; } + LOG(VB_GENERAL, LOG_INFO, LOC + QString("base_dev= %1.") + .arg(base_dev)); + if ("auto" != base_dev) + { + base_device = (cec_logical_address)base_dev.toInt(); + LOG(VB_GENERAL, LOG_INFO, LOC + QString("base_device= %1.") + .arg(base_device)); + switch (base_device) + { + case CECDEVICE_TV: + case CECDEVICE_RECORDINGDEVICE1: + case CECDEVICE_RECORDINGDEVICE2: + case CECDEVICE_TUNER1: + case CECDEVICE_PLAYBACKDEVICE1: + case CECDEVICE_AUDIOSYSTEM: + case CECDEVICE_TUNER2: + case CECDEVICE_TUNER3: + case CECDEVICE_PLAYBACKDEVICE2: + case CECDEVICE_RECORDINGDEVICE3: + case CECDEVICE_TUNER4: + case CECDEVICE_PLAYBACKDEVICE3: + case CECDEVICE_FREEUSE: + break; + case CECDEVICE_UNKNOWN: + case CECDEVICE_RESERVED1: + case CECDEVICE_RESERVED2: + case CECDEVICE_BROADCAST: + default: + base_device = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE; + break; + } + } + else + { + base_device = (cec_logical_address)CEC_DEFAULT_BASE_DEVICE; + } + // create adapter interface - cec_device_type_list list; - list.Clear(); - list.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE); - adapter = LibCecInit("MythTV", list); + libcec_configuration configuration; + configuration.Clear(); + configuration.clientVersion = LIBCEC_VERSION_CURRENT; + snprintf(configuration.strDeviceName, 13, "MythTV"); + configuration.deviceTypes.Add(defaultDeviceID); + configuration.iPhysicalAddress = CEC_DEFAULT_PHYSICALADDRESS; + configuration.iHDMIPort = defaultHDMIPort; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("using HDMI port %1.") + .arg(defaultHDMIPort)); + configuration.baseDevice = base_device; + LOG(VB_GENERAL, LOG_INFO, LOC + QString("using base device %1.") + .arg(configuration.baseDevice)); + configuration.callbacks = &callbacks; + ICECAdapter *adapter = LibCecInitialise(&configuration); if (!adapter) { @@ -129,12 +231,12 @@ class CECAdapterPriv return false; } - if (adapter->GetMinLibVersion() > MIN_LIBCEC_VERSION) + if ((configuration.serverVersion >> 12) > CEC_MIN_LIB_VERSION) { LOG(VB_GENERAL, LOG_ERR, LOC + QString("The installed libCEC supports version %1 and above. " "This version of MythTV only supports version %2.") - .arg(adapter->GetMinLibVersion()).arg(MIN_LIBCEC_VERSION)); + .arg(configuration.serverVersion).arg(CEC_MIN_LIB_VERSION)); return false; } @@ -185,12 +287,6 @@ class CECAdapterPriv // get the vendor ID (for non-standard implementations) adapter->GetDeviceVendorId(CECDEVICE_TV); - // set the physical address - adapter->SetPhysicalAddress(defaultHDMIPort); - - // set the logical address - adapter->SetLogicalAddress(defaultDeviceID); - // switch input (if configured) switchInput = true; HandleActions(); @@ -210,7 +306,6 @@ class CECAdapterPriv // delete adapter adapter->Close(); - LogMessages(); UnloadLibCec(adapter); LOG(VB_GENERAL, LOG_INFO, LOC + "Closing down CEC."); @@ -219,14 +314,12 @@ class CECAdapterPriv adapter = NULL; } - void LogMessages(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int LogMessages(void *, const cec_log_message &message) + #else + static int LogMessages(void *, const cec_log_message message) + #endif { - if (!adapter || !valid) - return; - - cec_log_message message; - while (adapter->GetNextLogMessage(&message)) - { QString msg(message.message); int lvl = LOG_UNKNOWN; switch (message.level) @@ -237,19 +330,15 @@ class CECAdapterPriv case CEC_LOG_DEBUG: lvl = LOG_DEBUG; break; } LOG(VB_GENERAL, lvl, LOC + QString("%1").arg(msg)); - } + return 0; } - void HandleCommands(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleCommands(void * /*cbParam*/, const cec_command &command) + #else + static int HandleCommands(void * /*cbParam*/, const cec_command command) + #endif { - if (!adapter || !valid) - return; - - LogMessages(); - - cec_command command; - while (adapter->GetNextCommand(&command)) - { LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Command %1 from '%2' (%3) - destination '%4' (%5)") .arg(command.opcode) @@ -260,27 +349,76 @@ class CECAdapterPriv switch (command.opcode) { - // TODO + // TODO handle CEC commands. default: break; } - } + return 0; + } - LogMessages(); + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration &config) + #else + static int HandleConfigurationChanged(void * /*cbParam*/, const libcec_configuration config) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + "Adapter configuration changed."); + return 1; } - void HandleKeyPresses(void) + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter & /*param*/) + #else + static int HandleAlerts(void * /*cbParam*/, const libcec_alert type, const libcec_parameter /*param*/) + #endif { - if (!adapter || !valid) - return; + switch (type) // TODO Handle alerts. + { + case CEC_ALERT_CONNECTION_LOST: + LOG(VB_GENERAL, LOG_ERR, LOC + "Connection lost - TODO: need to handle this!"); + break; + default: + LOG(VB_GENERAL, LOG_ERR, LOC + "Received unknown alert."); + break; + } + return 0; + } - cec_keypress key; - if (!adapter->GetNextKeypress(&key)) - return; + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state &state) + #else + static int HandleMenuStateChanged(void * /*cbParam*/, const cec_menu_state state) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("CEC menu state %1") + .arg(state == CEC_MENU_STATE_ACTIVATED ? "Activated" : "Deactivated")); + return 1; + } + #if CEC_LIB_VERSION_MAJOR < 2 + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address &address, const &uint8_t activated) + #else + static void HandleSourceActivated(void * /*cbParam*/, const cec_logical_address address, const uint8_t activated) + #endif + { + LOG(VB_GENERAL, LOG_INFO, LOC + QString("Source %1 %2") + .arg(address).arg(activated ? "Activated" : "Deactivated")); + + if (activated && resetSafe) + GetMythUI()->ResetScreensaver(); + else + resetSafe = true; + } + + #if CEC_LIB_VERSION_MAJOR < 2 + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress &key) + #else + static int HandleKeyPresses(void * /*cbParam*/, const cec_keypress key) + #endif + { // Ignore key down events and wait for the key 'up' if (key.duration < 1) - return; + return 0; QString code; int action = 0; @@ -595,13 +733,12 @@ class CECAdapterPriv .arg(code).arg(0 == action ? "(Not actioned)" : "")); if (0 == action) - return; + return 0; GetMythUI()->ResetScreensaver(); QKeyEvent* ke = new QKeyEvent(QEvent::KeyPress, action, Qt::NoModifier); qApp->postEvent(GetMythMainWindow(), (QEvent*)ke); - - LogMessages(); + return 0; } void HandleActions(void) @@ -629,7 +766,7 @@ class CECAdapterPriv // HDMI input if (switchInput && switchInputAllowed) { - if (adapter->SetActiveView()) + if (adapter->SetActiveSource()) LOG(VB_GENERAL, LOG_INFO, LOC + "Asked TV to switch to this input."); else LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to switch to this input."); @@ -638,14 +775,14 @@ class CECAdapterPriv powerOffTV = false; powerOnTV = false; switchInput = false; - - LogMessages(); } ICECAdapter *adapter; + ICECCallbacks callbacks; QString defaultDevice; int defaultHDMIPort; - cec_logical_address defaultDeviceID; + cec_device_type defaultDeviceID; + cec_logical_address base_device; QTimer *timer; bool valid; bool powerOffTV; @@ -728,8 +865,6 @@ void CECAdapter::Action(const QString &action) void CECAdapter::Process(void) { gLock->lock(); - m_priv->HandleCommands(); - m_priv->HandleKeyPresses(); m_priv->HandleActions(); gLock->unlock(); } diff --git a/mythtv/libs/libmythui/cecadapter.h b/mythtv/libs/libmythui/cecadapter.h index e9cf6d6..bb5eba8 100644 --- a/mythtv/libs/libmythui/cecadapter.h +++ b/mythtv/libs/libmythui/cecadapter.h @@ -7,6 +7,7 @@ #define LIBCEC_ENABLED QString("libCECEnabled") #define LIBCEC_DEVICE QString("libCECDevice") #define LIBCEC_PORT QString("libCECPort") +#define LIBCEC_BASE QString("libCECBase") #define LIBCEC_DEVICEID QString("libCECDeviceID") #define POWEROFFTV_ALLOWED QString("PowerOffTVAllowed") #define POWEROFFTV_ONEXIT QString("PowerOffTVOnExit") Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ChangeLog 23 Aug 2013 18:25:30 -0000 1.9 +++ ChangeLog 3 Oct 2013 12:05:01 -0000 1.10 @@ -1,19 +1,36 @@ -commit 6a46ea014907ac0ee010bed9d8896cb2ee09bc2d -Author: Stuart Morgan <smorgan(a)mythtv.org> -Date: Mon Aug 19 14:25:56 2013 +0100 +commit 33f0177459ded1ed3ca63c319bb825e3ee3a6d56 +Author: Martin Bene <myth(a)bene.priv.at> +Date: Sat Sep 14 16:27:22 2013 -0400 - Disable database logging by default. + Fix MythWeb's date/time handling - It can be re-enabled using --enable-dblog + The code in question has partially changed so I am applying part of Martin's patch + (the section that clears to session variables) to fix the problem. - Until we actually start using this data somewhere there is not much - point in storing it. Since it's already known that writing to the - database can affect I/O performance, especially where drives are - shared with recordings, this could potentially even cause a positive - feedback loop. The I/O starvation causes the backend to start logging - slow read/write warnings, which in turn increase the writes to the - database exacerbating the problems. - - The same problem is also true, to a greater or lesser extent with file - based logging but we actually need the file logs so there isn't much - we can do there. + Thank you Martin! + + Refs #9833 + + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> + +commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff +Author: Scott Shawcroft <scott.shawcroft(a)gmail.com> +Date: Tue Aug 27 22:34:55 2013 -0400 + + Fix the problem of MythWeb failing to load translations + + Refs #11513 + + Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org> + +commit 5d8ffe109286269ada87390a2b74e142ec36e364 +Author: Karl Dietz <dekarl(a)mythtv.org> +Date: Mon Aug 26 22:39:35 2013 +0200 + + fix merge in schedule templates added in f97529656 + + if (!$this->$name) ends up as if(!0)... + + Fixes #11775 + + (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560) mythtv-0.26-fixes.patch: b/mythtv/bindings/python/MythTV/database.py | 2 b/mythtv/bindings/python/MythTV/dataheap.py | 6 b/mythtv/bindings/python/MythTV/logging.py | 6 b/mythtv/bindings/python/MythTV/system.py | 11 b/mythtv/bindings/python/setup.py | 4 b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 7 b/mythtv/bindings/python/tmdb3/tmdb3/pager.py | 5 b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 2 b/mythtv/i18n/mythfrontend_de.qm |binary b/mythtv/i18n/mythfrontend_de.ts | 22 b/mythtv/libs/libmythbase/logging.cpp | 4 b/mythtv/libs/libmythbase/mythcommandlineparser.cpp | 6 b/mythtv/libs/libmythmetadata/metadatadownload.cpp | 8 b/mythtv/libs/libmythtv/avformatdecoder.cpp | 2 b/mythtv/libs/libmythtv/decoderbase.cpp | 5 b/mythtv/libs/libmythtv/eithelper.cpp | 29 b/mythtv/programs/mythfrontend/commandlineparser.cpp | 2 b/mythtv/programs/scripts/hardwareprofile/config.py | 5 b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 16 b/mythtv/programs/scripts/hardwareprofile/os_detect.py | 5 b/mythtv/programs/scripts/metadata/Movie/tmdb3.py | 8 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 | 640 ---- 27 files changed, 114 insertions(+), 2565 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 mythtv-0.26-fixes.patch Index: mythtv-0.26-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/mythtv-0.26-fixes.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mythtv-0.26-fixes.patch 23 Aug 2013 18:25:30 -0000 1.7 +++ mythtv-0.26-fixes.patch 3 Oct 2013 12:05:01 -0000 1.8 @@ -1,11 +1,2198 @@ - mythtv/libs/libmythbase/logging.cpp | 2 +- - mythtv/libs/libmythbase/mythcommandlineparser.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) + mythtv/bindings/python/MythTV/database.py | 2 +- + mythtv/bindings/python/MythTV/dataheap.py | 6 +- + mythtv/bindings/python/MythTV/logging.py | 6 +- + mythtv/bindings/python/MythTV/system.py | 11 +- + .../bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl | 99 -- + .../bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl | 157 --- + mythtv/bindings/python/MythTV/tmdb/__init__.py | 0 + mythtv/bindings/python/MythTV/tmdb/tmdb_api.py | 1317 -------------------- + .../bindings/python/MythTV/tmdb/tmdb_exceptions.py | 45 - + mythtv/bindings/python/MythTV/tmdb/tmdb_ui.py | 266 ---- + mythtv/bindings/python/setup.py | 4 +- + mythtv/bindings/python/tmdb3/scripts/pytmdb3.py | 7 +- + mythtv/bindings/python/tmdb3/tmdb3/pager.py | 5 +- + mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py | 2 +- + mythtv/i18n/mythfrontend_de.qm | Bin 630506 -> 630506 bytes + mythtv/i18n/mythfrontend_de.ts | 22 +- + mythtv/libs/libmythbase/logging.cpp | 4 +- + mythtv/libs/libmythbase/mythcommandlineparser.cpp | 6 +- + mythtv/libs/libmythmetadata/metadatadownload.cpp | 8 +- + mythtv/libs/libmythtv/avformatdecoder.cpp | 2 +- + mythtv/libs/libmythtv/decoderbase.cpp | 5 +- + mythtv/libs/libmythtv/eithelper.cpp | 29 +- + mythtv/programs/mythfrontend/commandlineparser.cpp | 2 +- + mythtv/programs/scripts/hardwareprofile/config.py | 5 + + .../distros/mythtv_data/data_mythtv.py | 16 +- + .../programs/scripts/hardwareprofile/os_detect.py | 5 + + mythtv/programs/scripts/metadata/Movie/tmdb.py | 640 ---------- + mythtv/programs/scripts/metadata/Movie/tmdb3.py | 8 +- + 28 files changed, 114 insertions(+), 2565 deletions(-) +diff --git a/mythtv/bindings/python/MythTV/database.py b/mythtv/bindings/python/MythTV/database.py +index 525a213..368fb9e 100644 +--- a/mythtv/bindings/python/MythTV/database.py ++++ b/mythtv/bindings/python/MythTV/database.py +@@ -835,7 +835,7 @@ class DatabaseConfig( object ): + database = QuickProperty('_database', 'mythconverg') + + @QuickProperty('_profile', gethostname()) +- def profile(self, value): ++ def profile(value): + if value == 'my-unique-identifier-goes-here': + raise Exception + return value +diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py +index 4a17d6b..268d007 100644 +--- a/mythtv/bindings/python/MythTV/dataheap.py ++++ b/mythtv/bindings/python/MythTV/dataheap.py +@@ -1136,7 +1136,7 @@ class VideoGrabber( Grabber ): + def __init__(self, mode, lang='en', db=None): + dbvalue = {'tv':'TelevisionGrabber', 'movie':'MovieGrabber'} + path = {'tv':'metadata/Television/ttvdb.py', +- 'movie':'metadata/Movie/tmdb.py'} ++ 'movie':'metadata/Movie/tmdb3.py'} + self.mode = mode.lower() + try: + Grabber.__init__(self, setting=dbvalue[self.mode], db=db, +@@ -1144,6 +1144,10 @@ class VideoGrabber( Grabber ): + prefix=os.path.join(INSTALL_PREFIX, 'share/mythtv')) + except KeyError: + raise MythError('Invalid MythVideo grabber') ++ ++ if self.path[-7:] == 'tmdb.py': ++ self.path = self.path[:-7] + 'tmdb3.py' ++ + self.append('-l',lang) + + #### MYTHNETVISION #### +diff --git a/mythtv/bindings/python/MythTV/logging.py b/mythtv/bindings/python/MythTV/logging.py +index f27387f..45ace32 100644 +--- a/mythtv/bindings/python/MythTV/logging.py ++++ b/mythtv/bindings/python/MythTV/logging.py +@@ -409,11 +409,15 @@ class MythLog( LOGLEVEL, LOGMASK, LOGFACILITY ): + def _logdatabase(self, mask, level, message, detail): + if self.db and self._DBLOG: + with self.db.cursor(DummyLogger()) as cursor: ++ application = argv[0] ++ if '/' in application: ++ application = application.rsplit('/', 1)[1] ++ + cursor.execute("""INSERT INTO logging + (host, application, pid, thread, + msgtime, level, message) + VALUES (?, ?, ?, ?, ?, ?, ?)""", +- (self.db.gethostname(), argv[0].rsplit('/', 1)[1], ++ (self.db.gethostname(), application, + os.getpid(), self.module, self.time(), level, + message + (' -- {0}'.format(detail) if detail else ''))) + +diff --git a/mythtv/bindings/python/MythTV/system.py b/mythtv/bindings/python/MythTV/system.py +index f24c8a9..44803bd 100644 +--- a/mythtv/bindings/python/MythTV/system.py ++++ b/mythtv/bindings/python/MythTV/system.py +@@ -79,10 +79,17 @@ class System( DBCache ): + self.path = None + + if setting is not None: +- # pull setting from database, substitute from argument if needed ++ # pull local setting from database + host = self.gethostname() + self.path = self.settings[host][setting] +- if (self.path is None) and (path is None): ++ if self.path is None: ++ # see if that setting is applied globally ++ self.path = self.settings['NULL'][setting] ++ if self.path is None: ++ # not set globally either, use supplied default ++ self.path = path ++ if self.path is None: ++ # no default supplied, just error out + raise MythDBError(MythError.DB_SETTING, setting, host) + + if self.path is None: +diff --git a/mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl b/mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl +deleted file mode 100644 +index f87b72a..0000000 +--- a/mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl ++++ /dev/null +@@ -1,99 +0,0 @@ +-<?xml version="1.0" encoding="UTF-8"?> +- +-<xsl:stylesheet version="1.0" +- xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +- xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" +- xmlns:tmdbXpath="http://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format"> +- +- <xsl:output method="xml" indent="yes" version="1.0" encoding="UTF-8" omit-xml-declaration="yes"/> +- +-  +- <xsl:template match="/"> +- <xsl:if test="not(string(opensearch:totalResults)='0')"> +- <metadata> +- <xsl:call-template name='movieQuery'/> +- </metadata> +- </xsl:if> +- </xsl:template> +- +- <xsl:template name="movieQuery"> +- <xsl:for-each select="//movie"> +- <item> +- <language><xsl:value-of select="normalize-space(language)"/></language> +- <xsl:for-each select="tmdbXpath:titleElement(string(name))"> +- <title><xsl:value-of select="normalize-space(./@title)"/></title> +- <xsl:if test="./@subtitle"> +- <subtitle><xsl:value-of select="normalize-space(./@subtitle)"/></subtitle> +- </xsl:if> +- </xsl:for-each> +- <inetref><xsl:value-of select="normalize-space(id)"/></inetref> +- <imdb><xsl:value-of select="normalize-space(substring-after(string(imdb_id), 'tt'))"/></imdb> +- <userrating><xsl:value-of select="normalize-space(rating)"/></userrating> +- <xsl:if test="./certification/text() != ''"> +- <certifications> +-  +- <xsl:for-each select=".//certification"> +- <xsl:element name="certification"> +- <xsl:attribute name="locale">us</xsl:attribute> +- <xsl:attribute name="name"><xsl:value-of select="normalize-space(.)"/></xsl:attribute> +- </xsl:element> +- </xsl:for-each> +- </certifications> +- </xsl:if> +- <description><xsl:value-of select="normalize-space(overview)"/></description> +- <releasedate><xsl:value-of select="normalize-space(released)"/></releasedate> +- <xsl:if test=".//image[@type='poster'] or .//image[@type='backdrop']"> +- <images> +- <xsl:if test=".//image[@type='poster']"> +- <xsl:element name="image"> +- <xsl:attribute name="type">coverart</xsl:attribute> +- <xsl:if test=".//image[@type='poster' and @size='original']"> +- <xsl:attribute name="url"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='original']/@url)"/></xsl:attribute> +- <xsl:if test=".//image[@type='poster' and @size='original']/@width != ''"> +- <xsl:attribute name="width"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='original']/@width)"/></xsl:attribute> +- </xsl:if> +- <xsl:if test=".//image[@type='poster' and @size='original']/@height != ''"> +- <xsl:attribute name="height"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='original']/@height)"/></xsl:attribute> +- </xsl:if> +- </xsl:if> +- <xsl:if test=".//image[@type='poster' and @size='cover']"> +- <xsl:attribute name="thumb"><xsl:value-of select="normalize-space(.//image[@type='poster' and @size='cover']/@url)"/></xsl:attribute> +- </xsl:if> [...2678 lines suppressed...] +- return +- sys.stdout.write(u'%s:%s\n' % (u'Name', data[u'name'])) +- keys = sorted(data.keys()) +- images = {} +- for key in keys: +- if key == u'name': +- continue +- if key in ['also_known_as', 'filmography', 'images' ]: +- if key == 'images': +- images = {} +- for k in data[key].keys(): +- images[k] = u'' +- if key == 'also_known_as': +- alias = u'' +- for k in data[key]: +- alias+=u'%s|' % k.replace(u'|', u' ') +- if alias: +- sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), alias[:-1])) +- continue +- for k in data[key]: +- if key == 'filmography': +- kys = sorted(k.keys()) +- filmography = u'' +- for c in kys: +- if c == u'name': +- continue +- filmography+=u'%s:%s|' % (self.camelcase(c.replace(u'|', u' ')), k[c].replace(u'|', u' ')) +- if filmography: +- sys.stdout.write(u'%s:%s|%s\n' % (self.camelcase(key), k[u'name'].replace(u'|', u' '), filmography[:-1])) +- elif key == 'images': +- sys.stdout.write(u'%s:%s\n' % (self.camelcase(k), data[key][k])) +- else: +- sys.stdout.write(u'%s:%s\n' % (self.camelcase(key), data[key])) +- # end peopleData() +- +- def hashData(self, hash_value): +- '''Get Movie data by Hash value and display "key:value" pairs to stdout +- ''' +- try: +- self.displayMovieData(self.config['moviedb'].searchHash(hash_value)) +- except TmdbMovieOrPersonNotFound, msg: +- #sys.stderr.write(u"%s\n" % msg) +- return +- except TmdHttpError, msg: +- sys.stderr.write(self.error_messages['TmdHttpError'] % msg) +- sys.exit(1) +- except TmdXmlError, msg: +- sys.stderr.write(self.error_messages['TmdXmlError'] % msg) +- sys.exit(1) +- except TmdBaseError, msg: +- sys.stderr.write(self.error_messages['TmdBaseError'] % msg) +- sys.exit(1) +- except TmdbUiAbort, msg: +- sys.stderr.write(self.error_messages['TmdbUiAbort'] % msg) +- sys.exit(1) +- except Exception, e: +- sys.stderr.write(u"! Error: Unknown error during a Hash value Movie information display for (%s)\nError(%s)\n" % (hash_value, e)) +- sys.exit(1) +- # end hashData() +- +-# end Class moviedbQueries() +- +- +-def main(): +- """Gets movie details using an IMDB# and a TMDB# OR get People information using a name +- """ +- # themoviedb.org api key given by Travis Bell for Mythtv +- apikey = "c27cb71cff5bd76e1a7a009380562c62" +- +- parser = OptionParser(usage=u"%prog usage: tmdb -hdruviomMPFBDS [parameters]\n <series name or 'series and season number' or 'series and season number and episode number'>\n\nFor details on using tmdb with Mythvideo see the tmdb wiki page at:\nhttp://www.mythtv.org/wiki/tmdb.py") +- +- parser.add_option( "-d", "--debug", action="store_true", default=False, dest="debug", +- help=u"Show debugging info") +- parser.add_option( "-r", "--raw", action="store_true",default=False, dest="raw", +- help=u"Dump raw data only") +- parser.add_option( "-u", "--usage", action="store_true", default=False, dest="usage", +- help=u"Display examples for executing the tmdb script") +- parser.add_option( "-v", "--version", action="store_true", default=False, dest="version", +- help=u"Display version and author") +- parser.add_option( "-i", "--interactive", action="store_true", default=False, dest="interactive", +- help=u"Interaction mode (allows selection of a specific Movie or Person)") +- parser.add_option( "-l", "--language", metavar="LANGUAGE", default=u'en', dest="language", +- help=u"Select data that matches the specified language fall back to english if nothing found (e.g. 'es' Español, 'de' Deutsch ... etc)") +- parser.add_option( "-M", "--movielist", action="store_true", default=False, dest="movielist", +- help=u"Get matching Movie list") +- parser.add_option( "-D", "--moviedata", action="store_true", default=False, dest="moviedata", +- help=u"Get Movie metadata including graphic URLs") +- parser.add_option( "-H", "--moviehash", action="store_true", default=False, dest="moviehash", +- help=u"Get Movie metadata including graphic URLs using a Hash value.\nSee: http://api.themoviedb.org/2.1/methods/Hash.getInfo") +- parser.add_option( "-P", "--peoplelist", action="store_true", default=False, dest="peoplelist", +- help=u"Get matching People list") +- parser.add_option( "-I", "--peopleinfo", action="store_true", default=False, dest="peopleinfo", +- help=u"Get A Person's metadata including graphic URLs") +- parser.add_option( "-t", action="store_true", default=False, dest="test", +- help=u"Test for the availability of runtime dependencies") +- +- opts, args = parser.parse_args() +- +- # Test mode, if we've made it here, everything is ok +- if opts.test: +- print "Everything appears to be in order" +- sys.exit(0) +- +- # Make all command line arguments unicode utf8 +- for index in range(len(args)): +- args[index] = unicode(args[index], 'utf8') +- +- if opts.debug: +- sys.stdout.write("\nopts: %s\n" % opts) +- sys.stdout.write("\nargs: %s\n\n" % args) +- +- # Process version command line requests +- if opts.version: +- version = etree.XML(u'<grabber></grabber>') +- etree.SubElement(version, "name").text = __title__ +- etree.SubElement(version, "author").text = __author__ +- etree.SubElement(version, "thumbnail").text = 'tmdb.png' +- etree.SubElement(version, "command").text = 'tmdb.py' +- etree.SubElement(version, "type").text = 'movie' +- etree.SubElement(version, "description").text = 'Search and metadata downloads for themoviedb.org' +- etree.SubElement(version, "version").text = __version__ +- sys.stdout.write(etree.tostring(version, encoding='UTF-8', pretty_print=True)) +- sys.exit(0) +- +- # Process usage command line requests +- if opts.usage: +- sys.stdout.write(__usage_examples__) +- sys.exit(0) +- +- if not len(args) == 1: +- sys.stderr.write("! Error: There must be one value for any option. Your options are (%s)\n" % (args)) +- sys.exit(1) +- +- if args[0] == u'': +- sys.stderr.write("! Error: There must be a non-empty argument, yours is empty.\n") +- sys.exit(1) +- +- Queries = moviedbQueries(apikey, +- mythtv = True, +- interactive = opts.interactive, +- select_first = False, +- debug = opts.debug, +- custom_ui = None, +- language = opts.language, +- search_all_languages = False,) +- +- # Display in XML format +- # See: http://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format +- Queries.config['moviedb'].xml = True +- +- # Process requested option +- if opts.movielist: # Movie Search -M +- Queries.movieSearch(args[0]) +- elif opts.moviedata: # Movie metadata -D +- Queries.movieData(args[0]) +- elif opts.peoplelist: # People Search -P +- Queries.peopleSearch(args[0]) +- elif opts.peopleinfo: # Person metadata -I +- Queries.peopleData(args[0]) +- elif opts.moviehash: # Movie metadata using a hash value -H +- Queries.hashData(args[0]) +- +- sys.exit(0) +-# end main() +- +-if __name__ == '__main__': +- main() +diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py +index cc1ca16..9e4edcb 100755 +--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py ++++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py +@@ -11,7 +11,7 @@ + #----------------------- + __title__ = "TheMovieDB.org V3" + __author__ = "Raymond Wagner" +-__version__ = "0.3.5" ++__version__ = "0.3.6" + # 0.1.0 Initial version + # 0.2.0 Add language support, move cache to home directory + # 0.3.0 Enable version detection to allow use in MythTV +@@ -21,6 +21,9 @@ __version__ = "0.3.5" + # 0.3.3 Use translated title if available + # 0.3.4 Add support for finding by IMDB under -D (simulate previous version) + # 0.3.5 Add debugging mode ++# 0.3.6 Add handling for TMDB site and library returning null results in ++# search. This should only need to be a temporary fix, and should be ++# resolved upstream. + + from optparse import OptionParser + import sys +@@ -116,6 +119,9 @@ def buildList(query, opts): + + count = 0 + for res in results: ++ if res is None: ++ continue ++ + m = VideoMetadata() + for i,j in mapping: + if getattr(res, j): Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-19/mythtv.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- mythtv.spec 23 Aug 2013 18:25:30 -0000 1.123 +++ mythtv.spec 3 Oct 2013 12:05:01 -0000 1.124 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # Git revision and branch ID -%define _gitrev v0.26.1-1-g6a46ea0 +%define _gitrev v0.26.1-24-g9fd7c61 %define branch fixes/0.26 # @@ -76,7 +76,7 @@ %if "%{branch}" == "master" Release: 0.1.git.%{_gitrev}%{?dist} %else -Release: 1%{?dist} +Release: 4%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -102,10 +102,12 @@ %if 0%{?rhel} %define with_crystalhd %{?_without_crystalhd: 1} %{?!_without_crystalhd: 0} %define with_systemd %{?_without_systemd: 1} %{?!_without_systemd: 0} +%define with_vpx %{?_without_vpx: 1} %{?!_without_vpx: 0} %else %define with_crystalhd %{?_without_crystalhd: 0} %{?!_without_crystalhd: 1} %define with_systemd %{?_without_systemd: 0} %{?!_without_systemd: 1} +%define with_vpx %{?_without_vpx: 0} %{?!_without_vpx: 1} %endif %define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} @@ -139,6 +141,8 @@ Patch1: mythlogserver-segv.patch Patch2: mythtv-0.26.0-types_h.patch Patch3: mythtv-0.26.1-libva_121.patch +# http://code.mythtv.org/trac/ticket/11338 +Patch4: mythtv-0.26-libcec2.patch Source10: PACKAGE-LICENSING Source11: ChangeLog @@ -181,8 +185,10 @@ BuildRequires: qt-devel >= 4.6 BuildRequires: phonon-devel phonon-backend-gstreamer BuildRequires: libuuid-devel +%if 0%{?fedora} BuildRequires: libcec-devel BuildRequires: libvpx-devel +%endif BuildRequires: lm_sensors-devel BuildRequires: lirc-devel @@ -361,6 +367,7 @@ Requires: mysql-server >= 5, mysql >= 5 %endif Requires: xmltv +Requires: udisks # Generate the required mythtv-frontend-api version string here so we only # have to do it once. @@ -837,6 +844,7 @@ %patch1 -p1 -b .mythlogserver %patch2 -p1 -b .types_h %patch3 -p1 -b .libva +%patch4 -p1 -b .libcec # Install ChangeLog install -m 0644 %{SOURCE11} . @@ -909,7 +917,9 @@ --enable-libx264 \ --enable-libtheora --enable-libvorbis \ --enable-libxvid \ +%if %{with_vpx} --enable-libvpx \ +%endif %if %{with_vdpau} --enable-vdpau \ %endif @@ -948,9 +958,11 @@ %endif --enable-debug -# Insert rpm version-release for mythbackend --version output - echo 'SOURCE_VERSION="%{version}-%{release} (%_gitrev)"' > VERSION - echo 'BRANCH="%{branch}"' >> VERSION +# Set the mythtv --version string + cat > VERSION <<EOF +SOURCE_VERSION=%{_gitrev} +BRANCH=%{branch} +EOF # Make make %{?_smp_mflags} @@ -1168,6 +1180,7 @@ usermod -a -G audio,video mythtv exit 0 +%if %{with_mythmusic} %pre -n mythmusic # Add the "mythtv" user, with membership in the audio and video group getent group mythtv >/dev/null || groupadd -r mythtv @@ -1178,6 +1191,7 @@ # or new installs. usermod -a -G audio,video mythtv exit 0 +%endif %post backend %if %{with_systemd} @@ -1459,6 +1473,15 @@ %changelog +* Tue Oct 1 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-4 +- Update to latest bugfix release. +- Add patch for libcec 2. +- Update to latest bugfix release. +- Add udisks as a requirement as it is required for ejecting cd/dvds. + +* Mon Sep 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.26.1-2 +- Rebuilt + * Thu Aug 22 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1 - Update to latest bugfix release. - Add patch for new libva 1.2.1 version in rawhide.

10 years, 7 months

1
0
0 / 0

rpms/vdr-burn/F-19 vdr-burn-0.2.2-config.patch, 1.1, 1.2 vdr-burn.spec, 1.10, 1.11 vdr-burn-0.2.2-Makefile.patch, 1.1, NONE

by Martin Gansser

Author: martinkg Update of /cvs/free/rpms/vdr-burn/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12595/F-19 Modified Files: vdr-burn-0.2.2-config.patch vdr-burn.spec Removed Files: vdr-burn-0.2.2-Makefile.patch Log Message: vdr-burn-0.2.2-config.patch: Makefile | 4 ++-- README | 4 ++-- burn/vdrburn-dvd.conf | 2 +- chain-archive.c | 2 +- jobs.c | 2 +- vdrburn-archive.sh | 6 +++--- vdrburn-dvd.sh | 11 ++++++----- 7 files changed, 16 insertions(+), 15 deletions(-) Index: vdr-burn-0.2.2-config.patch =================================================================== RCS file: /cvs/free/rpms/vdr-burn/F-19/vdr-burn-0.2.2-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vdr-burn-0.2.2-config.patch 23 Feb 2013 14:43:39 -0000 1.1 +++ vdr-burn-0.2.2-config.patch 3 Oct 2013 10:36:39 -0000 1.2 @@ -1,24 +1,17 @@ -Index: README -=================================================================== ---- README.orig 2012-10-07 17:31:04.771395847 +0200 -+++ README 2012-10-07 17:31:55.124400166 +0200 -@@ -77,7 +77,7 @@ - - 3b.(optional) Change the default temporary folder, the default DVD writer device - and the default ISO directory with TMPDIR (default: /tmp), -- DVDDEV (default: /dev/dvdrw) and ISODIR (default: /pub/export) -+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir) - - # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins - -Index: chain-archive.c -=================================================================== -RCS file: /var/cvsroot/burn/chain-archive.c,v -retrieving revision 1.13 -diff -u -r1.13 chain-archive.c ---- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13 -+++ chain-archive.c 12 Dec 2006 20:31:14 -0000 -@@ -64,7 +64,7 @@ +diff -up burn-0.2.2/burn/vdrburn-dvd.conf~ burn-0.2.2/burn/vdrburn-dvd.conf +--- burn-0.2.2/burn/vdrburn-dvd.conf~ 2011-10-08 15:28:55.000000000 +0300 ++++ burn-0.2.2/burn/vdrburn-dvd.conf 2013-02-24 23:51:46.936031051 +0200 +@@ -1,5 +1,5 @@ + # settings for vdrburn-dvd.sh + + # Java and Project X +-#export JAVA_EXE=/usr/bin/java ++export JAVA_EXE=/usr/bin/java + export PROJECTX_JAR=/usr/share/java/ProjectX.jar +diff -up burn-0.2.2/chain-archive.c~ burn-0.2.2/chain-archive.c +--- burn-0.2.2/chain-archive.c~ 2006-09-16 21:33:36.000000000 +0300 ++++ burn-0.2.2/chain-archive.c 2013-02-24 23:51:46.936031051 +0200 +@@ -64,7 +64,7 @@ namespace vdr_burn bind( &recording::get_graft_point, _2 ), " " ))); @@ -27,14 +20,10 @@ switch (get_job().get_store_mode()) { case storemode_create: -Index: jobs.c -=================================================================== -RCS file: /var/cvsroot/burn/jobs.c,v -retrieving revision 1.35 -diff -u -r1.35 jobs.c ---- jobs.c 1 Oct 2006 21:22:27 -0000 1.35 -+++ jobs.c 12 Dec 2006 20:31:14 -0000 -@@ -389,7 +389,7 @@ +diff -up burn-0.2.2/jobs.c~ burn-0.2.2/jobs.c +--- burn-0.2.2/jobs.c~ 2011-10-04 19:25:45.000000000 +0300 ++++ burn-0.2.2/jobs.c 2013-02-24 23:51:46.936031051 +0200 +@@ -436,7 +436,7 @@ namespace vdr_burn std::string job::get_archive_id() { std::string archive_id = ""; @@ -43,58 +32,80 @@ std::ifstream f(counter_path.c_str()); if (!f) { proctools::logger::error(proctools::format("couldn't read {0}") % counter_path); -Index: vdrburn-archive.sh -=================================================================== ---- vdrburn-archive.sh.orig 2012-10-07 17:35:46.210420545 +0200 -+++ vdrburn-archive.sh 2012-10-07 17:38:38.421435235 +0200 -@@ -53,7 +53,7 @@ +diff -up burn-0.2.2/Makefile~ burn-0.2.2/Makefile +--- burn-0.2.2/Makefile~ 2013-02-21 12:04:10.000000000 +0200 ++++ burn-0.2.2/Makefile 2013-02-24 23:51:13.517432291 +0200 +@@ -126,7 +126,7 @@ TMPDIR=/tmp + endif + + ifndef DVDDEV +-DVDDEV=/dev/dvdrw ++DVDDEV=/dev/cdrom + endif + + ifndef ISODIR +@@ -134,7 +134,7 @@ + endif + + ### compile only with ttxtsub support if core VDR is patched +-ifneq ($(strip $(wildcard $(VDRDIR)/vdrttxtsubshooks.h)),) ++ifneq ($(strip $(wildcard /usr/include/vdr/vdrttxtsubshooks.h)),) + DEFINES += -DTTXT_SUBTITLES + endif + +diff -up burn-0.2.2/README~ burn-0.2.2/README +--- burn-0.2.2/README~ 2011-12-28 18:18:15.000000000 +0200 ++++ burn-0.2.2/README 2013-02-24 23:51:46.937031069 +0200 +@@ -77,7 +77,7 @@ Installation + + 3b.(optional) Change the default temporary folder, the default DVD writer device + and the default ISO directory with TMPDIR (default: /tmp), +- DVDDEV (default: /dev/dvdrw) and ISODIR (default: /pub/export) ++ DVDDEV (default: /dev/cdrom) and ISODIR (default: video dir) + + # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins + +@@ -119,7 +119,7 @@ The plugin accepts the following paramet + -d DIR, --datadir=DIR use DIR for temporary datafiles + (default: /var/spool/video) + -D DEV --dvd=DEV use DEV as DVD Writer +- (default: /dev/dvdrw) ++ (default: /dev/cdrom) + -i DIR --iso=DIR use DIR to store ISO images + (default: /pub/export) + +diff -up burn-0.2.2/vdrburn-archive.sh~ burn-0.2.2/vdrburn-archive.sh +--- burn-0.2.2/vdrburn-archive.sh~ 2011-10-10 21:59:47.000000000 +0300 ++++ burn-0.2.2/vdrburn-archive.sh 2013-02-24 23:51:46.937031069 +0200 +@@ -53,7 +53,7 @@ case $1 in RECORDING_DMH="$RECPATH"/"$UPPERRECDIR"_DVD/"$RECDIR" mkdir -p "$RECORDING_DMH" - cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr -+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr" ++ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH"/dvd.vdr # Old style Records ("index.vdr"/"info.vdr") if [ -f "$RECORDING_PATH"/index.vdr ]; then cp "$RECORDING_PATH"/info.vdr "$RECORDING_DMH"/info.vdr -@@ -66,8 +66,8 @@ +@@ -66,8 +66,8 @@ case $1 in ;; archivemark) - ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1)) - printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard" -+ (DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1)) ++ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1)) + printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard" ;; *) -Index: vdrburn-dvd.sh -=================================================================== ---- vdrburn-dvd.sh.orig 2012-10-07 17:40:01.859441567 +0200 -+++ vdrburn-dvd.sh 2012-10-07 17:48:54.861488725 +0200 -@@ -78,7 +78,7 @@ - ;; - - demux) -- [ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf -+ [ -r /etc/vdr/plugins/burn/vdrburn-dvd.conf ] && . /etc/vdr/plugins/burn/vdrburn-dvd.conf - [ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java) - - [ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable \"$JAVA_EXE\" not found" && exit 1 -@@ -94,7 +94,7 @@ - - $IO_NICE $JAVA_EXE -Djava.awt.headless=true \ - -jar $PROJECTX_JAR \ -- -ini $CONFIG_PATH/ProjectX.ini \ -+ -ini /etc/vdr/plugins/burn/ProjectX.ini \ - $TTXT_OPTS \ - $CUT -id $USED_TRACKS \ - -demux -out "$MPEG_DATA_PATH" -name vdrsync \ -@@ -245,15 +245,16 @@ +diff -up burn-0.2.2/vdrburn-dvd.sh~ burn-0.2.2/vdrburn-dvd.sh +--- burn-0.2.2/vdrburn-dvd.sh~ 2011-10-10 21:59:34.000000000 +0300 ++++ burn-0.2.2/vdrburn-dvd.sh 2013-02-24 23:51:46.937031069 +0200 +@@ -245,15 +245,15 @@ case $1 in echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}" rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}" echo "Creating "$RECORDING_DMH"/dvd.vdr" - cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr -+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr" ++ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH"/dvd.vdr printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >> "$RECORDING_DMH"/dvd.vdr ;; @@ -106,8 +117,19 @@ + cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr" + ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1)) + printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard" -+ ;; mkiso) - +diff -up burn-0.2.2/vdrburn-dvd.sh~ burn-0.2.2/vdrburn-dvd.sh +--- burn-0.2.2/vdrburn-dvd.sh~ 2011-10-10 21:59:34.000000000 +0300 ++++ burn-0.2.2/vdrburn-dvd.sh 2013-03-17 02:27:44.741667614 +0200 +@@ -93,7 +93,8 @@ case $1 in + fi + + $IO_NICE $JAVA_EXE -Djava.awt.headless=true \ +- -jar $PROJECTX_JAR \ ++ -cp $PROJECTX_JAR:$(build-classpath apache-commons-net jakarta-oro) \ ++ net.sourceforge.dvb.projectx.common.Start \ + -ini $CONFIG_PATH/ProjectX.ini \ + $TTXT_OPTS \ + $CUT -id $USED_TRACKS \ Index: vdr-burn.spec =================================================================== RCS file: /cvs/free/rpms/vdr-burn/F-19/vdr-burn.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vdr-burn.spec 28 Apr 2013 20:25:22 -0000 1.10 +++ vdr-burn.spec 3 Oct 2013 10:36:39 -0000 1.11 @@ -1,32 +1,32 @@ -%define pname burn -%define gver 0.1.3 +%global gver 0.1.3 +%global pname burn +%global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$ Name: vdr-%{pname} Version: 0.2.2 -Release: 3%{?dist} +Release: 5%{?dist} Summary: DVD writing plugin for VDR -Group: Applications/Multimedia # genindex is GPLv2+, rest GPL+ License: GPL+ and GPLv2+ URL: http://projects.vdr-developer.org/projects/plg-burn -Source0: http://projects.vdr-developer.org/attachments/download/832/%{name}-%{vers... +Source0: http://projects.vdr-developer.org/attachments/download/1252/%{name}-%{ver... Source1: %{name}.conf Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz -Patch0: %{name}-%{version}-config.patch -Patch1: %{name}-%{version}-Makefile.patch +Patch0: %{name}-0.2.2-config.patch -BuildRequires: vdr-devel >= 1.7.31 +BuildRequires: vdr-devel >= 1.7.38 BuildRequires: boost-devel -BuildRequires: gd-devel +BuildRequires: gd-devel >= 2.0.33-9.3 +BuildRequires: gettext Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} -Requires: ProjectX +Requires: ProjectX >= 0.90.4.00.b29 Requires: m2vrequantiser Requires: dvdauthor Requires: mjpegtools Requires: dvd+rw-tools -Requires: dejavu-lgc-sans-fonts -Conflicts: ProjectX < 0.90.4.00.b29 +Requires: dejavu-sans-fonts +Requires: pxsup2dast %description This plugin enables VDR to write compliant DVDs from VDR recordings @@ -40,14 +40,13 @@ %prep %setup -q -c -a 2 -cd burn-0.2.2 -find -name CVS | xargs rm -rf -chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README -%patch0 -p0 -%patch1 -p1 +mv %{pname}-%{version} burn ; cd burn + +%patch0 -p1 sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh -sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c + +sed -i -e 's|"Vera"|"DejaVuSans"|g' skins.c cd ../genindex-%{gver} sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile @@ -56,52 +55,49 @@ %build -make -C burn-%{version} %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC" LIBDIR=. VDRDIR=. LOCALEDIR=./locale all +# main build not parallel clean (libvdr-burn.so -> proctools/libproctools.a) +make -C burn ISODIR=%{vdr_videodir} all make -C genindex-%{gver} %{?_smp_mflags} %install -install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}/bin -#install -pm 755 burn-%{version}/libvdr-%{pname}.so.%{vdr_apiversion} $RPM_BUILD_ROOT%{vdr_plugindir} -install -pm 755 burn-%{version}/libvdr-%{pname}.so $RPM_BUILD_ROOT%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion} -install -pm 755 burn-%{version}/*.sh genindex-%{gver}/genindex \ - $RPM_BUILD_ROOT%{vdr_plugindir}/bin +%make_install -C burn +install -dm 755 $RPM_BUILD_ROOT%{vdr_libdir}/bin +install -pm 755 burn/*.sh genindex-%{gver}/genindex \ + $RPM_BUILD_ROOT%{vdr_libdir}/bin install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/skins -cp -pR burn-%{version}/burn/* $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn +cp -pR burn/burn/* $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn rm -rf $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/{counters,fonts/*} -ln -s %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf \ +ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf \ $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/fonts/ -install -Dpm 644 burn-%{version}/burn/counters/standard \ +install -Dpm 644 burn/burn/counters/standard \ $RPM_BUILD_ROOT%{vdr_vardir}/burn/counters/standard install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf - -# locale -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale -cp -pR burn-%{version}/locale/* $RPM_BUILD_ROOT%{_datadir}/locale - %find_lang %{name} -%post -if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0? - %{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \ - %{vdr_configdir}/reccmds.conf >/dev/null 2>&1 || : -fi %files -f %{name}.lang -%defattr(-,root,root,-) -%doc burn-%{version}/COPYING burn-%{version}/HISTORY burn-%{version}/README README.genindex +%doc burn/COPYING burn/HISTORY burn/README README.genindex %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf %config(noreplace) %{vdr_configdir}/plugins/%{pname}/ -%{vdr_plugindir}/bin/genindex -%{vdr_plugindir}/bin/vdrburn-archive.sh -%{vdr_plugindir}/bin/vdrburn-dvd.sh -%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion} +%{vdr_libdir}/bin/genindex +%{vdr_libdir}/bin/vdrburn-archive.sh +%{vdr_libdir}/bin/vdrburn-dvd.sh +%{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} %defattr(-,%{vdr_user},root) -%config(noreplace) %{vdr_vardir}/%{pname} +%config(noreplace) %{vdr_vardir}/burn/ +%defattr(-,root,root,-) %changelog +* Thu Jun 13 2013 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.2-5 +- changes for the new Makefile style +- specfile cleanups + +* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.2-4 +- Rebuilt for GD 2.1.0 + * Sun Apr 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.2-3 - https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -120,7 +116,7 @@ - specfile cleanups * Thu Oct 11 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-3 -- rebuild for Fedora 18. +- rebuild for Fedora 18 * Wed Oct 10 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-2 - removed vdrsync Requirement @@ -129,8 +125,8 @@ * Sun Oct 07 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-1 - spec file cleanup - rebuild for new release -- Adapt to VDR 1.7.30. -- added priority header patch for Fedora 18. +- Adapt to VDR 1.7.30 +- added priority header patch for Fedora 18 * Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.0-0.20.pre21 - Rebuilt for c++ ABI breakage @@ -182,7 +178,7 @@ * Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.6.pre21 - 0.1.0-pre21, include private copy of genindex (0.1.3) for now. -* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-16 +* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-16 - Rebuild for VDR 1.4.4. * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.0.009-15 @@ -263,7 +259,7 @@ - Rebuild for VDR 1.3.33. * Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.6.pre3 -- Rebuild for VDR 1.3.32. +- Rebuild for VDR 1.3.32 * Tue Aug 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.5.pre3 - Rebuild for VDR 1.3.31. @@ -279,3 +275,4 @@ * Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3 - Update URLs. + --- vdr-burn-0.2.2-Makefile.patch DELETED ---

10 years, 7 months

1
0
0 / 0

rpms/staging-kmod-addons/F-19 staging-kmod-addons.spec,1.13,1.14

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/staging-kmod-addons/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8973 Modified Files: staging-kmod-addons.spec Log Message: Rebuilt Index: staging-kmod-addons.spec =================================================================== RCS file: /cvs/free/rpms/staging-kmod-addons/F-19/staging-kmod-addons.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- staging-kmod-addons.spec 20 Sep 2013 09:39:05 -0000 1.13 +++ staging-kmod-addons.spec 3 Oct 2013 09:49:05 -0000 1.14 @@ -7,7 +7,7 @@ Name: staging-kmod-addons Version: 3.11.1 -Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist} +Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1 Summary: Documentation and shared parts for the kmod-staging packages Group: System Environment/Kernel @@ -140,6 +140,9 @@ %changelog +* Thu Oct 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.11.1-1.1 +- Rebuilt + * Fri Sep 20 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.11.1-1 - Update to 3.11.1 - drop csr, dropped upstream

10 years, 7 months

1
0
0 / 0

rpms/catalyst-kmod/devel catalyst-kmod.spec,1.17,1.18

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/catalyst-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4046 Modified Files: catalyst-kmod.spec Log Message: * Wed Oct 02 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.4.beta2 - rebuilt Index: catalyst-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/catalyst-kmod.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- catalyst-kmod.spec 18 Sep 2013 14:51:52 -0000 1.17 +++ catalyst-kmod.spec 2 Oct 2013 23:11:03 -0000 1.18 @@ -13,7 +13,7 @@ Name: catalyst-kmod Version: 13.8 -Release: 0.3.beta2%{?dist} +Release: 0.4.beta2%{?dist} # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -99,6 +99,9 @@ %changelog +* Wed Oct 02 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.4.beta2 +- rebuilt + * Wed Sep 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.3.beta2 - Update to Catalyst 13.8beta1 (internal version 13.20.11)

10 years, 7 months

1
0
0 / 0

rpms/xorg-x11-drv-catalyst/devel xorg-x11-drv-catalyst.spec,1.8,1.9

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3746 Modified Files: xorg-x11-drv-catalyst.spec Log Message: * Wed Oct 02 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.4.beta2 - rebuilt Index: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/xorg-x11-drv-catalyst.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xorg-x11-drv-catalyst.spec 19 Sep 2013 10:28:05 -0000 1.8 +++ xorg-x11-drv-catalyst.spec 2 Oct 2013 23:10:08 -0000 1.9 @@ -5,7 +5,7 @@ %global __strip /bin/true Name: xorg-x11-drv-catalyst Version: 13.8 -Release: 0.3.beta2%{?dist} +Release: 0.4.beta2%{?dist} Summary: AMD's proprietary driver for ATI graphic cards Group: User Interface/X Hardware Support License: Redistributable, no modification permitted @@ -405,6 +405,9 @@ %changelog +* Wed Oct 02 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.4.beta2 +- rebuilt + * Thu Sep 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.3.beta2 - rebuilt

10 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits October 2013