8:58 p.m.
Author: jarod
Update of /cvs/free/rpms/mythtv/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22483
Modified Files:
.cvsignore mythtv.spec sources
Added Files:
myththemes-0.23.1-svnfixes.patch mythtv-0.23.1-svnfixes.patch
Removed Files:
mythplugins-0.23-svnfixes.patch mythtv-0.23-svnfixes.patch
Log Message:
* Fri Aug 13 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23.1-1
- Update to 0.23.1 release (plus a few minor svn fixes)
myththemes-0.23.1-svnfixes.patch:
0 files changed
--- NEW FILE myththemes-0.23.1-svnfixes.patch ---
mythtv-0.23.1-svnfixes.patch:
VERSION | 1
bindings/perl/IO/Socket/INET/MythTV.pm | 4
bindings/perl/MythTV.pm | 4
bindings/perl/MythTV/Channel.pm | 4
bindings/perl/MythTV/Program.pm | 4
bindings/perl/MythTV/Recording.pm | 4
bindings/perl/MythTV/StorageGroup.pm | 4
bindings/python/MythTV/MythBase.py | 26 +
bindings/python/MythTV/MythData.py | 14
bindings/python/MythTV/MythFunc.py | 4
bindings/python/scripts/mythpython | 10
configure | 1
contrib/config_files/lirc/lircrc.native.example.mceusb2 | 2
contrib/icons/master_iconmap/channel_icons.pl | 4
contrib/imports/mirobridge/mirobridge.py | 5
contrib/maintenance/flush_deleted_recgroup.pl | 4
contrib/maintenance/optimize_mythdb.pl | 4
contrib/user_jobs/firewire_primer.pl | 4
contrib/user_jobs/mythlink.pl | 4
docs/index.html | 15 -
docs/mythtv-HOWTO-1.html | 8
docs/mythtv-HOWTO-10.html | 2
docs/mythtv-HOWTO-11.html | 43 +-
docs/mythtv-HOWTO-12.html | 12
docs/mythtv-HOWTO-13.html | 10
docs/mythtv-HOWTO-14.html | 4
docs/mythtv-HOWTO-15.html | 4
docs/mythtv-HOWTO-16.html | 30 +-
docs/mythtv-HOWTO-17.html | 11
docs/mythtv-HOWTO-18.html | 4
docs/mythtv-HOWTO-19.html | 4
docs/mythtv-HOWTO-2.html | 2
docs/mythtv-HOWTO-20.html | 2
docs/mythtv-HOWTO-21.html | 4
docs/mythtv-HOWTO-22.html | 6
docs/mythtv-HOWTO-23.html | 48 ---
docs/mythtv-HOWTO-24.html | 13
docs/mythtv-HOWTO-3.html | 28 -
docs/mythtv-HOWTO-4.html | 2
docs/mythtv-HOWTO-5.html | 20 -
docs/mythtv-HOWTO-6.html | 4
docs/mythtv-HOWTO-7.html | 2
docs/mythtv-HOWTO-8.html | 4
docs/mythtv-HOWTO-9.html | 15 -
docs/mythtv-HOWTO-singlehtml.html | 238 ++++++----------
docs/mythtv-HOWTO.html | 15 -
docs/mythtv-HOWTO.sgml | 186 ++++++------
libs/libmythsoundtouch/AAFilter.cpp | 2
libs/libmythsoundtouch/AAFilter.h | 2
libs/libmythsoundtouch/BPMDetect.h | 2
libs/libmythsoundtouch/FIFOSampleBuffer.cpp | 2
libs/libmythsoundtouch/FIFOSampleBuffer.h | 2
libs/libmythsoundtouch/FIFOSamplePipe.h | 2
libs/libmythsoundtouch/FIRFilter.cpp | 2
libs/libmythsoundtouch/FIRFilter.h | 2
libs/libmythsoundtouch/RateTransposer.cpp | 2
libs/libmythsoundtouch/RateTransposer.h | 2
libs/libmythsoundtouch/STTypes.h | 2
libs/libmythsoundtouch/SoundTouch.cpp | 2
libs/libmythsoundtouch/SoundTouch.h | 2
libs/libmythsoundtouch/TDStretch.cpp | 2
libs/libmythsoundtouch/TDStretch.h | 2
libs/libmythsoundtouch/cpu_detect.h | 2
libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp | 2
libs/libmythsoundtouch/mmx_gcc.cpp | 2
libs/libmythui/lirc.cpp | 2
programs/mythfrontend/proglist.cpp | 8
version.pro | 2
68 files changed, 408 insertions(+), 483 deletions(-)
--- NEW FILE mythtv-0.23.1-svnfixes.patch ---
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/bindings/perl/IO/Socket/INET/MythTV.pm
mythtv-0.23.1/bindings/perl/IO/Socket/INET/MythTV.pm
--- mythtv-0.23.1-release/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/IO/Socket/INET/MythTV.pm 2009-04-10 20:04:30.069718000
-0400
@@ -3,8 +3,8 @@
# A MythTV Socket class that extends IO::Socket::INET to include some
# MythTV-specific data queries
#
-# @url $URL:
http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/IO/Soc...
$
-# @date $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+# @url $URL:
svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/b...
$
+# @date $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
# @version $Revision: 20349 $
# @author $Author: xris $
# @copyright Silicon Mechanics
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV/Channel.pm
mythtv-0.23.1/bindings/perl/MythTV/Channel.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/Channel.pm 2010-05-23 12:42:23.000000000
-0400
+++ mythtv-0.23.1/bindings/perl/MythTV/Channel.pm 2010-05-23 12:42:23.678567000 -0400
@@ -3,8 +3,8 @@
#
# Object containing info about a particular MythTV channel.
#
-# @url $URL:
http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV... $
-# @date $Date: 2010-05-23 09:42:23 -0700 (Sun, 23 May 2010) $
+# @url $URL:
svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/b...
$
+# @date $Date: 2010-05-23 12:42:23 -0400 (Sun, 23 May 2010) $
# @version $Revision: 24810 $
# @author $Author: mdean $
#
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV/Program.pm
mythtv-0.23.1/bindings/perl/MythTV/Program.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/Program.pm 2009-07-06 13:01:48.000000000
-0400
+++ mythtv-0.23.1/bindings/perl/MythTV/Program.pm 2009-07-06 13:01:48.827558000 -0400
@@ -3,8 +3,8 @@
#
# Object containing info about a particular MythTV program.
#
-# @url $URL:
http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV... $
-# @date $Date: 2009-07-06 10:01:48 -0700 (Mon, 06 Jul 2009) $
+# @url $URL:
svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/b...
$
+# @date $Date: 2009-07-06 13:01:48 -0400 (Mon, 06 Jul 2009) $
# @version $Revision: 20795 $
# @author $Author: stuartm $
#
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV/Recording.pm
mythtv-0.23.1/bindings/perl/MythTV/Recording.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/Recording.pm 2010-03-21 19:16:27.000000000
-0400
+++ mythtv-0.23.1/bindings/perl/MythTV/Recording.pm 2010-03-21 19:16:27.821969000 -0400
@@ -3,8 +3,8 @@
#
# Object containing info about a particular MythTV recording.
#
-# @url $URL:
http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV... $
-# @date $Date: 2010-03-21 16:16:27 -0700 (Sun, 21 Mar 2010) $
+# @url $URL:
svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/b...
$
+# @date $Date: 2010-03-21 19:16:27 -0400 (Sun, 21 Mar 2010) $
# @version $Revision: 23772 $
# @author $Author: beirdo $
#
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/bindings/perl/MythTV/StorageGroup.pm
mythtv-0.23.1/bindings/perl/MythTV/StorageGroup.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV/StorageGroup.pm 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/MythTV/StorageGroup.pm 2009-04-10 20:04:30.069718000
-0400
@@ -3,8 +3,8 @@
#
# Object containing info about a particular MythTV Storage Group.
#
-# @url $URL:
http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV...
$
-# @date $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+# @url $URL:
svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/b...
$
+# @date $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
# @version $Revision: 20349 $
# @author $Author: xris $
#
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/perl/MythTV.pm
mythtv-0.23.1/bindings/perl/MythTV.pm
--- mythtv-0.23.1-release/bindings/perl/MythTV.pm 2010-07-21 22:21:00.000000000 -0400
+++ mythtv-0.23.1/bindings/perl/MythTV.pm 2010-07-21 22:21:00.112292000 -0400
@@ -1,8 +1,8 @@
#
# MythTV bindings for perl.
#
-# @url $URL:
http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/bindings/perl/MythTV.pm $
-# @date $Date: 2010-07-21 19:21:00 -0700 (Wed, 21 Jul 2010) $
+# @url $URL:
svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/b...
$
+# @date $Date: 2010-07-21 22:21:00 -0400 (Wed, 21 Jul 2010) $
# @version $Revision: 25396 $
# @author $Author: gigem $
#
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/python/MythTV/MythBase.py
mythtv-0.23.1/bindings/python/MythTV/MythBase.py
--- mythtv-0.23.1-release/bindings/python/MythTV/MythBase.py 2010-05-04 20:45:58.000000000
-0400
+++ mythtv-0.23.1/bindings/python/MythTV/MythBase.py 2010-07-30 01:30:44.653168000 -0400
@@ -979,7 +979,7 @@ class MythDBBase( object ):
for config_file in config_files:
dbconn.update({ 'DBHostName':None, 'DBName':None,
'DBUserName':None, 'DBPassword':None,
- 'DBPort':0})
+ 'DBPort':0,
'LocalHostName':None})
try:
config = etree.parse(config_file).getroot()
for child in
config.find('UPnP').find('MythFrontend').\
@@ -1027,13 +1027,20 @@ class MythDBBase( object ):
fp.write(config)
fp.close()
- if 'DBPort' not in dbconn:
- dbconn['DBPort'] = 3306
+ if 'DBPort' in dbconn:
+ if dbconn['DBPort'] == '0':
+ dbconn['DBPort'] = 3306
+ else:
+ dbconn['DBPort'] = int(dbconn['DBPort'])
else:
- dbconn['DBPort'] = int(dbconn['DBPort'])
- if dbconn['DBPort'] == 0:
dbconn['DBPort'] = 3306
+ if 'LocalHostName' in dbconn:
+ if dbconn['LocalHostName'] is None:
+ dbconn['LocalHostName'] = socket.gethostname()
+ else:
+ dbconn['LocalHostName'] = socket.gethostname()
+
self.dbconn = dbconn
self.ident = "sql://%s@%s:%d/" % \
(dbconn['DBName'],dbconn['DBHostName'],dbconn['DBPort'])
@@ -1147,6 +1154,9 @@ class MythDBBase( object ):
self.db = None
raise MythDBError(MythError.DB_SCHEMAMISMATCH, value, sver, local)
+ def gethostname(self):
+ return self.dbconn['LocalHostName']
+
def getStorageGroup(self, groupname=None, hostname=None):
"""
obj.getStorageGroup(groupname=None, hostname=None)
@@ -1245,7 +1255,7 @@ class MythBEConn( object ):
raise
def announce(self,type):
- res = self.backendCommand('ANN %s %s 0' % (type, socket.gethostname()))
+ res = self.backendCommand('ANN %s %s 0' % (type, self.db.gethostname()))
if res != 'OK':
self.log(MythLog.IMPORTANT|MythLog.NETWORK,
"Unexpected answer to ANN", res)
@@ -1795,7 +1805,7 @@ class StorageGroup( DBData ):
DBData.__init__(self, (id,), db, raw)
if self.wheredat is None:
return
- if (self.hostname == socket.gethostname()) or \
+ if (self.hostname == self.db.gethostname()) or \
os.access(self.dirname.encode('utf-8'), os.F_OK):
self.local = True
else:
@@ -1817,7 +1827,7 @@ class Grabber( MythDBBase ):
if path is not None:
self.path = path
elif setting is not None:
- host = socket.gethostname()
+ host = self.gethostname()
self.path = self.settings[host][setting]
if self.path is None:
raise MythDBError(MythError.DB_SETTING, setting, host)
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/bindings/python/MythTV/MythData.py
mythtv-0.23.1/bindings/python/MythTV/MythData.py
--- mythtv-0.23.1-release/bindings/python/MythTV/MythData.py 2010-06-06 20:03:02.000000000
-0400
+++ mythtv-0.23.1/bindings/python/MythTV/MythData.py 2010-07-30 01:30:44.653168000 -0400
@@ -7,11 +7,11 @@ Provides data access classes for accessi
from MythStatic import *
from MythBase import *
-import re, sys, socket, os
+import re, sys, os
import xml.etree.cElementTree as etree
from time import mktime, strftime, strptime
from datetime import date, time, datetime
-from socket import gethostbyaddr, gethostname
+from socket import gethostbyaddr
#### FILE ACCESS ####
@@ -161,7 +161,7 @@ class FileTransfer( MythBEConn ):
elif type == 'r':
self.w = False
res = self.backendCommand('ANN FileTransfer %s %d %d %s' \
- % (socket.gethostname(), self.w, False,
+ % (self.db.gethostname(), self.w, False,
BACKEND_SEP.join(['-1',self.filename,self.sgroup])))
if res.split(BACKEND_SEP)[0] != 'OK':
raise MythError(MythError.PROTO_ANNOUNCE, self.host, self.port, res)
@@ -1454,7 +1454,7 @@ class NetVisionGrabber( Grabber ):
NVSCHEMA_VERSION, 'NetVision')
c = db.cursor(self.log)
log = MythLog('Python MythNetVision Grabber', db=db)
- host = gethostname()
+ host = db.gethostname()
glist = []
for t in types.split(','):
c.execute("""SELECT name,commandline
@@ -1478,7 +1478,7 @@ class NetVisionGrabber( Grabber ):
if c.execute("""SELECT commandline
FROM netvision%sgrabbers
WHERE name=%%s AND host=%%s""" % type,
- (name, gethostname())) == 1:
+ (name, db.gethostname())) == 1:
[...2322 lines suppressed...]
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: FIFOSampleBuffer.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSampleBuffer.h
mythtv-0.23.1/libs/libmythsoundtouch/FIFOSampleBuffer.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSampleBuffer.h 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIFOSampleBuffer.h 2009-04-10 20:04:30.069718000
-0400
@@ -15,7 +15,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: FIFOSampleBuffer.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSamplePipe.h
mythtv-0.23.1/libs/libmythsoundtouch/FIFOSamplePipe.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIFOSamplePipe.h 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIFOSamplePipe.h 2009-04-10 20:04:30.069718000
-0400
@@ -17,7 +17,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: FIFOSamplePipe.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.cpp
mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.cpp 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.cpp 2009-04-10 20:04:30.069718000
-0400
@@ -11,7 +11,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: FIRFilter.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.h
mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/FIRFilter.h 2009-04-10 20:04:30.000000000
-0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/FIRFilter.h 2009-04-10 20:04:30.069718000 -0400
@@ -11,7 +11,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: FIRFilter.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/mmx_gcc.cpp
mythtv-0.23.1/libs/libmythsoundtouch/mmx_gcc.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/mmx_gcc.cpp 2009-07-06 16:42:28.000000000
-0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/mmx_gcc.cpp 2009-07-06 16:42:28.950839000 -0400
@@ -15,7 +15,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-07-06 13:42:28 -0700 (Mon, 06 Jul 2009) $
+// Last changed : $Date: 2009-07-06 16:42:28 -0400 (Mon, 06 Jul 2009) $
// File revision : $Revision: 20797 $
//
// $Id: mmx_gcc.cpp 20797 2009-07-06 20:42:28Z janne $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.cpp
mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.cpp 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.cpp 2009-04-10 20:04:30.069718000
-0400
@@ -10,7 +10,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: RateTransposer.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.h
mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/RateTransposer.h 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/RateTransposer.h 2009-04-10 20:04:30.069718000
-0400
@@ -14,7 +14,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: RateTransposer.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.cpp
mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.cpp 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.cpp 2009-04-10 20:04:30.069718000
-0400
@@ -41,7 +41,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: SoundTouch.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.h
mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/SoundTouch.h 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/SoundTouch.h 2009-04-10 20:04:30.069718000 -0400
@@ -41,7 +41,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: SoundTouch.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/STTypes.h
mythtv-0.23.1/libs/libmythsoundtouch/STTypes.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/STTypes.h 2009-04-10 20:04:30.000000000
-0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/STTypes.h 2009-04-10 20:04:30.069718000 -0400
@@ -8,7 +8,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: STTypes.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*'
mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.cpp
mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.cpp
--- mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.cpp 2009-04-10
20:04:30.000000000 -0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.cpp 2009-04-10 20:04:30.069718000
-0400
@@ -13,7 +13,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: TDStretch.cpp 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.h
mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.h
--- mythtv-0.23.1-release/libs/libmythsoundtouch/TDStretch.h 2009-04-10 20:04:30.000000000
-0400
+++ mythtv-0.23.1/libs/libmythsoundtouch/TDStretch.h 2009-04-10 20:04:30.069718000 -0400
@@ -13,7 +13,7 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-04-10 17:04:30 -0700 (Fri, 10 Apr 2009) $
+// Last changed : $Date: 2009-04-10 20:04:30 -0400 (Fri, 10 Apr 2009) $
// File revision : $Revision: 20349 $
//
// $Id: TDStretch.h 20349 2009-04-11 00:04:30Z xris $
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/libs/libmythui/lirc.cpp
mythtv-0.23.1/libs/libmythui/lirc.cpp
--- mythtv-0.23.1-release/libs/libmythui/lirc.cpp 2009-11-28 10:55:09.000000000 -0500
+++ mythtv-0.23.1/libs/libmythui/lirc.cpp 2010-07-23 21:29:36.107491000 -0400
@@ -383,6 +383,8 @@ void LIRC::Process(const QByteArray &dat
mod |= (Qt::CTRL & keycode) ? Qt::ControlModifier: Qt::NoModifier;
mod |= (Qt::ALT & keycode) ? Qt::AltModifier : Qt::NoModifier;
+ keycode &= ~Qt::MODIFIER_MASK;
+
QString text = "";
if (!mod)
text = QString(QChar(keycode));
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/programs/mythfrontend/proglist.cpp
mythtv-0.23.1/programs/mythfrontend/proglist.cpp
--- mythtv-0.23.1-release/programs/mythfrontend/proglist.cpp 2010-01-24 09:23:40.000000000
-0500
+++ mythtv-0.23.1/programs/mythfrontend/proglist.cpp 2010-07-25 23:07:19.192973000 -0400
@@ -912,10 +912,14 @@ void ProgLister::fillViewList(const QStr
{
while (query.next())
{
- QString phrase = query.value(0).toString();
+ /* The keyword.phrase column uses utf8_bin collation, so
+ * Qt uses QString::fromAscii() for toString(). Explicitly
+ * convert the value using QString::fromUtf8() to prevent
+ * corruption. */
+ QString phrase = QString::fromUtf8(query.value(0)
+ .toByteArray().constData());
if (phrase.isEmpty())
continue;
- phrase = query.value(0).toString();
m_viewList << phrase;
m_viewTextList << phrase;
}
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/VERSION mythtv-0.23.1/VERSION
--- mythtv-0.23.1-release/VERSION 2010-07-22 02:40:45.000000000 -0400
+++ mythtv-0.23.1/VERSION 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-SOURCE_VERSION="0.23.1"
diff -Naurp -x '*/docs/*' mythtv-0.23.1-release/version.pro
mythtv-0.23.1/version.pro
--- mythtv-0.23.1-release/version.pro 2009-10-04 12:38:03.000000000 -0400
+++ mythtv-0.23.1/version.pro 2009-10-04 12:38:03.692900000 -0400
@@ -6,7 +6,7 @@
############################################################
SVNTREEDIR = $$system(pwd)
-SVNREPOPATH = "$$URL:
http://svn.mythtv.org/svn/tags/release-0-23-1/mythtv/version.pro $$"
+SVNREPOPATH = "$$URL:
svn+ssh://svn.mythtv.org/var/lib/svn/branches/release-0-23-fixes/mythtv/v...
$$"
SOURCES += version.cpp
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 Feb 2010 04:01:24 -0000 1.4
+++ .cvsignore 13 Aug 2010 20:58:30 -0000 1.5
@@ -6,3 +6,5 @@
mythplugins-0.22.tar.bz2
mythtv-0.23.tar.bz2
mythplugins-0.23.tar.bz2
+mythtv-0.23.1.tar.bz2
+mythplugins-0.23.1.tar.bz2
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- mythtv.spec 23 Jul 2010 19:10:21 -0000 1.89
+++ mythtv.spec 13 Aug 2010 20:58:30 -0000 1.90
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r25413
+%define _svnrev r25638
%define branch release-0-23-fixes
#
@@ -77,11 +77,11 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.23
+Version: 0.23.1
%if "%{branch}" == "trunk"
Release: 0.1.svn.%{_svnrev}%{?dist}
%else
-Release: 8%{?dist}
+Release: 1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1449,6 +1449,9 @@
################################################################################
%changelog
+* Fri Aug 13 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23.1-1
+- Update to 0.23.1 release (plus a few minor svn fixes)
+
* Fri Jul 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-8
- Update to release-0-23-fixes branch, svn revision 25413
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-13/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources 10 May 2010 16:03:45 -0000 1.53
+++ sources 13 Aug 2010 20:58:30 -0000 1.54
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-be44db841f9e03d0d17ab449545b38aa mythplugins-0.23.tar.bz2
-3c58f4f45a550b60fbddfb8726d7fc38 mythtv-0.23.tar.bz2
+3379a5fd12ae866cd10c5b5d23439898 mythtv-0.23.1.tar.bz2
+edd9c5f8a9ae0189b1c8951fa8282c4d mythplugins-0.23.1.tar.bz2
--- mythplugins-0.23-svnfixes.patch DELETED ---
--- mythtv-0.23-svnfixes.patch DELETED ---