2:52 a.m.
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17962
Modified Files:
mythtv.spec sources
Added Files:
mythplugins-compile_fixes_for_qt_4_7.patch
mythtv-compile_fixes_for_qt_4_7.patch
Log Message:
* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946
- Update to svn trunk, revision 25985
- Patch in Qt 4.7 build fix patches from mythtv trac ticket #8572
mythplugins-compile_fixes_for_qt_4_7.patch:
mythnetvision/mythnetvision/netsearch.cpp | 6 +++---
mythvideo/mythvideo/videodlg.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE mythplugins-compile_fixes_for_qt_4_7.patch ---
---
mythnetvision/mythnetvision/netsearch.cpp | 6 3 + 3 - 0 !
mythvideo/mythvideo/videodlg.h | 2 1 + 1 - 0 !
2 files changed, 4 insertions(+), 4 deletions(-)
Index: mythplugins/mythvideo/mythvideo/videodlg.h
===================================================================
--- mythplugins.orig/mythvideo/mythvideo/videodlg.h 2010-06-05 19:38:22.000000000 -0400
+++ mythplugins/mythvideo/mythvideo/videodlg.h 2010-07-01 22:26:25.000000000 -0400
@@ -153,7 +153,7 @@
QString RemoteImageCheck(QString host, QString filename);
QString GetCoverImage(MythGenericTree *node);
QString GetFirstImage(MythGenericTree *node, QString type,
- QString gpnode = NULL, int levels = 0);
+ QString gpnode = QString(), int levels = 0);
QString GetImageFromFolder(Metadata *metadata);
QString GetScreenshot(MythGenericTree *node);
QString GetBanner(MythGenericTree *node);
Index: mythplugins/mythnetvision/mythnetvision/netsearch.cpp
===================================================================
--- mythplugins.orig/mythnetvision/mythnetvision/netsearch.cpp 2010-06-05
19:38:22.000000000 -0400
+++ mythplugins/mythnetvision/mythnetvision/netsearch.cpp 2010-07-01 22:29:30.000000000
-0400
@@ -38,9 +38,9 @@
m_downloadable(NULL), m_progress(NULL),
m_busyPopup(NULL), m_okPopup(NULL),
m_popupStack(), m_netSearch(NULL),
- m_reply(NULL), m_currentSearch(NULL),
- m_currentGrabber(0), m_currentCmd(NULL),
- m_currentDownload(NULL), m_pagenum(0),
+ m_reply(NULL), m_currentSearch(QString()),
+ m_currentGrabber(0), m_currentCmd(QString()),
+ m_currentDownload(QString()), m_pagenum(0),
m_lock(QMutex::Recursive)
{
m_mythXML = GetMythXMLURL();
mythtv-compile_fixes_for_qt_4_7.patch:
libmyth/audiooutputbase.cpp | 2 +-
libmyth/mythdeque.h | 2 +-
libmythtv/recordingprofile.h | 2 +-
libmythtv/tv_rec.h | 2 +-
libmythupnp/eventing.h | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE mythtv-compile_fixes_for_qt_4_7.patch ---
---
libs/libmyth/audiooutputbase.cpp | 2 1 + 1 - 0 !
libs/libmyth/mythdeque.h | 2 1 + 1 - 0 !
libs/libmythtv/recordingprofile.h | 2 1 + 1 - 0 !
libs/libmythtv/tv_rec.h | 2 1 + 1 - 0 !
libs/libmythupnp/eventing.h | 4 2 + 2 - 0 !
5 files changed, 6 insertions(+), 6 deletions(-)
Index: mythtv/libs/libmythupnp/eventing.h
===================================================================
--- mythtv.orig/libs/libmythupnp/eventing.h 2010-01-10 08:49:06.000000000 -0500
+++ mythtv/libs/libmythupnp/eventing.h 2010-07-01 22:34:54.000000000 -0400
@@ -233,7 +233,7 @@
{
SVMap::iterator it = m_map.find(sName);
if (it == m_map.end())
- return T(0);
+ return T();
StateVariable< T > *pVariable =
dynamic_cast< StateVariable< T > *>( *it );
@@ -241,7 +241,7 @@
if (pVariable != NULL)
return pVariable->GetValue();
- return T(0);
+ return T();
}
uint BuildNotifyBody(QTextStream &ts, TaskTime ttLastNotified) const;
Index: mythtv/libs/libmyth/audiooutputbase.cpp
===================================================================
--- mythtv.orig/libs/libmyth/audiooutputbase.cpp 2010-07-01 20:06:22.000000000 -0400
+++ mythtv/libs/libmyth/audiooutputbase.cpp 2010-07-01 22:34:54.000000000 -0400
@@ -75,7 +75,7 @@
source_bytes_per_frame(0),
needs_upmix(false), needs_downmix(false),
surround_mode(QUALITY_LOW), old_stretchfactor(1.0f),
- volume(80), volumeControl(NULL),
+ volume(80), volumeControl(QString()),
processing(false),
Index: mythtv/libs/libmyth/mythdeque.h
===================================================================
--- mythtv.orig/libs/libmyth/mythdeque.h 2009-09-11 15:07:19.000000000 -0400
+++ mythtv/libs/libmyth/mythdeque.h 2010-07-01 22:34:54.000000000 -0400
@@ -19,7 +19,7 @@
T dequeue()
{
if (deque<T>::empty())
- return (T)(0);
+ return T();
T item = deque<T>::front();
deque<T>::pop_front();
return item;
Index: mythtv/libs/libmythtv/recordingprofile.h
===================================================================
--- mythtv.orig/libs/libmythtv/recordingprofile.h 2010-05-16 14:58:08.000000000 -0400
+++ mythtv/libs/libmythtv/recordingprofile.h 2010-07-01 22:34:54.000000000 -0400
@@ -84,7 +84,7 @@
public:
// initializers
- RecordingProfile(QString profName = NULL);
+ RecordingProfile(QString profName = QString());
virtual void loadByID(int id);
virtual bool loadByType(const QString &name, const QString &cardtype);
virtual bool loadByGroup(const QString &name, const QString &group);
Index: mythtv/libs/libmythtv/tv_rec.h
===================================================================
--- mythtv.orig/libs/libmythtv/tv_rec.h 2010-05-16 14:58:08.000000000 -0400
+++ mythtv/libs/libmythtv/tv_rec.h 2010-07-01 22:34:54.000000000 -0400
@@ -93,7 +93,7 @@
class TuningRequest
{
public:
- TuningRequest(uint f) :
+ TuningRequest(uint f = 0) :
flags(f), program(NULL), channel(QString::null),
input(QString::null), majorChan(0), minorChan(0), progNum(-1) {;}
TuningRequest(uint f, RecordingInfo *p) :
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mythtv.spec 29 Aug 2010 19:35:56 -0000 1.74
+++ mythtv.spec 30 Aug 2010 02:52:25 -0000 1.75
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r25946
+%define _svnrev r25985
%define branch trunk
#
@@ -130,9 +130,12 @@
################################################################################
Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
-#Patch0: mythtv-%{version}-svnfixes.patch
Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
+#Patch0: mythtv-%{version}-svnfixes.patch
#Patch1: mythplugins-%{version}-svnfixes.patch
+# http://svn.mythtv.org/trac/ticket/8572
+Patch2: mythtv-compile_fixes_for_qt_4_7.patch
+Patch3: mythplugins-compile_fixes_for_qt_4_7.patch
Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig.in
Source102: mythbackend.init.in
@@ -856,6 +859,7 @@
cd mythtv-%{version}
#patch0 -p1
+%patch2 -p1
# Drop execute permissions on contrib bits, since they'll be %doc
find contrib/ -type f -exec chmod -x "{}" \;
@@ -905,6 +909,7 @@
cd mythplugins-%{version}
#patch1 -p1
+%patch3 -p1
# Fix /mnt/store -> /var/lib/mythmusic
cd mythmusic
@@ -1492,6 +1497,10 @@
%changelog
* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946
+- Update to svn trunk, revision 25985
+- Patch in Qt 4.7 build fix patches from mythtv trac ticket #8572
+
+* Sun Aug 29 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.1.svn.r25946
- Update to svn trunk, revision 25946
- Add new crystalhd dependency
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 29 Aug 2010 19:31:12 -0000 1.47
+++ sources 30 Aug 2010 02:52:25 -0000 1.48
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-41f4bee41d2bcb824cbc41c547c1c6b8 mythplugins-0.24.tar.bz2
-c0096d14c2012ab2bfe8fda06b13f7ef mythtv-0.24.tar.bz2
+21ba14769f757377794b818800e8c4db mythplugins-0.24.tar.bz2
+2e716caf76cae79535da1a8863a7e557 mythtv-0.24.tar.bz2