rpms/mythtv/F-17 ChangeLog, 1.2, 1.3 mythbackend.service, 1.7, 1.8 mythtv-0.25.2-fixes.patch, 1.1, 1.2 mythtv.spec, 1.98, 1.99
Richard Shaw
hobbes1069 at rpmfusion.org
Sat Aug 25 21:59:18 CEST 2012
- Previous message: rpms/mythtv/devel mythbackend.service,1.7,1.8
- Next message: rpms/mythtv/F-16 ChangeLog, 1.1, 1.2 mythbackend.service, 1.6, 1.7 mythtv.spec, 1.95, 1.96 sources, 1.54, 1.55
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18151
Modified Files:
ChangeLog mythbackend.service mythtv-0.25.2-fixes.patch
mythtv.spec
Log Message:
* Sat Aug 25 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.2-2
- Update to latest fixes/0.25.
- Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 30 Jul 2012 18:22:56 -0000 1.2
+++ ChangeLog 25 Aug 2012 19:59:17 -0000 1.3
@@ -1,3 +1,36 @@
+commit 46cab93562429cd19029402a2387f63a72aeb898
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date: Tue Jul 31 14:21:22 2012 -0400
+
+ Correct --printexpire option in mythbackend.
+
+ This corrects logic that was accidentally inverted in 8bc8dd54, and
+ allows `mythbackend --printexpire` to be used again.
+ (cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
+
+commit 8ab229a8bed860fb0855797c683655a7465e2ee4
+Merge: a4cdc9e 1c496c8
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date: Tue Jul 31 14:22:32 2012 -0400
+
+ Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+
+commit 1c496c81662eabda444452071eb18f2fd375d4d0
+Author: Kyle <klillis at gmail.com>
+Date: Mon Jul 30 13:34:11 2012 -0400
+
+ Fixes #10897. Clear paused when we unpause FirewireRecorder.
+
+ Signed-off-by: Daniel Thor Kristjansson <danielk at cuymedia.net>
+
+commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
+Author: Daniel Thor Kristjansson <dkristjansson at mythtv.org>
+Date: Tue Jul 24 12:13:16 2012 -0400
+
+ Fixes #10870. Fix Start/Stop race condition in StreamHandler.
+
+ This is a backport of [445faaa47].
+
commit a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
Author: Stuart Morgan <smorgan at mythtv.org>
Date: Sun Jul 29 12:42:41 2012 +0100
@@ -51,6 +84,13 @@
e.g. GStreamer/Source/gst-plugins-ugly/gst/synaesthesia/synaescope.c
(cherry picked from commit e331017f2d1ee9be82da9c0b64ca4435ec3efd1e)
+commit a4cdc9e01295991056cdc8c5411e70937b1a4842
+Merge: 450ed91 f0e2ad8
+Author: Raymond Wagner <rwagner at mythtv.org>
+Date: Fri Jul 20 21:06:48 2012 -0400
+
+ Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+
commit f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
Author: Jean-Yves Avenard <jyavenard at mythtv.org>
Date: Wed Jul 18 20:49:11 2012 +1000
@@ -78,3 +118,12 @@
off network access.
Signed-off-by: Jean-Yves Avenard <jyavenard at mythtv.org>
+
+commit 450ed915d3a13b84489ecdebdad6fca18fc8c312
+Author: GDragon <gdragon at jetcom.org>
+Date: Mon Jul 9 15:33:31 2012 -0400
+
+ Properly set job type in fromProgram and fromRecorded methods.
+
+ Signed-off-by: Raymond Wagner <rwagner at mythtv.org>
+ (cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)
Index: mythbackend.service
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythbackend.service,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mythbackend.service 30 Jul 2012 18:22:56 -0000 1.7
+++ mythbackend.service 25 Aug 2012 19:59:17 -0000 1.8
@@ -44,7 +44,7 @@
# Default setting assumes a system wide install. Otherwise it should be set to
# the folder containing the .mythtv subfolder containing the config.xml file
-Environment=HOME=/etc/mythtv
+Environment=MYTHCONFDIR=/etc/mythtv
# systemd changes execution from the calling user (possibly root) to this user
# if you have permissions problems or obscure errors try logging in as mythtv
mythtv-0.25.2-fixes.patch:
checksums/mythplugins-0.25.2.md5sum | 1
checksums/mythtv-0.25.2.md5sum | 1
mythplugins/mythmusic/mythmusic/musicplayer.cpp | 7
mythplugins/mythmusic/mythmusic/polygon.h | 4
mythtv/bindings/python/MythTV/dataheap.py | 2
mythtv/html/setup/wizard-network.qsp | 4
mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++---------
mythtv/libs/libmythtv/firewirerecorder.cpp | 1
mythtv/libs/libmythtv/streamhandler.cpp | 34 +---
mythtv/libs/libmythtv/streamhandler.h | 6
mythtv/libs/libmythtv/subtitlescreen.cpp | 6
mythtv/libs/libmythtv/subtitlescreen.h | 7
mythtv/programs/mythbackend/main_helpers.cpp | 2
mythtv/themes/defaultmenu/mainmenu.xml | 1
14 files changed, 176 insertions(+), 96 deletions(-)
Index: mythtv-0.25.2-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv-0.25.2-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythtv-0.25.2-fixes.patch 30 Jul 2012 18:22:57 -0000 1.1
+++ mythtv-0.25.2-fixes.patch 25 Aug 2012 19:59:17 -0000 1.2
@@ -2,12 +2,17 @@
checksums/mythtv-0.25.2.md5sum | 1 +
mythplugins/mythmusic/mythmusic/musicplayer.cpp | 7 +
mythplugins/mythmusic/mythmusic/polygon.h | 4 +-
+ mythtv/bindings/python/MythTV/dataheap.py | 2 +
mythtv/html/setup/wizard-network.qsp | 4 +
mythtv/libs/libmythbase/serverpool.cpp | 196 +++++++++++++++--------
+ mythtv/libs/libmythtv/firewirerecorder.cpp | 1 +
+ mythtv/libs/libmythtv/streamhandler.cpp | 34 ++---
+ mythtv/libs/libmythtv/streamhandler.h | 6 +-
mythtv/libs/libmythtv/subtitlescreen.cpp | 6 +-
mythtv/libs/libmythtv/subtitlescreen.h | 7 +-
+ mythtv/programs/mythbackend/main_helpers.cpp | 2 +-
mythtv/themes/defaultmenu/mainmenu.xml | 1 +
- 9 files changed, 152 insertions(+), 75 deletions(-)
+ 14 files changed, 176 insertions(+), 96 deletions(-)
diff --git a/checksums/mythplugins-0.25.2.md5sum b/checksums/mythplugins-0.25.2.md5sum
new file mode 100644
@@ -68,6 +73,26 @@
}
};
#endif
+diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py
+index dd832ba..ae817e7 100644
+--- a/mythtv/bindings/python/MythTV/dataheap.py
++++ b/mythtv/bindings/python/MythTV/dataheap.py
+@@ -612,6 +612,7 @@ class Job( DBDataWrite, JOBTYPE, JOBCMD, JOBFLAG, JOBSTATUS ):
+ def fromRecorded(cls, rec, type, status=None, schedruntime=None,
+ hostname=None, args=None, flags=None):
+ job = cls(db=rec._db)
++ job.type = type
+ job.chanid = rec.chanid
+ job.starttime = rec.starttime
+ if status:
+@@ -632,6 +633,7 @@ class Job( DBDataWrite, JOBTYPE, JOBCMD, JOBFLAG, JOBSTATUS ):
+ if prog.rectype != prog.rsRecorded:
+ raise MythError('Invalid recording type for Job.')
+ job = cls(db=prog._db)
++ job.type = type
+ job.chanid = prog.chanid
+ job.starttime = prog.recstartts
+ if status:
diff --git a/mythtv/html/setup/wizard-network.qsp b/mythtv/html/setup/wizard-network.qsp
index 03c37ac..59b67a9 100644
--- a/mythtv/html/setup/wizard-network.qsp
@@ -334,6 +359,116 @@
}
}
+diff --git a/mythtv/libs/libmythtv/firewirerecorder.cpp b/mythtv/libs/libmythtv/firewirerecorder.cpp
+index 9caa28e..fbb5ed0 100644
+--- a/mythtv/libs/libmythtv/firewirerecorder.cpp
++++ b/mythtv/libs/libmythtv/firewirerecorder.cpp
+@@ -210,6 +210,7 @@ bool FirewireRecorder::PauseAndWait(int timeout)
+ {
+ LOG(VB_RECORD, LOG_INFO, LOC +
+ QString("PauseAndWait(%1) -- unpause").arg(timeout));
++ paused = false;
+ StartStreaming();
+ unpauseWait.wakeAll();
+ }
+diff --git a/mythtv/libs/libmythtv/streamhandler.cpp b/mythtv/libs/libmythtv/streamhandler.cpp
+index 2b0a7b6..fbe9399 100644
+--- a/mythtv/libs/libmythtv/streamhandler.cpp
++++ b/mythtv/libs/libmythtv/streamhandler.cpp
+@@ -26,9 +26,15 @@ StreamHandler::StreamHandler(const QString &device) :
+
+ StreamHandler::~StreamHandler()
+ {
+- if (!_stream_data_list.empty())
++ QMutexLocker locker(&_add_rm_lock);
++
+ {
+- LOG(VB_GENERAL, LOG_ERR, LOC + "dtor & _stream_data_list not empty");
++ QMutexLocker locker2(&_listener_lock);
++ if (!_stream_data_list.empty())
++ {
++ LOG(VB_GENERAL, LOG_ERR, LOC +
++ "dtor & _stream_data_list not empty");
++ }
+ }
+
+ // This should never be triggered.. just to be safe..
+@@ -41,6 +47,8 @@ void StreamHandler::AddListener(MPEGStreamData *data,
+ bool needs_buffering,
+ QString output_file)
+ {
++ QMutexLocker locker(&_add_rm_lock);
++
+ LOG(VB_RECORD, LOG_INFO, LOC + QString("AddListener(0x%1) -- begin")
+ .arg((uint64_t)data,0,16));
+ if (!data)
+@@ -93,6 +101,8 @@ void StreamHandler::AddListener(MPEGStreamData *data,
+
+ void StreamHandler::RemoveListener(MPEGStreamData *data)
+ {
++ QMutexLocker locker(&_add_rm_lock);
++
+ LOG(VB_RECORD, LOG_INFO, LOC + QString("RemoveListener(0x%1) -- begin")
+ .arg((uint64_t)data,0,16));
+ if (!data)
+@@ -158,12 +168,6 @@ void StreamHandler::Start(void)
+ while (!_running && !_error && _running_desired)
+ _running_state_changed.wait(&_start_stop_lock, 100);
+
+- if (!_running_desired)
+- {
+- LOG(VB_GENERAL, LOG_WARNING, LOC +
+- "Programmer Error: Stop called before Start finished");
+- }
+-
+ if (_error)
+ {
+ LOG(VB_GENERAL, LOG_WARNING, LOC + "Start failed");
+@@ -175,17 +179,9 @@ void StreamHandler::Stop(void)
+ {
+ QMutexLocker locker(&_start_stop_lock);
+
+- do
+- {
+- SetRunningDesired(false);
+- while (!_running_desired && _running)
+- _running_state_changed.wait(&_start_stop_lock, 100);
+- if (_running_desired)
+- {
+- LOG(VB_GENERAL, LOG_WARNING, LOC +
+- "Programmer Error: Start called before Stop finished");
+- }
+- } while (_running_desired);
++ SetRunningDesired(false);
++ while (_running)
++ _running_state_changed.wait(&_start_stop_lock, 100);
+
+ wait();
+ }
+diff --git a/mythtv/libs/libmythtv/streamhandler.h b/mythtv/libs/libmythtv/streamhandler.h
+index 1db0584..8f97cdb 100644
+--- a/mythtv/libs/libmythtv/streamhandler.h
++++ b/mythtv/libs/libmythtv/streamhandler.h
+@@ -45,7 +45,9 @@ class PIDInfo
+ typedef QMap<uint,PIDInfo*> PIDInfoMap;
+
+ // locking order
+-// _pid_lock -> _listener_lock -> _start_stop_lock
++// _pid_lock -> _listener_lock
++// _add_rm_lock -> _listener_lock
++// -> _start_stop_lock
+
+ class StreamHandler : protected MThread, public DeviceReaderCB
+ {
+@@ -101,6 +103,8 @@ class StreamHandler : protected MThread, public DeviceReaderCB
+ bool _needs_buffering;
+ bool _allow_section_reader;
+
++ QMutex _add_rm_lock;
++
+ mutable QMutex _start_stop_lock;
+ volatile bool _running_desired;
+ volatile bool _error;
diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
index 9ec70e9..43dc711 100644
--- a/mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -392,6 +527,19 @@
};
class FormattedTextLine
+diff --git a/mythtv/programs/mythbackend/main_helpers.cpp b/mythtv/programs/mythbackend/main_helpers.cpp
+index 5017af4..28d5a4a 100644
+--- a/mythtv/programs/mythbackend/main_helpers.cpp
++++ b/mythtv/programs/mythbackend/main_helpers.cpp
+@@ -405,7 +405,7 @@ int handle_command(const MythBackendCommandLineParser &cmdline)
+ return (ok) ? GENERIC_EXIT_OK : GENERIC_EXIT_CONNECT_ERROR;
+ }
+
+- if (!cmdline.toBool("printexpire"))
++ if (cmdline.toBool("printexpire"))
+ {
+ expirer = new AutoExpire();
+ expirer->PrintExpireList(cmdline.toString("printexpire"));
diff --git a/mythtv/themes/defaultmenu/mainmenu.xml b/mythtv/themes/defaultmenu/mainmenu.xml
index 1c72a92..b747575 100644
--- a/mythtv/themes/defaultmenu/mainmenu.xml
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mythtv.spec 30 Jul 2012 18:22:57 -0000 1.98
+++ mythtv.spec 25 Aug 2012 19:59:17 -0000 1.99
@@ -60,7 +60,7 @@
# Git revision and branch ID
# 0.25 release: git tag v0.25.1
-%define _gitrev v0.25.2-4-ged58b3a
+%define _gitrev v0.25.2-15-g46cab93
%define branch fixes/0.25
# Mythtv and plugins from github.com
@@ -81,7 +81,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1441,10 +1441,14 @@
%changelog
+* Sat Aug 25 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.2-2
+- Update to latest fixes/0.25.
+- Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).
+
* Mon Jul 16 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.2-1
- Patch HLS for adapative x264 profile.
- Make sure mythbackend starts after time has synced.
-- Update to latest fixies/0.25.
+- Update to latest fixes/0.25.
* Fri Jul 06 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.1-2
- Patch for PHP 5.4 warnings.
- Previous message: rpms/mythtv/devel mythbackend.service,1.7,1.8
- Next message: rpms/mythtv/F-16 ChangeLog, 1.1, 1.2 mythbackend.service, 1.6, 1.7 mythtv.spec, 1.95, 1.96 sources, 1.54, 1.55
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list