Attachment #102039 for bug #141722

View | Details | Raw Unified | Return to bug 141722
Collapse All | Expand All




# $FreeBSD: ports/multimedia/mythtv/Makefile,v 1.25 2009/11/15 22:29:08 glarkin Exp $

PORTNAME=	mythtv
PORTVERSION=	0.22
PORTREVISION=	2
CATEGORIES=	multimedia
MASTER_SITES=	ftp://ftp.osuosl.org/pub/mythtv/ \
		LOCAL/glarkin


LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
		freetype.9:${PORTSDIR}/print/freetype2
BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat
		${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat
RUN_DEPENDS=	tv_check:${PORTSDIR}/textproc/p5-xmltv \
		${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \
		wget:${PORTSDIR}/ftp/wget

ONLY_FOR_ARCHS=	i386 amd64
USE_BZIP2=	yes
USE_QT_VER=	4
QT_COMPONENTS=	gui sql network script linguist_build l10n \
		moc_build qmake_build rcc_build uic_build
USE_MYSQL=	51
USE_GMAKE=	yes
HAS_CONFIGURE=	yes
QT_NONSTANDARD=	yes
USE_PERL=	yes
USE_PYTHON=	yes
INSTALLS_EGGINFO=yes
PYDISTUTILS_PKGNAME=MythTV
REINPLACE_ARGS=	-i ""

MAKE_ENV=	QTDIR="${QT_PREFIX}" \
		QMAKESPEC="${QMAKESPEC}"

CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" CPPFLAGS="${CPPFLAGS}  ${QTCPPFLAGS}" \
		QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib"

USE_RC_SUBR=	mythbackend
USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters


MYTHTVGID?=	${MYTHTVUID}
MYTHTVDIR?=	/nonexistent

CONFIGURE_ARGS=	--enable-xvmc --enable-opengl-vsync --disable-directfb --enable-ivtv \
		--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw \
		--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw  \
		--prefix=${PREFIX} --extra-cflags=-g --extra-cxxflags=-g

QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++

QMAKESPEC?=	${LOCALBASE}/share/qt/mkspecs/freebsd-g++

OPTIONS=	LIRC		"Native LIRC Support" Off \
		MYSQL_LOCAL	"RUN_DEPEND on selected MySQL server" Off


post-patch:
		@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
			${WRKSRC}/libs/libmythtv/libmythtv.pro \
			${WRKSRC}/libs/libavformat/libavformat.pro \
			${WRKSRC}/bindings/perl/MythTV/Recording.pm \
			${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \
			${WRKSRC}/programs/scripts/database/mythconverg_backup.pl
do-configure:
		@${ECHO_CMD} CONFIGURE_ENV: ${CONFIGURE_ENV}
		@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
			./configure ${CONFIG}
		@${ECHO_CMD} MAKE_ENV: ${MAKE_ENV}
		@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
			-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
			mythtv.pro

post-install:
		@${INSTALL} -d ${PREFIX}/share/mythtv/database

Lines 1-3 Link Here

(-)/usr/ports/multimedia/mythtv/distinfo (-3 / +3 lines)
1	MD5 (mythtv-0.21.tar.bz2) = 49fc135e1cde90cd935c1229467fa37e	1	MD5 (mythtv-0.22.tar.bz2) = e8f8b5b6a51cd7be700e215b2a1bf2c0
2	SHA256 (mythtv-0.21.tar.bz2) = 33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4	2	SHA256 (mythtv-0.22.tar.bz2) = bb7212bac2cfc792c59a15a80caee8bbf469e250e6f48dc6b0856a60cb07b6fb
3	SIZE (mythtv-0.21.tar.bz2) = 14230687	3	SIZE (mythtv-0.22.tar.bz2) = 21895073




# BEFORE: LOGIN
# KEYWORD: shutdown

# Define mythbackend_enable in /etc/rc.conf[.local] to enable mythbackend
#       /etc/rc.conf
#       /etc/rc.conf.local
#
# mythbackend_enable (bool):  Set to "NO" by default.
#                             Set it to "YES" to enable mythbackend.
# mythbackend_logfile (str):  Custom logfile for mythbackend.
#                             (default /var/log/mythbackend.log)
# mythbackend_flags (str):    Additional flags for mythbackend.

. %%RC_SUBR%%

name="mythbackend"
rcvar=`set_rcvar`
command="%%PREFIX%%/bin/${name}"

load_rc_config $name

: ${mythbackend_enable="NO"}
: ${mythbackend_logfile="/var/log/${name}.log"}
: ${mythbackend_flags=""}

command_args="-d -l ${mythbackend_logfile}"

run_rc_command "$1"




--- configure.orig	2009-10-09 00:30:46.000000000 +0200
+++ configure	2009-12-02 19:24:10.000000000 +0100
@@ -633,21 +633,21 @@
     log check_cc "$@"
     cat > $TMPC
     log_file $TMPC
-    check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC
+    check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC
 }
 
 check_cpp(){
     log check_cpp "$@"
     cat > $TMPC
     log_file $TMPC
-    check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -E -o $TMPO $TMPC
+    check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC
 }
+        processor_flags=`grep '^  Features=' $dmesg | tr "[:upper:]" "[:lower:]"`
+    fi
+fi
+
 # OS
 targetos=$(tolower $(uname -s))
 
 check_cxx(){
     log check_cxx "$@"
     cat > $TMPCXX
     log_file $TMPCXX
-    check_cmd $cxx $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX
+    check_cmd $cxx $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX
 }
 
 check_as(){
@@ -2174,7 +2174,6 @@
         append CCONFIG "freebsd"
         # Workaround compile errors from missing u_int/uint def
         CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-        disable ivtv
         disable need_memalign
         enable backend
         ;;
@@ -4254,6 +4253,8 @@
 #       directories, it cannot be modified.
 QMAKE_LIBDIR_QT -= $libdir
 LATE_LIBS            += -L$libdir
+CONFIG_INCLUDEPATH=
+FREETYPE_CFLAGS -= -I/usr/local/include
 EOF
 
 diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1

Lines 1-11 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmyth__compat.h (-11 lines)
1	--- ./libs/libmyth/compat.h.orig 2008-02-18 02:35:01.000000000 -0500
2	+++ ./libs/libmyth/compat.h 2009-02-23 09:59:26.000000000 -0500
3	@@ -273,7 +273,7 @@
4
5	// Libdvdnav now uses off64_t lseek64(), which Darwin doesn't have.
6	// Luckily, its lseek() is already 64bit compatible
7	-#ifdef CONFIG_DARWIN
8	+#if defined(CONFIG_DARWIN) \|\| defined(__FreeBSD__)
9	typedef off_t off64_t;
10	#define lseek64(f,o,w) lseek(f,o,w)
11	#endif




--- ./libs/libmyth/libmyth.pro.orig	2008-03-04 12:08:41.000000000 -0500
+++ ./libs/libmyth/libmyth.pro	2009-04-22 21:04:16.000000000 -0400
@@ -43,14 +43,14 @@
 SOURCES += volumebase.cpp volumecontrol.cpp virtualkeyboard.cpp xmlparse.cpp
 SOURCES += mythhdd.cpp mythcdrom.cpp storagegroup.cpp dbutil.cpp
 
-INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround
-INCLUDEPATH += ../libavcodec ../libavutil
-INCLUDEPATH += ../.. ../ ./
-DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch
-DEPENDPATH += ../libmythfreesurround
-DEPENDPATH += ../libavcodec ../libavutil
-DEPENDPATH += ../ ../libmythui
-DEPENDPATH += ../libmythupnp
+INCLUDEPATH = ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround $${INCLUDEPATH}
+INCLUDEPATH = ../libavcodec ../libavutil $${INCLUDEPATH}
+INCLUDEPATH = ../.. ../ ./ $${INCLUDEPATH}
+DEPENDPATH = ../libmythsamplerate ../libmythsoundtouch $${DEPENDPATH}
+DEPENDPATH = ../libmythfreesurround $${DEPENDPATH}
+DEPENDPATH = ../libavcodec ../libavutil $${DEPENDPATH}
+DEPENDPATH = ../ ../libmythui $${DEPENDPATH}
+DEPENDPATH = ../libmythupnp $${DEPENDPATH}
 
 
 LIBS += -L../libmythsamplerate   -lmythsamplerate-$${LIBVERSION}




--- ./libs/libmyth/util.cpp.orig	2008-02-24 10:19:20.000000000 -0500
+++ ./libs/libmyth/util.cpp	2009-02-23 09:59:26.000000000 -0500
@@ -54,6 +54,10 @@
 #include <sys/mount.h>  // for struct statfs
 #endif
 
+#if defined(__FreeBSD__)
+#include <sys/mount.h>	// for struct statfs
+#endif
+
 #ifdef USE_LIRC
 #include "lircevent.h"
 #endif




--- ./libs/libmythdvdnav/dvd_input.c.orig	2008-01-27 14:27:40.000000000 -0500
+++ ./libs/libmythdvdnav/dvd_input.c	2009-02-23 09:59:26.000000000 -0500
@@ -27,6 +27,9 @@
 #include "dvd_reader.h"
 #include "dvd_input.h"
 
+#if defined(__FreeBSD__)
+#define lseek64 lseek
+#endif
 
 /* The function pointers that is the exported interface of this file. */
 dvd_input_t (*dvdinput_open)  (const char *);




--- ./libs/libmythdvdnav/dvdnav_internal.h.orig	2008-03-07 20:03:12.000000000 -0500
+++ ./libs/libmythdvdnav/dvdnav_internal.h	2009-02-23 09:59:26.000000000 -0500
@@ -62,6 +62,9 @@
 #else
 
 #include <pthread.h>
+#if defined(__FreeBSD__)
+#define lseek64 lseek
+#endif
 
 #endif /* WIN32 */
 




--- ./libs/libmythfreemheg/Programs.cpp.orig	2007-03-29 15:44:23.000000000 -0400
+++ ./libs/libmythfreemheg/Programs.cpp	2009-02-23 09:59:26.000000000 -0500
@@ -30,7 +30,15 @@
 #include "freemheg.h"
 
 #include <sys/timeb.h>
+#ifdef __FreeBSD__
+/* 
+ * This file refers to the non-POSIX structure timezone, which is
+ * defined in sys/time.h.
+ */
+#include <sys/time.h>
+#else
 #include <time.h>
+#endif
 
 #include "../../config.h"
 

Lines 1-11 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythtv__cardutil.cpp (-11 lines)
1	--- ./libs/libmythtv/cardutil.cpp.orig 2008-02-02 12:42:34.000000000 -0500
2	+++ ./libs/libmythtv/cardutil.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -1473,7 +1473,7 @@
4	{
5	bool ok;
6	QStringList ret;
7	- int videofd = open(device.ascii(), O_RDWR);
8	+ int videofd = open(device.ascii(), O_RDONLY);
9	if (videofd < 0)
10	{
11	ret += QObject::tr("Could not open '%1' "

Lines 1-10 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythtv__libmythtv.pro (-10 lines)
1	--- ./libs/libmythtv/libmythtv.pro.orig 2008-02-18 17:59:32.000000000 -0500
2	+++ ./libs/libmythtv/libmythtv.pro 2009-04-22 21:04:16.000000000 -0400
3	@@ -49,6 +49,7 @@
4
5
6	DEFINES += _LARGEFILE_SOURCE
7	+QMAKE_CXXFLAGS = -I../libmyth -I../libavcodec -I../libavutil -I../libmythmpeg2 $${QMAKE_CXXFLAGS}
8	QMAKE_CXXFLAGS += $${FREETYPE_CFLAGS}
9	QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS}
10




--- libs/libmythtv/videodev_myth.h.orig	2009-07-06 22:42:28.000000000 +0200
+++ libs/libmythtv/videodev_myth.h	2009-11-15 13:08:20.000000000 +0100
@@ -11,6 +11,36 @@
 typedef uint8_t  __u8; 
 typedef uint32_t __u64; 
 typedef int32_t  __s64;  // HACK. Non 64bit FreeBSD kernels require this for ioctls
+
+typedef struct fb_var_screeninfo
+{
+	int xres;
+	int yres;
+	int bits_per_pixel;
+	int xres_virtual;
+	int yres_virtual;
+	int xoffset;
+	int yoffset;
+	int nonstd;
+	int activate;
+};
+
+typedef struct fb_fix_screeninfo
+{
+	int smem_start;
+};
+
+#define FB_ACTIVATE_NOW 0
+
+#define FBIOBLANK 0
+#define FBIOGET_FSCREENINFO 0
+#define FBIOGET_VSCREENINFO 0
+#define FBIOPAN_DISPLAY 0
+#define FBIOPUT_VSCREENINFO 0
+
+#define VESA_NO_BLANKING 0
+#define VESA_VSYNC_SUSPEND 0
+
 #else
 #include <linux/types.h>
 #include <linux/version.h>




--- libs/libmythtv/videoout_ivtv.cpp.orig	2009-11-15 13:10:38.000000000 +0100
+++ libs/libmythtv/videoout_ivtv.cpp	2009-11-15 13:11:08.000000000 +0100
@@ -19,7 +19,9 @@
 #include <sys/param.h>
 
 // Linux headers
+#if defined(__linux__)
 #include <linux/fb.h>
+#endif
 
 // C++ headers
 #include <map>




--- ./libs/libmythupnp/httprequest.cpp.orig	2008-03-03 22:14:01.000000000 -0500
+++ ./libs/libmythupnp/httprequest.cpp	2009-02-23 09:59:26.000000000 -0500
@@ -21,9 +21,13 @@
 #if defined CONFIG_DARWIN || defined CONFIG_CYGWIN || defined(__FreeBSD__) || defined(USING_MINGW)
 #include "darwin-sendfile.h"
 #else
+#ifdef __FreeBSD__
+typedef off_t __off64_t;
+#else
 #define USE_SETSOCKOPT
 #include <sys/sendfile.h>
 #endif
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -398,6 +402,24 @@
         __off64_t offset = llStart;
         int       file   = open( sFileName.ascii(), O_RDONLY | O_LARGEFILE );
         ssize_t   sent   = 0;  
+#ifdef __FreeBSD__
+
+	int error;
+        error = sendfile (file,
+                          getSocketHandle (),
+                          offset,
+                          llSize,
+                          NULL,
+                          NULL,
+                          NULL );
+        if (error)
+          fprintf (stderr,
+                   "Can't transfer %s: %s (%d)\n",
+                   sFileName.ascii(),
+                   strerror (errno),
+                   errno );
+
+#else
 
         do 
         {  
@@ -411,6 +433,7 @@
 	    //VERBOSE(VB_UPNP, QString("SendResponseFile : --- size = %1, offset = %2, sent = %3").arg(llSize).arg(offset).arg(sent));
         } 
         while (( sent >= 0 ) && ( llSize > 0 ));  
+#endif
 
         if (sent == -1)
         {




--- ./programs/mythbackend/mainserver.cpp.orig	2008-03-02 23:47:04.000000000 -0500
+++ ./programs/mythbackend/mainserver.cpp	2009-02-23 09:59:26.000000000 -0500
@@ -251,7 +251,7 @@
         return;
     }
 
-    readReadyLock.lock();
+    // readReadyLock.lock();
 
     ProcessRequestThread *prt = NULL;
     threadPoolLock.lock();
@@ -278,19 +278,19 @@
 
     prt->setup(sock);
 
-    readReadyLock.unlock();
+    // readReadyLock.unlock();
 }
 
 void MainServer::ProcessRequest(MythSocket *sock)
 {
-    sock->Lock();
+    // sock->Lock();
 
     if (sock->bytesAvailable() > 0)
     {
         ProcessRequestWork(sock);
     }
 
-    sock->Unlock();
+    // sock->Unlock();
 }
 
 void MainServer::ProcessRequestWork(MythSocket *sock)

Lines 1-11 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-programs__mythbackend__scheduler.cpp (-11 lines)
1	--- ./programs/mythbackend/scheduler.cpp.orig 2008-02-20 22:23:22.000000000 -0500
2	+++ ./programs/mythbackend/scheduler.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -2054,7 +2054,7 @@
4	gContext->dispatch(me);
5
6	QString halt_cmd = gContext->GetSetting("ServerHaltCommand",
7	- "sudo /sbin/halt -p");
8	+ "/sbin/shutdown -p now");
9
10	if (!halt_cmd.isEmpty())
11	{

Lines 1-11 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-programs__mythfrontend__main.cpp (-11 lines)
1	--- ./programs/mythfrontend/main.cpp.orig 2008-02-23 22:25:03.000000000 -0500
2	+++ ./programs/mythfrontend/main.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -577,7 +577,7 @@
4	void haltnow()
5	{
6	QString halt_cmd = gContext->GetSetting("HaltCommand",
7	- "sudo /sbin/halt -p");
8	+ "/sbin/shutdown -p now");
9	if (!halt_cmd.isEmpty())
10	system(halt_cmd.ascii());
11	}




--- programs/mythtranscode/mpeg2fix.cpp.orig	2009-11-02 20:52:39.000000000 +0100
+++ programs/mythtranscode/mpeg2fix.cpp	2009-11-02 20:53:08.000000000 +0100
@@ -12,6 +12,10 @@
 #include <getopt.h>
 #include <stdint.h>
 
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
+
 #include "config.h"
 #include "mpeg2fix.h"
 

Lines 1-10 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-programs__mythtranscode__mythtranscode.pro (-10 lines)
1	--- ./programs/mythtranscode/mythtranscode.pro.orig 2007-02-24 12:44:00.000000000 -0500
2	+++ ./programs/mythtranscode/mythtranscode.pro 2009-04-22 21:04:16.000000000 -0400
3	@@ -20,3 +20,7 @@
4	INCLUDEPATH += replex
5	INCLUDEPATH += ../../libs/libavcodec ../../libs/libavformat \
6	../../libs/libavutil ../../libs/libmythmpeg2
7	+
8	+QMAKE_CXXFLAGS = -I../../libs/libavcodec -I../../libs/libavformat \
9	+ -I../../libs/libavutil -I../../libs/libmythmpeg2 \
10	+ $${QMAKE_CXXFLAGS}

Lines 1-11 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-programs__mythtv-setup__backendsettings.cpp (-11 lines)
1	--- ./programs/mythtv-setup/backendsettings.cpp.orig 2008-02-05 12:52:11.000000000 -0500
2	+++ ./programs/mythtv-setup/backendsettings.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -425,7 +425,7 @@
4	{
5	GlobalLineEdit *gc = new GlobalLineEdit("ServerHaltCommand");
6	gc->setLabel(QObject::tr("Server halt command"));
7	- gc->setValue("sudo /sbin/halt -p");
8	+ gc->setValue("/sbin/shutdown -p now");
9	gc->setHelpText(QObject::tr("The command used to halt the backends."));
10	return gc;
11	};




--- ./libs/libmyth/dbutil.h.orig	2009-09-20 02:29:45.000000000 +0000
+++ ./libs/libmyth/dbutil.h	2009-10-15 22:09:13.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef DBUTIL_H_
 #define DBUTIL_H_
 
-#include <qstringlist.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMap>
 
 #include "mythexp.h"
 #include "mythdbcon.h"
--- ./libs/libmyth/langsettings.cpp.orig	2009-10-03 22:01:21.000000000 +0000
+++ ./libs/libmyth/langsettings.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -1,5 +1,5 @@
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <QApplication>
+#include <QSqlDatabase>
 #include <QTranslator>
 
 using namespace std;
--- ./libs/libmyth/mythcontext.h.orig	2009-10-15 21:08:23.000000000 +0000
+++ ./libs/libmyth/mythcontext.h	2009-10-15 21:10:04.000000000 +0000
@@ -11,7 +11,8 @@
 #include <QMutex>
 #include <QList>
 
-#include <qevent.h>
+#include <QEvent>
+#include <QKeyEvent>
 
 #include "mythexp.h"
 #include "mythobservable.h"
--- ./libs/libmyth/mythmediamonitor.h.orig	2009-08-04 00:34:05.000000000 +0000
+++ ./libs/libmyth/mythmediamonitor.h	2009-10-15 22:21:14.000000000 +0000
@@ -2,9 +2,9 @@
 #define MYTH_MEDIA_MONITOR_H
 
 #include <QList>
-#include <qpointer.h>
-#include <qthread.h>
-#include <qstring.h>
+#include <QPointer>
+#include <QThread>
+#include <QString>
 #include <QStringList>
 #include <QMutex>
 #include <QEvent>
--- ./libs/libmyth/util.h.orig	2009-10-15 21:16:47.000000000 +0000
+++ ./libs/libmyth/util.h	2009-10-15 21:17:12.000000000 +0000
@@ -4,9 +4,9 @@
 #include <algorithm>
 using namespace std;
 
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qcolor.h>
+#include <QStringList>
+#include <QDateTime>
+#include <QColor>
 #include <QPixmap>
 
 #include <stdint.h>
--- ./libs/libmyth/visual.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmyth/visual.h	2009-10-15 22:12:52.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef __visual_h
 #define __visual_h
 
-#include <qmutex.h>
+#include <QMutex>
 
 class Decoder;
 class AudioOutput;
--- ./libs/libmyth/volumebase.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmyth/volumebase.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -1,4 +1,4 @@
-#include <qstring.h>
+#include <QString>
 #include <cstdio>
 #include <cstdlib>
 
--- ./libs/libmyth/volumebase.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmyth/volumebase.h	2009-10-15 22:09:13.000000000 +0000
@@ -4,7 +4,7 @@
 #include <iostream>
 using namespace std;
 
-#include <qstring.h>
+#include <QString>
 #include "mythcontext.h"
 
 typedef enum {
--- libs/libmyth/xmlparse.h.orig	2009-07-26 16:00:20.000000000 +0000
+++ libs/libmyth/xmlparse.h	2009-10-15 23:20:07.000000000 +0000
@@ -3,10 +3,10 @@
 
 #include "uitypes.h"
 #include "mythcontext.h"
-#include <qimage.h>
-#include <qrect.h>
-#include <qlabel.h>
-#include <qdom.h>
+#include <QImage>
+#include <QRect>
+#include <QLabel>
+#include <Qt/qdom.h>
 
 class MythUIHelper;
 
--- ./libs/libmythdb/decodeencode.h.orig	2009-09-28 18:46:50.000000000 +0000
+++ ./libs/libmythdb/decodeencode.h	2009-10-15 22:09:13.000000000 +0000
@@ -4,7 +4,7 @@
 #include <algorithm>
 using namespace std;
 
-#include <qstringlist.h>
+#include <QStringList>
 
 // This is necessary for GCC 3.3, which has llabs(long long)
 // // but not abs(long long) or std::llabs(long long)
--- ./libs/libmythdb/httpcomms.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythdb/httpcomms.h	2009-10-15 22:14:18.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef HTTPCOMMS_H_
 #define HTTPCOMMS_H_
 
-#include <qurl.h>
-#include <qobject.h>
+#include <QUrl>
+#include <QObject>
 #include <QByteArray>
 #include <QString>
 #include <QTimer>
--- libs/libmythdb/msocketdevice_win.cpp.orig	2009-10-15 22:45:16.000000000 +0000
+++ libs/libmythdb/msocketdevice_win.cpp	2009-10-15 22:45:49.000000000 +0000
@@ -43,9 +43,8 @@
 
 #include "msocketdevice.h"
 #include "qwindowdefs.h"
-#include "qdatetime.h"
-
-#include <qcoreapplication.h>
+#include <QDateTime>
+#include <QCoreApplication>
 
 #include <string.h>
 
--- ./libs/libmythdb/mythobservable.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythdb/mythobservable.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -1,5 +1,5 @@
-#include <qobject.h>
-#include <qapplication.h>
+#include <QObject>
+#include <QApplication>
 
 #include "mythobservable.h"
 
--- ./libs/libmythdb/oldsettings.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythdb/oldsettings.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -12,7 +12,7 @@
 #include "oldsettings.h"
 #include "mythverbose.h"
 
-#include <qstring.h>
+#include <QString>
 #include <fstream>
 #include <cstdlib>
 #include <cstdio>
@@ -23,7 +23,7 @@
 
 using namespace std;
 
-#include <qdir.h>
+#include <QDir>
 
 Settings::Settings(QString strSettingsFile)
 {
--- ./libs/libmythdb/oldsettings.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythdb/oldsettings.h	2009-10-15 22:09:13.000000000 +0000
@@ -9,7 +9,7 @@
 
 #ifndef OLDSETTINGS_H
 #define OLDSETTINGS_H
-#include <qstring.h>
+#include <QString>
 #include <QPixmap>
 #include <map>
 
--- ./libs/libmythfreemheg/BaseClasses.h.orig	2009-07-06 20:42:28.000000000 +0000
+++ ./libs/libmythfreemheg/BaseClasses.h	2009-10-15 22:09:13.000000000 +0000
@@ -27,7 +27,7 @@
 #include <malloc.h>
 #endif
 
-#include <qstring.h>
+#include <QString>
 
 #include "Logging.h" // For MHASSERT
 
--- ./libs/libmythfreemheg/Engine.cpp.orig	2009-07-15 19:04:28.000000000 +0000
+++ ./libs/libmythfreemheg/Engine.cpp	2009-10-15 22:14:18.000000000 +0000
@@ -20,7 +20,7 @@
 */
 
 #include <QStringList>
-#include <qregexp.h>
+#include <QRegExp>
 
 #include "Engine.h"
 #include "ParseNode.h"
--- ./libs/libmythfreemheg/Engine.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythfreemheg/Engine.h	2009-10-15 22:15:44.000000000 +0000
@@ -30,9 +30,9 @@
 #include "Visible.h"
 #include "Actions.h"
 #include "Link.h"
-#include <qstring.h>
-#include <qrect.h>
-#include <qregion.h>
+#include <QString>
+#include <QRect>
+#include <QRegion>
 #include <QList>
 #include <QStack>
 #include <QQueue>
--- ./libs/libmythfreemheg/Groups.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythfreemheg/Groups.h	2009-10-15 22:09:13.000000000 +0000
@@ -22,8 +22,8 @@
 
 #if !defined(GROUPCLASS_H)
 #define GROUPCLASS_H
-#include <qstring.h>
-#include <qdatetime.h> 
+#include <QString>
+#include <QDateTime> 
 #include <QList>
 
 #include "Root.h"
--- ./libs/libmythfreemheg/Ingredients.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythfreemheg/Ingredients.h	2009-10-15 22:09:13.000000000 +0000
@@ -26,7 +26,7 @@
 #include "BaseClasses.h"
 #include "Actions.h"
 #include "BaseActions.h"
-#include <qstring.h>
+#include <QString>
 
 class MHParseNode;
 
--- ./libs/libmythfreemheg/Link.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythfreemheg/Link.h	2009-10-15 22:09:13.000000000 +0000
@@ -28,7 +28,7 @@
 #include "Actions.h"
 #include "BaseActions.h"
 
-#include <qstring.h>
+#include <QString>
 
 class MHParseNode;
 
--- libs/libmythfreemheg/Logging.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ libs/libmythfreemheg/Logging.h	2009-10-15 22:49:01.000000000 +0000
@@ -23,7 +23,7 @@
 #define LOGGING_H
 
 #include <qglobal.h> // For Q_ASSERT
-#include <qstring.h> // For QString
+#include <QString> // For QString
 
 #include "freemheg.h" // For MHLogError
 
--- ./libs/libmythfreemheg/TokenGroup.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythfreemheg/TokenGroup.h	2009-10-15 22:21:14.000000000 +0000
@@ -31,7 +31,7 @@
 #include "BaseActions.h"
 #include "Actions.h"
 
-#include <qpoint.h>
+#include <QPoint>
 #include <QList>
 
 class MHEngine;
--- ./libs/libmythfreemheg/Visible.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythfreemheg/Visible.h	2009-10-15 22:15:44.000000000 +0000
@@ -21,7 +21,7 @@
 
 #if !defined(VISIBLE_H)
 #define VISIBLE_H
-#include <qregion.h>
+#include <QRegion>
 
 #include "Presentable.h"
 // Dependencies
--- ./libs/libmythfreemheg/freemheg.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythfreemheg/freemheg.h	2009-10-15 22:15:44.000000000 +0000
@@ -22,7 +22,7 @@
 #if !defined(FREEMHEG_H)
 #define FREEMHEG_H
 
-#include <qregion.h>
+#include <QRegion>
 #include <stdio.h>
 #include <stdlib.h>
 
--- ./libs/libmythfreesurround/freesurround.cpp.orig	2009-09-29 12:25:02.000000000 +0000
+++ ./libs/libmythfreesurround/freesurround.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -29,8 +29,8 @@
 #include <map>
 #include <math.h>
 
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QDateTime>
 
 using namespace std;
 
--- ./libs/libmythtv/NuppelVideoRecorder.h.orig	2009-08-23 11:07:56.000000000 +0000
+++ ./libs/libmythtv/NuppelVideoRecorder.h	2009-10-15 22:09:13.000000000 +0000
@@ -26,8 +26,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 // MythTV headers
 #include "recorderbase.h"
--- ./libs/libmythtv/RingBuffer.h.orig	2009-10-15 21:22:42.000000000 +0000
+++ ./libs/libmythtv/RingBuffer.h	2009-10-15 21:23:15.000000000 +0000
@@ -3,9 +3,9 @@
 #ifndef RINGBUFFER
 #define RINGBUFFER
 
-#include <qstring.h>
-#include <qwaitcondition.h>
-#include <qmutex.h>
+#include <QString>
+#include <QWaitCondition>
+#include <QMutex>
 #include <pthread.h>
 
 extern "C" {
--- ./libs/libmythtv/ThreadedFileWriter.h.orig	2009-10-15 21:24:11.000000000 +0000
+++ ./libs/libmythtv/ThreadedFileWriter.h	2009-10-15 21:24:35.000000000 +0000
@@ -3,9 +3,9 @@
 #define TFW_H_
 
 #include <pthread.h>
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qstring.h>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QString>
 #include <stdint.h>
 
 class ThreadedFileWriter
--- ./libs/libmythtv/avcinfo.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/avcinfo.h	2009-10-15 22:09:13.000000000 +0000
@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 QString guid_to_string(uint64_t guid);
 uint64_t string_to_guid(const QString &guid);
--- ./libs/libmythtv/avformatdecoder.h.orig	2009-10-14 14:51:54.000000000 +0000
+++ ./libs/libmythtv/avformatdecoder.h	2009-10-15 22:09:13.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef AVFORMATDECODER_H_
 #define AVFORMATDECODER_H_
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 #include <QList>
 
 #include "programinfo.h"
--- ./libs/libmythtv/cardutil.h.orig	2009-09-14 19:18:27.000000000 +0000
+++ ./libs/libmythtv/cardutil.h	2009-10-15 22:09:13.000000000 +0000
@@ -11,8 +11,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstringlist.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMap>
 
 class InputInfo;
 class CardInput;
--- ./libs/libmythtv/cc608decoder.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/cc608decoder.h	2009-10-15 22:12:52.000000000 +0000
@@ -8,8 +8,8 @@
 #include <vector>
 using namespace std;
 
-#include <qmutex.h>
-#include <qstringlist.h>
+#include <QMutex>
+#include <QStringList>
 
 #include "format.h"
 
--- ./libs/libmythtv/cc708decoder.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/cc708decoder.h	2009-10-15 22:09:13.000000000 +0000
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include <qstringlist.h>
+#include <QStringList>
 
 #include "format.h"
 #include "compat.h"
--- ./libs/libmythtv/cc708window.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/cc708window.h	2009-10-15 22:12:52.000000000 +0000
@@ -7,9 +7,9 @@
 #include <vector>
 using namespace std;
 
-#include <qstring.h>
-#include <qmutex.h>
-#include <qcolor.h>
+#include <QString>
+#include <QMutex>
+#include <QColor>
 
 class CC708CharacterAttribute
 {
--- ./libs/libmythtv/channelbase.h.orig	2009-04-18 00:45:58.000000000 +0000
+++ ./libs/libmythtv/channelbase.h	2009-10-15 22:09:13.000000000 +0000
@@ -4,8 +4,8 @@
 #define CHANNELBASE_H
 
 // Qt headers
-#include <qmap.h>
-#include <qstringlist.h>
+#include <QMap>
+#include <QStringList>
 
 // MythTV headers
 #include "channelutil.h"
--- ./libs/libmythtv/channelscan/channelscan_sm.h.orig	2009-09-14 21:51:47.000000000 +0000
+++ ./libs/libmythtv/channelscan/channelscan_sm.h	2009-10-15 22:12:52.000000000 +0000
@@ -33,13 +33,13 @@
 #include <pthread.h> 
 
 // Qt includes
-#include <qobject.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QString>
+#include <QMap>
+#include <QMutex>
 #include <QList>
 #include <QPair>
-#include <qdatetime.h>
+#include <QDateTime>
 
 // MythTV includes
 #include "frequencytables.h"
--- ./libs/libmythtv/channelscan/frequencytablesetting.cpp.orig	2009-08-13 23:02:30.000000000 +0000
+++ ./libs/libmythtv/channelscan/frequencytablesetting.cpp	2009-10-15 22:15:44.000000000 +0000
@@ -30,7 +30,7 @@
 #include "frequencytablesetting.h"
 
 // Qt headers
-#include <qlocale.h>
+#include <QLocale>
 
 ScanFrequencyTable::ScanFrequencyTable() : ComboBoxSetting(this)
 {
--- ./libs/libmythtv/channelscan/panedvbutilsimport.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/channelscan/panedvbutilsimport.h	2009-10-15 22:12:52.000000000 +0000
@@ -31,8 +31,8 @@
 #define _PANE_DVB_UTILS_IMPORT_H_
 
 // Qt headers
-#include <qstring.h>
-#include <qobject.h>
+#include <QString>
+#include <QObject>
 
 // MythTV headers
 #include "channelscanmiscsettings.h"
--- ./libs/libmythtv/channelscan/paneexistingscanimport.h.orig	2009-04-18 00:45:58.000000000 +0000
+++ ./libs/libmythtv/channelscan/paneexistingscanimport.h	2009-10-15 22:12:52.000000000 +0000
@@ -30,8 +30,8 @@
 #define _PANE_EXISTING_SCAN_IMPORT_H_
 
 // Qt headers
-#include <qstring.h>
-#include <qobject.h>
+#include <QString>
+#include <QObject>
 
 // MythTV headers
 #include "channelscanmiscsettings.h"
--- ./libs/libmythtv/channelscan/scaninfo.h.orig	2009-04-20 02:25:39.000000000 +0000
+++ ./libs/libmythtv/channelscan/scaninfo.h	2009-10-15 22:09:13.000000000 +0000
@@ -10,8 +10,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QDateTime>
 
 // MythTV headers
 #include "mythexp.h"
--- ./libs/libmythtv/channelscan/scanmonitor.cpp.orig	2009-09-02 22:05:54.000000000 +0000
+++ ./libs/libmythtv/channelscan/scanmonitor.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -33,7 +33,7 @@
 #include "channelscanner.h"
 
 // Qt headers
-#include <qapplication.h>
+#include <QApplication>
 
 /// Percentage to set to after the transports have been scanned
 #define TRANSPORT_PCT 6
--- ./libs/libmythtv/channelsettings.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/channelsettings.h	2009-10-15 22:25:30.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef CHANNELSETTINGS_H
 #define CHANNELSETTINGS_H
 
-#include <qwidget.h>
-#include <qsqldatabase.h>
+#include <QWidget>
+#include <QSqlDatabase>
 
 #include <cstdlib>
 
--- ./libs/libmythtv/darwinavcinfo.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/darwinavcinfo.h	2009-10-15 22:09:13.000000000 +0000
@@ -16,7 +16,7 @@
 #include <IOKit/avc/IOFireWireAVCLib.h>
 
 // Qt headers
-#include <qmap.h>
+#include <QMap>
 
 // MythTV headers
 #include "avcinfo.h"
--- ./libs/libmythtv/dbox2channel.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/dbox2channel.cpp	2009-10-15 22:25:30.000000000 +0000
@@ -9,7 +9,7 @@
 using namespace std;
 
 // Qt headers
-#include <q3http.h>
+#include <Q3Http>
 
 // MythTV headers
 #include "mythverbose.h"
--- ./libs/libmythtv/dbox2channel.h.orig	2009-07-06 20:42:28.000000000 +0000
+++ ./libs/libmythtv/dbox2channel.h	2009-10-15 22:12:52.000000000 +0000
@@ -13,8 +13,8 @@
 #endif
 
 // Qt headers
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 // MythTV headers
 #include "channelbase.h"
--- ./libs/libmythtv/dbox2epg.cpp.orig	2009-05-28 22:06:48.000000000 +0000
+++ ./libs/libmythtv/dbox2epg.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -4,7 +4,7 @@
  *  Distributed as part of MythTV under GPL v2 and later.
  */
 
-#include <qdatetime.h>
+#include <QDateTime>
 #include <QHttp>
 
 #include "dbox2channel.h"
--- ./libs/libmythtv/diseqc.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/diseqc.h	2009-10-15 22:12:52.000000000 +0000
@@ -15,9 +15,9 @@
 using namespace std;
 
 // Qt headers
-#include <qmap.h>
-#include <qstring.h>
-#include <qmutex.h>
+#include <QMap>
+#include <QString>
+#include <QMutex>
 
 class DTVMultiplex;
 
--- ./libs/libmythtv/dtvconfparser.cpp.orig	2009-08-16 21:35:50.000000000 +0000
+++ ./libs/libmythtv/dtvconfparser.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -31,7 +31,7 @@
 
 // Qt headers
 #include <QTextStream>
-#include <qfile.h>
+#include <QFile>
 
 // MythTV headers
 #include "mythcontext.h"
--- ./libs/libmythtv/dtvconfparser.h.orig	2009-08-16 21:35:50.000000000 +0000
+++ ./libs/libmythtv/dtvconfparser.h	2009-10-15 22:09:13.000000000 +0000
@@ -41,7 +41,7 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dtvchannel.h"
--- ./libs/libmythtv/dtvconfparserhelpers.h.orig	2009-10-05 16:02:07.000000000 +0000
+++ ./libs/libmythtv/dtvconfparserhelpers.h	2009-10-15 22:09:13.000000000 +0000
@@ -32,7 +32,7 @@
 #ifndef _DTVCONFPARSERHELPERS_H_
 #define _DTVCONFPARSERHELPERS_H_
 
-#include <qstring.h>
+#include <QString>
 
 // The following are a set of helper classes to allow easy translation
 // between the different string representations of various tuning params.
--- ./libs/libmythtv/dtvmultiplex.h.orig	2009-09-14 21:51:47.000000000 +0000
+++ ./libs/libmythtv/dtvmultiplex.h	2009-10-15 22:09:13.000000000 +0000
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dtvconfparserhelpers.h"
--- ./libs/libmythtv/dtvrecorder.h.orig	2009-08-03 17:23:43.000000000 +0000
+++ ./libs/libmythtv/dtvrecorder.h	2009-10-15 22:09:13.000000000 +0000
@@ -12,7 +12,7 @@
 #include <vector>
 using namespace std;
 
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include "recorderbase.h"
 #include "H264Parser.h"
--- ./libs/libmythtv/dummychannel.h.orig	2009-08-17 23:52:49.000000000 +0000
+++ ./libs/libmythtv/dummychannel.h	2009-10-15 22:09:13.000000000 +0000
@@ -6,7 +6,7 @@
 #ifndef DUMMYCHANNEL_H
 #define DUMMYCHANNEL_H
 
-#include <qstring.h>
+#include <QString>
 #include "tv_rec.h"
 #include "channelbase.h"
 
--- ./libs/libmythtv/dvbcam.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/dvbcam.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -33,8 +33,8 @@
  *
  */
 
-#include <qdatetime.h>
-#include <qvariant.h>
+#include <QDateTime>
+#include <QVariant>
 
 #include <iostream>
 #include <vector>
--- ./libs/libmythtv/dvbcam.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/dvbcam.h	2009-10-15 22:12:52.000000000 +0000
@@ -4,7 +4,7 @@
 #include <deque>
 using namespace std;
 
-#include <qmutex.h>
+#include <QMutex>
 
 #include "mpegtables.h"
 
--- ./libs/libmythtv/dvbrecorder.h.orig	2009-08-04 13:48:39.000000000 +0000
+++ ./libs/libmythtv/dvbrecorder.h	2009-10-15 22:12:52.000000000 +0000
@@ -14,7 +14,7 @@
 using namespace std;
 
 // Qt includes
-#include <qmutex.h>
+#include <QMutex>
 
 #include "dtvrecorder.h"
 #include "tspacket.h"
--- ./libs/libmythtv/dvbsignalmonitor.h.orig	2009-10-15 22:35:53.000000000 +0000
+++ ./libs/libmythtv/dvbsignalmonitor.h	2009-10-15 22:36:12.000000000 +0000
@@ -4,7 +4,7 @@
 #define DVBSIGNALMONITOR_H
 
 #include "dtvsignalmonitor.h"
-#include "qstringlist.h"
+#include <QStringList>
 
 class DVBChannel;
 class DVBStreamHandler;
--- ./libs/libmythtv/dvbtypes.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/dvbtypes.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -1,7 +1,7 @@
 // -*- Mode: c++ -*-
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // MythTV headers
 #include "dvbtypes.h"
--- ./libs/libmythtv/eitcache.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/eitcache.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -6,7 +6,7 @@
  */
 
 
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include "eitcache.h"
 #include "mythcontext.h"
--- ./libs/libmythtv/eitcache.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/eitcache.h	2009-10-15 22:12:52.000000000 +0000
@@ -9,9 +9,9 @@
 #include <stdint.h>
 
 // Qt headers
-#include <qmap.h>
-#include <qmutex.h>
-#include <qstring.h>
+#include <QMap>
+#include <QMutex>
+#include <QString>
 
 #include "mythexp.h"
 
--- ./libs/libmythtv/eitscanner.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/eitscanner.h	2009-10-15 22:14:18.000000000 +0000
@@ -3,12 +3,12 @@
 #define EITSCANNER_H
 
 // Qt includes
-#include <qmutex.h>
-#include <qobject.h>
-#include <qdatetime.h>
-#include <qstringlist.h>
-#include <qwaitcondition.h>
-#include <qthread.h>
+#include <QMutex>
+#include <QObject>
+#include <QDateTime>
+#include <QStringList>
+#include <QWaitCondition>
+#include <QThread>
 
 class TVRec;
 class ChannelBase;
--- ./libs/libmythtv/firewiredevice.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/firewiredevice.h	2009-10-15 22:12:52.000000000 +0000
@@ -12,8 +12,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 // MythTV headers
 #include "streamlisteners.h"
--- ./libs/libmythtv/firewiresignalmonitor.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/firewiresignalmonitor.h	2009-10-15 22:12:52.000000000 +0000
@@ -3,9 +3,9 @@
 #ifndef _FIREWIRESIGNALMONITOR_H_
 #define _FIREWIRESIGNALMONITOR_H_
 
-#include <qmap.h>
-#include <qmutex.h>
-#include <qdatetime.h>
+#include <QMap>
+#include <QMutex>
+#include <QDateTime>
 
 #include "dtvsignalmonitor.h"
 #include "firewiredevice.h"
--- ./libs/libmythtv/frequencytables.h.orig	2009-08-19 23:49:27.000000000 +0000
+++ ./libs/libmythtv/frequencytables.h	2009-10-15 22:12:52.000000000 +0000
@@ -9,9 +9,9 @@
 using namespace std;
 
 // Qt includes
-#include <qmap.h>
-#include <qstring.h>
-#include <qmutex.h>
+#include <QMap>
+#include <QString>
+#include <QMutex>
 
 // MythTV includes
 #include "dtvchannel.h"
--- ./libs/libmythtv/hdhrsignalmonitor.h.orig	2009-10-15 22:33:36.000000000 +0000
+++ ./libs/libmythtv/hdhrsignalmonitor.h	2009-10-15 22:33:54.000000000 +0000
@@ -4,7 +4,7 @@
 #define HDHRSIGNALMONITOR_H
 
 #include "dtvsignalmonitor.h"
-#include "qstringlist.h"
+#include <QStringList>
 
 class HDHRChannel;
 class HDHRStreamHandler;
--- ./libs/libmythtv/inputgroupmap.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/inputgroupmap.h	2009-10-15 22:09:13.000000000 +0000
@@ -7,7 +7,7 @@
 using namespace std;
 
 // Qt headers
-#include <qmap.h>
+#include <QMap>
 
 // MythTV headers
 #include "mythexp.h"
--- ./libs/libmythtv/inputinfo.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/inputinfo.h	2009-10-15 22:09:13.000000000 +0000
@@ -3,8 +3,8 @@
 #define _INPUTINFO_H_
 
 // Qt headers
-#include <qstringlist.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMap>
 
 // MythTV headers
 #include "channelutil.h" // for DBChanList
--- ./libs/libmythtv/iptv/iptvchannelinfo.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/iptv/iptvchannelinfo.h	2009-10-15 22:09:13.000000000 +0000
@@ -6,8 +6,8 @@
 #ifndef _IPTV_CHANNELINFO_H_
 #define _IPTV_CHANNELINFO_H_
 
-#include <qmap.h>
-#include <qstring.h>
+#include <QMap>
+#include <QString>
 
 class IPTVChannelInfo
 {
--- ./libs/libmythtv/iptv/iptvfeederlive.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/iptv/iptvfeederlive.h	2009-10-15 22:14:18.000000000 +0000
@@ -12,8 +12,8 @@
 using namespace std;
 
 // Qt headers
-#include <qwaitcondition.h>
-#include <qmutex.h>
+#include <QWaitCondition>
+#include <QMutex>
 
 // Mythtv headers
 #include "iptvfeeder.h"
--- ./libs/libmythtv/iptv/iptvfeederwrapper.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/iptv/iptvfeederwrapper.h	2009-10-15 22:12:52.000000000 +0000
@@ -10,8 +10,8 @@
 #include <vector>
 using namespace std;
 
-#include <qmutex.h>
-#include <qstring.h>
+#include <QMutex>
+#include <QString>
 
 class IPTVFeeder;
 class TSDataListener;
--- ./libs/libmythtv/iptv/iptvmediasink.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/iptv/iptvmediasink.h	2009-10-15 22:12:52.000000000 +0000
@@ -10,7 +10,7 @@
 #include <vector>
 using namespace std;
 
-#include <qmutex.h>
+#include <QMutex>
 
 #include <MediaSink.hh>
 
--- ./libs/libmythtv/iptvchannel.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/iptvchannel.h	2009-10-15 22:12:52.000000000 +0000
@@ -10,7 +10,7 @@
 #include "dtvchannel.h"
 #include "iptvchannelinfo.h"
 
-#include <qmutex.h>
+#include <QMutex>
 
 class IPTVFeederWrapper;
 
--- ./libs/libmythtv/iptvrecorder.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/iptvrecorder.h	2009-10-15 22:14:18.000000000 +0000
@@ -8,7 +8,7 @@
 #ifndef _IPTV_RECORDER_H_
 #define _IPTV_RECORDER_H_
 
-#include <qwaitcondition.h>
+#include <QWaitCondition>
 
 #include "dtvrecorder.h"
 #include "streamlisteners.h"
--- ./libs/libmythtv/ivtvdecoder.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/ivtvdecoder.h	2009-10-15 22:09:13.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef IVTVDECODER_H_
 #define IVTVDECODER_H_
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 #include "programinfo.h"
 #include "format.h"
--- ./libs/libmythtv/jobqueue.h.orig	2009-08-20 03:31:28.000000000 +0000
+++ ./libs/libmythtv/jobqueue.h	2009-10-15 20:56:23.000000000 +0000
@@ -1,13 +1,12 @@
 #ifndef JOBQUEUE_H_
 #define JOBQUEUE_H_
 
-#include <qobject.h>
-#include <qmap.h>
-#include <qmutex.h>
-#include <qobject.h>
-#include <qsqldatabase.h>
+#include <QObject>
+#include <QMap>
+#include <QMutex>
+#include <QSqlDatabase>
 #include <QEvent>
-#include <qwaitcondition.h>
+#include <QWaitCondition>
 #include <pthread.h>
 
 
--- ./libs/libmythtv/linuxavcinfo.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/linuxavcinfo.h	2009-10-15 22:09:13.000000000 +0000
@@ -11,7 +11,7 @@
 #include <libavc1394/rom1394.h>
 
 // Qt headers
-#include <qmap.h>
+#include <QMap>
 
 // MythTV headers
 #include "avcinfo.h"
--- ./libs/libmythtv/linuxfirewiredevice.cpp.orig	2009-06-27 22:32:06.000000000 +0000
+++ ./libs/libmythtv/linuxfirewiredevice.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -28,7 +28,7 @@
 using namespace std;
 
 // Qt headers
-#include <qdatetime.h>
+#include <QDateTime>
 
 // MythTV headers
 #include "linuxfirewiredevice.h"
--- ./libs/libmythtv/mhi.cpp.orig	2009-07-23 14:40:59.000000000 +0000
+++ ./libs/libmythtv/mhi.cpp	2009-10-15 22:25:30.000000000 +0000
@@ -1,7 +1,7 @@
 #include <unistd.h>
 
 #include <QRegion>
-#include <qbitarray.h>
+#include <QBitArray>
 
 #include <QVector>
 
--- ./libs/libmythtv/mpeg/atsc_huffman.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/mpeg/atsc_huffman.h	2009-10-15 22:09:13.000000000 +0000
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 // Qt header
-#include <qstring.h>
+#include <QString>
 
 QString atsc_huffman1_to_string(const unsigned char *compressed,
                                 uint size, uint table);
--- ./libs/libmythtv/mpeg/atsctables.cpp.orig	2009-10-15 22:34:14.000000000 +0000
+++ ./libs/libmythtv/mpeg/atsctables.cpp	2009-10-15 22:34:28.000000000 +0000
@@ -2,7 +2,7 @@
 // Copyright (c) 2003-2004, Daniel Thor Kristjansson
 #include "atsctables.h"
 #include "atscdescriptors.h"
-#include "qstring.h"
+#include <QString>
 
 QString MasterGuideTable::TableClassString(uint i) const 
 {
--- ./libs/libmythtv/mpeg/dishdescriptors.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/mpeg/dishdescriptors.h	2009-10-15 22:09:13.000000000 +0000
@@ -6,7 +6,7 @@
 #include <cassert>
 
 using namespace std;
-#include <qstring.h>
+#include <QString>
 
 #include "mythcontext.h"
 #include "atscdescriptors.h"
--- ./libs/libmythtv/mpeg/dvbdescriptors.h.orig	2009-08-21 19:29:37.000000000 +0000
+++ ./libs/libmythtv/mpeg/dvbdescriptors.h	2009-10-15 22:12:52.000000000 +0000
@@ -6,8 +6,8 @@
 #include <cassert>
 #include <vector>
 #include <map>
-#include <qmutex.h>
-#include <qstring.h>
+#include <QMutex>
+#include <QString>
 #include "mythcontext.h"
 #include "mythexp.h" // MPUBLIC - Symbol Visibility
 #include "mpegdescriptors.h"
--- ./libs/libmythtv/mpeg/dvbtables.cpp.orig	2009-10-15 22:35:21.000000000 +0000
+++ ./libs/libmythtv/mpeg/dvbtables.cpp	2009-10-15 22:35:40.000000000 +0000
@@ -5,7 +5,7 @@
 
 #include "dvbtables.h"
 #include "dvbdescriptors.h"
-#include "qstring.h"
+#include <QString>
 
 void NetworkInformationTable::Parse(void) const
 {
--- ./libs/libmythtv/mpeg/dvbtables.h.orig	2009-04-19 22:07:22.000000000 +0000
+++ ./libs/libmythtv/mpeg/dvbtables.h	2009-10-15 22:09:13.000000000 +0000
@@ -3,7 +3,7 @@
 #ifndef _DVB_TABLES_H_
 #define _DVB_TABLES_H_
 
-#include <qstring.h>
+#include <QString>
 #include <stdint.h>  // uint32_t
 #include "mpegtables.h"
 #include "dvbdescriptors.h"
--- ./libs/libmythtv/mpeg/freesat_huffman.cpp.orig	2009-06-09 21:28:48.000000000 +0000
+++ ./libs/libmythtv/mpeg/freesat_huffman.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -1,6 +1,6 @@
 #include "freesat_huffman.h"
 
-#include <qstring.h>
+#include <QString>
 
 struct fsattab {
     unsigned int value;
--- ./libs/libmythtv/mpeg/freesat_huffman.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/mpeg/freesat_huffman.h	2009-10-15 22:09:13.000000000 +0000
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 // Qt header
-#include <qstring.h>
+#include <QString>
 
 QString freesat_huffman_to_string(const unsigned char *compressed, uint size);
 
--- ./libs/libmythtv/mpeg/iso639.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/mpeg/iso639.h	2009-10-15 22:09:13.000000000 +0000
@@ -2,9 +2,9 @@
 #ifndef _ISO_639_2_H_
 #define _ISO_639_2_H_
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <QMap>
+#include <QString>
+#include <QStringList>
 #include <vector>
 #include "mythexp.h"
 using namespace std;
--- ./libs/libmythtv/mpeg/mpegstreamdata.h.orig	2009-08-27 19:38:29.000000000 +0000
+++ ./libs/libmythtv/mpeg/mpegstreamdata.h	2009-10-15 22:09:13.000000000 +0000
@@ -6,7 +6,7 @@
 #include <vector>
 using namespace std;
 
-#include <qmap.h>
+#include <QMap>
 #include <stdint.h>  // uint64_t
 #include "tspacket.h"
 #include "util.h"
--- ./libs/libmythtv/mpeg/premieredescriptors.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/mpeg/premieredescriptors.h	2009-10-15 22:09:13.000000000 +0000
@@ -5,8 +5,8 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include <qstring.h>
-#include <qdatetime.h>
+#include <QString>
+#include <QDateTime>
 
 #include "mpegdescriptors.h"
 
--- ./libs/libmythtv/mpeg/premieretables.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/mpeg/premieretables.h	2009-10-15 22:09:13.000000000 +0000
@@ -2,7 +2,7 @@
 #ifndef _PRIVATE_TABLES_H_
 #define _PRIVATE_TABLES_H_
 
-#include <qstring.h>
+#include <QString>
 #include <stdint.h>  // uint32_t
 #include "mpegtables.h"
 #include "dvbdescriptors.h"
--- ./libs/libmythtv/mpeg/tsstats.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/mpeg/tsstats.h	2009-10-15 22:09:13.000000000 +0000
@@ -3,8 +3,8 @@
 #ifndef __TS_STATS__
 #define __TS_STATS__
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 
 /** \class TSStats
  *  \brief Collects statistics on the number of TSPacket's seen on each PID.
--- ./libs/libmythtv/openglcontext.h.orig	2009-08-31 07:53:52.000000000 +0000
+++ ./libs/libmythtv/openglcontext.h	2009-10-15 22:12:52.000000000 +0000
@@ -6,8 +6,8 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qrect.h>
+#include <QString>
+#include <QRect>
 
 #ifdef USING_X11
 // MythTV headers
--- ./libs/libmythtv/openglvideo.h.orig	2009-09-07 02:13:12.000000000 +0000
+++ ./libs/libmythtv/openglvideo.h	2009-10-15 22:12:52.000000000 +0000
@@ -5,8 +5,8 @@
 #include <map>
 using namespace std;
 
-#include <qrect.h>
-#include <qmap.h>
+#include <QRect>
+#include <QMap>
 
 #include "videooutbase.h"
 #include "videoouttypes.h"
--- libs/libmythtv/osd.h.orig	2009-07-17 13:23:54.000000000 +0000
+++ libs/libmythtv/osd.h	2009-10-15 23:19:10.000000000 +0000
@@ -5,17 +5,17 @@
 #include <vector>
 using namespace std;
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qrect.h>
-#include <qpoint.h>
+#include <QString>
+#include <QStringList>
+#include <QRect>
+#include <QPoint>
 #include <QKeyEvent>
 #include <ctime>
-#include <qmap.h>
-#include <qdom.h>
-#include <qmutex.h>
-#include <qobject.h>
-#include <qregexp.h>
+#include <QMap>
+#include <Qt/qdom.h>
+#include <QMutex>
+#include <QObject>
+#include <QRegExp>
 
 // Mythtv Headers
 #include "themeinfo.h"
--- ./libs/libmythtv/osdsurface.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/osdsurface.h	2009-10-15 22:15:44.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef OSDSURFACE_H_
 #define OSDSURFACE_H_
 
-#include <qregion.h>
-#include <qmutex.h>
+#include <QRegion>
+#include <QMutex>
 #include "blend.h"
 
 #define MAX_NEG_CROP 1024
--- ./libs/libmythtv/playgroup.cpp.orig	2009-06-02 16:44:12.000000000 +0000
+++ ./libs/libmythtv/playgroup.cpp	2009-10-15 22:14:18.000000000 +0000
@@ -1,8 +1,8 @@
 #include "mythcontext.h"
 #include "mythdb.h"
-#include <qsqldatabase.h>
-#include <qcursor.h>
-#include <qlayout.h>
+#include <QSqlDatabase>
+#include <QCursor>
+#include <QLayout>
 #include <iostream>
 #include "playgroup.h"
 #include "programinfo.h"
--- ./libs/libmythtv/playgroup.h.orig	2009-10-15 22:32:53.000000000 +0000
+++ ./libs/libmythtv/playgroup.h	2009-10-15 22:33:15.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef PLAYGROUP_H
 #define PLAYGROUP_H
 
-#include "qstringlist.h"
+#include <QStringList>
 #include "settings.h"
 #include "mythwidgets.h"
 
--- ./libs/libmythtv/previewgenerator.h.orig	2009-08-21 19:29:37.000000000 +0000
+++ ./libs/libmythtv/previewgenerator.h	2009-10-15 22:12:52.000000000 +0000
@@ -4,8 +4,8 @@
 
 #include <pthread.h>
 
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 #include "programinfo.h"
 #include "util.h"
--- ./libs/libmythtv/profilegroup.cpp.orig	2009-06-02 16:44:12.000000000 +0000
+++ ./libs/libmythtv/profilegroup.cpp	2009-10-15 22:14:18.000000000 +0000
@@ -5,9 +5,9 @@
 #include "mythdb.h"
 #include "mythuihelper.h"
 #include "cardutil.h"
-#include <qsqldatabase.h>
-#include <qcursor.h>
-#include <qlayout.h>
+#include <QSqlDatabase>
+#include <QCursor>
+#include <QLayout>
 #include <iostream>
 
 QString ProfileGroupStorage::GetWhereClause(MSqlBindings &bindings) const
--- ./libs/libmythtv/recorderbase.h.orig	2009-10-08 16:06:13.000000000 +0000
+++ ./libs/libmythtv/recorderbase.h	2009-10-15 22:14:18.000000000 +0000
@@ -2,11 +2,11 @@
 #ifndef RECORDERBASE_H_
 #define RECORDERBASE_H_
 
-#include <qmutex.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qsqldatabase.h>
-#include <qwaitcondition.h>
+#include <QMutex>
+#include <QString>
+#include <QMap>
+#include <QSqlDatabase>
+#include <QWaitCondition>
 
 #include <pthread.h>
 
--- ./libs/libmythtv/remoteencoder.h.orig	2009-10-15 21:20:35.000000000 +0000
+++ ./libs/libmythtv/remoteencoder.h	2009-10-15 21:20:55.000000000 +0000
@@ -1,9 +1,9 @@
 #ifndef REMOTEENCODER_H_
 #define REMOTEENCODER_H_
 
-#include <qstringlist.h>
-#include <qmutex.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMutex>
+#include <QMap>
 
 #include "mythexp.h"
 #include "videoouttypes.h"
--- ./libs/libmythtv/signalmonitor.h.orig	2009-07-17 17:16:29.000000000 +0000
+++ ./libs/libmythtv/signalmonitor.h	2009-10-15 22:12:52.000000000 +0000
@@ -13,8 +13,8 @@
 using namespace std;
 
 // Qt headers
-#include <qobject.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QMutex>
 
 // MythTV headers
 #include "signalmonitorvalue.h"
--- ./libs/libmythtv/signalmonitorvalue.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/signalmonitorvalue.h	2009-10-15 22:09:13.000000000 +0000
@@ -3,7 +3,7 @@
 #define SIGNALMONITORVALUES_H
 
 #include <vector>
-#include <qstringlist.h>
+#include <QStringList>
 #include <mythcontext.h>
 
 class SignalMonitorValue
--- ./libs/libmythtv/sourceutil.h.orig	2009-09-14 18:59:30.000000000 +0000
+++ ./libs/libmythtv/sourceutil.h	2009-10-15 22:09:13.000000000 +0000
@@ -7,7 +7,7 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 #include "mythexp.h"
 
--- ./libs/libmythtv/teletextdecoder.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/teletextdecoder.h	2009-10-15 22:14:18.000000000 +0000
@@ -3,9 +3,9 @@
 
 #include <stdint.h>
 
-#include <qwaitcondition.h>
-#include <qobject.h>
-#include <qmutex.h>
+#include <QWaitCondition>
+#include <QObject>
+#include <QMutex>
 
 class OSDType;
 
--- ./libs/libmythtv/textsubtitleparser.cpp.orig	2009-07-13 18:41:55.000000000 +0000
+++ ./libs/libmythtv/textsubtitleparser.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -8,7 +8,7 @@
 #include <cstring>
 #include <climits>
 #include <algorithm>
-#include <qtextcodec.h>
+#include <QTextCodec>
 
 #include "mythcontext.h"
 #include "RingBuffer.h"
--- ./libs/libmythtv/transporteditor.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/transporteditor.h	2009-10-15 22:12:52.000000000 +0000
@@ -32,7 +32,7 @@
 #ifndef _TRANSPORT_EDITOR_H_
 #define _TRANSPORT_EDITOR_H_
 
-#include <qobject.h>
+#include <QObject>
 #include "settings.h"
 
 class VideoSourceSelector;
--- ./libs/libmythtv/ttfont.h.orig	2009-07-06 20:42:28.000000000 +0000
+++ ./libs/libmythtv/ttfont.h	2009-10-15 22:12:52.000000000 +0000
@@ -5,9 +5,9 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-#include <qstring.h>
-#include <qmap.h>
-#include <qcolor.h>
+#include <QString>
+#include <QMap>
+#include <QColor>
 
 #include "mythconfig.h"
 
--- ./libs/libmythtv/tv.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythtv/tv.h	2009-10-15 22:09:13.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef TV_H
 #define TV_H
 
-#include <qstring.h>
+#include <QString>
 #include "videoouttypes.h"
 
 /** \brief ChannelChangeDirection is an enumeration of possible channel
--- ./libs/libmythtv/tv_play.h.orig	2009-09-19 06:32:08.000000000 +0000
+++ ./libs/libmythtv/tv_play.h	2009-10-15 22:14:18.000000000 +0000
@@ -3,17 +3,17 @@
 #ifndef TVPLAY_H
 #define TVPLAY_H
 
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 #include <QHash>
-#include <qdatetime.h>
+#include <QDateTime>
 #include <QKeyEvent>
 #include <QEvent>
 #include <pthread.h>
-#include <qmutex.h>
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qwaitcondition.h>
+#include <QMutex>
+#include <QStringList>
+#include <QRegExp>
+#include <QWaitCondition>
 #include <QThread>
 #include <QReadWriteLock>
 
@@ -28,7 +28,7 @@
 #include "inputinfo.h"
 #include "channelgroup.h"
 
-#include <qobject.h>
+#include <QObject>
 
 #include <vector>
 using namespace std;
--- ./libs/libmythtv/tv_rec.cpp.orig	2009-10-01 18:01:46.000000000 +0000
+++ ./libs/libmythtv/tv_rec.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -11,8 +11,8 @@
 using namespace std;
 
 // Qt headers
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <QApplication>
+#include <QSqlDatabase>
 
 // MythTV headers
 #include "mythconfig.h"
--- ./libs/libmythtv/tvosdmenuentry.h.orig	2009-08-08 12:26:02.000000000 +0000
+++ ./libs/libmythtv/tvosdmenuentry.h	2009-10-15 22:12:52.000000000 +0000
@@ -1,9 +1,9 @@
 #ifndef TVOSDMENUENTRY_H_
 #define TVOSDMENUENTRY_H_
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmutex.h>
+#include <QString>
+#include <QStringList>
+#include <QMutex>
 #include <QVariant>
 #include "tv.h"
 #include "mythexp.h"
--- ./libs/libmythtv/util-opengl.h.orig	2009-08-22 11:11:52.000000000 +0000
+++ ./libs/libmythtv/util-opengl.h	2009-10-15 22:09:13.000000000 +0000
@@ -25,7 +25,7 @@
 #endif
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 #ifndef GL_TEXTTURE0
 #define GL_TEXTURE0 0x84C0
--- ./libs/libmythtv/util-xv.h.orig	2009-08-26 04:39:14.000000000 +0000
+++ ./libs/libmythtv/util-xv.h	2009-10-15 22:09:13.000000000 +0000
@@ -3,7 +3,7 @@
 #ifndef _UTIL_XV_H_
 #define _UTIL_XV_H_
 
-#include <qmap.h>
+#include <QMap>
 
 #include "videobuffers.h"
 #include "exitcodes.h"
--- ./libs/libmythtv/videobuffers.h.orig	2009-07-06 11:33:40.000000000 +0000
+++ ./libs/libmythtv/videobuffers.h	2009-10-15 22:25:30.000000000 +0000
@@ -8,9 +8,9 @@
 }
 #include <vector>
 #include <map>
-#include <qmutex.h>
-#include <qstring.h>
-#include <qwaitcondition.h>
+#include <QMutex>
+#include <QString>
+#include <QWaitCondition>
 #include "mythdeque.h"
 
 #ifdef USING_XVMC
--- ./libs/libmythtv/videodisplayprofile.h.orig	2009-06-08 01:42:55.000000000 +0000
+++ ./libs/libmythtv/videodisplayprofile.h	2009-10-15 22:14:18.000000000 +0000
@@ -6,10 +6,10 @@
 #include <vector>
 using namespace std;
 
-#include <qstringlist.h>
-#include <qmutex.h>
-#include <qsize.h>
-#include <qmap.h>
+#include <QStringList>
+#include <QMutex>
+#include <QSize>
+#include <QMap>
 
 #include "mythcontext.h"
 
--- ./libs/libmythtv/videoout_d3d.cpp.orig	2009-09-03 05:05:37.000000000 +0000
+++ ./libs/libmythtv/videoout_d3d.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -20,7 +20,7 @@
 #include "mmsystem.h"
 #include "tv.h"
 
-#include <qapplication.h>
+#include <QApplication>
 
 #undef UNICODE
 
--- ./libs/libmythtv/videoout_directfb.h.orig	2009-06-30 11:47:43.000000000 +0000
+++ ./libs/libmythtv/videoout_directfb.h	2009-10-15 22:12:52.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef VIDEOOUT_DIRECTFB_H
 #define VIDEOOUT_DIRECTFB_H
 
-#include <qobject.h>
+#include <QObject>
 #include "videooutbase.h"
 
 class NuppelVideoPlayer;
--- ./libs/libmythtv/videoout_dvdv.mm.orig	2008-11-12 18:32:17.000000000 +0000
+++ ./libs/libmythtv/videoout_dvdv.mm	2009-10-15 22:25:30.000000000 +0000
@@ -11,11 +11,11 @@
 #import <AGL/agl.h>
 #import <OpenGL/glext.h>
 
-#include <qmutex.h>
-#include <qstring.h>
-#include <q3ptrqueue.h>
-#include <qmap.h>
-#include <qsize.h>
+#include <QMutex>
+#include <QString>
+#include <Q3PtrQueue>
+#include <QMap>
+#include <QSize>
 
 #include "libmyth/mythconfig.h"
 #include "libmyth/mythverbose.h"
--- ./libs/libmythtv/videoout_ivtv.h.orig	2009-06-30 11:47:43.000000000 +0000
+++ ./libs/libmythtv/videoout_ivtv.h	2009-10-15 22:12:52.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef VIDEOOUT_IVTV_H_
 #define VIDEOOUT_IVTV_H_
 
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 #include "videooutbase.h"
 
--- ./libs/libmythtv/videoout_null.h.orig	2009-06-30 11:47:43.000000000 +0000
+++ ./libs/libmythtv/videoout_null.h	2009-10-15 22:12:52.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef VIDEOOUT_NULL_H_
 #define VIDEOOUT_NULL_H_
 
-#include <qmutex.h>
+#include <QMutex>
 
 #include "videooutbase.h"
 
--- libs/libmythupnp/configuration.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ libs/libmythupnp/configuration.h	2009-10-15 23:22:02.000000000 +0000
@@ -24,8 +24,8 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
-#include <qdom.h>
-#include <qstringlist.h>
+#include <Qt/qdom.h>
+#include <QStringList>
 
 class Configuration 
 {
--- libs/libmythupnp/mythxmlclient.h.orig	2009-04-14 02:33:12.000000000 +0000
+++ libs/libmythupnp/mythxmlclient.h	2009-10-15 23:21:42.000000000 +0000
@@ -24,8 +24,8 @@
 #ifndef MYTHXMLCLIENT_H_
 #define MYTHXMLCLIENT_H_
 
-#include <qdom.h>
-#include <qbuffer.h>
+#include <Qt/qdom.h>
+#include <QBuffer>
 
 #include "httpcomms.h"
 
--- ./libs/libmythupnp/refcounted.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythupnp/refcounted.h	2009-10-15 22:12:52.000000000 +0000
@@ -24,7 +24,7 @@
 #ifndef __REFCOUNTED_H__
 #define __REFCOUNTED_H__
 
-#include <qmutex.h>
+#include <QMutex>
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
--- ./libs/libmythupnp/soapclient.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythupnp/soapclient.cpp	2009-10-15 22:15:44.000000000 +0000
@@ -21,7 +21,7 @@
 //
 //////////////////////////////////////////////////////////////////////////////
 
-#include <qbuffer.h>
+#include <QBuffer>
 
 #include "soapclient.h"
 
--- libs/libmythupnp/soapclient.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ libs/libmythupnp/soapclient.h	2009-10-15 23:21:25.000000000 +0000
@@ -24,7 +24,7 @@
 #ifndef SOAPCLIENT_H_
 #define SOAPCLIENT_H_
 
-#include <qdom.h>
+#include <Qt/qdom.h>
 
 #include "httpcomms.h"
 #include "upnputil.h"
--- ./libs/libmythupnp/ssdp.cpp.orig	2009-08-12 16:30:58.000000000 +0000
+++ ./libs/libmythupnp/ssdp.cpp	2009-10-15 22:14:18.000000000 +0000
@@ -29,11 +29,11 @@
 #include "multicast.h"
 #include "broadcast.h"
 
-#include <qregexp.h>
+#include <QRegExp>
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <qstringlist.h>
+#include <QStringList>
 #include <sys/time.h>
 
 /////////////////////////////////////////////////////////////////////////////
--- ./libs/libmythupnp/taskqueue.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./libs/libmythupnp/taskqueue.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -23,7 +23,7 @@
 
 #include "taskqueue.h"
 #include <sys/time.h>
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include <iostream>
 
--- ./libs/libmythupnp/upnpdevice.cpp.orig	2009-04-14 02:21:29.000000000 +0000
+++ ./libs/libmythupnp/upnpdevice.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <cerrno>
 
-#include <qfile.h>
+#include <QFile>
 #include <QTextStream>
 
 int DeviceLocation::g_nAllocated   = 0;       // Debugging only
--- ./libs/libmythupnp/upnpmsrr.cpp.orig	2009-07-08 07:46:10.000000000 +0000
+++ ./libs/libmythupnp/upnpmsrr.cpp	2009-10-15 22:14:18.000000000 +0000
@@ -9,7 +9,7 @@
 #include "upnpmsrr.h"
 
 #include <math.h>
-#include <qregexp.h>
+#include <QRegExp>
 
 /////////////////////////////////////////////////////////////////////////////
 //
--- libs/libmythupnp/upnpmsrr.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ libs/libmythupnp/upnpmsrr.h	2009-10-15 23:21:08.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef UPnpMSRR_H_
 #define UPnpMSRR_H_
 
-#include <qdom.h>
-#include <qdatetime.h> 
+#include <Qt/qdom.h>
+#include <QDateTime> 
 
 #include "httpserver.h"
 #include "eventing.h"
--- ./libs/libmythupnp/upnputil.cpp.orig	2009-07-06 20:42:28.000000000 +0000
+++ ./libs/libmythupnp/upnputil.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -27,7 +27,7 @@
 #include <cerrno>
 
 // Qt headers
-#include <quuid.h>
+#include <QUuid>
 
 // MythTV headers
 #include "upnputil.h"
--- ./programs/mythbackend/autoexpire.cpp.orig	2009-08-21 05:32:05.000000000 +0000
+++ ./programs/mythbackend/autoexpire.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -3,10 +3,10 @@
 #include <signal.h>
 
 
-#include <qregexp.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
+#include <QRegExp>
+#include <QString>
+#include <QDateTime>
+#include <QFileInfo>
 
 #include <iostream>
 #include <algorithm>
--- ./programs/mythbackend/autoexpire.h.orig	2009-08-12 08:25:42.000000000 +0000
+++ ./programs/mythbackend/autoexpire.h	2009-10-15 22:14:18.000000000 +0000
@@ -9,10 +9,10 @@
 #include <vector>
 #include <set>
 
-#include <qmap.h> 
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qobject.h>
+#include <QMap> 
+#include <QMutex>
+#include <QWaitCondition>
+#include <QObject>
 
 using namespace std;
 class ProgramInfo;
--- ./programs/mythbackend/backendutil.cpp.orig	2009-09-05 13:55:01.000000000 +0000
+++ ./programs/mythbackend/backendutil.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -8,9 +8,9 @@
 #include <sys/vfs.h>
 #endif
 
-#include <qdir.h>
-#include <qmutex.h>
-#include <qmap.h>
+#include <QDir>
+#include <QMutex>
+#include <QMap>
 
 #include "backendutil.h"
 #include "remoteutil.h"
--- ./programs/mythbackend/encoderlink.h.orig	2009-05-09 18:51:42.000000000 +0000
+++ ./programs/mythbackend/encoderlink.h	2009-10-15 22:09:13.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ENCODERLINK_H_
 #define ENCODERLINK_H_
 
-#include <qstring.h>
+#include <QString>
 
 #include "tv.h"
 #include "programinfo.h"
--- ./programs/mythbackend/filetransfer.h.orig	2009-08-06 03:14:47.000000000 +0000
+++ ./programs/mythbackend/filetransfer.h	2009-10-15 22:14:18.000000000 +0000
@@ -9,9 +9,9 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
-#include <qmutex.h>
-#include <qwaitcondition.h>
+#include <QString>
+#include <QMutex>
+#include <QWaitCondition>
 
 class ProgramInfo;
 class RingBuffer;
--- ./programs/mythbackend/housekeeper.cpp.orig	2009-08-21 13:39:14.000000000 +0000
+++ ./programs/mythbackend/housekeeper.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -1,12 +1,12 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QString>
+#include <QDateTime>
+#include <QStringList>
+#include <QFileInfo>
 
 #include <iostream>
 #include <cstdlib>
--- programs/mythbackend/httpstatus.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ programs/mythbackend/httpstatus.h	2009-10-15 23:20:47.000000000 +0000
@@ -11,8 +11,8 @@
 #ifndef HTTPSTATUS_H_
 #define HTTPSTATUS_H_
 
-#include <qdom.h>
-#include <qdatetime.h> 
+#include <Qt/qdom.h>
+#include <QDateTime> 
 
 #include "httpserver.h"
 #include "mainserver.h"
--- ./programs/mythbackend/mediaserver.h.orig	2009-09-06 07:47:00.000000000 +0000
+++ ./programs/mythbackend/mediaserver.h	2009-10-15 22:12:52.000000000 +0000
@@ -11,8 +11,8 @@
 #ifndef __MEDIASERVER_H__
 #define __MEDIASERVER_H__
 
-#include <qobject.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QMutex>
 
 #include "libmythupnp/upnp.h"
 
--- ./programs/mythbackend/playbacksock.h.orig	2009-10-01 19:43:38.000000000 +0000
+++ ./programs/mythbackend/playbacksock.h	2009-10-15 22:12:52.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef PLAYBACKSOCK_H_
 #define PLAYBACKSOCK_H_
 
-#include <qstring.h>
-#include <qmutex.h>
+#include <QString>
+#include <QMutex>
 
 #include "programinfo.h"
 
--- ./programs/mythbackend/scheduler.cpp.orig	2009-09-18 00:30:33.000000000 +0000
+++ ./programs/mythbackend/scheduler.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -1,10 +1,10 @@
 #include <unistd.h>
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qfile.h>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QRegExp>
+#include <QString>
+#include <QDateTime>
+#include <QFile>
 
 #include <iostream>
 #include <algorithm>
--- ./programs/mythbackend/scheduler.h.orig	2009-09-14 18:20:41.000000000 +0000
+++ ./programs/mythbackend/scheduler.h	2009-10-15 22:14:18.000000000 +0000
@@ -8,10 +8,10 @@
 using namespace std;
 
 // Qt headers
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qmap.h> 
-#include <qobject.h>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QMap> 
+#include <QObject>
 
 // MythTV headers
 #include "recordinginfo.h"
--- ./programs/mythbackend/upnpcdsmusic.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythbackend/upnpcdsmusic.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -10,7 +10,7 @@
 
 #include "upnpcdsmusic.h"
 #include "httprequest.h"
-#include <qfileinfo.h>
+#include <QFileInfo>
 #include <limits.h>
 #include "mythcontext.h"
 
--- ./programs/mythbackend/upnpmedia.cpp.orig	2009-09-06 07:47:00.000000000 +0000
+++ ./programs/mythbackend/upnpmedia.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -1,8 +1,8 @@
 #include "httprequest.h"
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qurl.h>
-#include <qdir.h>
+#include <QFileInfo>
+#include <QRegExp>
+#include <QUrl>
+#include <QDir>
 #include <limits.h>
 #include <unistd.h>
 #include "util.h"
--- ./programs/mythcommflag/CustomEventRelayer.h.orig	2009-10-15 22:37:58.000000000 +0000
+++ ./programs/mythcommflag/CustomEventRelayer.h	2009-10-15 22:38:22.000000000 +0000
@@ -1,8 +1,8 @@
 #ifndef _CUSTOMEVENTRELAYER_H_
 #define _CUSTOMEVENTRELAYER_H_
 
-#include "qobject.h"
-#include "qstring.h"
+#include <QObject>
+#include <QString>
 #include <QEvent>
 
 #include "mythcontext.h"
--- ./programs/mythcommflag/FrameAnalyzer.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythcommflag/FrameAnalyzer.h	2009-10-15 22:09:13.000000000 +0000
@@ -10,7 +10,7 @@
 /* Base class for commercial flagging video frame analyzers. */
 
 #include <limits.h>
-#include <qmap.h>
+#include <QMap>
 
 /*  
  * At least FreeBSD doesn't define LONG_LONG_MAX, but it does define  
--- ./programs/mythcommflag/LogoDetectorBase.h.orig	2009-10-15 22:37:30.000000000 +0000
+++ ./programs/mythcommflag/LogoDetectorBase.h	2009-10-15 22:37:45.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef _LOGODETECTORBASE_H_
 #define _LOGODETECTORBASE_H_
 
-#include "qobject.h"
+#include <QObject>
 
 class NuppelVideoPlayer;
 
--- ./programs/mythcommflag/SceneChangeDetectorBase.h.orig	2009-10-15 22:38:34.000000000 +0000
+++ ./programs/mythcommflag/SceneChangeDetectorBase.h	2009-10-15 22:38:46.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef _SCENECHANGEDETECTORBASE_H_
 #define _SCENECHANGEDETECTORBASE_H_
 
-#include "qobject.h"
+#include <QObject>
 
 class SceneChangeDetectorBase : public QObject
 {
--- ./programs/mythfilldatabase/channeldata.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythfilldatabase/channeldata.h	2009-10-15 22:09:13.000000000 +0000
@@ -2,7 +2,7 @@
 #define _CHANNELDATA_H_
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 #include <QList>
 
 class ChanInfo
--- ./programs/mythfilldatabase/filldata.cpp.orig	2009-08-08 12:15:46.000000000 +0000
+++ ./programs/mythfilldatabase/filldata.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -11,10 +11,10 @@
 using namespace std;
 
 // Qt headers
-#include <qmap.h>
-#include <qdatetime.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <QMap>
+#include <QDateTime>
+#include <QDir>
+#include <QFile>
 #include <QProcess>
 #include <QList>
 
--- ./programs/mythfilldatabase/filldata.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythfilldatabase/filldata.h	2009-10-15 22:09:13.000000000 +0000
@@ -6,7 +6,7 @@
 using namespace std;
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 // libmythtv headers
 #include "datadirect.h"
--- ./programs/mythfilldatabase/fillutil.cpp.orig	2009-07-13 21:52:19.000000000 +0000
+++ ./programs/mythfilldatabase/fillutil.cpp	2009-10-15 22:09:13.000000000 +0000
@@ -1,6 +1,6 @@
 // Qt headers
-#include <qfile.h>
-#include <qdir.h>
+#include <QFile>
+#include <QDir>
 
 // libmyth headers
 #include "mythcontext.h"
--- ./programs/mythfilldatabase/fillutil.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythfilldatabase/fillutil.h	2009-10-15 22:09:13.000000000 +0000
@@ -5,7 +5,7 @@
 #include <cstdio>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
 
 class QFile;
 
--- programs/mythfrontend/exitprompt.cpp.orig	2009-10-15 23:37:14.000000000 +0000
+++ programs/mythfrontend/exitprompt.cpp	2009-10-15 23:37:41.000000000 +0000
@@ -16,7 +16,7 @@
 void ExitPrompter::halt()
 {
     QString halt_cmd = gContext->GetSetting("HaltCommand",
-                                            "sudo /sbin/halt -p");
+                                            "/sbin/shutdown -p now");
     if (!halt_cmd.isEmpty())
     {
         myth_system(halt_cmd);
--- ./programs/mythlcdserver/lcdprocclient.cpp.orig	2009-08-08 11:45:29.000000000 +0000
+++ ./programs/mythlcdserver/lcdprocclient.cpp	2009-10-15 22:25:30.000000000 +0000
@@ -11,8 +11,8 @@
 #include <stdlib.h>
 #include <cmath>
 
-#include <qapplication.h>
-#include <q3textstream.h>
+#include <QApplication>
+#include <Q3TextStream>
 
 #include "lcdprocclient.h"
 #include "mythcontext.h"
--- ./programs/mythlcdserver/lcdprocclient.h.orig	2009-10-15 21:55:16.000000000 +0000
+++ ./programs/mythlcdserver/lcdprocclient.h	2009-10-15 21:56:09.000000000 +0000
@@ -1,12 +1,12 @@
 #ifndef LCDPROCCLIENT_H_
 #define LCDPROCCLIENT_H_
 
-#include <qobject.h>
-#include <qstringlist.h>
-#include <q3valuevector.h>
-#include <q3socket.h>
-#include <qtimer.h>
-#include <qdatetime.h>
+#include <QObject>
+#include <QStringList>
+#include <Q3ValueVector>
+#include <Q3Socket>
+#include <QTimer>
+#include <QDateTime>
 #include <QEvent>
 #include <Q3PtrList>
 
--- ./programs/mythlcdserver/lcdserver.cpp.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythlcdserver/lcdserver.cpp	2009-10-15 22:14:18.000000000 +0000
@@ -56,10 +56,10 @@
 */
 
 #include <stdlib.h>
-#include <qstringlist.h>
-#include <qregexp.h>
-#include <qdir.h>
-#include <qapplication.h>
+#include <QStringList>
+#include <QRegExp>
+#include <QDir>
+#include <QApplication>
 #include <Q3PtrList>
 
 #include "util.h"
--- ./programs/mythlcdserver/lcdserver.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythlcdserver/lcdserver.h	2009-10-15 22:12:52.000000000 +0000
@@ -7,8 +7,8 @@
 
 */
 
-#include <qobject.h>
-#include <qstringlist.h>
+#include <QObject>
+#include <QStringList>
 
 #include "serversocket.h"
 #include "lcdprocclient.h"
--- ./programs/mythlcdserver/main.cpp.orig	2009-08-08 11:45:29.000000000 +0000
+++ ./programs/mythlcdserver/main.cpp	2009-10-15 22:25:30.000000000 +0000
@@ -13,7 +13,7 @@
 
 #include <QApplication>
 #include <QFile>
-#include <q3textstream.h>
+#include <Q3TextStream>
 
 #include "exitcodes.h"
 #include "mythcontext.h"
--- ./programs/mythlcdserver/serversocket.h.orig	2009-04-11 00:04:30.000000000 +0000
+++ ./programs/mythlcdserver/serversocket.h	2009-10-15 22:25:30.000000000 +0000
@@ -10,8 +10,8 @@
 
 */
 
-#include <q3socket.h>
-#include <q3serversocket.h>
+#include <Q3Socket>
+#include <Q3ServerSocket>
 
 
 
--- ./programs/mythtranscode/mpeg2fix.h.orig	2009-10-01 15:24:45.000000000 +0000
+++ ./programs/mythtranscode/mpeg2fix.h	2009-10-15 22:25:30.000000000 +0000
@@ -23,9 +23,9 @@
 #include <QStringList>
 #include <QDateTime>
 
-#include <q3ptrlist.h>
-#include <q3ptrqueue.h>
-#include <q3valuelist.h>
+#include <Q3PtrList>
+#include <Q3PtrQueue>
+#include <Q3ValueList>
 
 #include "transcodedefs.h"
 
@@ -265,7 +265,7 @@
 };
 
 #ifdef NO_MYTH
-    #include <qdatetime.h>
+    #include <QDateTime>
     #include <iostream>
 
     using namespace std;
--- ./programs/mythtvosd/main.cpp.orig	2009-08-08 11:45:29.000000000 +0000
+++ ./programs/mythtvosd/main.cpp	2009-10-15 22:21:14.000000000 +0000
@@ -9,11 +9,11 @@
 using namespace std;
 
 // Qt headers
-#include <qapplication.h>
+#include <QApplication>
 #include <QUdpSocket>
-#include <qstring.h>
-#include <qfile.h>
-#include <qhostaddress.h>
+#include <QString>
+#include <QFile>
+#include <QHostAddress>
 
 // MythTV headers
 #include "exitcodes.h"
--- ./programs/mythwelcome/welcomedialog.cpp.orig	2009-10-12 16:08:03.000000000 +0000
+++ ./programs/mythwelcome/welcomedialog.cpp	2009-10-15 22:12:52.000000000 +0000
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 // qt
-#include <qapplication.h>
+#include <QApplication>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QEvent>




@comment $FreeBSD: ports/multimedia/mythtv-frontend/pkg-plist,v 1.1 2009/01/15 21:24:56 glarkin Exp $
bin/mythavtest
bin/mythbackend
bin/mythcommflag
bin/mythfilldatabase
bin/mythfrontend
bin/mythjobqueue
bin/mythlcdserver
bin/mythwelcome
bin/mythshutdown
bin/mythreplex
bin/mythshutdown
bin/mythfilldatabase
bin/mythtv-setup
bin/mythtranscode
bin/mythtv-setup
bin/mythtvosd
bin/mythwelcome
include/mythtv/audiooutput.h
include/mythtv/audiosettings.h
include/mythtv/compat.h
include/mythtv/dbutil.h
include/mythtv/dialogbox.h
include/mythtv/dvdnav/dvd_reader.h
include/mythtv/dvdnav/dvd_types.h
include/mythtv/dvdnav/dvdnav.h
include/mythtv/dvdnav/dvdnav_events.h
include/mythtv/dvdread/dvd_reader.h
include/mythtv/dvdread/ifo_read.h
include/mythtv/dvdread/ifo_types.h
include/mythtv/dvdread/nav_read.h
include/mythtv/dvdread/nav_types.h
include/mythtv/exitcodes.h
include/mythtv/ffmpeg/adler32.h
include/mythtv/ffmpeg/aes.h
include/mythtv/ffmpeg/avcodec.h
include/mythtv/ffmpeg/avformat.h
include/mythtv/ffmpeg/avio.h
include/mythtv/ffmpeg/avstring.h
include/mythtv/ffmpeg/avutil.h
include/mythtv/ffmpeg/base64.h
include/mythtv/ffmpeg/common.h
include/mythtv/ffmpeg/crc.h
include/mythtv/ffmpeg/fifo.h
include/mythtv/ffmpeg/integer.h
include/mythtv/ffmpeg/internal.h
include/mythtv/ffmpeg/intfloat_readwrite.h
include/mythtv/ffmpeg/lls.h
include/mythtv/ffmpeg/log.h
include/mythtv/ffmpeg/lzo.h
include/mythtv/ffmpeg/mathematics.h
include/mythtv/ffmpeg/md5.h
include/mythtv/ffmpeg/mem.h
include/mythtv/ffmpeg/mmx.h
include/mythtv/ffmpeg/opt.h
include/mythtv/ffmpeg/random.h
include/mythtv/ffmpeg/rational.h
include/mythtv/ffmpeg/rtp.h
include/mythtv/ffmpeg/rtsp.h
include/mythtv/ffmpeg/rtspcodes.h
include/mythtv/ffmpeg/sha1.h
include/mythtv/ffmpeg/softfloat.h
include/mythtv/ffmpeg/tree.h
include/mythtv/ffmpeg/x86_cpu.h
include/mythtv/generictree.h
include/mythtv/httpcomms.h
include/mythtv/langsettings.h
include/mythtv/lcddevice.h
include/mythtv/libavcodec/avcodec.h
include/mythtv/libavcodec/mmx.h
include/mythtv/libavcodec/opt.h
include/mythtv/libavformat/avformat.h
include/mythtv/libavformat/avio.h
include/mythtv/libavformat/rtp.h
include/mythtv/libavformat/rtsp.h
include/mythtv/libavformat/rtspcodes.h
include/mythtv/libavutil/adler32.h
include/mythtv/libavutil/avstring.h
include/mythtv/libavutil/avutil.h
include/mythtv/libavutil/base64.h
include/mythtv/libavutil/common.h
include/mythtv/libavutil/crc.h
include/mythtv/libavutil/fifo.h
include/mythtv/libavutil/intfloat_readwrite.h
include/mythtv/libavutil/log.h
include/mythtv/libavutil/lzo.h
include/mythtv/libavutil/mathematics.h
include/mythtv/libavutil/md5.h
include/mythtv/libavutil/mem.h
include/mythtv/libavutil/pixfmt.h
include/mythtv/libavutil/rational.h
include/mythtv/libavutil/sha1.h
include/mythtv/libmyth/audiooutput.h
include/mythtv/libmyth/audiosettings.h
include/mythtv/libmyth/compat.h
include/mythtv/libmyth/dbutil.h
include/mythtv/libmyth/dialogbox.h
include/mythtv/libmyth/exitcodes.h
include/mythtv/libmyth/generictree.h

include/mythtv/libmyth/langsettings.h
include/mythtv/libmyth/lcddevice.h
include/mythtv/libmyth/managedlist.h
include/mythtv/libmyth/msocketdevice.h
include/mythtv/libmyth/mythconfig.h
include/mythtv/libmyth/mythconfig.mak
include/mythtv/libmyth/mythconfigdialogs.h
include/mythtv/libmyth/mythconfiggroups.h
include/mythtv/libmyth/mythcontext.h
include/mythtv/libmyth/mythdb.h
include/mythtv/libmyth/mythdbcon.h
include/mythtv/libmyth/mythdbparams.h
include/mythtv/libmyth/mythdeque.h
include/mythtv/libmyth/mythdialogs.h
include/mythtv/libmyth/mythdirs.h
include/mythtv/libmyth/mythevent.h
include/mythtv/libmyth/mythexp.h
include/mythtv/libmyth/mythhttppool.h
include/mythtv/libmyth/mythmedia.h
include/mythtv/libmyth/mythmediamonitor.h
include/mythtv/libmyth/mythobservable.h

include/mythtv/libmyth/mythpluginapi.h
include/mythtv/libmyth/mythsocket.h
include/mythtv/libmyth/mythstorage.h
include/mythtv/libmyth/mythterminal.h
include/mythtv/libmyth/mythtimer.h
include/mythtv/libmyth/mythuifilebrowser.h
include/mythtv/libmyth/mythverbose.h
include/mythtv/libmyth/mythversion.h
include/mythtv/libmyth/mythwidgets.h
include/mythtv/libmyth/mythwizard.h
include/mythtv/libmyth/oldsettings.h
include/mythtv/libmyth/output.h
include/mythtv/libmyth/programinfo.h
include/mythtv/libmyth/qcodecs.h
include/mythtv/libmyth/recordingtypes.h
include/mythtv/libmyth/remotefile.h
include/mythtv/libmyth/remoteutil.h
include/mythtv/libmyth/schemawizard.h
include/mythtv/libmyth/settings.h
include/mythtv/libmyth/storagegroup.h
include/mythtv/libmyth/uilistbtntype.h
include/mythtv/libmyth/uitypes.h
include/mythtv/libmyth/util.h
include/mythtv/libmyth/virtualkeyboard_qt.h
include/mythtv/libmyth/visual.h
include/mythtv/libmyth/volumebase.h
include/mythtv/libmyth/volumecontrol.h
include/mythtv/libmyth/xmlparse.h
include/mythtv/libmythdb/compat.h
include/mythtv/libmythdb/exitcodes.h
include/mythtv/libmythdb/httpcomms.h
include/mythtv/libmythdb/lcddevice.h
include/mythtv/libmythdb/msocketdevice.h
include/mythtv/libmythdb/mythconfig.h
include/mythtv/libmythdb/mythconfig.mak
include/mythtv/libmythdb/mythdb.h
include/mythtv/libmythdb/mythdbcon.h
include/mythtv/libmythdb/mythdbparams.h
include/mythtv/libmythdb/mythdirs.h
include/mythtv/libmythdb/mythevent.h
include/mythtv/libmythdb/mythexp.h
include/mythtv/libmythdb/mythobservable.h
include/mythtv/libmythdb/mythsocket.h
include/mythtv/libmythdb/mythstorage.h
include/mythtv/libmythdb/mythtimer.h
include/mythtv/libmythdb/mythverbose.h
include/mythtv/libmythdb/mythversion.h
include/mythtv/libmythdb/qcodecs.h
include/mythtv/libmythui/mythdialogbox.h
include/mythtv/libmythui/mythfontproperties.h
include/mythtv/libmythui/mythgenerictree.h
include/mythtv/libmythui/mythgesture.h
include/mythtv/libmythui/mythimage.h
include/mythtv/libmythui/mythlistbutton.h
include/mythtv/libmythui/mythmainwindow.h
include/mythtv/libmythui/mythpainter.h
include/mythtv/libmythui/mythpainter_ogl.h
include/mythtv/libmythui/mythpainter_qt.h
include/mythtv/libmythui/mythprogressdialog.h
include/mythtv/libmythui/mythrect.h
include/mythtv/libmythui/mythscreenstack.h
include/mythtv/libmythui/mythscreentype.h
include/mythtv/libmythui/mythsystem.h
include/mythtv/libmythui/myththemebase.h
include/mythtv/libmythui/myththemedmenu.h
include/mythtv/libmythui/mythuibutton.h
include/mythtv/libmythui/mythuibuttonlist.h
include/mythtv/libmythui/mythuibuttontree.h
include/mythtv/libmythui/mythuicheckbox.h
include/mythtv/libmythui/mythuiclock.h
include/mythtv/libmythui/mythuigroup.h
include/mythtv/libmythui/mythuiguidegrid.h
include/mythtv/libmythui/mythuihelper.h
include/mythtv/libmythui/mythuiimage.h
include/mythtv/libmythui/mythuiprogressbar.h
include/mythtv/libmythui/mythuishape.h
include/mythtv/libmythui/mythuispinbox.h
include/mythtv/libmythui/mythuistatetype.h
include/mythtv/libmythui/mythuitext.h
include/mythtv/libmythui/mythuitextedit.h
include/mythtv/libmythui/mythuitype.h
include/mythtv/libmythui/mythuiutils.h
include/mythtv/libmythui/mythuiwebbrowser.h
include/mythtv/libmythui/mythvirtualkeyboard.h
include/mythtv/libmythui/x11colors.h
include/mythtv/libmythui/xmlparsebase.h
include/mythtv/libswscale/swscale.h
include/mythtv/managedlist.h
include/mythtv/mpeg2dec/mpeg2.h
include/mythtv/msocketdevice.h
include/mythtv/mythconfig.h
include/mythtv/mythconfig.mak
include/mythtv/mythconfigdialogs.h
include/mythtv/mythconfiggroups.h
include/mythtv/mythcontext.h
include/mythtv/mythdb.h
include/mythtv/mythdbcon.h
include/mythtv/mythdbparams.h
include/mythtv/mythdeque.h
include/mythtv/mythdialogs.h
include/mythtv/mythdirs.h
include/mythtv/mythevent.h
include/mythtv/mythexp.h
include/mythtv/mythhttppool.h
include/mythtv/mythmedia.h
include/mythtv/mythmediamonitor.h
include/mythtv/mythobservable.h

include/mythtv/mythpluginapi.h
include/mythtv/mythsocket.h
include/mythtv/mythstorage.h
include/mythtv/mythterminal.h
include/mythtv/mythtimer.h
include/mythtv/mythuifilebrowser.h
include/mythtv/mythverbose.h
include/mythtv/mythversion.h
include/mythtv/mythwidgets.h
include/mythtv/mythwizard.h
include/mythtv/oldsettings.h
include/mythtv/output.h
include/mythtv/programinfo.h
include/mythtv/qcodecs.h
include/mythtv/recordingtypes.h
include/mythtv/remotefile.h
include/mythtv/remoteutil.h
include/mythtv/samplerate.h
include/mythtv/schemawizard.h
include/mythtv/settings.h
include/mythtv/storagegroup.h
include/mythtv/uilistbtntype.h

include/mythtv/upnp/eventing.h
include/mythtv/upnp/httprequest.h
include/mythtv/upnp/httpserver.h
include/mythtv/upnp/mmembuf.h
include/mythtv/upnp/multicast.h
include/mythtv/upnp/mythxmlclient.h
include/mythtv/upnp/soapclient.h

include/mythtv/upnp/upnptasksearch.h
include/mythtv/upnp/upnputil.h
include/mythtv/util.h
include/mythtv/virtualkeyboard_qt.h
include/mythtv/visual.h
include/mythtv/volumebase.h
include/mythtv/volumecontrol.h
include/mythtv/xmlparse.h
lib/libmyth-0.22.so
lib/libmyth-0.22.so.0
lib/libmyth-0.22.so.0.22
lib/libmyth-0.22.so.0.22.0
lib/libmythavcodec-0.22.so
lib/libmythavcodec-0.22.so.0
lib/libmythavcodec-0.22.so.0.22
lib/libmythavcodec-0.22.so.0.22.0
lib/libmythavformat-0.22.so
lib/libmythavformat-0.22.so.0
lib/libmythavformat-0.22.so.0.22
lib/libmythavformat-0.22.so.0.22.0
lib/libmythavutil-0.22.so
lib/libmythavutil-0.22.so.0
lib/libmythavutil-0.22.so.0.22
lib/libmythavutil-0.22.so.0.22.0
lib/libmythdb-0.22.so
lib/libmythdb-0.22.so.0
lib/libmythdb-0.22.so.0.22
lib/libmythdb-0.22.so.0.22.0
lib/libmythdvdnav-0.22.a
lib/libmythfreemheg-0.22.so
lib/libmythfreemheg-0.22.so.0
lib/libmythfreemheg-0.22.so.0.22
lib/libmythfreemheg-0.22.so.0.22.0
lib/libmythhdhomerun-0.22.so
lib/libmythhdhomerun-0.22.so.0
lib/libmythhdhomerun-0.22.so.0.22
lib/libmythhdhomerun-0.22.so.0.22.0
lib/libmythlivemedia-0.22.so
lib/libmythlivemedia-0.22.so.0
lib/libmythlivemedia-0.22.so.0.22
lib/libmythlivemedia-0.22.so.0.22.0
lib/libmythswscale-0.22.so
lib/libmythswscale-0.22.so.0
lib/libmythswscale-0.22.so.0.22
lib/libmythswscale-0.22.so.0.22.0
lib/libmythtv-0.22.so
lib/libmythtv-0.22.so.0
lib/libmythtv-0.22.so.0.22
lib/libmythtv-0.22.so.0.22.0
lib/libmythui-0.22.so
lib/libmythui-0.22.so.0
lib/libmythui-0.22.so.0.22
lib/libmythui-0.22.so.0.22.0
lib/libmythupnp-0.22.so
lib/libmythupnp-0.22.so.0
lib/libmythupnp-0.22.so.0.22
lib/libmythupnp-0.22.so.0.22.0
lib/mythtv/filters/libadjust.so
lib/mythtv/filters/libbobdeint.so
lib/mythtv/filters/libcrop.so
lib/mythtv/filters/libdenoise3d.so
lib/mythtv/filters/libfieldorder.so
lib/mythtv/filters/libforce.so
lib/mythtv/filters/libgreedyhdeint.so
lib/mythtv/filters/libinvert.so
lib/mythtv/filters/libivtc.so
lib/mythtv/filters/libkerneldeint.so
lib/mythtv/filters/liblinearblend.so
lib/mythtv/filters/libforce.so
lib/mythtv/filters/libconvert.so
lib/mythtv/filters/libadjust.so
lib/mythtv/filters/libonefield.so
lib/mythtv/filters/libquickdnr.so
lib/mythtv/filters/libivtc.so
lib/mythtv/filters/libyadif.so
%%DATADIR%%/devicemaster.xml
%%DATADIR%%/deviceslave.xml
%%DATADIR%%/mythconverg_backup.pl
%%DATADIR%%/mythconverg_restore.pl
%%DATADIR%%/setup.xml
lib/libmythavcodec-0.21.so.0
lib/libmythavcodec-0.21.so.0.21
lib/libmythavcodec-0.21.so.0.21.0
lib/libmythavformat-0.21.so
lib/libmythavformat-0.21.so.0
lib/libmythavformat-0.21.so.0.21
lib/libmythavformat-0.21.so.0.21.0
lib/libmythavutil-0.21.so
lib/libmythavutil-0.21.so.0
lib/libmythavutil-0.21.so.0.21
lib/libmythavutil-0.21.so.0.21.0
lib/libmythdvdnav-0.21.a
lib/libmythfreemheg-0.21.so
lib/libmythfreemheg-0.21.so.0
lib/libmythfreemheg-0.21.so.0.21
lib/libmythfreemheg-0.21.so.0.21.0
lib/libmythlivemedia-0.21.so
lib/libmythlivemedia-0.21.so.0
lib/libmythlivemedia-0.21.so.0.21
lib/libmythlivemedia-0.21.so.0.21.0
lib/libmythtv-0.21.so
lib/libmythtv-0.21.so.0
lib/libmythtv-0.21.so.0.21
lib/libmythtv-0.21.so.0.21.0
lib/libmythui-0.21.so
lib/libmythui-0.21.so.0
lib/libmythui-0.21.so.0.21
lib/libmythui-0.21.so.0.21.0
lib/libmythupnp-0.21.so
lib/libmythupnp-0.21.so.0
lib/libmythupnp-0.21.so.0.21
lib/libmythupnp-0.21.so.0.21.0
%%DATADIR%%/CDS_scpd.xml
%%DATADIR%%/CMGR_scpd.xml
%%DATADIR%%/FreeMono.ttf
%%DATADIR%%/FreeSans.ttf
%%DATADIR%%/FreeSansBold.ttf
%%DATADIR%%/MFEXML_scpd.xml
%%DATADIR%%/MSRR_scpd.xml
%%DATADIR%%/MXML_scpd.xml
%%DATADIR%%/database/mc.sql
%%DATADIR%%/i18n/mythfrontend_ca.qm
%%DATADIR%%/i18n/mythfrontend_cs.qm
%%DATADIR%%/i18n/mythfrontend_da.qm
%%DATADIR%%/i18n/mythfrontend_de.qm
%%DATADIR%%/i18n/mythfrontend_en_gb.qm
%%DATADIR%%/i18n/mythfrontend_en_us.qm
%%DATADIR%%/i18n/mythfrontend_es.qm
%%DATADIR%%/i18n/mythfrontend_et.qm
%%DATADIR%%/i18n/mythfrontend_fi.qm
%%DATADIR%%/i18n/mythfrontend_fr.qm
%%DATADIR%%/i18n/mythfrontend_he.qm
%%DATADIR%%/i18n/mythfrontend_hu.qm
%%DATADIR%%/i18n/mythfrontend_is.qm
%%DATADIR%%/i18n/mythfrontend_it.qm
%%DATADIR%%/i18n/mythfrontend_ja.qm
%%DATADIR%%/i18n/mythfrontend_nb.qm
%%DATADIR%%/i18n/mythfrontend_nl.qm
%%DATADIR%%/i18n/mythfrontend_pl.qm
%%DATADIR%%/i18n/mythfrontend_pt.qm
%%DATADIR%%/i18n/mythfrontend_pt_br.qm
%%DATADIR%%/i18n/mythfrontend_ru.qm
%%DATADIR%%/i18n/mythfrontend_sl.qm
%%DATADIR%%/i18n/mythfrontend_sv.qm
%%DATADIR%%/i18n/mythfrontend_tr.qm
%%DATADIR%%/themes/BlackCurves-OSD/BlackCurves-preview.png
%%DATADIR%%/themes/BlackCurves-OSD/COPYING
%%DATADIR%%/themes/BlackCurves-OSD/DejaVuSans.ttf
%%DATADIR%%/themes/BlackCurves-OSD/cut_point.png
%%DATADIR%%/themes/BlackCurves-OSD/fill_green.png
%%DATADIR%%/themes/BlackCurves-OSD/fill_red.png
%%DATADIR%%/themes/BlackCurves-OSD/osd.xml
%%DATADIR%%/themes/BlackCurves-OSD/osd_browse_info.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_channel_editor.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_channel_number.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_notify.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_popup.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_program_info.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_scroll.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_settings.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_status.png
%%DATADIR%%/themes/BlackCurves-OSD/osd_status_frame.png
%%DATADIR%%/themes/BlackCurves-OSD/phone.png
%%DATADIR%%/themes/BlackCurves-OSD/position_marker.png
%%DATADIR%%/themes/BlackCurves-OSD/select.png
%%DATADIR%%/themes/BlackCurves-OSD/themeinfo.xml
%%DATADIR%%/themes/DVR/dvr-preview.png
%%DATADIR%%/themes/DVR/main_settings.xml
%%DATADIR%%/themes/DVR/mainmenu.xml
%%DATADIR%%/themes/DVR/recpriorities_settings.xml
%%DATADIR%%/themes/DVR/themeinfo.xml
%%DATADIR%%/themes/DVR/tv_lists.xml
%%DATADIR%%/themes/DVR/tv_schedule.xml
%%DATADIR%%/themes/DVR/tv_search.xml
%%DATADIR%%/themes/DVR/tv_settings.xml
%%DATADIR%%/themes/DVR/tvmenu.xml
%%DATADIR%%/themes/DVR/util_menu.xml
%%DATADIR%%/themes/Gray-OSD/DejaVuSans-Bold.ttf
%%DATADIR%%/themes/Gray-OSD/DejaVuSans-Oblique.ttf
%%DATADIR%%/themes/Gray-OSD/DejaVuSans.ttf
%%DATADIR%%/themes/Gray-OSD/cut_end.png
%%DATADIR%%/themes/Gray-OSD/cut_start.png
%%DATADIR%%/themes/Gray-OSD/fill_green.png
%%DATADIR%%/themes/Gray-OSD/fill_red.png
%%DATADIR%%/themes/Gray-OSD/gray-osd-preview.png
%%DATADIR%%/themes/Gray-OSD/osd-bar-mid.png
%%DATADIR%%/themes/Gray-OSD/osd-channel-edit.png
%%DATADIR%%/themes/Gray-OSD/osd-editmode.png
%%DATADIR%%/themes/Gray-OSD/osd-notify.png
%%DATADIR%%/themes/Gray-OSD/osd-small.png
%%DATADIR%%/themes/Gray-OSD/osd.xml
%%DATADIR%%/themes/Gray-OSD/popup.png
%%DATADIR%%/themes/Gray-OSD/position_marker.png
%%DATADIR%%/themes/Gray-OSD/selector.png
%%DATADIR%%/themes/Gray-OSD/slider_frame.png
%%DATADIR%%/themes/Gray-OSD/themeinfo.xml
%%DATADIR%%/themes/MythCenter-wide/README
%%DATADIR%%/themes/MythCenter-wide/base.xml
%%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page1.html
%%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page2.html
%%DATADIR%%/themes/MythCenter-wide/menu-ui.xml
%%DATADIR%%/themes/MythCenter-wide/preview.jpg
%%DATADIR%%/themes/MythCenter-wide/qtlook.txt
%%DATADIR%%/themes/MythCenter-wide/themeinfo.xml
%%DATADIR%%/themes/MythCenter-wide/title/title_dvd.png
%%DATADIR%%/themes/MythCenter-wide/title/title_gallery.png
%%DATADIR%%/themes/MythCenter-wide/title/title_games.png
%%DATADIR%%/themes/MythCenter-wide/title/title_info_center.png
%%DATADIR%%/themes/MythCenter-wide/title/title_info_settings.png
%%DATADIR%%/themes/MythCenter-wide/title/title_main.png
%%DATADIR%%/themes/MythCenter-wide/title/title_multimedia.png
%%DATADIR%%/themes/MythCenter-wide/title/title_music.png
%%DATADIR%%/themes/MythCenter-wide/title/title_music_setup.png
%%DATADIR%%/themes/MythCenter-wide/title/title_priority.png
%%DATADIR%%/themes/MythCenter-wide/title/title_record.png
%%DATADIR%%/themes/MythCenter-wide/title/title_schedule.png
%%DATADIR%%/themes/MythCenter-wide/title/title_search.png
%%DATADIR%%/themes/MythCenter-wide/title/title_setup.png
%%DATADIR%%/themes/MythCenter-wide/title/title_tv.png
%%DATADIR%%/themes/MythCenter-wide/title/title_video.png
%%DATADIR%%/themes/MythCenter-wide/title/title_weather.png
%%DATADIR%%/themes/MythCenter-wide/ui.xml
%%DATADIR%%/themes/MythCenter-wide/ui/background.png
%%DATADIR%%/themes/MythCenter-wide/ui/button_on.png
%%DATADIR%%/themes/MythCenter-wide/ui/down.png
%%DATADIR%%/themes/MythCenter-wide/ui/horizon.png
%%DATADIR%%/themes/MythCenter-wide/ui/mythtv_logo.png
%%DATADIR%%/themes/MythCenter-wide/ui/up.png
%%DATADIR%%/themes/MythCenter-wide/watermark/alarmclock.png
%%DATADIR%%/themes/MythCenter-wide/watermark/appearance.png
%%DATADIR%%/themes/MythCenter-wide/watermark/big_arrow_down.png
%%DATADIR%%/themes/MythCenter-wide/watermark/browser.png
%%DATADIR%%/themes/MythCenter-wide/watermark/cd.png
%%DATADIR%%/themes/MythCenter-wide/watermark/cd_burn.png
%%DATADIR%%/themes/MythCenter-wide/watermark/cd_rip.png
%%DATADIR%%/themes/MythCenter-wide/watermark/checklist.png
%%DATADIR%%/themes/MythCenter-wide/watermark/clock.png
%%DATADIR%%/themes/MythCenter-wide/watermark/dvd.png
%%DATADIR%%/themes/MythCenter-wide/watermark/dvd_burn.png
%%DATADIR%%/themes/MythCenter-wide/watermark/dvd_eject.png
%%DATADIR%%/themes/MythCenter-wide/watermark/dvd_rip.png
%%DATADIR%%/themes/MythCenter-wide/watermark/error.png
%%DATADIR%%/themes/MythCenter-wide/watermark/gallery.png
%%DATADIR%%/themes/MythCenter-wide/watermark/gallery_settings.png
%%DATADIR%%/themes/MythCenter-wide/watermark/hardware_info.png
%%DATADIR%%/themes/MythCenter-wide/watermark/hardware_settings.png
%%DATADIR%%/themes/MythCenter-wide/watermark/important.png
%%DATADIR%%/themes/MythCenter-wide/watermark/info.png
%%DATADIR%%/themes/MythCenter-wide/watermark/info_setup.png
%%DATADIR%%/themes/MythCenter-wide/watermark/ipod.png
%%DATADIR%%/themes/MythCenter-wide/watermark/joystick.png
%%DATADIR%%/themes/MythCenter-wide/watermark/keys.png
%%DATADIR%%/themes/MythCenter-wide/watermark/movietime.png
%%DATADIR%%/themes/MythCenter-wide/watermark/multimedia.png
%%DATADIR%%/themes/MythCenter-wide/watermark/music.png
%%DATADIR%%/themes/MythCenter-wide/watermark/music_settings.png
%%DATADIR%%/themes/MythCenter-wide/watermark/news.png
%%DATADIR%%/themes/MythCenter-wide/watermark/phone.png
%%DATADIR%%/themes/MythCenter-wide/watermark/pie.png
%%DATADIR%%/themes/MythCenter-wide/watermark/play.png
%%DATADIR%%/themes/MythCenter-wide/watermark/priority.png
%%DATADIR%%/themes/MythCenter-wide/watermark/radio.png
%%DATADIR%%/themes/MythCenter-wide/watermark/record.png
%%DATADIR%%/themes/MythCenter-wide/watermark/screenwiz.png
%%DATADIR%%/themes/MythCenter-wide/watermark/search.png
%%DATADIR%%/themes/MythCenter-wide/watermark/setup.png
%%DATADIR%%/themes/MythCenter-wide/watermark/stream.png
%%DATADIR%%/themes/MythCenter-wide/watermark/tv.png
%%DATADIR%%/themes/MythCenter-wide/watermark/video.png
%%DATADIR%%/themes/MythCenter-wide/watermark/video_settings.png
%%DATADIR%%/themes/MythCenter-wide/watermark/weather.png
%%DATADIR%%/themes/MythCenter-wide/watermark/zoneminder.png
%%DATADIR%%/themes/MythCenter/README
%%DATADIR%%/themes/MythCenter/base.xml
%%DATADIR%%/themes/MythCenter/cr-lines.png
%%DATADIR%%/themes/MythCenter/cr-selectbar.png
%%DATADIR%%/themes/MythCenter/htmls/progdetails_page1.html
%%DATADIR%%/themes/MythCenter/htmls/progdetails_page2.html
%%DATADIR%%/themes/MythCenter/menu-ui.xml
%%DATADIR%%/themes/MythCenter/preview.jpg
%%DATADIR%%/themes/MythCenter/qtlook.txt
%%DATADIR%%/themes/MythCenter/themeinfo.xml
%%DATADIR%%/themes/MythCenter/title/title_dvd.png
%%DATADIR%%/themes/MythCenter/title/title_gallery.png
%%DATADIR%%/themes/MythCenter/title/title_games.png
%%DATADIR%%/themes/MythCenter/title/title_info_center.png
%%DATADIR%%/themes/MythCenter/title/title_info_settings.png
%%DATADIR%%/themes/MythCenter/title/title_main.png
%%DATADIR%%/themes/MythCenter/title/title_multimedia.png
%%DATADIR%%/themes/MythCenter/title/title_music.png
%%DATADIR%%/themes/MythCenter/title/title_music_setup.png
%%DATADIR%%/themes/MythCenter/title/title_priority.png
%%DATADIR%%/themes/MythCenter/title/title_record.png
%%DATADIR%%/themes/MythCenter/title/title_schedule.png
%%DATADIR%%/themes/MythCenter/title/title_search.png
%%DATADIR%%/themes/MythCenter/title/title_setup.png
%%DATADIR%%/themes/MythCenter/title/title_tv.png
%%DATADIR%%/themes/MythCenter/title/title_video.png
%%DATADIR%%/themes/MythCenter/title/title_weather.png
%%DATADIR%%/themes/MythCenter/ui.xml
%%DATADIR%%/themes/MythCenter/ui/background.png
%%DATADIR%%/themes/MythCenter/ui/button_off.png
%%DATADIR%%/themes/MythCenter/ui/button_on.png
%%DATADIR%%/themes/MythCenter/ui/down.png
%%DATADIR%%/themes/MythCenter/ui/mythtv_logo.png
%%DATADIR%%/themes/MythCenter/ui/up.png
%%DATADIR%%/themes/MythCenter/watermark/alarmclock.png
%%DATADIR%%/themes/MythCenter/watermark/appearance.png
%%DATADIR%%/themes/MythCenter/watermark/big_arrow_down.png
%%DATADIR%%/themes/MythCenter/watermark/browser.png
%%DATADIR%%/themes/MythCenter/watermark/cd.png
%%DATADIR%%/themes/MythCenter/watermark/cd_burn.png
%%DATADIR%%/themes/MythCenter/watermark/cd_rip.png
%%DATADIR%%/themes/MythCenter/watermark/checklist.png
%%DATADIR%%/themes/MythCenter/watermark/clock.png
%%DATADIR%%/themes/MythCenter/watermark/dvd.png
%%DATADIR%%/themes/MythCenter/watermark/dvd_burn.png
%%DATADIR%%/themes/MythCenter/watermark/dvd_eject.png
%%DATADIR%%/themes/MythCenter/watermark/dvd_rip.png
%%DATADIR%%/themes/MythCenter/watermark/error.png
%%DATADIR%%/themes/MythCenter/watermark/gallery.png
%%DATADIR%%/themes/MythCenter/watermark/gallery_settings.png
%%DATADIR%%/themes/MythCenter/watermark/hardware_info.png
%%DATADIR%%/themes/MythCenter/watermark/hardware_settings.png
%%DATADIR%%/themes/MythCenter/watermark/important.png
%%DATADIR%%/themes/MythCenter/watermark/info.png
%%DATADIR%%/themes/MythCenter/watermark/info_setup.png
%%DATADIR%%/themes/MythCenter/watermark/ipod.png
%%DATADIR%%/themes/MythCenter/watermark/joystick.png
%%DATADIR%%/themes/MythCenter/watermark/keys.png
%%DATADIR%%/themes/MythCenter/watermark/movietime.png
%%DATADIR%%/themes/MythCenter/watermark/multimedia.png
%%DATADIR%%/themes/MythCenter/watermark/music.png
%%DATADIR%%/themes/MythCenter/watermark/music_settings.png
%%DATADIR%%/themes/MythCenter/watermark/news.png
%%DATADIR%%/themes/MythCenter/watermark/phone.png
%%DATADIR%%/themes/MythCenter/watermark/pie.png
%%DATADIR%%/themes/MythCenter/watermark/play.png
%%DATADIR%%/themes/MythCenter/watermark/priority.png
%%DATADIR%%/themes/MythCenter/watermark/radio.png
%%DATADIR%%/themes/MythCenter/watermark/record.png
%%DATADIR%%/themes/MythCenter/watermark/screenwiz.png
%%DATADIR%%/themes/MythCenter/watermark/search.png
%%DATADIR%%/themes/MythCenter/watermark/setup.png
%%DATADIR%%/themes/MythCenter/watermark/stream.png
%%DATADIR%%/themes/MythCenter/watermark/tv.png
%%DATADIR%%/themes/MythCenter/watermark/video.png
%%DATADIR%%/themes/MythCenter/watermark/video_settings.png
%%DATADIR%%/themes/MythCenter/watermark/weather.png
%%DATADIR%%/themes/MythCenter/watermark/zoneminder.png
%%DATADIR%%/themes/Terra/backgrounds/background.png
%%DATADIR%%/themes/Terra/backgrounds/bottombar.png
%%DATADIR%%/themes/Terra/backgrounds/horizontal_menu_background.png
%%DATADIR%%/themes/Terra/backgrounds/topbar.png
%%DATADIR%%/themes/Terra/backgrounds/videobackground.png
%%DATADIR%%/themes/Terra/base.xml
%%DATADIR%%/themes/Terra/browser-ui.xml
%%DATADIR%%/themes/Terra/config-ui.xml
%%DATADIR%%/themes/Terra/config/selected_icon_mask.png
%%DATADIR%%/themes/Terra/controls/button.png
%%DATADIR%%/themes/Terra/controls/button_pushed.png
%%DATADIR%%/themes/Terra/controls/checkbox_background.png
%%DATADIR%%/themes/Terra/controls/checkbox_background_selected.png
%%DATADIR%%/themes/Terra/controls/cursor.png
%%DATADIR%%/themes/Terra/controls/selector_left_arrow.png
%%DATADIR%%/themes/Terra/controls/selector_right_arrow.png
%%DATADIR%%/themes/Terra/controls/short_textedit_background.png
%%DATADIR%%/themes/Terra/controls/short_textedit_background_selected.png
%%DATADIR%%/themes/Terra/controls/small_button.png
%%DATADIR%%/themes/Terra/controls/small_button_pushed.png
%%DATADIR%%/themes/Terra/gallery-ui.xml
%%DATADIR%%/themes/Terra/game-ui.xml
%%DATADIR%%/themes/Terra/guide/guide_arrow_left.png
%%DATADIR%%/themes/Terra/guide/guide_arrow_right.png
%%DATADIR%%/themes/Terra/guide/guide_frame.png
%%DATADIR%%/themes/Terra/guide/icon_mask.png
%%DATADIR%%/themes/Terra/htmls/progdetails_page1.html
%%DATADIR%%/themes/Terra/htmls/progdetails_page2.html
%%DATADIR%%/themes/Terra/menu-ui.xml
%%DATADIR%%/themes/Terra/menu/iconmask.png
%%DATADIR%%/themes/Terra/menu/menubackground.png
%%DATADIR%%/themes/Terra/menu/menuframe.png
%%DATADIR%%/themes/Terra/music-ui.xml
%%DATADIR%%/themes/Terra/popups/alt_menu_background.png
%%DATADIR%%/themes/Terra/popups/busy/busy_0.png
%%DATADIR%%/themes/Terra/popups/busy/busy_1.png
%%DATADIR%%/themes/Terra/popups/busy/busy_10.png
%%DATADIR%%/themes/Terra/popups/busy/busy_11.png
%%DATADIR%%/themes/Terra/popups/busy/busy_12.png
%%DATADIR%%/themes/Terra/popups/busy/busy_13.png
%%DATADIR%%/themes/Terra/popups/busy/busy_14.png
%%DATADIR%%/themes/Terra/popups/busy/busy_15.png
%%DATADIR%%/themes/Terra/popups/busy/busy_16.png
%%DATADIR%%/themes/Terra/popups/busy/busy_17.png
%%DATADIR%%/themes/Terra/popups/busy/busy_18.png
%%DATADIR%%/themes/Terra/popups/busy/busy_19.png
%%DATADIR%%/themes/Terra/popups/busy/busy_2.png
%%DATADIR%%/themes/Terra/popups/busy/busy_20.png
%%DATADIR%%/themes/Terra/popups/busy/busy_21.png
%%DATADIR%%/themes/Terra/popups/busy/busy_22.png
%%DATADIR%%/themes/Terra/popups/busy/busy_23.png
%%DATADIR%%/themes/Terra/popups/busy/busy_24.png
%%DATADIR%%/themes/Terra/popups/busy/busy_25.png
%%DATADIR%%/themes/Terra/popups/busy/busy_26.png
%%DATADIR%%/themes/Terra/popups/busy/busy_27.png
%%DATADIR%%/themes/Terra/popups/busy/busy_28.png
%%DATADIR%%/themes/Terra/popups/busy/busy_29.png
%%DATADIR%%/themes/Terra/popups/busy/busy_3.png
%%DATADIR%%/themes/Terra/popups/busy/busy_4.png
%%DATADIR%%/themes/Terra/popups/busy/busy_5.png
%%DATADIR%%/themes/Terra/popups/busy/busy_6.png
%%DATADIR%%/themes/Terra/popups/busy/busy_7.png
%%DATADIR%%/themes/Terra/popups/busy/busy_8.png
%%DATADIR%%/themes/Terra/popups/busy/busy_9.png
%%DATADIR%%/themes/Terra/popups/confirmation_background.png
%%DATADIR%%/themes/Terra/popups/largemenubackground.png
%%DATADIR%%/themes/Terra/popups/menu_background.png
%%DATADIR%%/themes/Terra/popups/menu_button.png
%%DATADIR%%/themes/Terra/popups/menu_button_pushed.png
%%DATADIR%%/themes/Terra/popups/progress_bar_background.png
%%DATADIR%%/themes/Terra/popups/progress_bar_fill.png
%%DATADIR%%/themes/Terra/popups/progress_bar_overlay.png
%%DATADIR%%/themes/Terra/popups/progress_dialog_background.png
%%DATADIR%%/themes/Terra/popups/selected_item_arrow.png
%%DATADIR%%/themes/Terra/popups/selected_submenu_arrow.png
%%DATADIR%%/themes/Terra/popups/submenu_arrow.png
%%DATADIR%%/themes/Terra/preview.png
%%DATADIR%%/themes/Terra/qtlook.txt
%%DATADIR%%/themes/Terra/recordings-ui.xml
%%DATADIR%%/themes/Terra/recordings/filterlist_background.png
%%DATADIR%%/themes/Terra/recordings/flagging_1.png
%%DATADIR%%/themes/Terra/recordings/flagging_2.png
%%DATADIR%%/themes/Terra/recordings/flagging_3.png
%%DATADIR%%/themes/Terra/recordings/flagging_4.png
%%DATADIR%%/themes/Terra/recordings/flagging_5.png
%%DATADIR%%/themes/Terra/recordings/flagging_6.png
%%DATADIR%%/themes/Terra/recordings/flagging_7.png
%%DATADIR%%/themes/Terra/recordings/flagging_8.png
%%DATADIR%%/themes/Terra/recordings/generallistbackground.png
%%DATADIR%%/themes/Terra/recordings/generallistselectedframe.png
%%DATADIR%%/themes/Terra/recordings/groupframe.png
%%DATADIR%%/themes/Terra/recordings/previewmask.png
%%DATADIR%%/themes/Terra/recordings/previewmask_unselected.png
%%DATADIR%%/themes/Terra/recordings/recording_1.png
%%DATADIR%%/themes/Terra/recordings/recording_2.png
%%DATADIR%%/themes/Terra/recordings/recording_3.png
%%DATADIR%%/themes/Terra/recordings/recording_4.png
%%DATADIR%%/themes/Terra/recordings/recording_5.png
%%DATADIR%%/themes/Terra/recordings/recording_6.png
%%DATADIR%%/themes/Terra/recordings/recording_7.png
%%DATADIR%%/themes/Terra/recordings/recording_8.png
%%DATADIR%%/themes/Terra/recordings/recordingsbackground.png
%%DATADIR%%/themes/Terra/recordings/selected_recording_background.png
%%DATADIR%%/themes/Terra/recordings/statusoverlay.png
%%DATADIR%%/themes/Terra/recordings/transcoding_1.png
%%DATADIR%%/themes/Terra/recordings/transcoding_2.png
%%DATADIR%%/themes/Terra/recordings/transcoding_3.png
%%DATADIR%%/themes/Terra/recordings/transcoding_4.png
%%DATADIR%%/themes/Terra/recordings/transcoding_5.png
%%DATADIR%%/themes/Terra/recordings/transcoding_6.png
%%DATADIR%%/themes/Terra/recordings/transcoding_7.png
%%DATADIR%%/themes/Terra/recordings/transcoding_8.png
%%DATADIR%%/themes/Terra/schedule-ui.xml
%%DATADIR%%/themes/Terra/schedule/generic_list_frame.png
%%DATADIR%%/themes/Terra/shared/black_star.png
%%DATADIR%%/themes/Terra/shared/bronze_star.png
%%DATADIR%%/themes/Terra/shared/cross.png
%%DATADIR%%/themes/Terra/shared/directory.png
%%DATADIR%%/themes/Terra/shared/gold_star.png
%%DATADIR%%/themes/Terra/shared/horizlist_internal_left_arrow.png
%%DATADIR%%/themes/Terra/shared/horizlist_internal_right_arrow.png
%%DATADIR%%/themes/Terra/shared/horizlist_left_arrow.png
%%DATADIR%%/themes/Terra/shared/horizlist_right_arrow.png
%%DATADIR%%/themes/Terra/shared/icons/16_9.png
%%DATADIR%%/themes/Terra/shared/icons/adflagged.png
%%DATADIR%%/themes/Terra/shared/icons/audio_mono.png
%%DATADIR%%/themes/Terra/shared/icons/audio_stereo.png
%%DATADIR%%/themes/Terra/shared/icons/audio_surround.png
%%DATADIR%%/themes/Terra/shared/icons/autoexpire.png
%%DATADIR%%/themes/Terra/shared/icons/bookmark.png
%%DATADIR%%/themes/Terra/shared/icons/cutlist.png
%%DATADIR%%/themes/Terra/shared/icons/hd_1080.png
%%DATADIR%%/themes/Terra/shared/icons/hd_720.png
%%DATADIR%%/themes/Terra/shared/icons/hdtv.png
%%DATADIR%%/themes/Terra/shared/list_down_arrow.png
%%DATADIR%%/themes/Terra/shared/list_left_arrow.png
%%DATADIR%%/themes/Terra/shared/list_right_arrow.png
%%DATADIR%%/themes/Terra/shared/list_up_arrow.png
%%DATADIR%%/themes/Terra/shared/playlist.png
%%DATADIR%%/themes/Terra/shared/selected_state_mask.png
%%DATADIR%%/themes/Terra/shared/silver_star.png
%%DATADIR%%/themes/Terra/shared/super_gold_star.png
%%DATADIR%%/themes/Terra/shared/tick.png
%%DATADIR%%/themes/Terra/shared/updirectory.png
%%DATADIR%%/themes/Terra/shared/watched.png
%%DATADIR%%/themes/Terra/themeinfo.xml
%%DATADIR%%/themes/Terra/ui.xml
%%DATADIR%%/themes/Terra/video-ui.xml
%%DATADIR%%/themes/Terra/video/browserlistbackground.png
%%DATADIR%%/themes/Terra/video/browserlistframe.png
%%DATADIR%%/themes/Terra/video/filters_background.png
%%DATADIR%%/themes/Terra/video/info_background.png
%%DATADIR%%/themes/Terra/video/info_poster_mask.png
%%DATADIR%%/themes/Terra/video/managerlistbackground.png
%%DATADIR%%/themes/Terra/video/managerlistframe.png
%%DATADIR%%/themes/Terra/video/managerpostermask.png
%%DATADIR%%/themes/Terra/video/parental_level_high.png
%%DATADIR%%/themes/Terra/video/parental_level_low.png
%%DATADIR%%/themes/Terra/video/parental_level_lowest.png
%%DATADIR%%/themes/Terra/video/parental_level_medium.png
%%DATADIR%%/themes/Terra/video/parental_level_none.png
%%DATADIR%%/themes/Terra/video/postermask.png
%%DATADIR%%/themes/Terra/video/video_gallery_background.png
%%DATADIR%%/themes/Terra/video/video_gallery_background_selected.png
%%DATADIR%%/themes/Terra/watermarks/README.license
%%DATADIR%%/themes/Terra/watermarks/aerial.png
%%DATADIR%%/themes/Terra/watermarks/appearance.png
%%DATADIR%%/themes/Terra/watermarks/archive.png
%%DATADIR%%/themes/Terra/watermarks/browser.png
%%DATADIR%%/themes/Terra/watermarks/cd.png
%%DATADIR%%/themes/Terra/watermarks/clock.png
%%DATADIR%%/themes/Terra/watermarks/create_archive.png
%%DATADIR%%/themes/Terra/watermarks/default.png
%%DATADIR%%/themes/Terra/watermarks/delete.png
%%DATADIR%%/themes/Terra/watermarks/eject_media.png
%%DATADIR%%/themes/Terra/watermarks/food.png
%%DATADIR%%/themes/Terra/watermarks/gallery.png
%%DATADIR%%/themes/Terra/watermarks/games.png
%%DATADIR%%/themes/Terra/watermarks/guide.png
%%DATADIR%%/themes/Terra/watermarks/import_archive.png
%%DATADIR%%/themes/Terra/watermarks/import_cd.png
%%DATADIR%%/themes/Terra/watermarks/import_dvd.png
%%DATADIR%%/themes/Terra/watermarks/import_files.png
%%DATADIR%%/themes/Terra/watermarks/info_settings.png
%%DATADIR%%/themes/Terra/watermarks/keys.png
%%DATADIR%%/themes/Terra/watermarks/library.png
%%DATADIR%%/themes/Terra/watermarks/media_settings.png
%%DATADIR%%/themes/Terra/watermarks/movie.png
%%DATADIR%%/themes/Terra/watermarks/music.png
%%DATADIR%%/themes/Terra/watermarks/music2.png
%%DATADIR%%/themes/Terra/watermarks/music_settings.png
%%DATADIR%%/themes/Terra/watermarks/netflix.png
%%DATADIR%%/themes/Terra/watermarks/new_music.png
%%DATADIR%%/themes/Terra/watermarks/news.png
%%DATADIR%%/themes/Terra/watermarks/osd_appearance.png
%%DATADIR%%/themes/Terra/watermarks/osd_editor.png
%%DATADIR%%/themes/Terra/watermarks/play_dvd.png
%%DATADIR%%/themes/Terra/watermarks/play_music.png
%%DATADIR%%/themes/Terra/watermarks/player_settings.png
%%DATADIR%%/themes/Terra/watermarks/previously_recorded.png
%%DATADIR%%/themes/Terra/watermarks/program_finder.png
%%DATADIR%%/themes/Terra/watermarks/radio.png
%%DATADIR%%/themes/Terra/watermarks/screen_setup.png
%%DATADIR%%/themes/Terra/watermarks/search_words.png
%%DATADIR%%/themes/Terra/watermarks/select_music.png
%%DATADIR%%/themes/Terra/watermarks/status.png
%%DATADIR%%/themes/Terra/watermarks/stop_light.png
%%DATADIR%%/themes/Terra/watermarks/tools.png
%%DATADIR%%/themes/Terra/watermarks/tv.png
%%DATADIR%%/themes/Terra/watermarks/vcr.png
%%DATADIR%%/themes/Terra/watermarks/video.png
%%DATADIR%%/themes/Terra/watermarks/video_settings.png
%%DATADIR%%/themes/Terra/watermarks/watchrec.png
%%DATADIR%%/themes/Terra/watermarks/weather.png
%%DATADIR%%/themes/Terra/watermarks/zm_console.png
%%DATADIR%%/themes/Terra/watermarks/zm_events.png
%%DATADIR%%/themes/Terra/watermarks/zm_live.png
%%DATADIR%%/themes/Terra/watermarks/zoneminder.png
%%DATADIR%%/themes/classic/classic-preview.png
%%DATADIR%%/themes/classic/main_settings.xml
%%DATADIR%%/themes/classic/mainmenu.xml
%%DATADIR%%/themes/classic/recpriorities_settings.xml
%%DATADIR%%/themes/classic/themeinfo.xml
%%DATADIR%%/themes/classic/tv_schedule.xml
%%DATADIR%%/themes/classic/tv_search.xml
%%DATADIR%%/themes/classic/tv_settings.xml
%%DATADIR%%/themes/classic/tvmenu.xml
%%DATADIR%%/themes/default-wide/appear-ui.xml
%%DATADIR%%/themes/default-wide/bar.png
%%DATADIR%%/themes/default-wide/base.xml
%%DATADIR%%/themes/default-wide/button_wide_background.png
%%DATADIR%%/themes/default-wide/button_wide_pushed_background.png
%%DATADIR%%/themes/default-wide/button_wide_selected_background.png
%%DATADIR%%/themes/default-wide/config-ui.xml
%%DATADIR%%/themes/default-wide/controls-ui.xml
%%DATADIR%%/themes/default-wide/cr-lines.png
%%DATADIR%%/themes/default-wide/cr-selectbar.png
%%DATADIR%%/themes/default-wide/def-ro-lines.png
%%DATADIR%%/themes/default-wide/filler.png
%%DATADIR%%/themes/default-wide/md_progress_background.png
%%DATADIR%%/themes/default-wide/pd-background.png
%%DATADIR%%/themes/default-wide/pf-background.png
%%DATADIR%%/themes/default-wide/pf-lines.png
%%DATADIR%%/themes/default-wide/pf-sel1.png
%%DATADIR%%/themes/default-wide/pf-sel2.png
%%DATADIR%%/themes/default-wide/pf-sel3.png
%%DATADIR%%/themes/default-wide/pf-top.png
%%DATADIR%%/themes/default-wide/preview.png
%%DATADIR%%/themes/default-wide/reclist_background.png
%%DATADIR%%/themes/default-wide/recordings-ui.xml
%%DATADIR%%/themes/default-wide/rk-lines.png
%%DATADIR%%/themes/default-wide/rk-selectbar.png
%%DATADIR%%/themes/default-wide/schedule-ui.xml
%%DATADIR%%/themes/default-wide/selectbar.png
%%DATADIR%%/themes/default-wide/shared/grid_back_reg.png
%%DATADIR%%/themes/default-wide/shared/grid_back_sel.png
%%DATADIR%%/themes/default-wide/shared/grid_noimage.png
%%DATADIR%%/themes/default-wide/solid-container.png
%%DATADIR%%/themes/default-wide/solid-cr-background.png
%%DATADIR%%/themes/default-wide/status-bar.png
%%DATADIR%%/themes/default-wide/status-ui.xml
%%DATADIR%%/themes/default-wide/text_button_off.png
%%DATADIR%%/themes/default-wide/text_button_on.png
%%DATADIR%%/themes/default-wide/text_button_pushed.png
%%DATADIR%%/themes/default-wide/track_info_background.png
%%DATADIR%%/themes/default-wide/trans-backup.png
%%DATADIR%%/themes/default-wide/trans-container.png
%%DATADIR%%/themes/default-wide/trans-cr-background.png
%%DATADIR%%/themes/default-wide/trans-rk-background.png
%%DATADIR%%/themes/default-wide/trans-sr-background.png
%%DATADIR%%/themes/default-wide/welcome-ui.xml
%%DATADIR%%/themes/default/appear-ui.xml
%%DATADIR%%/themes/default/autoexpire.png
%%DATADIR%%/themes/default/avchd.png
%%DATADIR%%/themes/default/background.png
%%DATADIR%%/themes/default/backup.png
%%DATADIR%%/themes/default/bar.png
%%DATADIR%%/themes/default/base.xml
%%DATADIR%%/themes/default/blank.png
%%DATADIR%%/themes/default/blankbutton_off.png
%%DATADIR%%/themes/default/topleft.png
%%DATADIR%%/themes/default/unchecked.png
%%DATADIR%%/themes/default/wide.png
%%DATADIR%%/themes/default/blankbutton_pushed.png
%%DATADIR%%/themes/default/text_button_on.png
%%DATADIR%%/themes/default/blankbutton_on.png
%%DATADIR%%/themes/default/blankbutton_pushed.png
%%DATADIR%%/themes/default/bookmark.png
%%DATADIR%%/themes/default/bottomright.png
%%DATADIR%%/themes/default/busyimages/0.png
%%DATADIR%%/themes/default/busyimages/1.png
%%DATADIR%%/themes/default/busyimages/10.png
%%DATADIR%%/themes/default/busyimages/11.png
%%DATADIR%%/themes/default/busyimages/12.png
%%DATADIR%%/themes/default/busyimages/13.png
%%DATADIR%%/themes/default/busyimages/14.png
%%DATADIR%%/themes/default/busyimages/15.png
%%DATADIR%%/themes/default/busyimages/16.png
%%DATADIR%%/themes/default/busyimages/17.png
%%DATADIR%%/themes/default/busyimages/18.png
%%DATADIR%%/themes/default/busyimages/19.png
%%DATADIR%%/themes/default/busyimages/2.png
%%DATADIR%%/themes/default/busyimages/20.png
%%DATADIR%%/themes/default/busyimages/21.png
%%DATADIR%%/themes/default/busyimages/22.png
%%DATADIR%%/themes/default/busyimages/23.png
%%DATADIR%%/themes/default/busyimages/24.png
%%DATADIR%%/themes/default/busyimages/3.png
%%DATADIR%%/themes/default/busyimages/4.png
%%DATADIR%%/themes/default/busyimages/5.png
%%DATADIR%%/themes/default/busyimages/6.png
%%DATADIR%%/themes/default/busyimages/7.png
%%DATADIR%%/themes/default/busyimages/8.png
%%DATADIR%%/themes/default/busyimages/9.png
%%DATADIR%%/themes/default/button_background.png
%%DATADIR%%/themes/default/button_pushed_background.png
%%DATADIR%%/themes/default/button_selected_background.png
%%DATADIR%%/themes/default/categories.xml
%%DATADIR%%/themes/default/cc.png
%%DATADIR%%/themes/default/checkbox_background_off.png
%%DATADIR%%/themes/default/checkbox_background_selected.png
%%DATADIR%%/themes/default/checkbox_fullcheck.png
%%DATADIR%%/themes/default/checkbox_halfcheck.png
%%DATADIR%%/themes/default/checked.png
%%DATADIR%%/themes/default/checked_high.png
%%DATADIR%%/themes/default/commflagged.png
%%DATADIR%%/themes/default/config-ui.xml
%%DATADIR%%/themes/default/container.png
%%DATADIR%%/themes/default/controls-ui.xml
%%DATADIR%%/themes/default/cr-background.png
%%DATADIR%%/themes/default/cr-lines.png
%%DATADIR%%/themes/default/cr-selectbar.png
%%DATADIR%%/themes/default/cursor.png
%%DATADIR%%/themes/default/cutlist.png
%%DATADIR%%/themes/default/dd.png
%%DATADIR%%/themes/default/def-ro-lines.png
%%DATADIR%%/themes/default/down_arrow.png
%%DATADIR%%/themes/default/downarrow.png
%%DATADIR%%/themes/default/dummy1280x720p29.97.ts
%%DATADIR%%/themes/default/dummy1920x1088p29.97.ts
%%DATADIR%%/themes/default/dummy640x480p29.97.ts
%%DATADIR%%/themes/default/dummy720x480p29.97.ts
%%DATADIR%%/themes/default/dummy720x576p25.00.ts
%%DATADIR%%/themes/default/dummy768x576p50.00.ts
%%DATADIR%%/themes/default/filler.png
%%DATADIR%%/themes/default/galleryfolder.png
%%DATADIR%%/themes/default/gg-arrow-down.png
%%DATADIR%%/themes/default/gg-arrow-left.png
%%DATADIR%%/themes/default/gg-arrow-right.png
%%DATADIR%%/themes/default/gg-arrow-up.png
%%DATADIR%%/themes/default/gg-chans.png
%%DATADIR%%/themes/default/gg-rs-all.png
%%DATADIR%%/themes/default/gg-rs-channel.png
%%DATADIR%%/themes/default/gg-rs-findone.png
%%DATADIR%%/themes/default/gg-rs-override.png
%%DATADIR%%/themes/default/gg-rs-single.png
%%DATADIR%%/themes/default/gg-rs-timeslot.png
%%DATADIR%%/themes/default/gg-rs-weekslot.png
%%DATADIR%%/themes/default/gg-times.png
%%DATADIR%%/themes/default/hd.png
%%DATADIR%%/themes/default/hd1080.png
%%DATADIR%%/themes/default/hd720.png
%%DATADIR%%/themes/default/htmls/notfound.html
%%DATADIR%%/themes/default/htmls/progdetails_page1.html
%%DATADIR%%/themes/default/htmls/progdetails_page2.html
%%DATADIR%%/themes/default/keyboard/ar.xml
%%DATADIR%%/themes/default/keyboard/ar_ui.xml
%%DATADIR%%/themes/default/keyboard/de.xml
%%DATADIR%%/themes/default/keyboard/de_ui.xml
%%DATADIR%%/themes/default/keyboard/dk.xml
%%DATADIR%%/themes/default/keyboard/dk_ui.xml
%%DATADIR%%/themes/default/keyboard/en_uk.xml
%%DATADIR%%/themes/default/keyboard/en_uk_ui.xml
%%DATADIR%%/themes/default/keyboard/en_us.xml
%%DATADIR%%/themes/default/keyboard/en_us_ui.xml
%%DATADIR%%/themes/default/keyboard/es.xml
%%DATADIR%%/themes/default/keyboard/es_ui.xml
%%DATADIR%%/themes/default/keyboard/fr.xml
%%DATADIR%%/themes/default/keyboard/fr_ch.xml
%%DATADIR%%/themes/default/keyboard/fr_ch_ui.xml
%%DATADIR%%/themes/default/keyboard/fr_ui.xml
%%DATADIR%%/themes/default/keyboard/he.xml
%%DATADIR%%/themes/default/keyboard/he_ui.xml
%%DATADIR%%/themes/default/keyboard/it.xml
%%DATADIR%%/themes/default/keyboard/it_ui.xml
%%DATADIR%%/themes/default/keyboard/key_down.png
%%DATADIR%%/themes/default/keyboard/key_down_back.png
%%DATADIR%%/themes/default/keyboard/ru_ui.xml
%%DATADIR%%/themes/default/keyboard/key_normal.png
%%DATADIR%%/themes/default/keyboard/key_down_del.png
%%DATADIR%%/themes/default/keyboard/key_down_done.png
%%DATADIR%%/themes/default/keyboard/key_down_move.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_del.png
%%DATADIR%%/themes/default/keyboard/key_down_shift.png
%%DATADIR%%/themes/default/keyboard/key_down_space.png
%%DATADIR%%/themes/default/keyboard/key_down_space2.png
%%DATADIR%%/themes/default/keyboard/key_downfocused.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_back.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_del.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_done.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_move.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_shift.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_space.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_space2.png
%%DATADIR%%/themes/default/keyboard/key_focused.png
%%DATADIR%%/themes/default/keyboard/key_focused_back.png
%%DATADIR%%/themes/default/keyboard/key_focused_del.png
%%DATADIR%%/themes/default/keyboard/key_focused_done.png
%%DATADIR%%/themes/default/keyboard/key_focused_move.png
%%DATADIR%%/themes/default/keyboard/key_focused_shift.png
%%DATADIR%%/themes/default/keyboard/key_focused_space.png
%%DATADIR%%/themes/default/keyboard/key_focused_space2.png
%%DATADIR%%/themes/default/keyboard/key_normal.png
%%DATADIR%%/themes/default/keyboard/key_normal_back.png
%%DATADIR%%/themes/default/keyboard/key_normal_del.png
%%DATADIR%%/themes/default/keyboard/key_normal_done.png
%%DATADIR%%/themes/default/keyboard/it_ui.xml
%%DATADIR%%/themes/default/keyboard/key_downfocused_space2.png
%%DATADIR%%/themes/default/keyboard/key_normal_move.png
%%DATADIR%%/themes/default/keyboard/key_down_space.png
%%DATADIR%%/themes/default/keyboard/key_downfocused_done.png
%%DATADIR%%/themes/default/keyboard/key_normal_shift.png
%%DATADIR%%/themes/default/keyboard/key_normal_space.png
%%DATADIR%%/themes/default/keyboard/key_normal_space2.png
%%DATADIR%%/themes/default/keyboard/keyboard-background.png
%%DATADIR%%/themes/default/keyboard/keyboard.xml
%%DATADIR%%/themes/default/keyboard/leftarrow.png
%%DATADIR%%/themes/default/keyboard/returnarrow.png
%%DATADIR%%/themes/default/keyboard/rightarrow.png
%%DATADIR%%/themes/default/keyboard/ru.xml
%%DATADIR%%/themes/default/keyboard/ru_ui.xml
%%DATADIR%%/themes/default/keyboard/shiftarrow.png
%%DATADIR%%/themes/default/keyboard/sv.xml
%%DATADIR%%/themes/default/keyboard/sv_ui.xml
%%DATADIR%%/themes/default/lb-arrow.png
%%DATADIR%%/themes/default/lb-check-empty.png
%%DATADIR%%/themes/default/lb-check-full.png
%%DATADIR%%/themes/default/lb-check-half.png
%%DATADIR%%/themes/default/keyboard/dk_ui.xml
%%DATADIR%%/themes/default/keyboard/key_downfocused_back.png
%%DATADIR%%/themes/default/keyboard/key_normal_space.png
%%DATADIR%%/themes/default/keyboard/en_uk_ui.xml
%%DATADIR%%/themes/default/keyboard/key_down_space2.png
%%DATADIR%%/themes/default/keyboard/key_down.png
%%DATADIR%%/themes/default/keyboard/en_us_ui.xml
%%DATADIR%%/themes/default/keyboard/es_ui.xml
%%DATADIR%%/themes/default/keyboard/key_normal_back.png
%%DATADIR%%/themes/default/keyboard/key_focused_del.png
%%DATADIR%%/themes/default/keyboard/key_down_done.png
%%DATADIR%%/themes/default/keyboard/key_focused_move.png
%%DATADIR%%/themes/default/keyboard/key_downfocused.png
%%DATADIR%%/themes/default/dummy1280x720p29.97.ts
%%DATADIR%%/themes/default/gg-rs-findone.png
%%DATADIR%%/themes/default/trans-background.png
%%DATADIR%%/themes/default/pf-top.png
%%DATADIR%%/themes/default/bookmark.png
%%DATADIR%%/themes/default/cr-selectbar.png
%%DATADIR%%/themes/default/pf-sel1.png
%%DATADIR%%/themes/default/trans-container.png
%%DATADIR%%/themes/default/scrollarrow-dn.png
%%DATADIR%%/themes/default/pf-sel2.png
%%DATADIR%%/themes/default/pf-sel3.png
%%DATADIR%%/themes/default/solid-showings.png
%%DATADIR%%/themes/default/gg-background.png
%%DATADIR%%/themes/default/gg-rs-weekslot.png
%%DATADIR%%/themes/default/solid-titles.png
%%DATADIR%%/themes/default/lb-dnarrow-reg.png
%%DATADIR%%/themes/default/lb-dnarrow-sel.png
%%DATADIR%%/themes/default/lb-ltarrow-reg.png
%%DATADIR%%/themes/default/def-ro-lines.png
%%DATADIR%%/themes/default/scrollarrow-right.png
%%DATADIR%%/themes/default/cc.png
%%DATADIR%%/themes/default/gg-times.png
%%DATADIR%%/themes/default/hd.png
%%DATADIR%%/themes/default/solid-cr-background.png
%%DATADIR%%/themes/default/galleryfolder.png
%%DATADIR%%/themes/default/scrollarrow-left.png
%%DATADIR%%/themes/default/lb-uparrow-reg.png
%%DATADIR%%/themes/default/categories.xml
%%DATADIR%%/themes/default/dummy720x480p29.97.ts
%%DATADIR%%/themes/default/lb-ltarrow-sel.png
%%DATADIR%%/themes/default/lb-rtarrow-reg.png
%%DATADIR%%/themes/default/lb-check-full.png
%%DATADIR%%/themes/default/lb-rtarrow-sel.png
%%DATADIR%%/themes/default/lb-uparrow-reg.png
%%DATADIR%%/themes/default/lb-uparrow-sel.png
%%DATADIR%%/themes/default/left_arrow.png
%%DATADIR%%/themes/default/leftarrow.png
%%DATADIR%%/themes/default/leftright_off.png
%%DATADIR%%/themes/default/leftright_on.png
%%DATADIR%%/themes/default/leftright_pushed.png
%%DATADIR%%/themes/default/mono.png
%%DATADIR%%/themes/default/mythdialogbox-background.png
%%DATADIR%%/themes/default/mythfilebrowser-background.png
%%DATADIR%%/themes/default/mythprogressdialog-background.png
%%DATADIR%%/themes/default/pd-background.png
%%DATADIR%%/themes/default/pf-background.png
%%DATADIR%%/themes/default/pf-lines.png
%%DATADIR%%/themes/default/pf-sel1.png
%%DATADIR%%/themes/default/pf-sel2.png
%%DATADIR%%/themes/default/pf-sel3.png
%%DATADIR%%/themes/default/pf-top.png
%%DATADIR%%/themes/default/pf-topbackground.png
%%DATADIR%%/themes/default/playlist_yes.png
%%DATADIR%%/themes/default/preview.png
%%DATADIR%%/themes/default/processing.png
%%DATADIR%%/themes/default/progressbar_background.png
%%DATADIR%%/themes/default/progressbar_fill.png
%%DATADIR%%/themes/default/reclist_background.png
%%DATADIR%%/themes/default/recordings-ui.xml
%%DATADIR%%/themes/default/right_arrow.png
%%DATADIR%%/themes/default/rightarrow.png
%%DATADIR%%/themes/default/rk-background.png
%%DATADIR%%/themes/default/rk-lines.png
%%DATADIR%%/themes/default/rk-selectbar.png
%%DATADIR%%/themes/default/schedule-ui.xml
%%DATADIR%%/themes/default/schedule_conflict.png
%%DATADIR%%/themes/default/schedule_disabled.png
%%DATADIR%%/themes/default/schedule_other.png
%%DATADIR%%/themes/default/schedule_record.png
%%DATADIR%%/themes/default/schedule_recording.png
%%DATADIR%%/themes/default/selectbar.png
%%DATADIR%%/themes/default/shared/directory.png
%%DATADIR%%/themes/default/shared/executable.png
%%DATADIR%%/themes/default/shared/file.png
%%DATADIR%%/themes/default/shared/grid_back_reg.png
%%DATADIR%%/themes/default/shared/grid_back_sel.png
%%DATADIR%%/themes/default/shared/grid_noimage.png
%%DATADIR%%/themes/default/shared/updirectory.png
%%DATADIR%%/themes/default/small_watched.png
%%DATADIR%%/themes/default/solid-container.png
%%DATADIR%%/themes/default/solid-cr-background.png
%%DATADIR%%/themes/default/sr-background.png
%%DATADIR%%/themes/default/gg-rs-override.png
%%DATADIR%%/themes/default/gg-rs-single.png
%%DATADIR%%/themes/default/dummy640x480p29.97.ts
%%DATADIR%%/themes/default/gg-arrow-right.png
%%DATADIR%%/themes/default/lb-check-empty.png
%%DATADIR%%/themes/default/bar.png
%%DATADIR%%/themes/default/gg-arrow-left.png
%%DATADIR%%/themes/default/leftarrow.png
%%DATADIR%%/themes/default/processing.png
%%DATADIR%%/themes/default/status-ui.xml
%%DATADIR%%/themes/default/cr-lines.png
%%DATADIR%%/themes/default/base.xml
%%DATADIR%%/themes/default/dummy1920x1088p29.97.ts
%%DATADIR%%/themes/default/filler.png
%%DATADIR%%/themes/default/cutlist.png
%%DATADIR%%/themes/default/trans-rk-background.png
%%DATADIR%%/themes/default/lb-check-half.png
%%DATADIR%%/themes/default/lb-arrow.png
%%DATADIR%%/themes/default/dummy720x576p25.00.ts
%%DATADIR%%/themes/default/status-bar.png
%%DATADIR%%/themes/default/status-ui.xml
%%DATADIR%%/themes/default/uparrow.png
%%DATADIR%%/themes/default/lb-ltarrow-reg.png
%%DATADIR%%/themes/default/stereo.png
%%DATADIR%%/themes/default/subs.png
%%DATADIR%%/themes/default/subs_onscreen.png
%%DATADIR%%/themes/default/surround.png
%%DATADIR%%/themes/default/text_button_off.png
%%DATADIR%%/themes/default/text_button_on.png
%%DATADIR%%/themes/default/text_button_pushed.png
%%DATADIR%%/themes/default/topleft.png
%%DATADIR%%/themes/default/trans-backup.png
%%DATADIR%%/themes/default/trans-container.png
%%DATADIR%%/themes/default/trans-cr-background.png
%%DATADIR%%/themes/default/trans-rk-background.png
%%DATADIR%%/themes/default/gg-rs-all.png
%%DATADIR%%/themes/default/trans-sr-background.png
%%DATADIR%%/themes/default/unchecked.png
%%DATADIR%%/themes/default/unchecked_high.png
%%DATADIR%%/themes/default/up_arrow.png
%%DATADIR%%/themes/default/uparrow.png
%%DATADIR%%/themes/default/watched.png
%%DATADIR%%/themes/default/wide.png
%%DATADIR%%/themes/default/wide_button_background.png
%%DATADIR%%/themes/default/wide_button_pushed_background.png
%%DATADIR%%/themes/default/wide_button_selected_background.png
%%DATADIR%%/themes/defaultmenu/info_menu.xml
%%DATADIR%%/themes/defaultmenu/info_settings.xml
%%DATADIR%%/themes/defaultmenu/library.xml
%%DATADIR%%/themes/defaultmenu/main_settings.xml
%%DATADIR%%/themes/defaultmenu/mainmenu.xml
%%DATADIR%%/themes/defaultmenu/manage_recordings.xml
%%DATADIR%%/themes/defaultmenu/media_settings.xml
%%DATADIR%%/themes/defaultmenu/optical_menu.xml
%%DATADIR%%/themes/defaultmenu/recpriorities_settings.xml
%%DATADIR%%/themes/defaultmenu/themeinfo.xml
%%DATADIR%%/themes/defaultmenu/tv_lists.xml
%%DATADIR%%/themes/defaultmenu/tv_schedule.xml
%%DATADIR%%/themes/defaultmenu/tv_search.xml
%%DATADIR%%/themes/defaultmenu/tv_settings.xml
%%DATADIR%%/themes/defaultmenu/tvmenu.xml
%%DATADIR%%/themes/defaultmenu/util_menu.xml
%%DATADIR%%/themes/isthmus/cut_end.png
%%DATADIR%%/themes/isthmus/cut_start.png
%%DATADIR%%/themes/isthmus/fill_green.png
%%DATADIR%%/themes/isthmus/fill_red.png
%%DATADIR%%/themes/isthmus/isthmus-preview.png
%%DATADIR%%/themes/isthmus/news_scroller.png
%%DATADIR%%/themes/isthmus/osd-alert.png
%%DATADIR%%/themes/isthmus/osd-channel-edit.png
%%DATADIR%%/themes/isthmus/osd-mid.png
%%DATADIR%%/themes/isthmus/osd.xml
%%DATADIR%%/themes/isthmus/phone.png
%%DATADIR%%/themes/isthmus/popup.png
%%DATADIR%%/themes/isthmus/position_marker.png
%%DATADIR%%/themes/isthmus/red.png
%%DATADIR%%/themes/isthmus/selector.png
%%DATADIR%%/themes/isthmus/slider_frame.png
%%DATADIR%%/themes/isthmus/themeinfo.xml
%%DATADIR%%/themes/mediacentermenu/advanced.xml
%%DATADIR%%/themes/mediacentermenu/info_settings.xml
%%DATADIR%%/themes/mediacentermenu/main_settings.xml
%%DATADIR%%/themes/mediacentermenu/mainmenu.xml
%%DATADIR%%/themes/mediacentermenu/manage_recordings.xml
%%DATADIR%%/themes/mediacentermenu/media_settings.xml
%%DATADIR%%/themes/mediacentermenu/optical_menu.xml
%%DATADIR%%/themes/mediacentermenu/plugin_menu.xml
%%DATADIR%%/themes/mediacentermenu/recpriorities_settings.xml
%%DATADIR%%/themes/mediacentermenu/themeinfo.xml
%%DATADIR%%/themes/mediacentermenu/tv_lists.xml
%%DATADIR%%/themes/mediacentermenu/tv_schedule.xml
%%DATADIR%%/themes/mediacentermenu/tv_search.xml
%%DATADIR%%/themes/mediacentermenu/tv_settings.xml
%%DATADIR%%/themes/default/mw_text_button_off.png
%%DATADIR%%/themes/default/mw_text_button_on.png
%%DATADIR%%/themes/default/mw_text_button_pushed.png
%%DATADIR%%/themes/default/welcome-ui.xml
%%PYTHON_SITELIBDIR%%/MythTV/MythLog.py
%%PYTHON_SITELIBDIR%%/MythTV/MythLog.pyc
%%PYTHON_SITELIBDIR%%/MythTV/MythDB.py
%%PYTHON_SITELIBDIR%%/MythTV/MythDB.pyc
%%PYTHON_SITELIBDIR%%/MythTV/MythVideo.py
%%PYTHON_SITELIBDIR%%/MythTV/MythVideo.pyc
%%PYTHON_SITELIBDIR%%/MythTV/MythTV.py
%%PYTHON_SITELIBDIR%%/MythTV/MythTV.pyc
%%PYTHON_SITELIBDIR%%/MythTV/__init__.py
%%PYTHON_SITELIBDIR%%/MythTV/__init__.pyc
%%DATADIR%%/themes/blue/SEARCH_LISTS.png
%%DATADIR%%/themes/blue/SEARCH_WORDS.png
%%DATADIR%%/themes/blue/rew_button_on.png
%%DATADIR%%/themes/blue/rk-lines.png
%%DATADIR%%/themes/blue/autoexpire.png
%%DATADIR%%/themes/blue/trans-showings.png
%%DATADIR%%/themes/blue/SEARCH_MOVIES.png
%%DATADIR%%/themes/blue/rightarrow.png
%%DATADIR%%/themes/blue/mv_filerequest.png
%%DATADIR%%/themes/blue/mm_waiting.png
%%DATADIR%%/themes/blue/progfind_sel1.png
%%DATADIR%%/themes/blue/progfind_sel2.png
%%DATADIR%%/themes/blue/SEARCH_CHAN.png
%%DATADIR%%/themes/blue/progfind_sel3.png
%%DATADIR%%/themes/blue/trans-mmbackground.png
%%DATADIR%%/themes/blue/rew_button_pushed.png
%%DATADIR%%/themes/blue/rip_cd.png
%%DATADIR%%/themes/blue/prev_button_off.png
%%DATADIR%%/themes/blue/search_template.psd
%%DATADIR%%/themes/blue/MEDIA_LIBRARY.png
%%DATADIR%%/themes/blue/watch_dvd.png
%%DATADIR%%/themes/blue/trans-rk-background.png
%%DATADIR%%/themes/blue/next_button_on.png
%%DATADIR%%/themes/blue/leftarrow.png
%%DATADIR%%/themes/blue/play.png
%%DATADIR%%/themes/blue/FINDER.png
%%DATADIR%%/themes/blue/webpage.png
%%DATADIR%%/themes/blue/play_cd.png
%%DATADIR%%/themes/blue/rolines.png
%%DATADIR%%/themes/blue/cr-lines.png
%%DATADIR%%/themes/blue/previous.png
%%DATADIR%%/themes/blue/processing.png
%%DATADIR%%/themes/blue/GAME_SCAN.png
%%DATADIR%%/themes/blue/SEARCH_NEW.png
%%DATADIR%%/themes/blue/record.png
%%DATADIR%%/themes/blue/POWER_SEARCH.png
%%DATADIR%%/themes/blue/theme.xml
%%DATADIR%%/themes/blue/mv-vlist.png
%%DATADIR%%/themes/blue/ui.xml
%%DATADIR%%/themes/blue/trans-gameshowings.png
%%DATADIR%%/themes/blue/next_button_pushed.png
%%DATADIR%%/themes/blue/recpriorities.png
%%DATADIR%%/themes/blue/ff_button_on.png
%%DATADIR%%/themes/blue/logo_template.psd
%%DATADIR%%/themes/blue/MUSIC_SCAN.png
%%DATADIR%%/themes/blue/rip_dvd.png
%%DATADIR%%/themes/blue/eject.png
%%DATADIR%%/themes/blue/blankicon.jpg
%%DATADIR%%/themes/blue/prev_button_pushed.png
%%DATADIR%%/themes/blue/dvd.png
%%DATADIR%%/themes/blue/ff_button_pushed.png
%%DATADIR%%/themes/blue/uparrow.png
%%DATADIR%%/themes/blue/weather.png
%%DATADIR%%/themes/blue/pause_button_off.png
%%DATADIR%%/themes/blue/watch_vcd.png
%%DATADIR%%/themes/blue/next_button_off.png
%%DATADIR%%/themes/blue/FILE_TYPES.png
%%DATADIR%%/themes/blue/prev_button_on.png
%%DATADIR%%/themes/blue/pause_button_on.png
%%DATADIR%%/themes/blue/button_off.png
%%DATADIR%%/themes/blue/text_button_off.png
%%DATADIR%%/themes/blue/selectionbar.png
%%DATADIR%%/themes/blue/MANUAL.png
%%DATADIR%%/themes/blue/trans-game-background.png
%%DATADIR%%/themes/blue/SEARCH_TIME.png
%%DATADIR%%/themes/blue/watch_tv.png
%%DATADIR%%/themes/blue/UPCOMING.png
%%DATADIR%%/themes/blue/home.png
%%DATADIR%%/themes/blue/pause_button_pushed.png
%%DATADIR%%/themes/blue/showstatus.png
%%DATADIR%%/themes/blue/cutlist.png
%%DATADIR%%/themes/blue/trans-sr-background.png
%%DATADIR%%/themes/blue/mv-vbrowser.png
%%DATADIR%%/themes/blue/trans-titles.png
%%DATADIR%%/themes/blue/gg-vid-background.png
%%DATADIR%%/themes/defaultosd/themeinfo.xml
%%DATADIR%%/themes/defaultosd/defaultosd-preview.png
%%DATADIR%%/themes/defaultosd/position-indicator.png
%%DATADIR%%/themes/defaultosd/osd-channel-edit.png
%%DATADIR%%/themes/defaultosd/osd-callerid.png
%%DATADIR%%/themes/defaultosd/cut-end.png
%%DATADIR%%/themes/defaultosd/osd-browse.png
%%DATADIR%%/themes/defaultosd/osd.xml
%%DATADIR%%/themes/defaultosd/osd-big.png
%%DATADIR%%/themes/defaultosd/cut-start.png
%%DATADIR%%/themes/defaultosd/grey.png
%%DATADIR%%/themes/defaultosd/osd-alert.png
%%DATADIR%%/themes/defaultosd/red.png
%%DATADIR%%/themes/defaultosd/fill-blue.png
%%DATADIR%%/themes/defaultosd/osd-small.png
%%DATADIR%%/themes/blueosd/themeinfo.xml
%%DATADIR%%/themes/blueosd/blueosd-preview.png
%%DATADIR%%/themes/blueosd/osd-callerid.png
%%DATADIR%%/themes/blueosd/osd-mid.png
%%DATADIR%%/themes/blueosd/position-indicator.png
%%DATADIR%%/themes/blueosd/osd-channel-edit.png
%%DATADIR%%/themes/blueosd/cut-end.png
%%DATADIR%%/themes/blueosd/cut-start.png
%%DATADIR%%/themes/blueosd/osd.xml
%%DATADIR%%/themes/blueosd/osd-big.png
%%DATADIR%%/themes/blueosd/grey.png
%%DATADIR%%/themes/blueosd/red.png
%%DATADIR%%/themes/blueosd/osd-alert.png
%%DATADIR%%/themes/blueosd/fill-blue.png
%%DATADIR%%/themes/blueosd/osd-small.png
%%DATADIR%%/themes/default-wide/netflix-ui.xml
%%DATADIR%%/themes/default-wide/appear-ui.xml
%%DATADIR%%/themes/default-wide/selectbar.png
%%DATADIR%%/themes/default-wide/preview.png
%%DATADIR%%/themes/default-wide/netflix-bg.png
%%DATADIR%%/themes/default-wide/trans-background.png
%%DATADIR%%/themes/default-wide/mythburn-ui.xml
%%DATADIR%%/themes/default-wide/cr-selectbar.png
%%DATADIR%%/themes/default-wide/pf-top.png
%%DATADIR%%/themes/default-wide/mv_pushbutton_off.png
%%DATADIR%%/themes/default-wide/trans-container.png
%%DATADIR%%/themes/default-wide/pf-sel1.png
%%DATADIR%%/themes/default-wide/solid-showings.png
%%DATADIR%%/themes/default-wide/music-ui.xml
%%DATADIR%%/themes/default-wide/pf-sel2.png
%%DATADIR%%/themes/default-wide/welcome-ui.xml
%%DATADIR%%/themes/default-wide/pf-sel3.png
%%DATADIR%%/themes/default-wide/gg-background.png
%%DATADIR%%/themes/default-wide/text_button_on.png
%%DATADIR%%/themes/default-wide/cr-lines.png
%%DATADIR%%/themes/default-wide/bar.png
%%DATADIR%%/themes/default-wide/track_info_background.png
%%DATADIR%%/themes/default-wide/def-ro-lines.png
%%DATADIR%%/themes/default-wide/solid-background.png
%%DATADIR%%/themes/default-wide/gallery-ui.xml
%%DATADIR%%/themes/default-wide/text_button_pushed.png
%%DATADIR%%/themes/default-wide/solid-cr-background.png
%%DATADIR%%/themes/default-wide/game-ui.xml
%%DATADIR%%/themes/default-wide/mm_blackhole_border.png
%%DATADIR%%/themes/default-wide/pf-lines.png
%%DATADIR%%/themes/default-wide/pf-background.png
%%DATADIR%%/themes/default-wide/rk-lines.png
%%DATADIR%%/themes/default-wide/trans-showings.png
%%DATADIR%%/themes/default-wide/music-sel-bg.png
%%DATADIR%%/themes/default-wide/solid-container.png
%%DATADIR%%/themes/default-wide/mm_waiting.png
%%DATADIR%%/themes/default-wide/mm_volume_background.png
%%DATADIR%%/themes/default-wide/news-ui.xml
%%DATADIR%%/themes/default-wide/filler.png
%%DATADIR%%/themes/default-wide/status-ui.xml
%%DATADIR%%/themes/default-wide/mytharchive-ui.xml
%%DATADIR%%/themes/default-wide/md_progress_background.png
%%DATADIR%%/themes/default-wide/trans-rk-background.png
%%DATADIR%%/themes/default-wide/mythnative-ui.xml
%%DATADIR%%/themes/default-wide/text_button_off.png
%%DATADIR%%/themes/default-wide/status-bar.png
%%DATADIR%%/themes/default-wide/controls-ui.xml
%%DATADIR%%/themes/default-wide/rk-selectbar.png
%%DATADIR%%/themes/default-wide/trans-cr-background.png
%%DATADIR%%/themes/default-wide/mv_pushbutton_on.png
%%DATADIR%%/themes/default-wide/pd-background.png
%%DATADIR%%/themes/default-wide/mv_pushbutton_pushed.png
%%DATADIR%%/themes/default-wide/trans-sr-background.png
%%DATADIR%%/themes/default-wide/trans-titles.png
%%DATADIR%%/themes/default-wide/trans-backup.png
%%DATADIR%%/themes/default-wide/gg-vid-background.png
%%DATADIR%%/themes/G.A.N.T/title/title_info_center.png
%%DATADIR%%/themes/G.A.N.T/title/title_schedule.png
%%DATADIR%%/themes/G.A.N.T/title/title_dvd_setup.png
%%DATADIR%%/themes/G.A.N.T/title/title_media_settings.png
%%DATADIR%%/themes/G.A.N.T/title/title_gallery.png
%%DATADIR%%/themes/G.A.N.T/title/title_music_setup.png
%%DATADIR%%/themes/G.A.N.T/title/title_setup.png
%%DATADIR%%/themes/G.A.N.T/title/title_media_library.png
%%DATADIR%%/themes/G.A.N.T/title/title_search.png
%%DATADIR%%/themes/G.A.N.T/title/title_video.png
%%DATADIR%%/themes/G.A.N.T/title/title_netflix.png
%%DATADIR%%/themes/G.A.N.T/title/title_tv_settings.png
%%DATADIR%%/themes/G.A.N.T/title/title_info_settings.png
%%DATADIR%%/themes/G.A.N.T/title/title_utilities.png
%%DATADIR%%/themes/G.A.N.T/title/title_dvd.png
%%DATADIR%%/themes/G.A.N.T/title/title_optical_discs.png
%%DATADIR%%/themes/G.A.N.T/title/title_music.png
%%DATADIR%%/themes/G.A.N.T/title/title_search_lists.png
%%DATADIR%%/themes/G.A.N.T/title/title_search_words.png
%%DATADIR%%/themes/G.A.N.T/title/title_main.png
%%DATADIR%%/themes/G.A.N.T/title/title_video_setup.png
%%DATADIR%%/themes/G.A.N.T/title/title_manage.png
%%DATADIR%%/themes/G.A.N.T/title/title_priorities.png
%%DATADIR%%/themes/G.A.N.T/title/title_game_setup.png
%%DATADIR%%/themes/G.A.N.T/title/title_tv.png
%%DATADIR%%/themes/G.A.N.T/type/processing.png
%%DATADIR%%/themes/G.A.N.T/type/autoexpire.png
%%DATADIR%%/themes/G.A.N.T/type/bookmark.png
%%DATADIR%%/themes/G.A.N.T/type/commflagged.png
%%DATADIR%%/themes/G.A.N.T/type/cutlist.png
%%DATADIR%%/themes/G.A.N.T/watermark/tv_recorded.png
%%DATADIR%%/themes/G.A.N.T/watermark/pizza.png
%%DATADIR%%/themes/G.A.N.T/watermark/refresh.png
%%DATADIR%%/themes/G.A.N.T/watermark/weather.png
%%DATADIR%%/themes/G.A.N.T/watermark/rip_cd.png
%%DATADIR%%/themes/G.A.N.T/watermark/music_playlist.png
%%DATADIR%%/themes/G.A.N.T/watermark/conflict.png
%%DATADIR%%/themes/G.A.N.T/watermark/video_folder.png
%%DATADIR%%/themes/G.A.N.T/watermark/delete.png
%%DATADIR%%/themes/G.A.N.T/watermark/newspaper.png
%%DATADIR%%/themes/G.A.N.T/watermark/search.png
%%DATADIR%%/themes/G.A.N.T/watermark/video.png
%%DATADIR%%/themes/G.A.N.T/watermark/game.png
%%DATADIR%%/themes/G.A.N.T/watermark/cd_play.png
%%DATADIR%%/themes/G.A.N.T/watermark/paint.png
%%DATADIR%%/themes/G.A.N.T/watermark/tv2.png
%%DATADIR%%/themes/G.A.N.T/watermark/previous.png
%%DATADIR%%/themes/G.A.N.T/watermark/padlock.png
%%DATADIR%%/themes/G.A.N.T/watermark/dvd.png
%%DATADIR%%/themes/G.A.N.T/watermark/check.png
%%DATADIR%%/themes/G.A.N.T/watermark/music.png
%%DATADIR%%/themes/G.A.N.T/watermark/log.png
%%DATADIR%%/themes/G.A.N.T/watermark/telephone.png
%%DATADIR%%/themes/G.A.N.T/watermark/stop.png
%%DATADIR%%/themes/G.A.N.T/watermark/cd_music.png
%%DATADIR%%/themes/G.A.N.T/watermark/cd.png
%%DATADIR%%/themes/G.A.N.T/watermark/wrench.png
%%DATADIR%%/themes/G.A.N.T/watermark/globe.png
%%DATADIR%%/themes/G.A.N.T/watermark/camera.png
%%DATADIR%%/themes/G.A.N.T/watermark/tv.png
%%DATADIR%%/themes/G.A.N.T/watermark/clock.png
%%DATADIR%%/themes/G.A.N.T/watermark/webcam.png
%%DATADIR%%/themes/G.A.N.T/watermark/archive.png
%%DATADIR%%/themes/G.A.N.T/watermark/eject.png
%%DATADIR%%/themes/G.A.N.T/bkg/grey.png
%%DATADIR%%/themes/G.A.N.T/mm_blankbutton_off.png
%%DATADIR%%/themes/G.A.N.T/rk-selectbar.png
%%DATADIR%%/themes/G.A.N.T/themeinfo.xml
%%DATADIR%%/themes/G.A.N.T/gantleft.png
%%DATADIR%%/themes/G.A.N.T/mm_leftright_on.png
%%DATADIR%%/themes/G.A.N.T/mm_leftright_pushed.png
%%DATADIR%%/themes/G.A.N.T/mm_ffw.png
%%DATADIR%%/themes/G.A.N.T/mm_blankbutton_on.png
%%DATADIR%%/themes/G.A.N.T/mm_simple_button_pushed.png
%%DATADIR%%/themes/G.A.N.T/bar.png
%%DATADIR%%/themes/G.A.N.T/mm_unchecked.png
%%DATADIR%%/themes/G.A.N.T/gantup.png
%%DATADIR%%/themes/G.A.N.T/gantdown.png
%%DATADIR%%/themes/G.A.N.T/mm_unchecked_high.png
%%DATADIR%%/themes/G.A.N.T/mm_checked.png
%%DATADIR%%/themes/G.A.N.T/mm_blankbutton_pushed.png
%%DATADIR%%/themes/G.A.N.T/mm_leftright_off.png
%%DATADIR%%/themes/G.A.N.T/mm_checked_high.png
%%DATADIR%%/themes/G.A.N.T/gantright.png
%%DATADIR%%/themes/G.A.N.T/mm_rew.png
%%DATADIR%%/themes/G.A.N.T/arrow_up.png
%%DATADIR%%/themes/G.A.N.T/myth_logo.png
%%DATADIR%%/themes/G.A.N.T/cloudy.png
%%DATADIR%%/themes/G.A.N.T/rainsnow.png
%%DATADIR%%/themes/G.A.N.T/mm_simple_button_off.png
%%DATADIR%%/themes/G.A.N.T/mm_selectionbar.png
%%DATADIR%%/themes/G.A.N.T/lshowers.png
%%DATADIR%%/themes/G.A.N.T/mm_pause.png
%%DATADIR%%/themes/G.A.N.T/base.xml
%%DATADIR%%/themes/G.A.N.T/music-ui.xml
%%DATADIR%%/themes/G.A.N.T/mm_next.png
%%DATADIR%%/themes/G.A.N.T/fog.png
%%DATADIR%%/themes/G.A.N.T/mm_track_info_background.png
%%DATADIR%%/themes/G.A.N.T/text-blank.png
%%DATADIR%%/themes/G.A.N.T/ui.xml
%%DATADIR%%/themes/G.A.N.T/sunny.png
%%DATADIR%%/themes/G.A.N.T/preview.jpg
%%DATADIR%%/themes/G.A.N.T/mm_rating.png
%%DATADIR%%/themes/G.A.N.T/mm_stop.png
%%DATADIR%%/themes/G.A.N.T/arrow_down.png
%%DATADIR%%/themes/G.A.N.T/theme.xml
%%DATADIR%%/themes/G.A.N.T/thunshowers.png
%%DATADIR%%/themes/G.A.N.T/showers.png
%%DATADIR%%/themes/G.A.N.T/flurries.png
%%DATADIR%%/themes/G.A.N.T/mm_play.png
%%DATADIR%%/themes/G.A.N.T/unknown.png
%%DATADIR%%/themes/G.A.N.T/mm_prev.png
%%DATADIR%%/themes/G.A.N.T/qtlook.txt
%%DATADIR%%/themes/G.A.N.T/mcloudy.png
%%DATADIR%%/themes/G.A.N.T/README
%%DATADIR%%/themes/G.A.N.T/mm_simple_button_on.png
%%DATADIR%%/themes/G.A.N.T/mm_waiting.png
%%DATADIR%%/themes/G.A.N.T/pcloudy.png
%%DATADIR%%/themes/G.A.N.T/fair.png
%%DATADIR%%/themes/G.A.N.T/snowshow.png
%%DATADIR%%/themes/classic/themeinfo.xml
%%DATADIR%%/themes/classic/classic-preview.png
%%DATADIR%%/themes/classic/tv_settings.xml
%%DATADIR%%/themes/classic/mainmenu.xml
%%DATADIR%%/themes/classic/recpriorities_settings.xml
%%DATADIR%%/themes/classic/main_settings.xml
%%DATADIR%%/themes/classic/tv_schedule.xml
%%DATADIR%%/themes/classic/tv_search.xml
%%DATADIR%%/themes/classic/tvmenu.xml
%%DATADIR%%/themes/DVR/tv_schedule.xml
%%DATADIR%%/themes/DVR/util_menu.xml
%%DATADIR%%/themes/DVR/recpriorities_settings.xml
%%DATADIR%%/themes/DVR/main_settings.xml
%%DATADIR%%/themes/DVR/tv_lists.xml
%%DATADIR%%/themes/DVR/mainmenu.xml
%%DATADIR%%/themes/DVR/tv_settings.xml
%%DATADIR%%/themes/DVR/tv_search.xml
%%DATADIR%%/themes/DVR/tvmenu.xml
%%DATADIR%%/themes/DVR/dvr-preview.png
%%DATADIR%%/themes/DVR/themeinfo.xml
%%DATADIR%%/setup.xml
%%DATADIR%%/FreeSans.ttf
%%DATADIR%%/FreeSansBold.ttf
%%DATADIR%%/FreeMono.ttf
%%DATADIR%%/i18n/mythfrontend_it.qm
%%DATADIR%%/i18n/mythfrontend_he.qm
%%DATADIR%%/i18n/mythfrontend_es.qm
%%DATADIR%%/i18n/mythfrontend_ca.qm
%%DATADIR%%/i18n/mythfrontend_nl.qm
%%DATADIR%%/i18n/mythfrontend_fr.qm
%%DATADIR%%/i18n/mythfrontend_de.qm
%%DATADIR%%/i18n/mythfrontend_dk.qm
%%DATADIR%%/i18n/mythfrontend_pt.qm
%%DATADIR%%/i18n/mythfrontend_sv.qm
%%DATADIR%%/i18n/mythfrontend_ja.qm
%%DATADIR%%/i18n/mythfrontend_si.qm
%%DATADIR%%/i18n/mythfrontend_fi.qm
%%DATADIR%%/i18n/mythfrontend_zh_tw.qm
%%DATADIR%%/i18n/mythfrontend_nb.qm
%%DATADIR%%/i18n/mythfrontend_is.qm
%%DATADIR%%/i18n/mythfrontend_pt_br.qm
%%DATADIR%%/i18n/mythfrontend_en_gb.qm
%%DATADIR%%/i18n/mythfrontend_cz.qm
%%DATADIR%%/i18n/mythfrontend_et.qm
%%DATADIR%%/i18n/mythfrontend_pl.qm
%%DATADIR%%/i18n/mythfrontend_tr.qm
%%DATADIR%%/i18n/mythfrontend_ru.qm
%%DATADIR%%/database/mc.sql
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MythTV/.packlist
%%SITE_PERL%%/IO/Socket/INET/MythTV.pm
%%SITE_PERL%%/MythTV.pm
%%SITE_PERL%%/MythTV/Channel.pm
%%SITE_PERL%%/MythTV/Program.pm
%%SITE_PERL%%/MythTV/Recording.pm
%%SITE_PERL%%/MythTV/Channel.pm
%%SITE_PERL%%/MythTV/StorageGroup.pm
%%SITE_PERL%%/MythTV/Program.pm
%%SITE_PERL%%/MythTV.pm
@dirrm include/mythtv/upnp
@dirrm include/mythtv/mpeg2dec
@dirrm include/mythtv/libswscale
@dirrm include/mythtv/libmythtv
@dirrm include/mythtv/libmythui
@dirrm include/mythtv/libmythdb
@dirrm include/mythtv/libmyth
@dirrm include/mythtv/libavutil
@dirrm include/mythtv/libavformat
@dirrm include/mythtv/libavcodec
@dirrm include/mythtv/dvdread
@dirrm include/mythtv/dvdnav
@dirrm include/mythtv
@dirrm lib/mythtv/filters
@dirrm lib/mythtv
@dirrm %%DATADIR%%/database
@dirrm %%DATADIR%%/i18n
@dirrm %%DATADIR%%/themes/DVR
@dirrm %%DATADIR%%/themes/G.A.N.T/bkg
@dirrm %%DATADIR%%/themes/G.A.N.T/title
@dirrm %%DATADIR%%/themes/G.A.N.T/type
@dirrm %%DATADIR%%/themes/G.A.N.T/watermark
@dirrm %%DATADIR%%/themes/G.A.N.T
@dirrm %%DATADIR%%/themes/blue
@dirrm %%DATADIR%%/themes/blueosd
@dirrm %%DATADIR%%/themes/classic
@dirrm %%DATADIR%%/themes/default/keyboard
@dirrm %%DATADIR%%/themes/default
@dirrm %%DATADIR%%/themes/default-wide
@dirrm %%DATADIR%%/themes/defaultosd
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/MythTV
@dirrmtry %%SITE_PERL%%/IO/Socket/INET
@dirrmtry %%SITE_PERL%%/IO/Socket
@dirrmtry %%SITE_PERL%%/IO
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MythTV
@dirrm %%PYTHON_SITELIBDIR%%/MythTV
@dirrm %%DATADIR%%/themes/mediacentermenu
@dirrm %%DATADIR%%/themes/isthmus
@dirrm %%DATADIR%%/themes/defaultmenu
@dirrm %%DATADIR%%/themes/default/shared
@dirrm %%DATADIR%%/themes/default/recording
@dirrm %%DATADIR%%/themes/default/keyboard
@dirrm %%DATADIR%%/themes/default/htmls
@dirrm %%DATADIR%%/themes/default/busyimages
@dirrm %%DATADIR%%/themes/default-wide/shared
@dirrm %%DATADIR%%/themes/default-wide
@dirrm %%DATADIR%%/themes/default
@dirrm %%DATADIR%%/themes/classic
@dirrm %%DATADIR%%/themes/Terra/watermarks
@dirrm %%DATADIR%%/themes/Terra/video
@dirrm %%DATADIR%%/themes/Terra/shared/icons
@dirrm %%DATADIR%%/themes/Terra/shared
@dirrm %%DATADIR%%/themes/Terra/schedule
@dirrm %%DATADIR%%/themes/Terra/recordings
@dirrm %%DATADIR%%/themes/Terra/popups/busy
@dirrm %%DATADIR%%/themes/Terra/popups
@dirrm %%DATADIR%%/themes/Terra/menu
@dirrm %%DATADIR%%/themes/Terra/htmls
@dirrm %%DATADIR%%/themes/Terra/guide
@dirrm %%DATADIR%%/themes/Terra/controls
@dirrm %%DATADIR%%/themes/Terra/config
@dirrm %%DATADIR%%/themes/Terra/backgrounds
@dirrm %%DATADIR%%/themes/Terra
@dirrm %%DATADIR%%/themes/MythCenter/watermark
@dirrm %%DATADIR%%/themes/MythCenter/ui
@dirrm %%DATADIR%%/themes/MythCenter/title
@dirrm %%DATADIR%%/themes/MythCenter/htmls
@dirrm %%DATADIR%%/themes/MythCenter-wide/watermark
@dirrm %%DATADIR%%/themes/MythCenter-wide/ui
@dirrm %%DATADIR%%/themes/MythCenter-wide/title
@dirrm %%DATADIR%%/themes/MythCenter-wide/htmls
@dirrm %%DATADIR%%/themes/MythCenter-wide
@dirrm %%DATADIR%%/themes/MythCenter
@dirrm %%DATADIR%%/themes/Gray-OSD
@dirrm %%DATADIR%%/themes/DVR
@dirrm %%DATADIR%%/themes/BlackCurves-OSD
@dirrmtry %%DATADIR%%/themes
@dirrm %%DATADIR%%/i18n
@dirrm %%DATADIR%%/database
@dirrmtry %%DATADIR%%

Return to bug 141722

Lines 7-14 Link Here

(-)/usr/ports/multimedia/mythtv/Makefile (-33 / +28 lines)
7	# $FreeBSD: ports/multimedia/mythtv/Makefile,v 1.25 2009/11/15 22:29:08 glarkin Exp $	7	# $FreeBSD: ports/multimedia/mythtv/Makefile,v 1.25 2009/11/15 22:29:08 glarkin Exp $
8		8
9	PORTNAME= mythtv	9	PORTNAME= mythtv
10	PORTVERSION= 0.21	10	PORTVERSION= 0.22
11	PORTREVISION= 2
12	CATEGORIES= multimedia	11	CATEGORIES= multimedia
13	MASTER_SITES= ftp://ftp.osuosl.org/pub/mythtv/ \	12	MASTER_SITES= ftp://ftp.osuosl.org/pub/mythtv/ \
14	LOCAL/glarkin	13	LOCAL/glarkin
Lines 18-42 Link Here
18		17
19	LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \	18	LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
20	freetype.9:${PORTSDIR}/print/freetype2	19	freetype.9:${PORTSDIR}/print/freetype2
21	BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake \	20	BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat
22	${SITE_PERL}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-SAX-Expat
23	RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \	21	RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \
24	${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin \	22	${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \
25	wget:${PORTSDIR}/ftp/wget	23	wget:${PORTSDIR}/ftp/wget
26		24
27	ONLY_FOR_ARCHS= i386 amd64	25	ONLY_FOR_ARCHS= i386 amd64
28	USE_BZIP2= yes	26	USE_BZIP2= yes
29	USE_QT_VER= 3	27	USE_QT_VER= 4
		28	QT_COMPONENTS= gui sql network script linguist_build l10n \
		29	moc_build qmake_build rcc_build uic_build
30	USE_MYSQL= 51	30	USE_MYSQL= 51
31	USE_GMAKE= yes	31	USE_GMAKE= yes
32	GNU_CONFIGURE= yes	32	HAS_CONFIGURE= yes
33	LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \	33	QT_NONSTANDARD= yes
34	LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \	34	USE_PERL= yes
35	LC_TIME=""	35	USE_PYTHON= yes
36	CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \	36	INSTALLS_EGGINFO=yes
37	CFLAGS="${CFLAGS}" ${LOCALE_CLEANUP}	37	PYDISTUTILS_PKGNAME=MythTV
38	MAKE_ENV= QTDIR="${QT_PREFIX}" QMAKESPEC="${QMAKESPEC}" \	38	REINPLACE_ARGS= -i ""
39	${LOCALE_CLEANUP}	39
		40	MAKE_ENV= QTDIR="${QT_PREFIX}" \
		41	QMAKESPEC="${QMAKESPEC}"
		42
		43	CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" \
		44	QTDIR="${QT_PREFIX}" LDFLAGS="-L${LOCALBASE}/lib"
		45
40	USE_RC_SUBR= mythbackend	46	USE_RC_SUBR= mythbackend
41	USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters	47	USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters
42		48
Lines 48-61 Link Here
48	MYTHTVGID?= ${MYTHTVUID}	54	MYTHTVGID?= ${MYTHTVUID}
49	MYTHTVDIR?= /nonexistent	55	MYTHTVDIR?= /nonexistent
50		56
51	CONFIG= --enable-xvmc --enable-opengl-vsync --disable-directfb \	57	CONFIGURE_ARGS= --enable-xvmc --enable-opengl-vsync --disable-directfb --enable-ivtv \
52	--disable-ivtv \	58	--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw \
53	--disable-xvmc-pro --disable-xvmc-vld --disable-xvmcw \
54	--prefix=${PREFIX} --extra-cflags=-g --extra-cxxflags=-g	59	--prefix=${PREFIX} --extra-cflags=-g --extra-cxxflags=-g
55		60
56	CONFIGURE_ARGS= --with-qt-dir=${LOCALBASE} ${CONFIG}	61	QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
57
58	QMAKESPEC?= ${LOCALBASE}/share/qt/mkspecs/freebsd-g++
59		62
60	OPTIONS= LIRC "Native LIRC Support" Off \	63	OPTIONS= LIRC "Native LIRC Support" Off \
61	MYSQL_LOCAL "RUN_DEPEND on selected MySQL server" Off	64	MYSQL_LOCAL "RUN_DEPEND on selected MySQL server" Off
Lines 83-101 Link Here
83		86
84	post-patch:	87	post-patch:
85	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	88	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
86	${WRKSRC}/configure	89	${WRKSRC}/libs/libmythtv/libmythtv.pro \
87		90	${WRKSRC}/libs/libavformat/libavformat.pro \
88	post-extract:	91	${WRKSRC}/bindings/perl/MythTV/Recording.pm \
89	@${ECHO_CMD} export QMAKESPEC=${QMAKESPEC}	92	${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \
90		93	${WRKSRC}/programs/scripts/database/mythconverg_backup.pl
91	do-configure:
92	@${ECHO_CMD} CONFIGURE_ENV: ${CONFIGURE_ENV}
93	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
94	./configure ${CONFIG}
95	@${ECHO_CMD} MAKE_ENV: ${MAKE_ENV}
96	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
97	-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
98	mythtv.pro
99		94
100	post-install:	95	post-install:
101	@${INSTALL} -d ${PREFIX}/share/mythtv/database	96	@${INSTALL} -d ${PREFIX}/share/mythtv/database

Lines 7-29 Link Here

(-)/usr/ports/multimedia/mythtv/files/mythbackend.in (-9 / +12 lines)
7	# BEFORE: LOGIN	7	# BEFORE: LOGIN
8	# KEYWORD: shutdown	8	# KEYWORD: shutdown
9		9
10	# Define mythbackend_enable in one of these places:	10	# Define mythbackend_enable in /etc/rc.conf[.local] to enable mythbackend
11	# /etc/rc.conf
12	# /etc/rc.conf.local
13	#	11	#
14	# DO NOT CHANGE THESE DEFAULT VALUES HERE	12	# mythbackend_enable (bool): Set to "NO" by default.
15	#	13	# Set it to "YES" to enable mythbackend.
16	mythbackend_enable=${mythbackend_enable-"NO"}	14	# mythbackend_logfile (str): Custom logfile for mythbackend.
17	PATH=${PATH}:%%PREFIX%%/bin	15	# (default /var/log/mythbackend.log)
		16	# mythbackend_flags (str): Additional flags for mythbackend.
18		17
19	. %%RC_SUBR%%	18	. %%RC_SUBR%%
20		19
21	name="mythbackend"	20	name="mythbackend"
22	rcvar=`set_rcvar`	21	rcvar=`set_rcvar`
23	command="%%PREFIX%%/bin/mythbackend &"	22	command="%%PREFIX%%/bin/${name}"
24		23
25	load_rc_config $name	24	load_rc_config $name
26		25
27	start_cmd="echo \"Starting ${name}.\"; ${command}"	26	: ${mythbackend_enable="NO"}
		27	: ${mythbackend_logfile="/var/log/${name}.log"}
		28	: ${mythbackend_flags=""}
		29
		30	command_args="-d -l ${mythbackend_logfile}"
28		31
29	run_rc_command "$1"	32	run_rc_command "$1"

Lines 1-29 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-configure (-27 / +42 lines)
1	--- configure.orig 2008-03-04 16:23:23.000000000 -0500	1	--- configure.orig 2009-10-09 00:30:46.000000000 +0200
2	+++ configure 2009-03-03 18:10:09.000000000 -0500	2	+++ configure 2009-12-02 19:24:10.000000000 +0100
3	@@ -1149,6 +1149,17 @@	3	@@ -633,21 +633,21 @@
4	fi	4	log check_cc "$@"
5	fi	5	cat > $TMPC
		6	log_file $TMPC
		7	- check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC
		8	+ check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC
		9	}
6		10
7	+# BSD.	11	check_cpp(){
8	+if uname -s \| grep BSD > 0; then	12	log check_cpp "$@"
9	+ dmesg=/var/run/dmesg.boot	13	cat > $TMPC
10	+ if test -f $dmesg ; then	14	log_file $TMPC
11	+ processor=`grep ^CPU: $dmesg`	15	- check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -E -o $TMPO $TMPC
12	+# processor_flags is used only to determine whether the processor	16	+ check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC
13	+# supports MMX. The script expexts lower-case 'mmx'. Give it to it.	17	}
14	+ processor_flags=`grep '^ Features=' $dmesg \| tr "[:upper:]" "[:lower:]"`
15	+ fi
16	+fi
17	+
18	# OS
19	targetos=$(tolower $(uname -s))
20		18
21	@@ -1466,7 +1477,7 @@	19	check_cxx(){
22	x86_64\|amd64)	20	log check_cxx "$@"
23	arch="x86_32"	21	cat > $TMPCXX
24	enable fast_unaligned	22	log_file $TMPCXX
25	- canon_arch="`$cc -dumpmachine \| sed -e 's,\([^-]\)-.,\1,'`"	23	- check_cmd $cxx $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX
26	+ canon_arch="`$cxx -dumpmachine \| sed -e 's,\([^-]\)-.,\1,'`"	24	+ check_cmd $cxx $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX
27	if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then	25	}
28	if [ -z "`echo $CFLAGS \| grep -- -m32`" ]; then	26
29	arch="x86_64"	27	check_as(){
		28	@@ -2174,7 +2174,6 @@
		29	append CCONFIG "freebsd"
		30	# Workaround compile errors from missing u_int/uint def
		31	CFLAGS=`echo $CFLAGS \| sed 's/-D_POSIX_C_SOURCE=200112//'`
		32	- disable ivtv
		33	disable need_memalign
		34	enable backend
		35	;;
		36	@@ -4254,6 +4253,8 @@
		37	# directories, it cannot be modified.
		38	QMAKE_LIBDIR_QT -= $libdir
		39	LATE_LIBS += -L$libdir
		40	+CONFIG_INCLUDEPATH=
		41	+FREETYPE_CFLAGS -= -I/usr/local/include
		42	EOF
		43
		44	diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1

Lines 1-25 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmyth__libmyth.pro (-25 lines)
1	--- ./libs/libmyth/libmyth.pro.orig 2008-03-04 12:08:41.000000000 -0500
2	+++ ./libs/libmyth/libmyth.pro 2009-04-22 21:04:16.000000000 -0400
3	@@ -43,14 +43,14 @@
4	SOURCES += volumebase.cpp volumecontrol.cpp virtualkeyboard.cpp xmlparse.cpp
5	SOURCES += mythhdd.cpp mythcdrom.cpp storagegroup.cpp dbutil.cpp
6
7	-INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround
8	-INCLUDEPATH += ../libavcodec ../libavutil
9	-INCLUDEPATH += ../.. ../ ./
10	-DEPENDPATH += ../libmythsamplerate ../libmythsoundtouch
11	-DEPENDPATH += ../libmythfreesurround
12	-DEPENDPATH += ../libavcodec ../libavutil
13	-DEPENDPATH += ../ ../libmythui
14	-DEPENDPATH += ../libmythupnp
15	+INCLUDEPATH = ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround $${INCLUDEPATH}
16	+INCLUDEPATH = ../libavcodec ../libavutil $${INCLUDEPATH}
17	+INCLUDEPATH = ../.. ../ ./ $${INCLUDEPATH}
18	+DEPENDPATH = ../libmythsamplerate ../libmythsoundtouch $${DEPENDPATH}
19	+DEPENDPATH = ../libmythfreesurround $${DEPENDPATH}
20	+DEPENDPATH = ../libavcodec ../libavutil $${DEPENDPATH}
21	+DEPENDPATH = ../ ../libmythui $${DEPENDPATH}
22	+DEPENDPATH = ../libmythupnp $${DEPENDPATH}
23
24
25	LIBS += -L../libmythsamplerate -lmythsamplerate-$${LIBVERSION}

Lines 1-13 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmyth__util.cpp (-13 lines)
1	--- ./libs/libmyth/util.cpp.orig 2008-02-24 10:19:20.000000000 -0500
2	+++ ./libs/libmyth/util.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -54,6 +54,10 @@
4	#include <sys/mount.h> // for struct statfs
5	#endif
6
7	+#if defined(__FreeBSD__)
8	+#include <sys/mount.h> // for struct statfs
9	+#endif
10	+
11	#ifdef USE_LIRC
12	#include "lircevent.h"
13	#endif

Lines 1-12 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythdvdnav__dvd_input.c (-12 lines)
1	--- ./libs/libmythdvdnav/dvd_input.c.orig 2008-01-27 14:27:40.000000000 -0500
2	+++ ./libs/libmythdvdnav/dvd_input.c 2009-02-23 09:59:26.000000000 -0500
3	@@ -27,6 +27,9 @@
4	#include "dvd_reader.h"
5	#include "dvd_input.h"
6
7	+#if defined(__FreeBSD__)
8	+#define lseek64 lseek
9	+#endif
10
11	/* The function pointers that is the exported interface of this file. */
12	dvd_input_t (dvdinput_open) (const char );

Lines 1-12 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythdvdnav__dvdnav_internal.h (-12 lines)
1	--- ./libs/libmythdvdnav/dvdnav_internal.h.orig 2008-03-07 20:03:12.000000000 -0500
2	+++ ./libs/libmythdvdnav/dvdnav_internal.h 2009-02-23 09:59:26.000000000 -0500
3	@@ -62,6 +62,9 @@
4	#else
5
6	#include <pthread.h>
7	+#if defined(__FreeBSD__)
8	+#define lseek64 lseek
9	+#endif
10
11	#endif /* WIN32 */
12

Lines 1-18 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythfreemheg__Programs.cpp (-18 lines)
1	--- ./libs/libmythfreemheg/Programs.cpp.orig 2007-03-29 15:44:23.000000000 -0400
2	+++ ./libs/libmythfreemheg/Programs.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -30,7 +30,15 @@
4	#include "freemheg.h"
5
6	#include <sys/timeb.h>
7	+#ifdef __FreeBSD__
8	+/*
9	+ * This file refers to the non-POSIX structure timezone, which is
10	+ * defined in sys/time.h.
11	+ */
12	+#include <sys/time.h>
13	+#else
14	#include <time.h>
15	+#endif
16
17	#include "../../config.h"
18

Line 0 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythtv__videodev_myth.h (+39 lines)
	1	--- libs/libmythtv/videodev_myth.h.orig 2009-07-06 22:42:28.000000000 +0200
	2	+++ libs/libmythtv/videodev_myth.h 2009-11-15 13:08:20.000000000 +0100
	3	@@ -11,6 +11,36 @@
	4	typedef uint8_t __u8;
	5	typedef uint32_t __u64;
	6	typedef int32_t __s64; // HACK. Non 64bit FreeBSD kernels require this for ioctls
	7	+
	8	+typedef struct fb_var_screeninfo
	9	+{
	10	+ int xres;
	11	+ int yres;
	12	+ int bits_per_pixel;
	13	+ int xres_virtual;
	14	+ int yres_virtual;
	15	+ int xoffset;
	16	+ int yoffset;
	17	+ int nonstd;
	18	+ int activate;
	19	+};
	20	+
	21	+typedef struct fb_fix_screeninfo
	22	+{
	23	+ int smem_start;
	24	+};
	25	+
	26	+#define FB_ACTIVATE_NOW 0
	27	+
	28	+#define FBIOBLANK 0
	29	+#define FBIOGET_FSCREENINFO 0
	30	+#define FBIOGET_VSCREENINFO 0
	31	+#define FBIOPAN_DISPLAY 0
	32	+#define FBIOPUT_VSCREENINFO 0
	33	+
	34	+#define VESA_NO_BLANKING 0
	35	+#define VESA_VSYNC_SUSPEND 0
	36	+
	37	#else
	38	#include <linux/types.h>
	39	#include <linux/version.h>

Line 0 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythtv__videoout_ivtv.cpp (+12 lines)
	1	--- libs/libmythtv/videoout_ivtv.cpp.orig 2009-11-15 13:10:38.000000000 +0100
	2	+++ libs/libmythtv/videoout_ivtv.cpp 2009-11-15 13:11:08.000000000 +0100
	3	@@ -19,7 +19,9 @@
	4	#include <sys/param.h>
	5
	6	// Linux headers
	7	+#if defined(__linux__)
	8	#include <linux/fb.h>
	9	+#endif
	10
	11	// C++ headers
	12	#include <map>

Lines 1-49 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-libs__libmythupnp__httprequest.cpp (-49 lines)
1	--- ./libs/libmythupnp/httprequest.cpp.orig 2008-03-03 22:14:01.000000000 -0500
2	+++ ./libs/libmythupnp/httprequest.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -21,9 +21,13 @@
4	#if defined CONFIG_DARWIN \|\| defined CONFIG_CYGWIN \|\| defined(__FreeBSD__) \|\| defined(USING_MINGW)
5	#include "darwin-sendfile.h"
6	#else
7	+#ifdef __FreeBSD__
8	+typedef off_t __off64_t;
9	+#else
10	#define USE_SETSOCKOPT
11	#include <sys/sendfile.h>
12	#endif
13	+#endif
14	#include <sys/types.h>
15	#include <sys/stat.h>
16	#include <unistd.h>
17	@@ -398,6 +402,24 @@
18	__off64_t offset = llStart;
19	int file = open( sFileName.ascii(), O_RDONLY \| O_LARGEFILE );
20	ssize_t sent = 0;
21	+#ifdef __FreeBSD__
22	+
23	+ int error;
24	+ error = sendfile (file,
25	+ getSocketHandle (),
26	+ offset,
27	+ llSize,
28	+ NULL,
29	+ NULL,
30	+ NULL );
31	+ if (error)
32	+ fprintf (stderr,
33	+ "Can't transfer %s: %s (%d)\n",
34	+ sFileName.ascii(),
35	+ strerror (errno),
36	+ errno );
37	+
38	+#else
39
40	do
41	{
42	@@ -411,6 +433,7 @@
43	//VERBOSE(VB_UPNP, QString("SendResponseFile : --- size = %1, offset = %2, sent = %3").arg(llSize).arg(offset).arg(sent));
44	}
45	while (( sent >= 0 ) && ( llSize > 0 ));
46	+#endif
47
48	if (sent == -1)
49	{

Lines 1-34 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-programs__mythbackend__mainserver.cpp (-34 lines)
1	--- ./programs/mythbackend/mainserver.cpp.orig 2008-03-02 23:47:04.000000000 -0500
2	+++ ./programs/mythbackend/mainserver.cpp 2009-02-23 09:59:26.000000000 -0500
3	@@ -251,7 +251,7 @@
4	return;
5	}
6
7	- readReadyLock.lock();
8	+ // readReadyLock.lock();
9
10	ProcessRequestThread *prt = NULL;
11	threadPoolLock.lock();
12	@@ -278,19 +278,19 @@
13
14	prt->setup(sock);
15
16	- readReadyLock.unlock();
17	+ // readReadyLock.unlock();
18	}
19
20	void MainServer::ProcessRequest(MythSocket *sock)
21	{
22	- sock->Lock();
23	+ // sock->Lock();
24
25	if (sock->bytesAvailable() > 0)
26	{
27	ProcessRequestWork(sock);
28	}
29
30	- sock->Unlock();
31	+ // sock->Unlock();
32	}
33
34	void MainServer::ProcessRequestWork(MythSocket *sock)

Line 0 Link Here

(-)/usr/ports/multimedia/mythtv/files/patch-programs__mythtranscode__mpeg2fix.cpp (+13 lines)
	1	--- programs/mythtranscode/mpeg2fix.cpp.orig 2009-11-02 20:52:39.000000000 +0100
	2	+++ programs/mythtranscode/mpeg2fix.cpp 2009-11-02 20:53:08.000000000 +0100
	3	@@ -12,6 +12,10 @@
	4	#include <getopt.h>
	5	#include <stdint.h>
	6
	7	+#ifdef __FreeBSD__
	8	+#include <sys/stat.h>
	9	+#endif
	10	+
	11	#include "config.h"
	12	#include "mpeg2fix.h"
	13