summaryrefslogtreecommitdiffstats
path: root/abs/core/mythtv/stable
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-09-26 01:57:08 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-09-26 01:57:08 (GMT)
commit7b29169fff9e7c624890c5edffe85def8a293136 (patch)
tree47753889faa3a2063b66d1c7e7681e703eb1b39a /abs/core/mythtv/stable
parentc491dea779dac29afff3578bf8245943817c2339 (diff)
downloadlinhes_pkgbuild-7b29169fff9e7c624890c5edffe85def8a293136.zip
linhes_pkgbuild-7b29169fff9e7c624890c5edffe85def8a293136.tar.gz
linhes_pkgbuild-7b29169fff9e7c624890c5edffe85def8a293136.tar.bz2
LinHES 6.01.00
Diffstat (limited to 'abs/core/mythtv/stable')
-rw-r--r--abs/core/mythtv/stable/glass-wide/PKGBUILD15
-rw-r--r--abs/core/mythtv/stable/linhes-theme/PKGBUILD17
-rw-r--r--abs/core/mythtv/stable/morethemes/PKGBUILD32
-rw-r--r--abs/core/mythtv/stable/mytharchive/PKGBUILD10
-rw-r--r--abs/core/mythtv/stable/mythbrowser/PKGBUILD10
-rw-r--r--abs/core/mythtv/stable/mythcontrols/PKGBUILD8
-rwxr-xr-xabs/core/mythtv/stable/mythdb-initial/PKGBUILD2
-rw-r--r--abs/core/mythtv/stable/mythdb-initial/__changelog25
-rw-r--r--abs/core/mythtv/stable/mythdb-initial/mc.sql40
-rwxr-xr-xabs/core/mythtv/stable/mythdb-initial/permissions.sql2
-rw-r--r--abs/core/mythtv/stable/mythflix/PKGBUILD22
-rw-r--r--abs/core/mythtv/stable/mythgallery/PKGBUILD7
-rw-r--r--abs/core/mythtv/stable/mythgame/PKGBUILD7
-rw-r--r--abs/core/mythtv/stable/mythmovies/PKGBUILD33
-rw-r--r--abs/core/mythtv/stable/mythmusic/PKGBUILD14
-rw-r--r--abs/core/mythtv/stable/mythnews/PKGBUILD7
-rw-r--r--abs/core/mythtv/stable/mythphone/PKGBUILD6
-rw-r--r--abs/core/mythtv/stable/mythsmolt/PKGBUILD26
-rw-r--r--abs/core/mythtv/stable/mythstream/PKGBUILD35
-rw-r--r--abs/core/mythtv/stable/mythstream/mythstream.diff79
-rw-r--r--abs/core/mythtv/stable/mythstream/mythstream.install23
-rw-r--r--abs/core/mythtv/stable/myththemes/PKGBUILD7
-rw-r--r--abs/core/mythtv/stable/mythtv/2.6.28_dvb_api_version.diff22
-rw-r--r--abs/core/mythtv/stable/mythtv/PKGBUILD74
-rw-r--r--abs/core/mythtv/stable/mythtv/gnome_screensaver.patch18
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/HOST_SETTINGS.xml94
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/is.xml3
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/library.xml.patch15
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/linhes.xml60
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch39
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/mythbackup.xml20
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/mythrestore.xml20
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/optical_menu.xml.patch15
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/original/create_patch.sh5
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/setup.xml111
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/siriusmenu.xml419
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/update.xml20
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/update2.xml26
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/util_menu.xml.patch17
-rw-r--r--abs/core/mythtv/stable/mythtv/menu-xml/xmmenu.xml574
-rw-r--r--abs/core/mythtv/stable/mythtv/mpegpspatch66
-rw-r--r--abs/core/mythtv/stable/mythtv/mythbackend.lr9
-rw-r--r--abs/core/mythtv/stable/mythtv/mythfrontend.lr9
-rw-r--r--abs/core/mythtv/stable/mythtv/myththemedmenu.cpp.patch125
-rw-r--r--abs/core/mythtv/stable/mythtv/myththemedmenu.h.patch25
-rw-r--r--abs/core/mythtv/stable/mythtv/mythtv.install46
-rw-r--r--abs/core/mythtv/stable/mythtv/pretty2
-rw-r--r--abs/core/mythtv/stable/mythtv/smolt_jump.patch9
-rw-r--r--abs/core/mythtv/stable/mythvideo/PKGBUILD13
-rw-r--r--abs/core/mythtv/stable/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch151
-rw-r--r--abs/core/mythtv/stable/mythvideo/mythvideo.install20
-rw-r--r--abs/core/mythtv/stable/mythweather/PKGBUILD6
-rw-r--r--abs/core/mythtv/stable/mythweb/PKGBUILD40
-rw-r--r--abs/core/mythtv/stable/mythweb/mythweb.install11
-rw-r--r--abs/core/mythtv/stable/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff102
-rw-r--r--abs/core/mythtv/stable/mythweb/patch/icons.tar.gzbin0 -> 14759 bytes
-rw-r--r--abs/core/mythtv/stable/mythweb/patch/mythweb.pl.diff23
-rw-r--r--abs/core/mythtv/stable/mythweb/patch/mythweb_gallery_updated1.diff1657
-rw-r--r--abs/core/mythtv/stable/mythweb/transcoders.patch23
-rw-r--r--abs/core/mythtv/stable/mythweb/wiiweb.tar.bz2bin0 -> 23648 bytes
-rw-r--r--abs/core/mythtv/stable/mythzoneminder/PKGBUILD32
61 files changed, 4254 insertions, 94 deletions
diff --git a/abs/core/mythtv/stable/glass-wide/PKGBUILD b/abs/core/mythtv/stable/glass-wide/PKGBUILD
new file mode 100644
index 0000000..2d0cb11
--- /dev/null
+++ b/abs/core/mythtv/stable/glass-wide/PKGBUILD
@@ -0,0 +1,15 @@
+pkgname=glass-wide
+pkgver=1
+pkgrel=1
+pkgdesc="glass-wide theme for mythtv .21 ."
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="unkown"
+source="http://iw.net/~brfransen/myth/glass-wide.tar.gz"
+
+build() {
+ cd $startdir/src/
+ mkdir -p $startdir/pkg/usr/share/mythtv/themes
+ cp -a glass-wide $startdir/pkg/usr/share/mythtv/themes
+ rm -rf $startdir/pkg/usr/shar/mythtv/themes/.DS_Store
+}
diff --git a/abs/core/mythtv/stable/linhes-theme/PKGBUILD b/abs/core/mythtv/stable/linhes-theme/PKGBUILD
new file mode 100644
index 0000000..310bb96
--- /dev/null
+++ b/abs/core/mythtv/stable/linhes-theme/PKGBUILD
@@ -0,0 +1,17 @@
+# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
+# Maintainer: Cecil Watson<knoppmyth@gmail.com>
+
+pkgname=linhes-theme
+pkgver=1
+pkgrel=10
+pkgdesc="Default LinHES theme."
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://linhes.org/"
+source=(ftp://ftp.knoppmyth.net/R6/sources/linhes-theme.tar.bz2)
+
+build() {
+ cd $startdir/src/
+ mkdir -p $startdir/pkg/usr/share/mythtv/themes
+ cp -a LinHES $startdir/pkg/usr/share/mythtv/themes
+}
diff --git a/abs/core/mythtv/stable/morethemes/PKGBUILD b/abs/core/mythtv/stable/morethemes/PKGBUILD
new file mode 100644
index 0000000..dd05575
--- /dev/null
+++ b/abs/core/mythtv/stable/morethemes/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: kleptophobiac@gmail.com
+
+pkgname=morethemes
+pkgver=0.21
+pkgrel=1
+pkgdesc="Additional themes for MythTV"
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org/"
+license=('GPL')
+depends=("mythtv>=${pkgver}")
+source=("ftp://ftp.knoppmyth.net/R6/sources/${pkgname}.tar.bz2")
+md5sums=('53f87f0498bc516585df78ff932785f4')
+groups=('mythtv-extras')
+
+build() {
+ cd $startdir/src/themes
+ . /etc/profile.d/qt3.sh
+
+ # use QT3 qmake
+ export PATH=$QTDIR/bin:$PATH
+ ./configure --prefix=/usr || return 1
+
+ qmake $pkgname.pro
+ make qmake || return 1
+ make || return 1
+
+ # basic install
+ make INSTALL_ROOT=$startdir/pkg install || return 1
+}
+
diff --git a/abs/core/mythtv/stable/mytharchive/PKGBUILD b/abs/core/mythtv/stable/mytharchive/PKGBUILD
index fb3b755..f5c51f2 100644
--- a/abs/core/mythtv/stable/mytharchive/PKGBUILD
+++ b/abs/core/mythtv/stable/mytharchive/PKGBUILD
@@ -4,20 +4,20 @@
pkgname=mytharchive
pkgver=0.21
-pkgrel=1
+pkgrel=9
pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
-depends=("mythtv>=${pkgver}" 'libxmu' 'mysql-python' 'pil' 'dvdauthor')
+depends=("mythtv>=${pkgver}" 'libxmu' 'mysql-python' 'pil' 'dvdauthor' 'mjpegtools' 'transcode')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
-
+ svn update
# use QT3 qmake
export PATH=$QTDIR/bin:$PATH
diff --git a/abs/core/mythtv/stable/mythbrowser/PKGBUILD b/abs/core/mythtv/stable/mythbrowser/PKGBUILD
index 5a53093..51a27d2 100644
--- a/abs/core/mythtv/stable/mythbrowser/PKGBUILD
+++ b/abs/core/mythtv/stable/mythbrowser/PKGBUILD
@@ -4,22 +4,22 @@
pkgname=mythbrowser
pkgver=0.21
-pkgrel=2
+pkgrel=6
pkgdesc="Mini web browser for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
-depends=("mythtv>=${pkgver}" 'wget' 'libxvmc' 'kdelibs3')
+depends=("mythtv>=${pkgver}" 'wget' 'libxvmc' 'kdelibs3' 'qt3')
groups=('mythtv-extras')
options=('!makeflags')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
. /etc/profile.d/kde3.sh
-
+ svn update
sed -i 's#kde3#kde#' configure || return 1
./configure --prefix=/usr --enable-opengl --disable-all --enable-mythbrowser || return 1
diff --git a/abs/core/mythtv/stable/mythcontrols/PKGBUILD b/abs/core/mythtv/stable/mythcontrols/PKGBUILD
index cf7f43c..669278c 100644
--- a/abs/core/mythtv/stable/mythcontrols/PKGBUILD
+++ b/abs/core/mythtv/stable/mythcontrols/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=mythcontrols
pkgver=0.21
-pkgrel=1
+pkgrel=4
pkgdesc="Experimental controls for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
@@ -12,13 +12,13 @@ license=('GPL')
depends=("mythtv>=${pkgver}")
options=('!makeflags')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
-
+ svn update
# use QT3 qmake
export PATH=$QTDIR/bin:$PATH
./configure --prefix=/usr --disable-all --enable-opengl --enable-mythcontrols
diff --git a/abs/core/mythtv/stable/mythdb-initial/PKGBUILD b/abs/core/mythtv/stable/mythdb-initial/PKGBUILD
index 02f2789..aa1feef 100755
--- a/abs/core/mythtv/stable/mythdb-initial/PKGBUILD
+++ b/abs/core/mythtv/stable/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythdb-initial
pkgver=1
-pkgrel=3
+pkgrel=42
pkgdesc="setup the initial mythtv database for linhes"
url=""
license=""
diff --git a/abs/core/mythtv/stable/mythdb-initial/__changelog b/abs/core/mythtv/stable/mythdb-initial/__changelog
new file mode 100644
index 0000000..c53f2f6
--- /dev/null
+++ b/abs/core/mythtv/stable/mythdb-initial/__changelog
@@ -0,0 +1,25 @@
+
+
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
+('Hostpluginmytharchive','1','larch5'),
+('Hostpluginmythbrowser','1','larch5'),
+('Hostpluginmythcontrols','1','larch5'),
+('Hostpluginmythflix','1','larch5'),
+('Hostpluginmythgallery','1','larch5'),
+('Hostpluginmythgame','1','larch5'),
+('HostpluginmythgameFceu','1','larch5'),
+('HostpluginmythgameMame','1','larch5'),
+('HostpluginmythgameZsnes','1','larch5'),
+('Hostpluginmythmovietime','1','larch5'),
+('Hostpluginmythmusic','1','larch5'),
+('Hostpluginmythnews','1','larch5'),
+('Hostpluginmythphone','1','larch5'),
+('Hostpluginmythsmolt','1','larch5'),
+('Hostpluginmythvideo','1','larch5'),
+('Hostpluginmythvideo_dvdcss','0','larch5'),
+('Hostpluginmythweather','1','larch5'),
+('HostAudiotype','ALSA','larch5')
+
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
+('WOLbackendReconnectWaitTime','5',NULL);
+
diff --git a/abs/core/mythtv/stable/mythdb-initial/mc.sql b/abs/core/mythtv/stable/mythdb-initial/mc.sql
index 6e9bdaa..cdb22d4 100644
--- a/abs/core/mythtv/stable/mythdb-initial/mc.sql
+++ b/abs/core/mythtv/stable/mythdb-initial/mc.sql
@@ -2317,7 +2317,45 @@ SET character_set_client = @saved_cs_client;
LOCK TABLES `settings` WRITE;
/*!40000 ALTER TABLE `settings` DISABLE KEYS */;
-INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES ('mythfilldatabaseLastRunStart',NULL,NULL),('mythfilldatabaseLastRunEnd',NULL,NULL),('mythfilldatabaseLastRunStatus',NULL,NULL),('DataDirectMessage',NULL,NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1214',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','CPU+','larch5'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('AllRecGroupPassword','',NULL),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('OSDCC708DefaultFontType','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat','<num> <sign>','larch5'),('LongChannelFormat','<num> <name>','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','255',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','G.A.N.T','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng','larch5'),('ISO639Language1','eng','larch5'),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','0','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1001',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a %b %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1001',NULL),('GalleryDBSchemaVer','1000',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','mplayer -fs %s','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1012',NULL),('MusicDBSchemaVer','1013',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('mythvideo.DBSchemaVer','1016',NULL),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video/.covers','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -M tv=no;video=no','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -P','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -D','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1000',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','/usr/bin/mythbrowser','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5');
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES ('mythfilldatabaseLastRunStart',NULL,NULL),('mythfilldatabaseLastRunEnd',NULL,NULL),('mythfilldatabaseLastRunStatus',NULL,NULL),('DataDirectMessage',NULL,NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1214',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','CPU+','larch5'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('AllRecGroupPassword','',NULL),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('OSDCC708DefaultFontType','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat','<num> <sign>','larch5'),('LongChannelFormat','<num> <name>','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','255',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','LinHES','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng','larch5'),('ISO639Language1','eng','larch5'),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','0','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1001',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a %b %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1001',NULL),('GalleryDBSchemaVer','1000',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','mplayer -fs %s','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1012',NULL),('MusicDBSchemaVer','1013',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('mythvideo.DBSchemaVer','1016',NULL),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video/.covers','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -M tv=no;video=no','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -P','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -D','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1000',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','/usr/bin/mythbrowser','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5'),('HOSTOSsize','5','larch5'),('HostMyhostname','type_hostname_here','larch5'),('NetworkControlEnabled','1','larch5');
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
+('Hostpluginmytharchive','1','larch5'),
+('Hostpluginmythbrowser','1','larch5'),
+('Hostpluginmythcontrols','1','larch5'),
+('Hostpluginmythflix','1','larch5'),
+('Hostpluginmythgallery','1','larch5'),
+('Hostpluginmythgame','1','larch5'),
+('HostpluginmythgameFceu','1','larch5'),
+('HostpluginmythgameMame','1','larch5'),
+('HostpluginmythgameZsnes','1','larch5'),
+('Hostpluginmythmovietime','1','larch5'),
+('Hostpluginmythmusic','1','larch5'),
+('Hostpluginmythnews','1','larch5'),
+('Hostpluginmythphone','1','larch5'),
+('Hostpluginmythsmolt','1','larch5'),
+('Hostpluginmythvideo','1','larch5'),
+('Hostpluginmythvideo_dvdcss','0','larch5'),
+('Hostpluginmythweather','1','larch5'),
+('HostAudiotype','ALSA','larch5'),
+('HostpluginmythgameZsnes','1','larch5'),
+('HostpluginmythgameMame','1','larch5'),
+('Hostpluginmythvideo_dvdcss','0','larch5'),
+('Hostpluginmythappletrailers','1','larch5'),
+('Hostpluginmythstream','1','larch5'),
+('Hostpluginmythvodka','1','larch5'),
+('HostMiro','1','larch5'),
+('HostpluginmythgameXE','1','larch5'),
+('HostpluginmythgameROMDB','1','larch5'),
+('HostXine','1','larch5'),
+('HOSTOSsize','5','larch5'),
+('HostMyhostname','type_hostname_here','larch5'),
+('NetworkControlEnabled','1','larch5'),
+('Hostaccessuser','1','larch5');
+
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
+('WOLbackendReconnectWaitTime','5',NULL);
+
+
/*!40000 ALTER TABLE `settings` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/abs/core/mythtv/stable/mythdb-initial/permissions.sql b/abs/core/mythtv/stable/mythdb-initial/permissions.sql
index acb4673..5a36e15 100755
--- a/abs/core/mythtv/stable/mythdb-initial/permissions.sql
+++ b/abs/core/mythtv/stable/mythdb-initial/permissions.sql
@@ -1,6 +1,6 @@
GRANT ALL ON mythconverg.* TO mythtv@localhost IDENTIFIED BY "mythtv";
-GRANT ALL ON mythconverg.* TO mythtv@"%" IDENTIFIED BY "mythtv";
+GRANT ALL ON mythconverg.* TO mythtv@'%' IDENTIFIED BY "mythtv";
GRANT ALL ON mythconverg.* TO mythtv@myhost IDENTIFIED BY "mythtv";
GRANT FILE ON *.* TO 'mythtv'@'%';
FLUSH PRIVILEGES;
diff --git a/abs/core/mythtv/stable/mythflix/PKGBUILD b/abs/core/mythtv/stable/mythflix/PKGBUILD
index f613963..5423c06 100644
--- a/abs/core/mythtv/stable/mythflix/PKGBUILD
+++ b/abs/core/mythtv/stable/mythflix/PKGBUILD
@@ -3,28 +3,38 @@
# Maintainer: kleptophobiac@gmail.com
pkgname=mythflix
+PLUGIN=$pkgname
pkgver=0.21
-pkgrel=1
+pkgrel=5
pkgdesc="Netflix access plugin for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}")
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
-
- # use QT3 qmake
+ svn update
+ cd $startdir/src/mythplugins
+ grep -q programs-libs.pro $PLUGIN/$PLUGIN/$PLUGIN.pro
+ if [ $? != 0 ]
+ then
+ echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
+ msg "appending program lib"
+ fi
+ cd -
+ # use QT3 qmake
export PATH=$QTDIR/bin:$PATH
./configure --prefix=/usr --disable-all --enable-opengl --enable-mythflix
qmake mythplugins.pro
make qmake || return 1
- make -j 2 || return 1
+# make -j 2 || return 1
+ make || return 1
make INSTALL_ROOT=$startdir/pkg install
}
diff --git a/abs/core/mythtv/stable/mythgallery/PKGBUILD b/abs/core/mythtv/stable/mythgallery/PKGBUILD
index 76a66c5..bdf7b57 100644
--- a/abs/core/mythtv/stable/mythgallery/PKGBUILD
+++ b/abs/core/mythtv/stable/mythgallery/PKGBUILD
@@ -4,19 +4,20 @@
pkgname=mythgallery
pkgver=0.21
-pkgrel=1
+pkgrel=5
pkgdesc="Image gallery plugin for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}" 'libexif' 'libtiff')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
+ svn update
# use QT3 qmake
export PATH=$QTDIR/bin:$PATH
diff --git a/abs/core/mythtv/stable/mythgame/PKGBUILD b/abs/core/mythtv/stable/mythgame/PKGBUILD
index 33fb9a5..aac284a 100644
--- a/abs/core/mythtv/stable/mythgame/PKGBUILD
+++ b/abs/core/mythtv/stable/mythgame/PKGBUILD
@@ -4,20 +4,21 @@
pkgname=mythgame
pkgver=0.21
-pkgrel=1
+pkgrel=4
pkgdesc="Emulation plugin for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}" 'zlib')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-$pkgver
+ cd $startdir/src/mythplugins
export QMAKESPEC='linux-g++'
source /etc/profile.d/qt3.sh
+# svn update
./configure --prefix=/usr --disable-all --enable-opengl --enable-mythgame
diff --git a/abs/core/mythtv/stable/mythmovies/PKGBUILD b/abs/core/mythtv/stable/mythmovies/PKGBUILD
new file mode 100644
index 0000000..c07b3a2
--- /dev/null
+++ b/abs/core/mythtv/stable/mythmovies/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: kleptophobiac@gmail.com
+
+pkgname=mythmovies
+pkgver=0.21
+pkgrel=5
+pkgdesc="Displays information about movies playing in the area."
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org"
+license=('GPL')
+depends=('mythtv>=${pkgver}')
+source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
+groups=('mythtv-extras')
+
+build() {
+ cd $startdir/src/mythplugins
+ . /etc/profile.d/qt3.sh
+ svn update
+
+ # use QT3 qmake
+ export PATH=$QTDIR/bin:$PATH
+
+ ./configure --prefix=/usr --enable-opengl --disable-all --enable-mythmovies
+
+ qmake mythplugins.pro
+ make qmake || return 1
+ make -j 2 || return 1
+
+ make INSTALL_ROOT=$startdir/pkg install
+}
+
diff --git a/abs/core/mythtv/stable/mythmusic/PKGBUILD b/abs/core/mythtv/stable/mythmusic/PKGBUILD
index 02adcce..b422f34 100644
--- a/abs/core/mythtv/stable/mythmusic/PKGBUILD
+++ b/abs/core/mythtv/stable/mythmusic/PKGBUILD
@@ -4,29 +4,31 @@
pkgname=mythmusic
pkgver=0.21
-pkgrel=2
+pkgrel=12
pkgdesc="Music playing plugin for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}" 'libid3tag' 'libmad' 'libvorbis' 'flac>=1.1.4' 'libcdaudio' \
- 'cdparanoia' 'fftw2' 'sdl' 'faad2>=2.6.1' 'lame' 'taglib')
+ 'cdparanoia' 'fftw2' 'sdl' 'faad2>=2.6.1' 'lame' 'taglib' \
+ 'libvisual-plugins' 'libvisual-projectm')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
# use QT3 qmake
export PATH=$QTDIR/bin:$PATH
./configure --prefix=/usr --disable-all --enable-mythmusic --enable-fftw \
- --enable-sdl --enable-aac --enable-opengl
+ --enable-sdl --enable-aac --enable-opengl --enable-libvisual
qmake mythplugins.pro
make qmake || return 1
- make -j 2 || return 1
+# make -j 2 || return 1
+ make
make INSTALL_ROOT=$startdir/pkg install
}
diff --git a/abs/core/mythtv/stable/mythnews/PKGBUILD b/abs/core/mythtv/stable/mythnews/PKGBUILD
index 9133755..1f22161 100644
--- a/abs/core/mythtv/stable/mythnews/PKGBUILD
+++ b/abs/core/mythtv/stable/mythnews/PKGBUILD
@@ -4,19 +4,20 @@
pkgname=mythnews
pkgver=0.21
-pkgrel=1
+pkgrel=4
pkgdesc="News checking plugin for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}")
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
+ svn update
# use QT3 qmake
export PATH=$QTDIR/bin:$PATH
diff --git a/abs/core/mythtv/stable/mythphone/PKGBUILD b/abs/core/mythtv/stable/mythphone/PKGBUILD
index 24cd04f..1ce2d5a 100644
--- a/abs/core/mythtv/stable/mythphone/PKGBUILD
+++ b/abs/core/mythtv/stable/mythphone/PKGBUILD
@@ -4,18 +4,18 @@
pkgname=mythphone
pkgver=0.21
-pkgrel=1
+pkgrel=3
pkgdesc="Plugin that allows phone calls to be made to MythTv"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}")
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
# use QT3 qmake
diff --git a/abs/core/mythtv/stable/mythsmolt/PKGBUILD b/abs/core/mythtv/stable/mythsmolt/PKGBUILD
new file mode 100644
index 0000000..25c91cf
--- /dev/null
+++ b/abs/core/mythtv/stable/mythsmolt/PKGBUILD
@@ -0,0 +1,26 @@
+pkgname=mythsmolt
+pkgver=0.21
+pkgrel=8
+pkgdesc="mythsmolt, a hardware profileing tool"
+arch=('i686' 'x86_64')
+url="http://www.mythvantage.com"
+license=('GPL')
+depends=("mythtv>=${pkgver}" urlgrabber)
+source=("http://www.mythvantage.com/request.php?4")
+
+groups=('mythtv-extras')
+
+build() {
+ cd $startdir/src/mythsmolt_src/mythsmolt
+ . /etc/profile.d/qt3.sh
+
+ # use QT3 qmake
+ export PATH=$QTDIR/bin:$PATH
+ echo "INCLUDEPATH += /usr/include/mythtv" >> mythsmolt.pro.usr
+
+ qmake mythsmolt.pro.usr
+ make qmake || return 1
+ make -j 2 || return 1
+
+ make INSTALL_ROOT=$startdir/pkg install
+}
diff --git a/abs/core/mythtv/stable/mythstream/PKGBUILD b/abs/core/mythtv/stable/mythstream/PKGBUILD
new file mode 100644
index 0000000..275afa8
--- /dev/null
+++ b/abs/core/mythtv/stable/mythstream/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: kleptophobiac@gmail.com
+
+pkgname=mythstream
+pkgver=0.18_1
+pkgrel=8
+pkgdesc="Unofficial MythTV plugin for Internet audio and video streams."
+arch=('i686' 'x86_64')
+url="http://home.kabelfoon.nl/~moongies/streamtuned.html"
+license=('GPL')
+depends=('mythtv' 'perl-xml-simple')
+source=("http://home.kabelfoon.nl/~moongies/sw9vc4htz2/mythstream-v0.18_1.tar.gz" "http://home.kabelfoon.nl/~moongies/sw9vc4htz2/mythstream.cpp.patch_svn20071123" "mythstream.diff")
+md5sums=('')
+install=mythstream.install
+groups=('mythtv-extras')
+install=mythstream.install
+
+build() {
+ cd $startdir/src/mythstream-0.18_1
+ patch -p1 < ../mythstream.diff
+ patch -p0 < ../mythstream.cpp.patch_svn20071123
+ ln -s ../../../mythtv/src/mythtv-0.21/libs/lib* .
+ . /etc/profile.d/qt3.sh
+
+ # use QT3 qmake
+ export PATH=$QTDIR/bin:$PATH
+ echo "INCLUDEPATH += /usr/include/mythtv" >> mythstream/mythstream.pro
+
+ qmake mythstream.pro
+ make qmake || return 1
+ make -j 2 || return 1
+
+ make INSTALL_ROOT=$startdir/pkg install
+}
diff --git a/abs/core/mythtv/stable/mythstream/mythstream.diff b/abs/core/mythtv/stable/mythstream/mythstream.diff
new file mode 100644
index 0000000..477881c
--- /dev/null
+++ b/abs/core/mythtv/stable/mythstream/mythstream.diff
@@ -0,0 +1,79 @@
+diff -ruaN mythstream-0.18_1.orig/libs/fft.cpp mythstream-0.18_1/libs/fft.cpp
+--- mythstream-0.18_1.orig/libs/fft.cpp 2006-11-06 22:50:22.000000000 +0000
++++ mythstream-0.18_1/libs/fft.cpp 2009-01-26 02:44:33.000000000 +0000
+@@ -23,7 +23,7 @@
+ // development snapshot, many todo's
+
+ #include <iostream>
+-
++#include <math.h>
+
+ #include <qapplication.h>
+ #include <unistd.h>
+diff -ruaN mythstream-0.18_1.orig/libs/harvester.cpp mythstream-0.18_1/libs/harvester.cpp
+--- mythstream-0.18_1.orig/libs/harvester.cpp 2007-09-25 22:58:20.000000000 +0000
++++ mythstream-0.18_1/libs/harvester.cpp 2009-01-26 02:44:55.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <qdom.h>
+
+ #include <sys/stat.h>
++#include <cstdlib>
+
+ #include "harvester.h"
+
+diff -ruaN mythstream-0.18_1.orig/libs/recorder.cpp mythstream-0.18_1/libs/recorder.cpp
+--- mythstream-0.18_1.orig/libs/recorder.cpp 2005-05-14 13:22:51.000000000 +0000
++++ mythstream-0.18_1/libs/recorder.cpp 2009-01-26 02:45:14.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include <qvbox.h>
+ #include <qlayout.h>
+ #include <qregexp.h>
++#include <cstdlib>
+
+ #include <qurl.h>
+
+diff -ruaN mythstream-0.18_1.orig/libs/storageconfig.cpp mythstream-0.18_1/libs/storageconfig.cpp
+--- mythstream-0.18_1.orig/libs/storageconfig.cpp 2007-09-05 21:03:14.000000000 +0000
++++ mythstream-0.18_1/libs/storageconfig.cpp 2009-01-26 02:45:35.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <qlayout.h>
+ #include <qcursor.h>
+ #include <qregexp.h>
++#include <cstdlib>
+
+ #include "storageconfig.h"
+
+diff -ruaN mythstream-0.18_1.orig/libs/streamconfig.cpp mythstream-0.18_1/libs/streamconfig.cpp
+--- mythstream-0.18_1.orig/libs/streamconfig.cpp 2007-09-05 20:36:21.000000000 +0000
++++ mythstream-0.18_1/libs/streamconfig.cpp 2009-01-26 02:45:48.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <qregexp.h>
+ #include <qtextedit.h>
+ #include <qtextstream.h>
++#include <cstdlib>
+
+ #include "streamconfig.h"
+
+diff -ruaN mythstream-0.18_1.orig/libs/streamstatus.cpp mythstream-0.18_1/libs/streamstatus.cpp
+--- mythstream-0.18_1.orig/libs/streamstatus.cpp 2007-09-19 00:13:45.000000000 +0000
++++ mythstream-0.18_1/libs/streamstatus.cpp 2009-01-26 02:46:05.000000000 +0000
+@@ -38,7 +38,7 @@
+ #include <qregexp.h>
+ #include <qurl.h>
+ #include <math.h>
+-
++#include <cstdlib>
+
+ #include "streamstatus.h"
+
+diff -ruaN mythstream-0.18_1.orig/libs/streamstorage.cpp mythstream-0.18_1/libs/streamstorage.cpp
+--- mythstream-0.18_1.orig/libs/streamstorage.cpp 2007-09-23 18:26:15.000000000 +0000
++++ mythstream-0.18_1/libs/streamstorage.cpp 2009-01-26 02:46:28.000000000 +0000
+@@ -34,6 +34,7 @@
+
+ #include "streamstorage.h"
+ #include "configelements.h"
++#include <cstdlib>
+
+ #include <sys/stat.h>
+
diff --git a/abs/core/mythtv/stable/mythstream/mythstream.install b/abs/core/mythtv/stable/mythstream/mythstream.install
new file mode 100644
index 0000000..5af96f2
--- /dev/null
+++ b/abs/core/mythtv/stable/mythstream/mythstream.install
@@ -0,0 +1,23 @@
+# arg 1: the new package version
+post_install() {
+ mv /usr/share/mythtv/is.xml /tmp
+ grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp
+ echo "<!--#MythStream-->" >> /tmp/is.xml.tmp
+ echo " <button>" >> /tmp/is.xml.tmp
+ echo " <type>STREAM</type>" >> /tmp/is.xml.tmp
+ echo " <text>MythStream</text>" >> /tmp/is.xml.tmp
+ echo " <action>PLUGIN mythstream</action>" >> /tmp/is.xml.tmp
+ echo " </button>" >> /tmp/is.xml.tmp
+ echo "<!--#MythStream-->" >> /tmp/is.xml.tmp
+ echo "" >> /tmp/is.xml.tmp
+ echo "</mythmenu>" >> /tmp/is.xml.tmp
+ mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml
+}
+post_remove() {
+ mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp
+ sed -e '/\#MythStream/,/\#MythStream/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml
+}
+
+op=$1
+shift
+$op $*
diff --git a/abs/core/mythtv/stable/myththemes/PKGBUILD b/abs/core/mythtv/stable/myththemes/PKGBUILD
index 5223b92..6c0a0bb 100644
--- a/abs/core/mythtv/stable/myththemes/PKGBUILD
+++ b/abs/core/mythtv/stable/myththemes/PKGBUILD
@@ -4,19 +4,20 @@
pkgname=myththemes
pkgver=0.21
-pkgrel=1
+pkgrel=3
pkgdesc="Themes for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org/"
license=('GPL')
depends=("mythtv>=${pkgver}")
source=("ftp://ftp.knoppmyth.net/R6/sources/${pkgname}-${pkgver}-fixes.tar.bz2")
-md5sums=('f13db28f928d70a11eaf416970d06eda')
+md5sums=('25d4642344cbfd8ee0ceab75022e13fb')
groups=('mythtv-extras')
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $startdir/src/$pkgname
. /etc/profile.d/qt3.sh
+ svn update
# use QT3 qmake
export PATH=$QTDIR/bin:$PATH
diff --git a/abs/core/mythtv/stable/mythtv/2.6.28_dvb_api_version.diff b/abs/core/mythtv/stable/mythtv/2.6.28_dvb_api_version.diff
new file mode 100644
index 0000000..0116023
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/2.6.28_dvb_api_version.diff
@@ -0,0 +1,22 @@
+Index: libs/libmythtv/dvbtypes.h
+===================================================================
+--- libs/libmythtv/dvbtypes.h (revision 19792)
++++ libs/libmythtv/dvbtypes.h (working copy)
+@@ -19,7 +19,7 @@
+ #include <linux/dvb/frontend.h>
+ #include <linux/dvb/dmx.h>
+
+-#if (DVB_API_VERSION != 3)
++#if (DVB_API_VERSION != 3 && DVB_API_VERSION != 5)
+ # error "DVB driver includes with API version 3 not found!"
+ #endif
+
+@@ -27,7 +27,7 @@
+ # define DVB_API_VERSION_MINOR 0
+ #endif
+
+-#if (DVB_API_VERSION >= 3 && DVB_API_VERSION_MINOR >= 1)
++#if ((DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1) || DVB_API_VERSION == 5)
+ # define USE_ATSC
+ #else
+ #warning DVB API version < 3.1
diff --git a/abs/core/mythtv/stable/mythtv/PKGBUILD b/abs/core/mythtv/stable/mythtv/PKGBUILD
index 72c6855..af084fc 100644
--- a/abs/core/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable/mythtv/PKGBUILD
@@ -1,29 +1,39 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
pkgname=mythtv
pkgver=0.21
-pkgrel=4
+pkgrel=90
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
-depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
- 'libxvmc')
-backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt)
-source=(ftp://ftp.knoppmyth.net/R6/sources/${pkgname}-${pkgver}-fixes.tar.bz2 \
- mythbackend\
- QUICKSTART.archlinux)
-md5sums=('08506f0c5120c072085b6995f529167a' '7ef6de58240e7aad389a0b13d91b1cf6'\
- 'a0ecb7f476cb71c0c1ac90d349fc7695')
+depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg'
+ 'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883' 'perl-net-upnp'
+ 'perl-time-format')
+backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xmlusr/share/mythtv/media_settings.xml )
+source=(ftp://ftp.knoppmyth.net/R6/sources/${pkgname}-${pkgver}-fixes.tar.bz2
+ mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch
+ smolt_jump.patch pretty gnome_screensaver.patch mpegpspatch
+ mythbackend.lr mythfrontend.lr)
+
license=('GPL2')
-makedepends=(libgl subversion)
+makedepends=(libgl subversion python perl)
groups=('pvr')
url="http://www.mythtv.org/"
install=mythtv.install
build() {
- cd $startdir/src/${pkgname}-${pkgver} || return 1
+ cd $startdir/src/${pkgname}-${pkgver} || return 1
+ svn update
+
+#apply patches
+ patch -p0 < ../myththemedmenu.cpp.patch
+ patch -p0 < ../myththemedmenu.h.patch
+# patch -p0 < ../pop_be_restart.h.patch
+# patch -p0 < ../pop_be_restart.cpp.patch
+ patch -p0 < ../smolt_jump.patch
+# patch -p0 < ../2.6.28_dvb_api_version.diff
+ patch -p0 < ../gnome_screensaver.patch
+# cd libs/libavformat
+# patch -p0 < $startdir/src/mpegpspatch
+# cd -
+
. /etc/profile.d/qt3.sh
# use QT3 qmake
@@ -33,10 +43,10 @@ build() {
./configure --prefix=/usr --cpu=${ARCH} --enable-mmx --enable-audio-oss \
--enable-audio-alsa --enable-dvb --enable-lirc --enable-joystick-menu \
- --disable-firewire --enable-v4l --enable-ivtv --enable-dvb \
- --dvb-path=/usr/include/linux/dvb --enable-xvmc --disable-ffmpeg \
+ --enable-firewire --enable-v4l --enable-ivtv --enable-dvb \
+ --dvb-path=/usr/include --enable-xvmc --disable-ffmpeg \
--enable-xvmc-pro --enable-xvmc-vld --enable-opengl-vsync \
- --disable-audio-jack --disable-audio-arts || return 1
+ --disable-audio-jack --disable-audio-arts --disable-directfb || return 1
# build
#needs the subversion program
@@ -58,13 +68,31 @@ build() {
install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend \
|| return 1
cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
- cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ \
- || return 1
+ # cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ \
+# || return 1
# install contrib
mkdir -p $startdir/pkg/usr/share/mythtv/contrib || return 1
- install -m0755 contrib/* $startdir/pkg/usr/share/mythtv/contrib
+ rsync -a --exclude=.svn --exclude=*~ contrib $startdir/pkg/usr/share/mythtv/
+# cp -rap contrib $startdir/pkg/usr/share/mythtv/contrib
+ #install -m0755 contrib/* $startdir/pkg/usr/share/mythtv/contrib
# set suid on mythfrontend
- chmod a+s $startdir/pkg/usr/bin/mythfrontend
+ #chmod a+s $startdir/pkg/usr/bin/mythfrontend
+
+#Patch the xml LinHES style
+ cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv
+ cd $startdir/pkg/usr/share/mythtv
+ patch -Np0 < $startdir/menu-xml/mainmenu.xml.patch || return 1
+ patch -Np0 < $startdir/menu-xml/optical_menu.xml.patch || return 1
+ patch -Np0 < $startdir/menu-xml/library.xml.patch || return 1
+ patch -Np0 < $startdir/menu-xml/util_menu.xml.patch || return 1
+
+#Make log dir
+ mkdir -p $startdir/pkg/var/log/mythtv
+ chown 1000.1000 $startdir/pkg/var/log/mythtv
+ mkdir -p $startdir/pkg/etc/cron.hourly
+ install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
+ mkdir -p $startdir/pkg/etc/logrotate.d/
+ cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d
}
diff --git a/abs/core/mythtv/stable/mythtv/gnome_screensaver.patch b/abs/core/mythtv/stable/mythtv/gnome_screensaver.patch
new file mode 100644
index 0000000..6da37be
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/gnome_screensaver.patch
@@ -0,0 +1,18 @@
+--- libs/libmyth/screensaver-x11.cpp.orig 2009-03-15 19:10:47.000000000 +0000
++++ libs/libmyth/screensaver-x11.cpp 2009-03-15 19:10:56.000000000 +0000
+@@ -143,9 +143,13 @@
+ (m_last_deactivated.secsTo(current_time) > 30))
+ {
+ if (m_xscreensaverRunning)
++ {
+ myth_system("xscreensaver-command -deactivate >&- 2>&- &");
+- else if (m_gscreensaverRunning)
+- myth_system("gnome-screensaver-command --poke >&- 2>&- &");
++ }
++ if (m_gscreensaverRunning)
++ {
++ myth_system("gnome-screensaver-command -dp &");
++ }
+ m_last_deactivated = current_time;
+ }
+ }
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable/mythtv/menu-xml/HOST_SETTINGS.xml
new file mode 100644
index 0000000..ac52497
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/HOST_SETTINGS.xml
@@ -0,0 +1,94 @@
+<mythmenu name="HOST_SETTINGS">
+
+ <button>
+ <type>MV_NETWORK_SETUP_MENU</type>
+ <text>Network Settings</text>
+ <action>EXEC mythinstall -s network </action>
+ </button>
+
+ <button>
+ <type>MV_NETWORK_SETUP_MENU</type>
+ <text>DDNS Settings</text>
+ <action>EXEC mythinstall -s ddns </action>
+ </button>
+ <button>
+ <type>MV_SYSTEM_SETUP_MENU</type>
+ <text>System Type</text>
+ <action>EXEC mythinstall -s hostype </action>
+ </button>
+
+ <button>
+ <type>MV_SCREENSAVER_SETUP_MENU</type>
+ <text>Screensaver Settings</text>
+ <action>EXEC mythinstall -s screensaver </action>
+ </button>
+
+ <button>
+ <type>MV_IR_SETUP_MENU</type>
+ <text>Remotes</text>
+ <action>EXEC mythinstall -s ir </action>
+ </button>
+
+ <button>
+ <type>MV_MISC_SETUP_MENU</type>
+ <text>Miscellanous Settings</text>
+ <action>EXEC mythinstall -s misc </action>
+ </button>
+
+ <button>
+ <type>MV_SOFTWARE_MENU</type>
+ <text>Software</text>
+ <action>EXEC mythinstall -s plugins </action>
+ </button>
+
+ <button>
+ <type>MV_SHUTDOWN_SETUP_MENU</type>
+ <text>Shutdown Settings</text>
+ <action>EXEC mythinstall -s sleep </action>
+ </button>
+
+ <button>
+ <type>MV_ADVANCED_X_SETUP_MENU</type>
+ <text>Display Settings</text>
+ <action>EXEC mythinstall -s advancedX</action>
+ </button>
+
+ <button>
+ <type>MV_ADVANCED_SETUP_MENU</type>
+ <text>Advanced Settings</text>
+ <action>EXEC mythinstall -s advanced</action>
+ </button>
+
+ <button>
+ <type>MV_AUDIO_SETUP_MENU</type>
+ <text>Audio Settings</text>
+ <action>EXEC mythinstall -s sound </action>
+ </button>
+
+ <button>
+ <type>MV_ACCESS_SETUP_MENU</type>
+ <text>Access Control</text>
+ <action>EXEC mythinstall -s accesscontrol </action>
+ </button>
+
+ <button>
+ <type>MV_USER_SETUP_MENU</type>
+ <text>User Accounts</text>
+ <action>EXEC mythinstall -s user </action>
+ </button>
+
+ <button>
+ <type>MV_WEBACCESS_SETUP_MENU</type>
+ <text>Web Security</text>
+ <action>EXEC mythinstall -s webuser </action>
+ </button>
+
+ <!--
+ <button>
+ <type>SETUP_MENU</type>
+ <text>Settings Profile Manager</text>
+ <action>EXEC mythinstall -t </action>
+ </button>
+ -->
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/is.xml b/abs/core/mythtv/stable/mythtv/menu-xml/is.xml
new file mode 100644
index 0000000..88b7e6b
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/is.xml
@@ -0,0 +1,3 @@
+<mythmenu name="Internet Steams">
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable/mythtv/menu-xml/library.xml.patch
new file mode 100644
index 0000000..749e1e7
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/library.xml.patch
@@ -0,0 +1,15 @@
+--- library.xml.orig 2009-03-15 19:20:15.000000000 +0000
++++ library.xml 2009-03-15 19:20:44.000000000 +0000
+@@ -119,10 +119,8 @@
+
+ <button>
+ <type>STREAM</type>
+- <text>Play Online Streams</text>
+- <text lang="HE">נגן מדיה מכוונת</text>
+- <action>PLUGIN mythstream</action>
+- <depends>mythstream</depends>
++ <text>Online Streams</text>
++ <action>MENU is.xml</action>
+ </button>
+
+ <button>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable/mythtv/menu-xml/linhes.xml
new file mode 100644
index 0000000..80bd3c9
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/linhes.xml
@@ -0,0 +1,60 @@
+<mythmenu name="LinHES">
+
+ <button>
+ <type>SETUP_GENERAL</type>
+ <text>MythTV Configuration</text>
+ <text lang="IT">Impostazioni</text>
+ <text lang="ES">Configuración</text>
+ <text lang="CA">Configurar</text>
+ <text lang="FR">paramètres</text>
+ <text lang="DE">Zubehör / Konfiguration</text>
+ <text lang="DK">Tilbehør/Indstillinger</text>
+ <text lang="IS">Uppsetning</text>
+ <text lang="NL">Configuratie</text>
+ <text lang="PT">Utensílios</text>
+ <text lang="SV">Verktyg / Inställningar</text>
+ <text lang="JA">設定</text>
+ <text lang="FI">Oheis/Asetukset</text>
+ <text lang="ZH_TW">工具/設定</text>
+ <text lang="SI">Nastavitve</text>
+ <text lang="ET">Utiliidid / sätted</text>
+ <text lang="NB">Verktøy/Oppsett</text>
+ <text lang="CZ">Pomůcky</text>
+ <text lang="RU">Утилиты / Настройки</text>
+ <text lang="AR">تضبيطات</text>
+ <text lang="PL">Narzędzia / ustawienia</text>
+ <text lang="HE">עזרים / הגדרות</text>
+ <alttext lang="DE">Verschiedenes</alttext>
+ <alttext lang="SV">Inställningar</alttext>
+ <alttext lang="ET">Sätted</alttext>
+ <alttext lang="RU">Настройки</alttext>
+ <alttext lang="AR">تضبيطات</alttext>
+ <action>MENU util_menu.xml</action>
+ </button>
+
+ <button>
+ <type>LINHES_SETUP</type>
+ <text>LinHES Configuration</text>
+ <action>MENU HOST_SETTINGS.xml</action>
+ </button>
+
+ <button>
+ <type>BACKUP</type>
+ <text>Backup LinHES</text>
+ <action>MENU mythbackup.xml</action>
+ </button>
+
+ <button>
+ <type>RESTORE</type>
+ <text>Restore LinHES</text>
+ <action>MENU mythrestore.xml</action>
+ </button>
+
+<!--#Check for updates-->
+ <button>
+ <type>UPGRADE</type>
+ <text>Upgrade LinHES</text>
+ <action>MENU update.xml</action>
+ </button>
+<!--#Check for updates-->
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch
new file mode 100644
index 0000000..a299325
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/mainmenu.xml.patch
@@ -0,0 +1,39 @@
+--- mainmenu.xml.orig 2009-01-09 02:45:07.000000000 +0000
++++ mainmenu.xml 2009-01-22 08:04:28.000000000 +0000
+@@ -158,34 +158,8 @@
+
+ <button>
+ <type>MENU_UTILITIES_SETUP</type>
+- <text>Utilities / Setup</text>
+- <text lang="IT">Impostazioni</text>
+- <text lang="ES">Configuración</text>
+- <text lang="CA">Configurar</text>
+- <text lang="FR">paramètres</text>
+- <text lang="DE">Zubehör / Konfiguration</text>
+- <text lang="DK">Tilbehør/Indstillinger</text>
+- <text lang="IS">Uppsetning</text>
+- <text lang="NL">Configuratie</text>
+- <text lang="PT">Utensílios</text>
+- <text lang="SV">Verktyg / Inställningar</text>
+- <text lang="JA">設定</text>
+- <text lang="FI">Oheis/Asetukset</text>
+- <text lang="ZH_TW">工具/設定</text>
+- <text lang="SI">Nastavitve</text>
+- <text lang="ET">Utiliidid / sätted</text>
+- <text lang="NB">Verktøy/Oppsett</text>
+- <text lang="CZ">Pomůcky</text>
+- <text lang="RU">Утилиты / Настройки</text>
+- <text lang="AR">تضبيطات</text>
+- <text lang="PL">Narzędzia / ustawienia</text>
+- <text lang="HE">עזרים / הגדרות</text>
+- <alttext lang="DE">Verschiedenes</alttext>
+- <alttext lang="SV">Inställningar</alttext>
+- <alttext lang="ET">Sätted</alttext>
+- <alttext lang="RU">Настройки</alttext>
+- <alttext lang="AR">تضبيطات</alttext>
+- <action>MENU util_menu.xml</action>
++ <text>Service Menu</text>
++ <action>MENU linhes.xml</action>
+ </button>
+
+ <!-- <button>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable/mythtv/menu-xml/mythbackup.xml
new file mode 100644
index 0000000..5914b33
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/mythbackup.xml
@@ -0,0 +1,20 @@
+<mythmenu name="LinHES">
+
+ <button>
+ <type>BACKUP</type>
+ <text>Do you wish to backup?</text>
+ <action>NONE</action>
+ </button>
+
+ <button>
+ <type>BACKUP</type>
+ <text>Yes</text>
+ <action>EXEC sudo /usr/LH/bin/mythbackup</action>
+ </button>
+
+ <button>
+ <type>BACKUP</type>
+ <text>No</text>
+ <action>UPMENU</action>
+ </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable/mythtv/menu-xml/mythrestore.xml
new file mode 100644
index 0000000..8f5c285
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/mythrestore.xml
@@ -0,0 +1,20 @@
+<mythmenu name="LinHES">
+
+ <button>
+ <type>RESTORE</type>
+ <text>Do you wish to restore?</text>
+ <action>NONE</action>
+ </button>
+
+ <button>
+ <type>RESTORE</type>
+ <text>Yes</text>
+ <action>EXEC sudo /usr/LH/bin/mythrestore</action>
+ </button>
+
+ <button>
+ <type>BACKUP</type>
+ <text>No</text>
+ <action>UPMENU</action>
+ </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable/mythtv/menu-xml/optical_menu.xml.patch
new file mode 100644
index 0000000..d1cb70c
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/optical_menu.xml.patch
@@ -0,0 +1,15 @@
+--- optical_menu.xml.orig 2008-10-02 22:46:30.000000000 +0000
++++ optical_menu.xml 2008-07-02 04:05:15.000000000 +0000
+@@ -129,6 +129,12 @@
+ </button>
+
+ <button>
++ <type>DVD_RIP</type>
++ <text>Import video files from DVD</text>
++ <action>EXEC /usr/LH/bin/importfiles.sh</action>
++ </button>
++
++ <button>
+ <type>EJECT</type>
+ <text>Eject media</text>
+ <text lang="IT">Espelli Media</text>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/original/create_patch.sh b/abs/core/mythtv/stable/mythtv/menu-xml/original/create_patch.sh
new file mode 100644
index 0000000..34d8b8c
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/original/create_patch.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+for i in *.xml
+do
+ diff -u $i.orig $i > ../$i.patch
+done
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/setup.xml b/abs/core/mythtv/stable/mythtv/menu-xml/setup.xml
new file mode 100644
index 0000000..f56bb6f
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/setup.xml
@@ -0,0 +1,111 @@
+<mythmenu name="MAIN">
+
+ <button>
+ <type>SETUP_GENERAL</type>
+ <text>1. General</text>
+ <text lang="IT">1. Generale</text>
+ <text lang="PT">1. Geral</text>
+ <text lang="SV">1. Generellt</text>
+ <text lang="JA">1. 一般</text>
+ <text lang="DE">1. Allgemeines</text>
+ <text lang="FI">1. Yleiset</text>
+ <text lang="FR">1. Général</text>
+ <text lang="SI">1. Splošno</text>
+ <text lang="ET">1. Üldine</text>
+ <text lang="NB">1 Generelt</text>
+ <text lang="DK">1. Generelt</text>
+ <text lang="ES">1. General</text>
+ <text lang="CZ">1. Obecný</text>
+ <text lang="RU">1. Общие</text>
+ <action>GENERAL</action>
+ </button>
+
+ <button>
+ <type>SETUP_CAPTURE_CARDS</type>
+ <text>2. Capture cards</text>
+ <text lang="IT">2. Schede di Acquisizione</text>
+ <text lang="PT">2. Placas de Captura</text>
+ <text lang="SV">2. TV-kort</text>
+ <text lang="JA">2. キャプチャカード</text>
+ <text lang="DE">2. TV-Karten</text>
+ <text lang="FI">2. TV-kortit</text>
+ <text lang="FR">2. Cartes d'acquisition</text>
+ <text lang="SI">2. Kartice za zajem</text>
+ <text lang="ET">2. TV-kaardid</text>
+ <text lang="NB">2 TV-kort</text>
+ <text lang="DK">2. TV-kort</text>
+ <text lang="ES">2. Capturadoras</text>
+ <text lang="CZ">2. Zachytávací karty</text>
+ <text lang="RU">2. Карты захвата</text>
+ <action>CAPTURE CARDS</action>
+ </button>
+
+ <button>
+ <type>SETUP_VIDEO_SOURCES</type>
+ <text>3. Video sources</text>
+ <text lang="IT">3. Fonte Video</text>
+ <text lang="PT">3. Fontes de Vídeo</text>
+ <text lang="SV">3. Videokällor</text>
+ <text lang="JA">3. ビデオソース</text>
+ <text lang="DE">3. Videoquellen</text>
+ <text lang="FI">3. Kuvanlähteet</text>
+ <text lang="FR">3. Sources vidéo</text>
+ <text lang="SI">3. Video viri</text>
+ <text lang="ET">3. Videosisendid</text>
+ <text lang="NB">3 Videokilder</text>
+ <text lang="DK">3. Videokilder</text>
+ <text lang="ES">3. Fuentes de Vídeo</text>
+ <text lang="CZ">3. Zdroje obrazu</text>
+ <text lang="RU">3. Видео источники</text>
+ <action>VIDEO SOURCES</action>
+ </button>
+
+ <button>
+ <type>SETUP_INPUT_CONNECTIONS</type>
+ <text>4. Input connections</text>
+ <text lang="IT">4. Connessioni di Ingresso</text>
+ <text lang="PT">4. Ligações de Entrada</text>
+ <text lang="SV">4. Anslutningar</text>
+ <text lang="JA">4. 入力とソースの接続</text>
+ <text lang="DE">4. Verknüpfungen</text>
+ <text lang="FI">4. Sisääntuloasetukset</text>
+ <text lang="FR">4. Entrées Vidéos</text>
+ <text lang="SI">4. Vhodne povezave</text>
+ <text lang="ET">4. Sisendite ühendused</text>
+ <text lang="NB">4 Inndata</text>
+ <text lang="DK">4. Indgange</text>
+ <text lang="ES">4. Conexiones</text>
+ <text lang="CZ">4. Připojení vstupů</text>
+ <text lang="RU">4. Соединение входов</text>
+ <action>CARD INPUTS</action>
+ </button>
+
+ <button>
+ <type>SETUP_CHANNEL_EDITOR</type>
+ <text>5. Channel Editor</text>
+ <text lang="IT">5. Modifica Canali</text>
+ <text lang="SV">5. Kanaleditor</text>
+ <text lang="JA">5. チャンネル設定</text>
+ <text lang="DE">5. Sender bearbeiten</text>
+ <text lang="FI">5. Kanavanviritys</text>
+ <text lang="FR">5. Editeur de chaînes</text>
+ <text lang="SI">5. Urejanje kanalov</text>
+ <text lang="ET">5. Kanaliredaktor</text>
+ <text lang="NB">5 Kanalredigerer</text>
+ <text lang="DK">5. Kanal opsætning</text>
+ <text lang="ES">5. Editor Canales</text>
+ <text lang="CZ">5. Editor kanálů</text>
+ <text lang="RU">5. Редактор каналов</text>
+ <action>CHANNEL EDITOR</action>
+ </button>
+
+ <button>
+ <type>SETUP_STORAGE_GROUPS</type>
+ <text>6. Storage Directories</text>
+ <text lang="IT">6. Cartelle</text>
+ <text lang="FI">Tallennusryhmät</text>
+ <text lang="SV">Lagringsgrupper</text>
+ <action>STORAGE GROUPS</action>
+ </button>
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/siriusmenu.xml b/abs/core/mythtv/stable/mythtv/menu-xml/siriusmenu.xml
new file mode 100644
index 0000000..e317b36
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/siriusmenu.xml
@@ -0,0 +1,419 @@
+<mythmenu name="SIRIUS">
+ <button>
+ <type>MUSIC</type>
+ <text>Sirius Hits 1</text>
+ <action>EXEC /usr/bin/cliSipie siriushits1</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>StarLite</text>
+ <action>EXEC /usr/bin/cliSipie starlite</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Sirius Love</text>
+ <action>EXEC /usr/bin/cliSipie siriuslove</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Movin EZ</text>
+ <action>EXEC /usr/bin/cliSipie movineasy</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Sirius Gold</text>
+ <action>EXEC /usr/bin/cliSipie siriusgold</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>'60s Vibrations</text>
+ <action>EXEC /usr/bin/cliSipie 60svibrations</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Totally '70s</text>
+ <action>EXEC /usr/bin/cliSipie totally70s</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Big '80s</text>
+ <action>EXEC /usr/bin/cliSipie big80s</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>ThePulse</text>
+ <action>EXEC /usr/bin/cliSipie thepulse</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Bridge</text>
+ <action>EXEC /usr/bin/cliSipie thebridge</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>BBC Radio 1</text>
+ <action>EXEC /usr/bin/cliSipie bbcradio1</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Super Shuffle</text>
+ <action>EXEC /usr/bin/cliSipie supershuffle</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Elvis Radio</text>
+ <action>EXEC /usr/bin/cliSipie elvisradio</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Classic Vinyl</text>
+ <action>EXEC /usr/bin/cliSipie classicvinyl</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Classic Rewind</text>
+ <action>EXEC /usr/bin/cliSipie classicrewind</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>TheVault</text>
+ <action>EXEC /usr/bin/cliSipie thevault</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Jam_ON</text>
+ <action>EXEC /usr/bin/cliSipie jamon</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Spectrum</text>
+ <action>EXEC /usr/bin/cliSipie thespectrum</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>BuzzSaw</text>
+ <action>EXEC /usr/bin/cliSipie buzzsaw</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Octane</text>
+ <action>EXEC /usr/bin/cliSipie octane</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Alt Nation</text>
+ <action>EXEC /usr/bin/cliSipie altnation</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>1st Wave</text>
+ <action>EXEC /usr/bin/cliSipie firstwave</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Hair Nation</text>
+ <action>EXEC /usr/bin/cliSipie hairnation</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>'90s Alternative</text>
+ <action>EXEC /usr/bin/cliSipie 90salternative</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Garage</text>
+ <action>EXEC /usr/bin/cliSipie undergroundgarage</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Left of Center</text>
+ <action>EXEC /usr/bin/cliSipie leftofcenter</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Hard Attack</text>
+ <action>EXEC /usr/bin/cliSipie hardattack</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Faction</text>
+ <action>EXEC /usr/bin/cliSipie faction</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Punk</text>
+ <action>EXEC /usr/bin/cliSipie punk</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>The Coffee House</text>
+ <action>EXEC /usr/bin/cliSipie coffeehouse</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Margaritaville</text>
+ <action>EXEC /usr/bin/cliSipie radiomargaritaville</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Sirius Disorder</text>
+ <action>EXEC /usr/bin/cliSipie siriusdisorder</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Reggae</text>
+ <action>EXEC /usr/bin/cliSipie reggaerhythms</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Area 33</text>
+ <action>EXEC /usr/bin/cliSipie area33</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Boombox</text>
+ <action>EXEC /usr/bin/cliSipie boombox</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Chill</text>
+ <action>EXEC /usr/bin/cliSipie chill</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>The Beat</text>
+ <action>EXEC /usr/bin/cliSipie thebeat</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Strobe</text>
+ <action>EXEC /usr/bin/cliSipie thestrobe</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Hip-Hop Nation</text>
+ <action>EXEC /usr/bin/cliSipie hiphopnation</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>BackSpin</text>
+ <action>EXEC /usr/bin/cliSipie backspin</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Shade 45</text>
+ <action>EXEC /usr/bin/cliSipie shade45</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Hot Jamz</text>
+ <action>EXEC /usr/bin/cliSipie hotjamz</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Heart &amp; Soul</text>
+ <action>EXEC /usr/bin/cliSipie heartandsoul</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>SoulTown</text>
+ <action>EXEC /usr/bin/cliSipie soultown</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>New Country</text>
+ <action>EXEC /usr/bin/cliSipie newcountry</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Prime Country</text>
+ <action>EXEC /usr/bin/cliSipie primecountry</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Roadhouse</text>
+ <action>EXEC /usr/bin/cliSipie theroadhouse</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Outlaw Country</text>
+ <action>EXEC /usr/bin/cliSipie outlawcountry</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Bluegrass</text>
+ <action>EXEC /usr/bin/cliSipie bluegrass</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Spirit</text>
+ <action>EXEC /usr/bin/cliSipie spirit</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Praise</text>
+ <action>EXEC /usr/bin/cliSipie praise</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Planet Jazz</text>
+ <action>EXEC /usr/bin/cliSipie planetjazz</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>JazzCafe</text>
+ <action>EXEC /usr/bin/cliSipie jazzcafe</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>PureJazz</text>
+ <action>EXEC /usr/bin/cliSipie purejazz</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Spa 73</text>
+ <action>EXEC /usr/bin/cliSipie spa73</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Blues</text>
+ <action>EXEC /usr/bin/cliSipie siriusblues</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Siriusly Sinatra</text>
+ <action>EXEC /usr/bin/cliSipie siriuslysinatra</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Broadway's Best</text>
+ <action>EXEC /usr/bin/cliSipie broadwaysbest</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Symphony Hall</text>
+ <action>EXEC /usr/bin/cliSipie symphonyhall</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Met Opera Radio</text>
+ <action>EXEC /usr/bin/cliSipie metropolitanopera</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Sirius Pops</text>
+ <action>EXEC /usr/bin/cliSipie siriuspops</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Universo Latino</text>
+ <action>EXEC /usr/bin/cliSipie universolatino</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Rumbon</text>
+ <action>EXEC /usr/bin/cliSipie rumbon</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Martha Stewart</text>
+ <action>EXEC /usr/bin/cliSipie marthastewartlivingradio</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Sirius Stars</text>
+ <action>EXEC /usr/bin/cliSipie siriusstars</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>OutQ Gay Radio</text>
+ <action>EXEC /usr/bin/cliSipie siriusoutq</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Patriot</text>
+ <action>EXEC /usr/bin/cliSipie siriuspatriot</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Left</text>
+ <action>EXEC /usr/bin/cliSipie siriusleft</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>CNN</text>
+ <action>EXEC /usr/bin/cliSipie cnn</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>wrn</text>
+ <action>EXEC /usr/bin/cliSipie wrn</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Blue Collar Comedy</text>
+ <action>EXEC /usr/bin/cliSipie bluecollarcomedy</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Raw Dog Comedy</text>
+ <action>EXEC /usr/bin/cliSipie rawdog</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Laugh Break Comedy</text>
+ <action>EXEC /usr/bin/cliSipie laughbreak</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>thefoxxhole</text>
+ <action>EXEC /usr/bin/cliSipie thefoxxhole</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>lime</text>
+ <action>EXEC /usr/bin/cliSipie lime</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Kids Stuff</text>
+ <action>EXEC /usr/bin/cliSipie kidsstuff</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Catholic Channel</text>
+ <action>EXEC /usr/bin/cliSipie thecatholicchannel</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>EWTN</text>
+ <action>EXEC /usr/bin/cliSipie ewtnglobal</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>christiantalk</text>
+ <action>EXEC /usr/bin/cliSipie christiantalk</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Sirius NFL Radio</text>
+ <action>EXEC /usr/bin/cliSipie siriusnflradio</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Maxim Radio</text>
+ <action>EXEC /usr/bin/cliSipie maximradio</action>
+ </button>
+ <button>
+ <type>MUSIC</type>
+ <text>Cosmo Radio</text>
+ <action>EXEC /usr/bin/cliSipie cosmopolitanradio</action>
+ </button>
+ <button>
+ <type>TV_DELETE</type>
+ <text>Stop Listening</text>
+ <action>EXEC /usr/bin/sipie_kill</action>
+ </button>
+
+</mythmenu>
+
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable/mythtv/menu-xml/update.xml
new file mode 100644
index 0000000..5b28833
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/update.xml
@@ -0,0 +1,20 @@
+<mythmenu name="LinHES">
+
+ <button>
+ <type>UPGRADE</type>
+ <text>Check for updates?</text>
+ <action>NONE</action>
+ </button>
+
+ <button>
+ <type>UPGRADE</type>
+ <text>Yes</text>
+ <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action>
+ </button>
+
+ <button>
+ <type>UPGRADE</type>
+ <text>No</text>
+ <action>UPMENU</action>
+ </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable/mythtv/menu-xml/update2.xml
new file mode 100644
index 0000000..2ab82ea
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/update2.xml
@@ -0,0 +1,26 @@
+<mythmenu name="LinHES">
+
+ <button>
+ <type>UPGRADE</type>
+ <text>Perform updates?</text>
+ <action>NONE</action>
+ </button>
+
+ <button>
+ <type>UPGRADE</type>
+ <text>Yes</text>
+ <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action>
+ </button>
+
+ <button>
+ <type>UPGRADE</type>
+ <text>No</text>
+ <action>UPMENU</action>
+ </button>
+
+ <button>
+ <type>UPGRADE</type>
+ <text>View files to be upgraded.</text>
+ <action>EXEC sudo /usr/LH/bin/linhes_update3.sh</action>
+ </button>
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/util_menu.xml.patch b/abs/core/mythtv/stable/mythtv/menu-xml/util_menu.xml.patch
new file mode 100644
index 0000000..26ac863
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/util_menu.xml.patch
@@ -0,0 +1,17 @@
+--- util_menu.xml.orig 2009-01-09 02:45:07.000000000 +0000
++++ util_menu.xml 2009-01-22 08:04:28.000000000 +0000
+@@ -76,7 +76,13 @@
+ <action>PLUGIN mythcontrols</action>
+ <depends>mythcontrols</depends>
+ </button>
+-
++
++ <button>
++ <type>VIDEO_SCREENSHOOTER</type>
++ <text>Thumbnail Generator</text>
++ <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
++ </button>
++
+ <button>
+ <type>SETUP_MENU</type>
+ <text>Setup</text>
diff --git a/abs/core/mythtv/stable/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/stable/mythtv/menu-xml/xmmenu.xml
new file mode 100644
index 0000000..6b26d11
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/menu-xml/xmmenu.xml
@@ -0,0 +1,574 @@
+<!-- Current as of April 25, 2007 -->
+<mythmenu name="XM">
+
+ <button>
+ <type>MUSIC</type>
+ <text>The '40s</text>
+ <action>EXEC /usr/bin/xamp kill 4</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The '50s</text>
+ <action>EXEC /usr/bin/xamp kill 5</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The '60s</text>
+ <action>EXEC /usr/bin/xamp kill 6</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The '70s</text>
+ <action>EXEC /usr/bin/xamp kill 7</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The '80s</text>
+ <action>EXEC /usr/bin/xamp kill 8</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The '90s</text>
+ <action>EXEC /usr/bin/xamp kill 9</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>America</text>
+ <action>EXEC /usr/bin/xamp kill 10</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>X Country</text>
+ <action>EXEC /usr/bin/xamp kill 12</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Willie's Place</text>
+ <action>EXEC /usr/bin/xamp kill 13</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Bluegrass Junction</text>
+ <action>EXEC /usr/bin/xamp kill 14</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Village</text>
+ <action>EXEC /usr/bin/xamp kill 15</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Highway 16</text>
+ <action>EXEC /usr/bin/xamp kill 16</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>US Country</text>
+ <action>EXEC /usr/bin/xamp kill 17</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>20 on 20</text>
+ <action>EXEC /usr/bin/xamp kill 20</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Heart</text>
+ <action>EXEC /usr/bin/xamp kill 23</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Blend</text>
+ <action>EXEC /usr/bin/xamp kill 25</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Flight 26</text>
+ <action>EXEC /usr/bin/xamp kill 26</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Cinemagic</text>
+ <action>EXEC /usr/bin/xamp kill 27</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>On Broadway</text>
+ <action>EXEC /usr/bin/xamp kill 28</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>U-Pop</text>
+ <action>EXEC /usr/bin/xamp kill 29</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Hitlist</text>
+ <action>EXEC /usr/bin/xamp kill 30</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Torch</text>
+ <action>EXEC /usr/bin/xamp kill 31</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Message</text>
+ <action>EXEC /usr/bin/xamp kill 32</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Spirit</text>
+ <action>EXEC /usr/bin/xamp kill 33</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>enLighten</text>
+ <action>EXEC /usr/bin/xamp kill 34</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Deep Tracks</text>
+ <action>EXEC /usr/bin/xamp kill 40</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Boneyard</text>
+ <action>EXEC /usr/bin/xamp kill 41</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Liquid Metal</text>
+ <action>EXEC /usr/bin/xamp kill 42</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XMU</text>
+ <action>EXEC /usr/bin/xamp kill 43</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Fred</text>
+ <action>EXEC /usr/bin/xamp kill 44</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Cafe</text>
+ <action>EXEC /usr/bin/xamp kill 45</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Top Tracks</text>
+ <action>EXEC /usr/bin/xamp kill 46</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Ethel</text>
+ <action>EXEC /usr/bin/xamp kill 47</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Squizz</text>
+ <action>EXEC /usr/bin/xamp kill 48</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Big Tracks</text>
+ <action>EXEC /usr/bin/xamp kill 49</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Loft</text>
+ <action>EXEC /usr/bin/xamp kill 50</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Music Lab</text>
+ <action>EXEC /usr/bin/xamp kill 51</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Verge</text>
+ <action>EXEC /usr/bin/xamp kill 52</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Fungus</text>
+ <action>EXEC /usr/bin/xamp kill 53</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Lucy</text>
+ <action>EXEC /usr/bin/xamp kill 54</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Soul Street</text>
+ <action>EXEC /usr/bin/xamp kill 60</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Flow</text>
+ <action>EXEC /usr/bin/xamp kill 61</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Suite 62</text>
+ <action>EXEC /usr/bin/xamp kill 62</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Groove</text>
+ <action>EXEC /usr/bin/xamp kill 64</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Rhyme</text>
+ <action>EXEC /usr/bin/xamp kill 65</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>RAW</text>
+ <action>EXEC /usr/bin/xamp kill 66</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The City</text>
+ <action>EXEC /usr/bin/xamp kill 67</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Heat</text>
+ <action>EXEC /usr/bin/xamp kill 68</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Real Jazz</text>
+ <action>EXEC /usr/bin/xamp kill 70</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Watercolors</text>
+ <action>EXEC /usr/bin/xamp kill 71</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Beyond Jazz</text>
+ <action>EXEC /usr/bin/xamp kill 72</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>High Standards</text>
+ <action>EXEC /usr/bin/xamp kill 73</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Bluesville</text>
+ <action>EXEC /usr/bin/xamp kill 74</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Hear Music</text>
+ <action>EXEC /usr/bin/xamp kill 75</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Fine Tuning</text>
+ <action>EXEC /usr/bin/xamp kill 76</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Audio Visions</text>
+ <action>EXEC /usr/bin/xamp kill 77</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Escape</text>
+ <action>EXEC /usr/bin/xamp kill 78</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>On The Rocks</text>
+ <action>EXEC /usr/bin/xamp kill 79</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Move</text>
+ <action>EXEC /usr/bin/xamp kill 80</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>BPM</text>
+ <action>EXEC /usr/bin/xamp kill 81</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The System</text>
+ <action>EXEC /usr/bin/xamp kill 82</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Chrome</text>
+ <action>EXEC /usr/bin/xamp kill 83</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM-Chill</text>
+ <action>EXEC /usr/bin/xamp kill 84</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Fuego</text>
+ <action>EXEC /usr/bin/xamp kill 90</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Viva</text>
+ <action>EXEC /usr/bin/xamp kill 91</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Aguila</text>
+ <action>EXEC /usr/bin/xamp kill 92</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Caliente</text>
+ <action>EXEC /usr/bin/xamp kill 94</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Luna</text>
+ <action>EXEC /usr/bin/xamp kill 95</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Air Musique</text>
+ <action>EXEC /usr/bin/xamp kill 100</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Joint</text>
+ <action>EXEC /usr/bin/xamp kill 101</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Sur La Route</text>
+ <action>EXEC /usr/bin/xamp kill 102</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>World Zone</text>
+ <action>EXEC /usr/bin/xamp kill 103</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Ngoma</text>
+ <action>EXEC /usr/bin/xamp kill 104</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Classics</text>
+ <action>EXEC /usr/bin/xamp kill 110</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Vox</text>
+ <action>EXEC /usr/bin/xamp kill 112</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Pops</text>
+ <action>EXEC /usr/bin/xamp kill 113</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Kids</text>
+ <action>EXEC /usr/bin/xamp kill 116</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Bob Edwards Show</text>
+ <action>EXEC /usr/bin/xamp kill 133</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>XM Comedy</text>
+ <action>EXEC /usr/bin/xamp kill 150</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Laugh USA</text>
+ <action>EXEC /usr/bin/xamp kill 151</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Special X</text>
+ <action>EXEC /usr/bin/xamp kill 154</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Agenda</text>
+ <action>EXEC /usr/bin/xamp kill 134</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Oprah and Friends</text>
+ <action>EXEC /usr/bin/xamp kill 156</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>The Virus</text>
+ <action>EXEC /usr/bin/xamp kill 202</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>1 Hit Wonders</text>
+ <action>EXEC /usr/bin/xamp kill 300</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Metalcore</text>
+ <action>EXEC /usr/bin/xamp kill 301</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>New Indie First</text>
+ <action>EXEC /usr/bin/xamp kill 302</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Late Night Mix</text>
+ <action>EXEC /usr/bin/xamp kill 303</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Sessions@AOL</text>
+ <action>EXEC /usr/bin/xamp kill 304</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>Shuffle</text>
+ <action>EXEC /usr/bin/xamp kill 305</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>New Rock First</text>
+ <action>EXEC /usr/bin/xamp kill 306</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>New Country First</text>
+ <action>EXEC /usr/bin/xamp kill 307</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>New Hip Hop First</text>
+ <action>EXEC /usr/bin/xamp kill 308</action>
+ </button>
+
+ <button>
+ <type>MUSIC</type>
+ <text>New Pop First</text>
+ <action>EXEC /usr/bin/xamp kill 309</action>
+ </button>
+
+ <button>
+ <type>TV_DELETE</type>
+ <text>Stop Listening</text>
+ <action>EXEC /usr/bin/xamp kill</action>
+ </button>
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable/mythtv/mpegpspatch b/abs/core/mythtv/stable/mythtv/mpegpspatch
new file mode 100644
index 0000000..eed08eb
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/mpegpspatch
@@ -0,0 +1,66 @@
+--- orig_mpeg.c 2009-03-23 11:26:22.000000000 -0700
++++ mpeg.c 2009-03-23 11:28:09.000000000 -0700
+@@ -66,35 +66,40 @@
+
+ static int mpegps_probe(AVProbeData *p)
+ {
++ uint32_t code= -1;
++ int sys=0, pspack=0, priv1=0, vid=0, audio=0, invalid=0;
+ int i;
+- int size= FFMIN(2048, p->buf_size);
+- uint32_t code=0xFF;
++ int score=0;
+
+- /* we search the first start code. If it is a packet start code,
+- then we decide it is mpeg ps. We do not send highest value to
+- give a chance to mpegts */
+- /* NOTE: the search range was restricted to avoid too many false
+- detections */
+-
+- for (i = 0; i < size; i++) {
+- code = (code << 8) | p->buf[i];
++ for(i=0; i<p->buf_size; i++){
++ code = (code<<8) + p->buf[i];
+ if ((code & 0xffffff00) == 0x100) {
+- if (code == PACK_START_CODE ||
+- code == SYSTEM_HEADER_START_CODE ||
+- (code >= 0x1e0 && code <= 0x1ef) ||
+- (code >= 0x1c0 && code <= 0x1df) ||
+- code == PRIVATE_STREAM_2 ||
+- code == PROGRAM_STREAM_MAP ||
+- code == PRIVATE_STREAM_1 ||
+- code == PADDING_STREAM ||
+- code >= 0x100 && code <= 0x1b0)
+- return AVPROBE_SCORE_MAX - 2;
+- else
+- return 0;
++ int pes= check_pes(p->buf+i, p->buf+p->buf_size);
++
++ if(code == SYSTEM_HEADER_START_CODE) sys++;
++ else if(code == PRIVATE_STREAM_1) priv1++;
++ else if(code == PACK_START_CODE) pspack++;
++ else if((code & 0xf0) == VIDEO_ID && pes) vid++;
++ else if((code & 0xe0) == AUDIO_ID && pes) audio++;
++
++ else if((code & 0xf0) == VIDEO_ID && !pes) invalid++;
++ else if((code & 0xe0) == AUDIO_ID && !pes) invalid++;
+ }
+ }
+
+- return 0;
++ if(vid+audio > invalid) /* invalid VDR files nd short PES streams */
++ score= AVPROBE_SCORE_MAX/4;
++
++//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
++ if(sys>invalid && sys*9 <= pspack*10)
++ return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
++ if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10)
++ return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
++ if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
++ return AVPROBE_SCORE_MAX/2+2;
++
++ //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
++ return score;
+ }
+
+ typedef struct MpegDemuxContext {
diff --git a/abs/core/mythtv/stable/mythtv/mythbackend.lr b/abs/core/mythtv/stable/mythtv/mythbackend.lr
new file mode 100644
index 0000000..4f218bc
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/mythbackend.lr
@@ -0,0 +1,9 @@
+/var/log/mythtv/mythbackend.log {
+ copytruncate
+ daily
+ size 10M
+ missingok
+ rotate 7
+ compress
+ notifempty
+}
diff --git a/abs/core/mythtv/stable/mythtv/mythfrontend.lr b/abs/core/mythtv/stable/mythtv/mythfrontend.lr
new file mode 100644
index 0000000..1580533
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/mythfrontend.lr
@@ -0,0 +1,9 @@
+/var/log/mythtv/mythfrontend.log {
+ copytruncate
+ daily
+ size 10M
+ missingok
+ rotate 7
+ compress
+ notifempty
+}
diff --git a/abs/core/mythtv/stable/mythtv/myththemedmenu.cpp.patch b/abs/core/mythtv/stable/mythtv/myththemedmenu.cpp.patch
new file mode 100644
index 0000000..e5c57ef
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/myththemedmenu.cpp.patch
@@ -0,0 +1,125 @@
+--- libs/libmythui/myththemedmenu.cpp.orig 2008-01-31 15:26:38.000000000 +0000
++++ libs/libmythui/myththemedmenu.cpp 2008-02-07 22:24:27.000000000 +0000
+@@ -2102,6 +2102,10 @@
+ }
+ lastbutton = NULL;
+ }
++ else if (action == "MENU")
++ {
++ parent->doMenu();
++ }
+ else if (action == "EJECT")
+ {
+ myth_eject();
+@@ -2482,6 +2486,8 @@
+
+ if (d->foundtheme)
+ d->parseMenu(menufile);
++
++ m_menuPopup = NULL;
+ }
+
+ MythThemedMenu::~MythThemedMenu(void)
+@@ -2592,3 +2598,102 @@
+ MythScreenType::aboutToShow();
+ d->updateLCD();
+ }
++void MythThemedMenu::doMenu()
++{
++ int allowsd = gContext->GetNumSetting("AllowQuitShutdown");
++ if (m_menuPopup)
++ return;
++ QString label = "System Menu";
++ MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
++ m_menuPopup = new MythDialogBox(label, mainStack, "menuPopup");
++ if (m_menuPopup->Create())
++ mainStack->AddScreen(m_menuPopup);
++
++ //changed line to always show shutdown/reboot
++ if ( allowsd != 10 && allowsd !=14 )
++ {
++ m_menuPopup->SetReturnEvent(this,"popmenu_exit");
++ m_menuPopup->AddButton("Power off");
++ m_menuPopup->AddButton("Reboot");
++ m_menuPopup->AddButton("About");
++ m_menuPopup->AddButton("Cancel");
++ }
++ else
++ {
++ m_menuPopup->SetReturnEvent(this,"popmenu_noexit");
++ m_menuPopup->AddButton("About");
++ m_menuPopup->AddButton("Cancel");
++ }
++}
++
++void MythThemedMenu::aboutScreen()
++{
++{
++ extern const char *myth_source_version;
++ extern const char *myth_source_path;
++ QString distro_line;
++ distro_line="";
++
++ QFile file("/etc/os_myth_release");
++ if ( file.open(IO_ReadOnly | IO_Translate) )
++ {
++ QTextStream t( &file ); // use a text stream
++ distro_line = t.readLine();
++ file.close();
++ }
++
++ QString label = "";
++ label.append(QObject::tr("Revision: ") + myth_source_version + " \n Branch:" + myth_source_path + "\n" + distro_line );
++
++ MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
++ m_menuPopup = new MythDialogBox(label, mainStack, "About");
++ if (m_menuPopup->Create())
++ mainStack->AddScreen(m_menuPopup);
++
++ m_menuPopup->SetReturnEvent(this,"About");
++ m_menuPopup->AddButton("OK!");
++ }
++}
++
++void MythThemedMenu::customEvent(QCustomEvent *event)
++{
++ if (event->type() == kMythDialogBoxCompletionEventType)
++ {
++ DialogCompletionEvent *dce =
++ dynamic_cast<DialogCompletionEvent*>(event);
++
++ QString resultid= dce->GetId();
++ int buttonnum = dce->GetResult();
++ if (resultid == "popmenu_exit")
++ {
++ if (buttonnum == 0)
++ {
++ QString halt_cmd = gContext->GetSetting("HaltCommand",
++ "sudo /sbin/halt -p");
++ if (!halt_cmd.isEmpty())
++ system(halt_cmd.ascii());
++ }
++
++ if (buttonnum == 1)
++ {
++ QString reboot_cmd = gContext->GetSetting("RebootCommand",
++ "sudo /sbin/reboot");
++ if (!reboot_cmd.isEmpty())
++ system(reboot_cmd.ascii());
++ }
++
++ if (buttonnum == 2)
++ {
++ aboutScreen();
++ }
++ }
++
++ if (resultid == "popmenu_noexit")
++ {
++ if (buttonnum == 0)
++ aboutScreen();
++ }
++
++ m_menuPopup = NULL;
++ }
++}
diff --git a/abs/core/mythtv/stable/mythtv/myththemedmenu.h.patch b/abs/core/mythtv/stable/mythtv/myththemedmenu.h.patch
new file mode 100644
index 0000000..9744b11
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/myththemedmenu.h.patch
@@ -0,0 +1,25 @@
+--- libs/libmythui/myththemedmenu.h.orig 2008-01-31 15:26:45.000000000 +0000
++++ libs/libmythui/myththemedmenu.h 2008-02-07 21:00:22.000000000 +0000
+@@ -2,6 +2,7 @@
+ #define MYTHTHEMEDMENU_H_
+
+ #include "mythscreentype.h"
++#include "mythdialogbox.h"
+
+ class MythMainWindow;
+ class MythThemedMenuPrivate;
+@@ -26,8 +27,14 @@
+
+ void ReloadTheme(void);
+ void ReloadExitKey(void);
++
+ virtual void aboutToShow(void);
+
++ void doMenu();
++ void aboutScreen();
++ MythDialogBox *m_menuPopup;
++ void customEvent(QCustomEvent *event);
++
+ protected:
+ virtual bool keyPressEvent(QKeyEvent *e);
+ virtual void gestureEvent(MythUIType *origtype, MythGestureEvent *ge);
diff --git a/abs/core/mythtv/stable/mythtv/mythtv.install b/abs/core/mythtv/stable/mythtv/mythtv.install
index c460f19..db1da94 100644
--- a/abs/core/mythtv/stable/mythtv/mythtv.install
+++ b/abs/core/mythtv/stable/mythtv/mythtv.install
@@ -1,11 +1,53 @@
# arg 1: the new package version
post_install() {
- echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
+ if [ ! -d /var/log/mythtv ]
+ then
+ mkdir -p /var/log/mythv
+ chown -R mythtv /var/log/mythtv
+ echo "---" > /var/log/mythtv/mythbackend.log
+ chown mythtv /var/log/mythtv/mythbackend.log
+ fi
+ if [ -e /tmp/is.xml ]
+ then
+ cp /tmp/is.xml /usr/share/mythtv/is.xml
+ fi
+
+ if [ -e /tmp/media_settings.xml ]
+ then
+ cp /tmp/media_settings.xml /usr/share/mythtv/media_settings.xml
+ fi
+}
+pre_upgrade() {
+ if [ -e /usr/share/mythtv/is.xml ]
+ then
+ cp /usr/share/mythtv/is.xml /tmp
+ fi
+
+ if [ -e /usr/share/mythtv/media_settings.xml ]
+ then
+ cp /usr/share/mythtv/media_settings.xml /tmp
+ fi
+}
+
+post_upgrade() {
+ cp /tmp/is.xml /usr/share/mythtv/
+ cp /tmp/media_settings.xml /usr/share/mythtv/
+ if [ ! -d /var/log/mythtv ]
+ then
+ mkdir -p /var/log/mythv
+ chown -R mythtv /var/log/mythtv
+ fi
+ chown root.mythtv /etc/systemconfig
+ chmod 664 /etc/systemconfig
+}
+pre_remove () {
+ pre_upgrade
}
# arg 1: the old package version
post_remove() {
- echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
+ /bin/true
+
}
op=$1
diff --git a/abs/core/mythtv/stable/mythtv/pretty b/abs/core/mythtv/stable/mythtv/pretty
new file mode 100644
index 0000000..e47aaec
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/pretty
@@ -0,0 +1,2 @@
+#!/bin/bash
+su mythtv -c "perl /usr/share/mythtv/contrib/mythrename.pl --link /myth/pretty"
diff --git a/abs/core/mythtv/stable/mythtv/smolt_jump.patch b/abs/core/mythtv/stable/mythtv/smolt_jump.patch
new file mode 100644
index 0000000..696be80
--- /dev/null
+++ b/abs/core/mythtv/stable/mythtv/smolt_jump.patch
@@ -0,0 +1,9 @@
+--- programs/mythfrontend/networkcontrol.cpp.orig 2008-03-23 23:00:25.000000000 +0000
++++ programs/mythfrontend/networkcontrol.cpp 2008-03-23 23:01:33.000000000 +0000
+@@ -81,6 +81,7 @@
+ jumpMap["zoneminderliveview"] = "ZoneMinder Live View";
+ jumpMap["zoneminderevents"] = "ZoneMinder Events";
++ jumpMap["mythsmolt"] = "MythSmolt";
+
+ // These jump point names match the (lowercased) locations from gContext
+ jumpMap["channelrecpriority"] = "Channel Recording Priorities";
diff --git a/abs/core/mythtv/stable/mythvideo/PKGBUILD b/abs/core/mythtv/stable/mythvideo/PKGBUILD
index 21f2a22..a233549 100644
--- a/abs/core/mythtv/stable/mythvideo/PKGBUILD
+++ b/abs/core/mythtv/stable/mythvideo/PKGBUILD
@@ -4,20 +4,24 @@
pkgname=mythvideo
pkgver=0.21
-pkgrel=2
+pkgrel=9
pkgdesc="Video playback and browsing plugin for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}" 'mplayer' 'perlxml' 'perl-libwww' 'perl-uri' 'perl-xml-simple' 'ffmpeg')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2"\
- mtd)
-md5sums=('af20a78ac66719feddf9a39f1a799ded' '476c12ba074794ad7f4ae092bdf949d6')
+ "ftp://ftp.knoppmyth.net/R6/sources/tmdb.tar.bz2" \
+ mtd mythvideo-6338-use_tmdb_in_fixes.patch)
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe' '48cff8f7095586c85ec70989746736b4' '476c12ba074794ad7f4ae092bdf949d6' '4bd38d054dfc4b0b1724f398d38676f7')
replaces=('mythdvd')
groups=('mythtv-extras')
+install=mythvideo.install
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
+ svn update
+ patch -p1 < ../mythvideo-6338-use_tmdb_in_fixes.patch
. /etc/profile.d/qt3.sh
# use QT3 qmake
@@ -31,6 +35,7 @@ build() {
make INSTALL_ROOT=$startdir/pkg install
install -D -m755 ../mtd $startdir/pkg/etc/rc.d/mtd
+ cp -Rv $startdir/src/tmdb/* $startdir/pkg/usr/share/mythtv/mythvideo/scripts/
}
diff --git a/abs/core/mythtv/stable/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch b/abs/core/mythtv/stable/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch
new file mode 100644
index 0000000..a5a182d
--- /dev/null
+++ b/abs/core/mythtv/stable/mythvideo/mythvideo-6338-use_tmdb_in_fixes.patch
@@ -0,0 +1,151 @@
+Index: mythplugins/mythvideo/mythvideo/videomanager.cpp
+===================================================================
+--- mythplugins.orig/mythvideo/mythvideo/videomanager.cpp 2009-03-09 22:39:40.000000000 -0400
++++ mythplugins/mythvideo/mythvideo/videomanager.cpp 2009-03-09 23:04:55.000000000 -0400
+@@ -1535,6 +1535,56 @@
+ }
+ }
+
++ // Since there's no DB update to remove imdb.pl settings in -fixes,
++ // check for the old imdb.pl command and, if it's the old default,
++ // use tmdb.pl, instead (if available in the same location or the
++ // scripts dir)). Checks to see if cmd ends with end (the end of the
++ // old default imdb.pl command line). If so, it checks for tmdb, and
++ // if it exists in either the same location as specified in cmd or in
++ // the MythVideo scripts directory, replace end with "/tmdb.pl " + arg
++ QString UpdateCommandForTMDB(const QString cmd, const QString end,
++ const QString arg)
++ {
++ QString updated_cmd = cmd;
++ if (updated_cmd.endsWith(end))
++ {
++ QString script_path = updated_cmd;
++ script_path.truncate(updated_cmd.findRev(end,
++ 0 - end.length()));
++ QString tmdb_path(script_path + "/tmdb.pl");
++ if (QFile::exists(tmdb_path))
++ {
++ VERBOSE(VB_GENERAL, QString("Overriding old default "
++ "grabber script command line. "
++ "Using tmdb.pl, instead."));
++ updated_cmd = tmdb_path + " " + arg;
++ }
++ else
++ {
++ // It's possible the user has a non-default imdb.pl
++ // command-line--including path location--in the setting,
++ // so check to see if we've already checked the mythvideo
++ // scripts directory
++ QString def_path = QDir::cleanDirPath(QString("%1/%2")
++ .arg(gContext->GetShareDir())
++ .arg("mythvideo/scripts"));
++ if (script_path != def_path)
++ {
++ tmdb_path = def_path + "/tmdb.pl";
++ if (QFile::exists(tmdb_path))
++ {
++ VERBOSE(VB_GENERAL, QString("Overriding old "
++ "default grabber script command line. "
++ "Using tmdb.pl, instead."));
++ updated_cmd = tmdb_path + " " + arg;
++ }
++ }
++ }
++ }
++
++ return updated_cmd;
++ }
++
+ virtual void OnExecDone(bool normal_exit, const QStringList &out,
+ const QStringList &err) = 0;
+
+@@ -1624,9 +1674,16 @@
+
+ QString def_cmd = QDir::cleanDirPath(QString("%1/%2")
+ .arg(gContext->GetShareDir())
+- .arg("mythvideo/scripts/imdb.pl -M tv=no;video=no"));
++ .arg("mythvideo/scripts/tmdb.pl -M"));
+
+- QString cmd = gContext->GetSetting("MovieListCommandLine", def_cmd);
++ // Since there's no DB update to remove imdb.pl settings in -fixes,
++ // check for the old imdb.pl command and, if it's the old default,
++ // use tmdb.pl, instead (if available in the same location or the
++ // scripts dir))
++ QString cmd = UpdateCommandForTMDB(
++ gContext->GetSetting("MovieListCommandLine",
++ def_cmd),
++ "/imdb.pl -M tv=no;video=no", "-M");
+
+ QStringList args;
+ args += title;
+@@ -1682,9 +1739,15 @@
+
+ const QString def_cmd = QDir::cleanDirPath(QString("%1/%2")
+ .arg(gContext->GetShareDir())
+- .arg("mythvideo/scripts/imdb.pl -D"));
+- const QString cmd = gContext->GetSetting("MovieDataCommandLine",
+- def_cmd);
++ .arg("mythvideo/scripts/tmdb.pl -D"));
++ // Since there's no DB update to remove imdb.pl settings in -fixes,
++ // check for the old imdb.pl command and, if it's the old default,
++ // use tmdb.pl, instead (if available in the same location or the
++ // scripts dir))
++ const QString cmd = UpdateCommandForTMDB(
++ gContext->GetSetting("MovieDataCommandLine",
++ def_cmd),
++ "/imdb.pl -D", "-D");
+
+ StartRun(cmd, video_uid, "Video Data Query");
+ }
+@@ -1726,9 +1789,16 @@
+ const QString default_cmd =
+ QDir::cleanDirPath(QString("%1/%2")
+ .arg(gContext->GetShareDir())
+- .arg("mythvideo/scripts/imdb.pl -P"));
+- const QString cmd = gContext->GetSetting("MoviePosterCommandLine",
+- default_cmd);
++ .arg("mythvideo/scripts/tmdb.pl -P"));
++ // Since there's no DB update to remove imdb.pl settings in -fixes,
++ // check for the old imdb.pl command and, if it's the old default,
++ // use tmdb.pl, instead (if available in the same location or the
++ // scripts dir))
++ const QString cmd = UpdateCommandForTMDB(
++ gContext->GetSetting("MoviePosterCommandLine",
++ default_cmd),
++ "/imdb.pl -P", "-P");
++
+ StartRun(cmd, video_uid, "Poster Query");
+ }
+
+Index: mythplugins/mythvideo/mythvideo/globalsettings.cpp
+===================================================================
+--- mythplugins.orig/mythvideo/mythvideo/globalsettings.cpp 2009-03-09 22:39:40.000000000 -0400
++++ mythplugins/mythvideo/mythvideo/globalsettings.cpp 2009-03-09 22:42:47.000000000 -0400
+@@ -210,8 +210,7 @@
+ {
+ HostLineEdit *gc = new HostLineEdit("MovieListCommandLine");
+ gc->setLabel(QObject::tr("Command to search for movie listings"));
+- gc->setValue(gContext->GetShareDir() + "mythvideo/scripts/imdb.pl " +
+- "-M tv=no;video=no");
++ gc->setValue(gContext->GetShareDir() + "mythvideo/scripts/tmdb.pl -M");
+ gc->setHelpText(QObject::tr("This command must be "
+ "executable by the user running MythVideo."));
+ return gc;
+@@ -221,7 +220,7 @@
+ {
+ HostLineEdit *gc = new HostLineEdit("MoviePosterCommandLine");
+ gc->setLabel(QObject::tr("Command to search for movie posters"));
+- gc->setValue(gContext->GetShareDir() + "mythvideo/scripts/imdb.pl -P");
++ gc->setValue(gContext->GetShareDir() + "mythvideo/scripts/tmdb.pl -P");
+ gc->setHelpText(QObject::tr("This command must be "
+ "executable by the user running MythVideo."));
+ return gc;
+@@ -231,7 +230,7 @@
+ {
+ HostLineEdit *gc = new HostLineEdit("MovieDataCommandLine");
+ gc->setLabel(QObject::tr("Command to extract data for movies"));
+- gc->setValue(gContext->GetShareDir() + "mythvideo/scripts/imdb.pl -D");
++ gc->setValue(gContext->GetShareDir() + "mythvideo/scripts/tmdb.pl -D");
+ gc->setHelpText(QObject::tr("This command must be "
+ "executable by the user running MythVideo."));
+ return gc;
diff --git a/abs/core/mythtv/stable/mythvideo/mythvideo.install b/abs/core/mythtv/stable/mythvideo/mythvideo.install
new file mode 100644
index 0000000..a06777d
--- /dev/null
+++ b/abs/core/mythtv/stable/mythvideo/mythvideo.install
@@ -0,0 +1,20 @@
+# arg 1: the new package version
+post_install() {
+ ln -s /myth/video /data/srv/httpd/htdocs/mythweb/data/video
+ ln -s /myth/video/.covers /data/srv/httpd/htdocs/mythweb/data/video_covers
+}
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ /bin/true
+}
+
+# arg 1: the old package version
+post_remove() {
+ rm -fr /data/srv/httpd/htdocs/mythweb/data/video
+ rm -fr /data/srv/httpd/htdocs/mythweb/data/video_covers
+}
+
+op=$1
+shift
+$op $*
diff --git a/abs/core/mythtv/stable/mythweather/PKGBUILD b/abs/core/mythtv/stable/mythweather/PKGBUILD
index ce2894a..201ea5d 100644
--- a/abs/core/mythtv/stable/mythweather/PKGBUILD
+++ b/abs/core/mythtv/stable/mythweather/PKGBUILD
@@ -4,18 +4,18 @@
pkgname=mythweather
pkgver=0.21
-pkgrel=1
+pkgrel=3
pkgdesc="Weather checking plugin for MythTV"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
depends=("mythtv>=${pkgver}" 'wget')
source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
build() {
- cd $startdir/src/mythplugins-${pkgver}
+ cd $startdir/src/mythplugins
. /etc/profile.d/qt3.sh
# use QT3 qmake
diff --git a/abs/core/mythtv/stable/mythweb/PKGBUILD b/abs/core/mythtv/stable/mythweb/PKGBUILD
index e01323c..20e9e3d 100644
--- a/abs/core/mythtv/stable/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable/mythweb/PKGBUILD
@@ -1,27 +1,39 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Philipp Giebel <arch@ambience-design.net>
-
pkgname=mythweb
pkgver=0.21
-pkgrel=1
+pkgrel=20
pkgdesc="Web interface for MythTV's backend"
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
-depends=("mythtv>=${pkgver}" 'apache' 'php')
+depends=("mythtv>=${pkgver}" 'lighttpd' 'php' 'local-website')
install=mythweb.install
-source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
-md5sums=('af20a78ac66719feddf9a39f1a799ded')
+source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2" wiiweb.tar.bz2 transcoders.patch)
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
groups=('mythtv-extras')
+DOCROOT=/data/srv/httpd/htdocs/mythweb
build() {
- mkdir -p $startdir/pkg/srv/www/mythweb/{image_cache,php_sessions}
- cp -r $startdir/src/mythplugins-$pkgver/$pkgname/* $startdir/pkg/srv/www/mythweb
- cp $startdir/src/mythplugins-$pkgver/$pkgname/data/.htaccess $startdir/pkg/srv/www/mythweb
- rm $startdir/pkg/srv/www/mythweb/README
- chown -R nobody:nobody $startdir/pkg/srv/www/mythweb
- chmod g+rw $startdir/pkg/srv/www/mythweb/{image_cache,php_sessions,data}
+ cd $startdir/src/mythplugins/mythweb
+ svn update
+ mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions}
+#apply gallery patches here
+# cd $startdir/src/mythplugins-$pkgver/$pkgname/
+# patch -p0 < $startdir/patch/mythweb_gallery_updated1.diff
+# patch -p2 < $startdir/patch/2923-mythweb-gallery-English_GB_lang.diff
+# tar -zxvf $startdir/patch/icons.tar.gz
+###
+
+ # Workaround for LIGHTTPD bug in mythweb.pl (affects DB queries)
+ cd $startdir/src/mythplugins/$pkgname/
+ patch -p0 < $startdir/patch/mythweb.pl.diff
+ patch -p1 < $startdir/transcoders.patch
+
+ cp -r $startdir/src/mythplugins/$pkgname/* $startdir/pkg/$DOCROOT
+# cp $startdir/src/mythplugins-$pkgver/$pkgname/data/.htaccess $startdir/pkg/$DOCROOT
+ rm $startdir/pkg/srv/$DOCROOT/README
+ tar xjvf $srcdir/wiiweb.tar.bz2 -C $pkgdir/$DOCROOT
+ chown -R http:users $startdir/pkg/$DOCROOT
+ chmod g+rw $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data}
}
diff --git a/abs/core/mythtv/stable/mythweb/mythweb.install b/abs/core/mythtv/stable/mythweb/mythweb.install
index 470cbd1..a2aa1bd 100644
--- a/abs/core/mythtv/stable/mythweb/mythweb.install
+++ b/abs/core/mythtv/stable/mythweb/mythweb.install
@@ -1,10 +1,13 @@
post_install() {
- echo "You must create a symlink from /home/httpd/html/mythweb/video_dir"
- echo "to your MythTV recordings directory. Don't forget to change the"
- echo "permissions so that the webserver can read those files and create"
- echo "thumbnails."
+ if [ ! -e /data/srv/httpd/htdocs/mythweb/data/video ]
+ then
+ ln -s /myth/video /data/srv/httpd/htdocs/mythweb/data/video
+ fi
}
+post_upgrade(){
+ post_install $1
+}
op=$1
shift
$op $*
diff --git a/abs/core/mythtv/stable/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff b/abs/core/mythtv/stable/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff
new file mode 100644
index 0000000..103fb2f
--- /dev/null
+++ b/abs/core/mythtv/stable/mythweb/patch/2923-mythweb-gallery-English_GB_lang.diff
@@ -0,0 +1,102 @@
+Index: mythplugins/mythweb/modules/_shared/lang/English_GB.lang
+===================================================================
+--- mythplugins/mythweb/modules/_shared/lang/English_GB.lang (revision 16505)
++++ mythplugins/mythweb/modules/_shared/lang/English_GB.lang (working copy)
+@@ -154,6 +154,7 @@
+ "Current Conditions"
+ "Current Recording"
+ "Current recordings"
++"Current path"
+ "Currently Browsing: $1"
+ "Currently Recording: Edit"
+ "Custom"
+@@ -169,6 +170,7 @@
+ Deaf Signed
+ "Default"
+ "Default MythVideo View"
++"Default view size"
+ "Delete"
+ "delete"
+ "Delete $1"
+@@ -247,6 +249,8 @@
+ "freqid"
+ "Friday"
+ "Frontends"
++"Gallery"
++"Gallery image path"
+ "generic_date"
+ %a %b %e, %Y
+ "generic_time"
+@@ -270,12 +274,14 @@
+ "Hide"
+ "High"
+ "Home"
++"Horizontal screen resolution"
+ "Host"
+ "Hosted by"
+ "Hour"
+ "Hour Format"
+ "hue"
+ "Humidity"
++"Images per page"
+ "IMDB"
+ "IMDBTYPE"
+ "Inactive"
+@@ -334,6 +340,8 @@
+ "length"
+ "Length"
+ "Length (min)"
++"List of allowed image formats"
++"List of available view sizes"
+ "Listing &quot;Jump to&quot;"
+ "Listing Time Key"
+ "Listings"
+@@ -383,6 +391,7 @@
+ "mythvideo.sort_ignores_case"
+ "MythWeb"
+ "MythWeb Defaults"
++"MythWeb Gallery"
+ "MythWeb Global Defaults"
+ "MythWeb Session"
+ "MythWeb Skin"
+@@ -413,6 +422,7 @@
+ "Number of shows"
+ "Number of Songs"
+ "Number of timeslots"
++"of"
+ "Only display favourite channels"
+ "Only match commercial-free channels"
+ "Only match HD programs"
+@@ -429,6 +439,7 @@
+ "Past Month"
+ "Past Week"
+ "Past Year"
++"Path where the thumbnails are"
+ "Paused"
+ "Pending"
+ "People"
+@@ -688,6 +699,7 @@
+ "Subtitles Available"
+ "Sunday"
+ "Surround Sound"
++"Switch view mode"
+ "Tab"
+ "The requested recording schedule has been deleted."
+ "There are no items in this Playlist!"
+@@ -705,6 +717,7 @@
+ "Title Match"
+ "Title search"
+ "Title Search"
++"to"
+ "Today"
+ "Tomorrow"
+ "Too Many"
+@@ -791,6 +804,8 @@
+ "Wednesday"
+ "welcome: backend_log"
+ Show the server logs.
++"welcome: gallery"
++ Browse your picture collection.
+ "welcome: music"
+ Browse your music collection.
+ "welcome: remote"
diff --git a/abs/core/mythtv/stable/mythweb/patch/icons.tar.gz b/abs/core/mythtv/stable/mythweb/patch/icons.tar.gz
new file mode 100644
index 0000000..691d28e
--- /dev/null
+++ b/abs/core/mythtv/stable/mythweb/patch/icons.tar.gz
Binary files differ
diff --git a/abs/core/mythtv/stable/mythweb/patch/mythweb.pl.diff b/abs/core/mythtv/stable/mythweb/patch/mythweb.pl.diff
new file mode 100644
index 0000000..6dcbf99
--- /dev/null
+++ b/abs/core/mythtv/stable/mythweb/patch/mythweb.pl.diff
@@ -0,0 +1,23 @@
+*** mythweb-unpatched.pl 2009-06-02 14:55:24.011861459 -0400
+--- mythweb.pl 2009-06-02 14:56:24.386441304 -0400
+***************
+*** 49,57 ****
+
+ # Connect to the database
+ END { $dbh->disconnect() if ($dbh); }
+! our $dbh = DBI->connect("dbi:mysql:database=$ENV{'db_name'}:host=$ENV{'db_server'}",
+! $ENV{'db_login'},
+! $ENV{'db_password'});
+ unless ($dbh) {
+ print header(),
+ "Cannot connect to database: $!\n\n";
+--- 49,57 ----
+
+ # Connect to the database
+ END { $dbh->disconnect() if ($dbh); }
+! our $dbh = DBI->connect("dbi:mysql:database=$ENV{'DB_NAME'}:host=$ENV{'DB_SERVER'}",
+! $ENV{'DB_LOGIN'},
+! $ENV{'DB_PASSWORD'});
+ unless ($dbh) {
+ print header(),
+ "Cannot connect to database: $!\n\n";
diff --git a/abs/core/mythtv/stable/mythweb/patch/mythweb_gallery_updated1.diff b/abs/core/mythtv/stable/mythweb/patch/mythweb_gallery_updated1.diff
new file mode 100644
index 0000000..f683b17
--- /dev/null
+++ b/abs/core/mythtv/stable/mythweb/patch/mythweb_gallery_updated1.diff
@@ -0,0 +1,1657 @@
+diff -Naur ../mythweb-orig/modules/gallery/handler.php ./modules/gallery/handler.php
+--- ../mythweb-orig/modules/gallery/handler.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/handler.php 2007-08-20 22:33:02.000000000 -0400
+@@ -0,0 +1,35 @@
++<?php
++/**
++ * Handler for the Gallery module.
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/handler.php $
++ * @date $Date: 2006-12-19 09:17:33 +0100 (Di, 19 Dez 2006) $
++ * @version $Revision: 12295 $
++ * @author $Author: rsiebert $
++ * @license GPL
++ *
++ * @package MythWeb
++ * @subpackage MythGallery
++ *
++/**/
++
++// Load settings functions
++require_once 'includes/objects/Settings.php';
++
++// Load Gallery class
++require_once 'includes/objects/Gallery.php';
++
++// Load configuration
++loadGalleryConfig();
++
++// Create the gallery
++global $gallery;
++
++$gallery = new Gallery();
++
++// Print the gallery page template
++require_once tmpl_dir.'gallery.php';
++
++// Exit
++exit;
++
+diff -Naur ../mythweb-orig/modules/gallery/includes/objects/Gallery.php ./modules/gallery/includes/objects/Gallery.php
+--- ../mythweb-orig/modules/gallery/includes/objects/Gallery.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/includes/objects/Gallery.php 2007-08-20 22:27:02.000000000 -0400
+@@ -0,0 +1,608 @@
++<?php
++/**
++ * Gallery Functions for the Gallery module
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/tmpl/default/gallery.php $
++ * @date $Date: 2006-12-19 09:17:33 +0100 (Di, 19 Dez 2006) $
++ * @version $Revision: 12295 $
++ * @author $Author: xris $
++ * @license GPL
++ *
++ * @package MythWeb
++ *
++/**/
++
++class Gallery {
++
++ var $config;
++
++ function Gallery() {
++ // load default configuration
++ $this->config['image_path'] = $_SESSION['gallery']['image_path'];
++ $this->config['cache_path'] = $_SESSION['gallery']['cache_path'];
++ $this->config['default_viewsize'] = $_SESSION['gallery']['default_viewsize'];
++ $this->config['screen_width'] = $_SESSION['gallery']['screen_width'];
++ $this->config['viewsizes'] = $_SESSION['gallery']['viewsizes'];
++ $this->config['valid_image_files'] = $_SESSION['gallery']['valid_image_files'];
++
++ }
++
++ // =======================================================
++ function start() {
++
++ // the current selected directory where the cached images are stored
++ $current_path = $this->getCurrentImagePath();
++ // the path to the real images
++ $image_path = $this->config['image_path'];
++ // the filename of a selected image
++ $image_name = $this->getImageName();
++ // the current viewsize mode
++ $image_viewsize = $this->getImageViewSize();
++ // get the image index for the viewsize medium
++ $image_index = $this->getImageIndex();
++ // get the contents of the folders
++ $folderList = $this->getFolderList( $current_path );
++ // check what kind of images should be displayed
++ if ($image_viewsize == 'fullsize') {
++ // create the images if there are not yet in the directory
++ $this->makeImages( $current_path, $folderList, $image_viewsize, $image_index );
++ // display the big image
++ $this->showFullsizeImage( $current_path, $folderList, $image_index );
++ // there is nothing else to do
++ exit;
++ }
++ // show the horizontal navigation bar
++ $this->showGalleryHeader( $current_path, $image_viewsize, $image_index );
++ // check if the thumbnail directory is there, if not create it
++ $this->makeDirectory( $current_path );
++ // create the images if there are not yet in the directory
++ $this->makeImages( $current_path, $folderList, $image_viewsize, $image_index );
++ echo '<table width="100%" cellspacing="0" cellpadding="0">'."\n".
++ '<tr>'."\n".
++ '<td class="folder_navigation">'."\n";
++ $this->showFolderTree( $current_path, $folderList );
++ echo '</td>'."\n".
++ '<td class="image_listing">'."\n";
++ if ($this->onlyDirectoriesAvailable( $current_path, $folderList, $image_viewsize, $image_index ) == false ) {
++ echo '<table class="imagelist_and_navigation" cellspacing="0" cellpadding="0">'."\n".
++ '<tr>'."\n".
++ '<td>'."\n";
++ $this->showNavigation( $current_path, $folderList, $image_viewsize, $image_index );
++ echo '</td>'."\n".
++ '</tr>'."\n".
++ '<tr>'."\n".
++ '<td>'."\n";
++ $this->showImages( $current_path, $folderList, $image_viewsize, $image_index );
++ echo '</td>'."\n".
++ '</tr>'."\n".
++ '</tr>'."\n".
++ '</table>'."\n";
++ } else {
++ echo '&nbsp;';
++ }
++ echo '</td>'."\n".
++ '</tr>'."\n".
++ '</table>'."\n";
++ }
++
++ // =======================================================
++ function getViewSizesList() {
++ $viewsizesList = explode(';',preg_replace('/ /','',$this->config['viewsizes']));
++ return $viewsizesList;
++ }
++
++
++ // =======================================================
++ function getCurrentImagePath() {
++ switch ($_SERVER['REQUEST_METHOD']) {
++ case 'GET':
++ $current_path = stripslashes($_GET['path']);
++ break;
++ case 'POST':
++ $current_path = stripslashes($_POST['path']);
++ break;
++ }
++ if (!is_dir($current_path) ) {
++ $current_path = $this->config['image_path'];
++ }
++ return $current_path;
++ }
++
++ // =======================================================
++ function getImageViewSize() {
++ switch ($_SERVER['REQUEST_METHOD']) {
++ case 'GET':
++ $viewsize = stripslashes($_GET[viewsize]);
++ break;
++ case 'POST':
++ $viewsize = stripslashes($_POST[viewsize]);
++ break;
++ }
++ // check if the given viewsize is one of the viewsizes
++ // specified in the config. fullsize is also needed
++ if (isset($viewsize) &&
++ (($viewsize == 'fullsize') ||
++ in_array($viewsize, $this->getViewSizesList()))) {
++ return $viewsize;
++ } else {
++ return $this->config['default_viewsize'];
++ }
++ }
++
++ // =======================================================
++ function getImageName() {
++ switch ($_SERVER['REQUEST_METHOD']) {
++ case 'GET':
++ $image_name = $_GET['file'];
++ break;
++ case 'POST':
++ $image_name = $_POST['file'];
++ break;
++ }
++ return $image_name;
++ }
++
++ // =======================================================
++ function getImageIndex() {
++ if (isset($_GET['index']))
++ return $_GET['index'];
++ return 1;
++ }
++
++
++ // =======================================================
++ // displays the path of the choosen directories horizontally
++ // so one can navigate back
++ function showGalleryHeader( $current_path, $image_viewsize, $image_index ) {
++ echo '<table class="current_path_and_viewsize" cellspacing="0" cellpadding="0">'."\n".
++ '<tr>'."\n".
++ '<td class="current_path">'.
++ t('Current path').': ';
++ $folders = explode('/', $current_path);
++ for ($i=1; $i < count($folders); $i++) {
++ echo '<a class="header" href="'.root.'gallery/gallery.php?'.path.'=';
++ // show thefolders in the navigation bar
++ for ($j=1; $j <= $i; $j++) {
++ echo '/'.$folders[$j];
++ }
++ echo '&'.viewsize.'='.$this->getImageViewSize().'">'.
++ $folders[$i].'</a>'."\n";
++ // don't show the separators when there are no more subfolders
++ if ($i < (count($folders)-1)) {
++ echo ' / ';
++ }
++ }
++ // display the menu where one can shoose between small and medium images
++ echo '</td>'."\n".
++ '<td class="change_viewsize_text">'.
++ t('Switch view mode').':&nbsp;&nbsp;'.
++ '</td>'."\n".
++ '<form name="change_viewsize" method="post">'."\n".
++ '<td class="change_viewsize_selection">'."\n".
++ '<select class="change_viewsize" name="'.
++ viewsize.'" onChange="submit()" size="1">'."\n";
++ $viewsizesList = $this->getViewSizesList();
++ for ($i=0; $i < count($viewsizesList); $i++) {
++ echo '<option value="'.$viewsizesList[$i].'" ';
++ if ($this->getImageViewSize() == $viewsizesList[$i]) {
++ echo 'selected';
++ }
++ $str = strtr($viewsizesList[$i], ',','x');
++ echo '>'.$str.' '.t('Images per page').'</option>'."\n";
++ }
++ echo '</select>'."\n".
++ '<input type="hidden" name="'.index.'" value="'.$image_index.'">'.
++ '<input type="hidden" name="'.path.'" value="'.$current_path.'">';
++ echo '</td></form>'."\n".
++ '</tr>'."\n".
++ '</table>'."\n";
++ }
++
++ // =======================================================
++ function showFolderTree( $current_path, $folderList ) {
++
++ // dont go into the directory if there are not subdirs
++ if ($this->getFolderCount( $current_path, $folderList[$i]) == 0) {
++ $current_path = substr($current_path, 0, strrpos($current_path, '/'));
++ $folderList = $this->getFolderList( $current_path );
++ }
++ // displays the directory tree and the pictures
++ echo '<table class="folder_navigation" width="100%" cellspacing="0" cellpadding="0">'."\n".
++ '<tr>'."\n".
++ '<td>'."\n";
++ // display the directories
++ for ($i = 0; $i < count( $folderList ); $i++) {
++ // only display folders that are not hidden or special
++ if ((is_dir( $current_path.'/'.$folderList[$i] )) &&
++ ($folderList[$i] != '..')){
++ echo '<div class="folder_navigation" '.
++ 'onmouseover="this.className=\'folder_navigation_active\'" '.
++ 'onmouseout="this.className=\'folder_navigation\'">';
++ $link = $this->getFolderLink( $current_path, $folderList[$i] );
++ $folderCount = $this->getFolderCount( $current_path, $folderList[$i] );
++ // display the folder as a link and the number of subfolder next to it
++ $this->displayFolderLink( $link, $folderList[$i], $folderCount );
++ echo '</div>';
++ }
++ }
++ echo '</td>'."\n".
++ '</tr>'."\n".
++ '</table>'."\n";
++ }
++
++ // =======================================================
++ function getFolderList( $current_path ) {
++ if ($current_path != $this->config['cache_path'] ) {
++ $folderList[] = '..';
++ }
++ // get the image extensions
++ $extenstionList = explode(',',$this->config['valid_image_files']);
++ // get the directories and files
++ if ($dh = opendir($current_path)) {
++ while (($file = readdir($dh)) !== false) {
++ // only add the file/dir if its a directory or a file
++ // with the specified extension
++
++ if ((substr($file,0,1) != '.') &&
++ (is_dir($current_path.'/'.$file)) ||
++ (in_array(strtolower(substr($file,-3)), $extenstionList)))
++ {
++ $folderList[] = $file;
++ }
++ }
++ }
++ // delete the first entry when we are at the image_path
++ // to prevent from going a directory up
++ if ($current_path == $this->config['image_path'])
++ array_shift($folderList);
++ // sort the array alphabetically
++ sort($folderList);
++ return $folderList;
++ }
++
++ // =======================================================
++ function getFolderLink( $current_path, $folder ) {
++ $link = '<a class="folderlist" href="'.root.'gallery/gallery.php?'.path.'=';
++ // display the .. directory only if there is another
++ // directory above this one.
++ if (($folder == '..') && ($current_path != $this->config['cache_path'])) {
++ $folderList = explode( '/', $current_path.'/');
++ for( $i=1; $i < count($folderList)-2; $i++ ) {
++ $link .= '/'.$folderList[$i];
++ }
++ } else {
++ $link .= $current_path.'/'.$folder;
++ }
++ $link .= '&'.viewsize.'='.$this->getImageViewSize().'">';
++ return $link;
++ }
++
++ // =======================================================
++ function displayFolderLink( $link, $folder, $folderCount ) {
++ echo '<table class="folderlink_inactive" cellspacing="0" cellpadding="0">'.
++ '<tr>'.
++ '<td align="left" width="30px">'.
++ '<img class="navigation" src="'.root.skin_dir.'/img/gallery/dir.png">'.
++ '</td>'.
++ '<td align="left" width="auto">'.
++ $link.$folder.'</a>';
++ $this->displayFolderCount( $folderCount );
++ echo '</td>'.
++ '</tr>'.
++ '</table>'."\n";
++ }
++
++ // =======================================================
++ function getFolderCount($current_path, $folder) {
++ // dont get the folder count if its the .. directory
++ if ($folder != '..') {
++ return count(glob($current_path.'/'.$folder.'/*',GLOB_ONLYDIR));
++ }
++ }
++
++ // =======================================================
++ // shows how many sub directories the specified folder has
++ function displayFolderCount( $folderCount ) {
++ if ($folderCount == 1) {
++ echo ' ('.$folderCount.')';// '.t('subfolder');
++ }
++ if ($folderCount > 1) {
++ echo ' ('.$folderCount.')';// '.t('subfolders');
++ }
++ }
++
++
++ // =======================================================
++ // creates the directory for the thumbnails. the directory
++ // structure is identical to the one of original pictures
++ function makeDirectory( $current_path ) {
++ if (!file_exists( $this->config['cache_path'].$current_path )) {
++ // add the document root to the thumbnail directory
++ // because mkdir works with absolute paths
++ $cache_path = $_SERVER[DOCUMENT_ROOT].$this->config['cache_path'];
++ // split the directory string into separate directories
++ $folderList = explode( '/', $current_path );
++ // go through all folder and create each one
++ for($i=1; $i < count($folderList); $i++) {
++ $cache_path .= '/'.$folderList[$i];
++ // check if the directory is already there
++ if (!file_exists($cache_path)) {
++ mkdir ($cache_path);
++ }
++ }
++ }
++ }
++
++ // =======================================================
++ // check if the images are there, if not create them
++ function makeImages( $current_path, $folderList, $image_viewsize, $image_index ) {
++ $path = $_SERVER[DOCUMENT_ROOT].$this->config['cache_path'].$current_path;
++ // use the image_viewsize numbers as a prefix if fullsize is not requested
++ if ( $image_viewsize != fullsize ) {
++ // only so many images will be created that will be displayed on the screen
++ $max_cols = substr($image_viewsize, 0, 1);
++ $max_rows = substr($image_viewsize, 2, 1);
++ $max_number = ($max_cols * $max_rows);
++ // the prefix that will be added to a file so that
++ // different sizes have different names
++ $file_prefix = strtr($image_viewsize, ',','_').'_';
++ } else {
++ $max_number = 1;
++ // the prefix that will be added to a file so that
++ // different sizes have different names
++ $file_prefix = $image_viewsize.'_';
++ }
++ // get the amount of subfolders. increase the count in the loop by these
++ // subfolders
++ $folder_count = count(glob($current_path.'/'.$folder.'/*',GLOB_ONLYDIR));
++ for ($i = $image_index; $i < ($max_number + $image_index + $folder_count); $i++) {
++ // show the picture only if its not hidden and not a directory
++ if (!is_dir( $current_path.'/'.$folderList[$i] )) {
++ // check if there is already a thumbnail available, if not create it
++ if (!file_exists( $path.'/'.$file_prefix.$folderList[$i] )) {
++ // get the extension of the file
++ $fileParts = explode('.', $folderList[$i]);
++ $file_extension = strtolower($fileParts[count($fileParts)-1]);
++ // get image pointer
++ $image_p = null;
++ if ($file_extension == 'jpg')
++ $image_p = @imagecreatefromjpeg( $current_path.'/'.$folderList[$i] );
++ if ($file_extension == 'png')
++ $image_p = @imagecreatefrompng( $current_path.'/'.$folderList[$i] );
++ if ($file_extension == 'gif')
++ $image_p = @imagecreatefromgif( $current_path.'/'.$folderList[$i] );
++ // proceed if we have an image pointer
++ if ($image_p) {
++ // get the image size for the cached images
++ $size = getimagesize( $current_path.'/'.$folderList[$i]);
++ $width = $size[0];
++ $height = $size[1];
++ // get the width for the choosen viewsize
++ // calculate it from the columns and rows if fullsize is not
++ // requested, otherwise use the original image size
++ if ( $image_viewsize != fullsize ) {
++ $new_width = (( $this->config['screen_width'] / $max_cols ) - 50 );
++ // calculate new image dimensions
++ $new_height = ($height/$width) * $new_width;
++ if ( $height > $width ) {
++ $new_width = ($width/$height) * $new_height;
++ }
++ } else {
++ $new_width = $width;
++ $new_height = $height;
++ }
++ // get a new image pointer
++ $new_image_p = imagecreatetruecolor($new_width, $new_height);
++ // resample the old image to the new one
++ imagecopyresampled($new_image_p, $image_p, 0, 0, 0, 0,
++ $new_width, $new_height, $width, $height );
++ // save the image
++ if ($file_extension == 'jpg')
++ imagejpeg($new_image_p, $path.'/'.$file_prefix.$folderList[$i] );
++ if ($file_extension == 'png')
++ imagepng($new_image_p, $path.'/'.$file_prefix.$folderList[$i] );
++ if ($file_extension == 'gif')
++ imagegif($new_image_p, $path.'/'.$file_prefix.$folderList[$i] );
++ // destroy the old pointers
++ imagedestroy( $image_p );
++ imagedestroy( $new_image_p );
++ }
++ }
++ }
++ }
++ }
++
++ // =======================================================
++ function showImages( $current_path, $folderList, $image_viewsize, $image_index ) {
++
++ $path = $_SERVER[DOCUMENT_ROOT].$this->config['cache_path'].$current_path;
++ // get the column and row values, display that many images in a row
++ $max_cols = substr($image_viewsize, 0, 1);
++ $max_rows = substr($image_viewsize, 2, 1);
++ // counter for the current column and row
++ $current_col = 0;
++ // the prefix that will be added to a file so that different sizes have different names
++ $file_prefix = strtr($image_viewsize, ',','_').'_';
++
++ // get the amount of subfolders
++ $folder_count = count(glob($current_path.'/'.$folder.'/*',GLOB_ONLYDIR));
++ // increase the index by the folder count
++ for ($i = 1; $i <= $folder_count; $i++) {
++ $image_index += 1;
++ }
++ echo '<table width="100%" cellspacing="0" cellpadding="0">'."\n".
++ '<tr>'.
++ '<td colspan="'.$max_cols.'">'.
++ '&nbsp;'.
++ '</td>'.
++ '</tr>';
++ // go through all entries in the folderList
++ for ($i = $image_index; $i < (($max_cols * $max_rows)+$image_index); $i++) {
++ if (( file_exists( $path.'/'.$file_prefix.$folderList[$i] )) &&
++ ( isset($folderList[$i]) )) {
++ // if the column is zero then start a new row
++ // the specified number of images will be displayed side by side
++ if ( $current_col == 0 ) echo '<tr>'."\n";
++ // stretch the table cells to equal size
++ echo '<td class="single_image" style="width:';
++ // calculate the width of the cells
++ echo floor( 100 / $max_cols );
++ echo '%;">'."\n".
++ // display the image centered and put border around it
++ '<div align="center">'."\n".
++ '<a href="'.root.'gallery/gallery.php?'.
++ path.'='.$current_path.
++ '&'.index.'='.$i.
++ '&'.viewsize.'='.fullsize.
++ '" target="blank">'."\n".
++ '<img class="single_image" src="'.
++ $this->config['cache_path'].$current_path.'/'.
++ $file_prefix.$folderList[$i].'" '.
++ 'onmouseover="this.className=\'single_image_active\'" '.
++ 'onmouseout="this.className=\'single_image\'">'."\n".
++ '</a>'."\n".
++ '</div>'."\n".
++ '<div align="center">'."\n".
++ // show the filename
++ $folderList[$i]."\n".
++ '</div>'."\n".
++ '</td>'."\n";
++ // if the max number of columns are reached close the row
++ if ( $current_col == $max_cols ) echo '</tr>'."\n";
++ // reset the column count back to zero
++ $current_col++;
++ if ( $current_col == $max_cols ) $current_col = 0;
++ }
++ }
++ echo '</table>';
++ }
++
++
++ // =======================================================
++ function onlyDirectoriesAvailable( $current_path, $folderList, $image_viewsize, $image_index ) {
++ $path = $_SERVER[DOCUMENT_ROOT].$this->config['cache_path'].$current_path;
++ // only so many images will be created that will be displayed on the screen
++ $max_cols = substr($image_viewsize, 0, 1);
++ $max_rows = substr($image_viewsize, 2, 1);
++ $max_number = ($max_cols * $max_rows);
++ // the prefix that will be added to a file so that different sizes have different names
++ $file_prefix = strtr($image_viewsize, ',','_').'_';
++
++ // go through the folderList. if there are only directories in it
++ // then dont display the navigation stuff
++ $only_dirs = true;
++ for ($i = 0; $i < count($folderList); $i++) {
++ if ( file_exists( $path.'/'.$file_prefix.$folderList[$i] )) {
++ $only_dirs = false;
++ break;
++ }
++ }
++ return $only_dirs;
++ }
++
++ // =======================================================
++ function showNavigation( $current_path, $folderList, $image_viewsize, $image_index ) {
++ $path = $_SERVER[DOCUMENT_ROOT].$this->config['cache_path'].$current_path;
++ // only so many images will be created that will be displayed on the screen
++ $max_cols = substr($image_viewsize, 0, 1);
++ $max_rows = substr($image_viewsize, 2, 1);
++ $max_number = ($max_cols * $max_rows);
++ // the prefix that will be added to a file so that different sizes have different names
++ $file_prefix = strtr($image_viewsize, ',','_').'_';
++
++ echo '<table width="100%" cellspacing="0" cellpadding="0">'."\n".
++ '<tr>'."\n".
++ '<td class="image_navigation">&nbsp;'."\n".
++ '</td>'."\n".
++ '<td class="image_navigation">'."\n";
++ // display the goto first page link
++ if ($image_index != 1) {
++ echo '<a href="'.root.'gallery/gallery.php?'.
++ '&'.path.'='.$current_path.
++ '&'.index.'=1'.
++ '&'.viewsize.'='.$image_viewsize.'">'."\n".
++ // display the right arrow
++ '<img src="'.root.skin_dir.'/img/gallery/first_page.png">'.
++ '</a>'."\n";
++ } else {
++ echo '<img src="'.root.skin_dir.'/img/gallery/first_page_disabled.png">'."\n";
++ }
++ // display the previous page icon if there are more than one entries
++ if ($image_index != 1) {
++ echo '<a href="'.root.'gallery/gallery.php?'.
++ '&'.path.'='.$current_path.
++ '&'.index.'=';
++ if ($image_index < $max_number) {
++ echo 1;
++ } else {
++ echo ($image_index - $max_number);
++ }
++ echo '&'.viewsize.'='.$image_viewsize.'">'."\n".
++ // display the left arrow
++ '<img src="'.root.skin_dir.'/img/gallery/prev_page.png">'.
++ '</a>'."\n";
++ } else {
++ echo '<img src="'.root.skin_dir.'/img/gallery/prev_page_disabled.png">'."\n";
++ }
++ echo '</td>'."\n".
++ '<td class="image_navigation">'."\n".
++ // display an info in what page we are right now
++ '( '.$image_index.' '.t('to').' ';
++ if (($image_index + $max_number) < count($folderList)) {
++ echo ($image_index+$max_number-1);
++ } else {
++ echo (count($folderList)-1);
++ }
++ echo ' '.t('of').' '.(count($folderList)-1).' )'."\n".
++ '</td>'."\n".
++ '<td class="image_navigation">'."\n";
++ // display the next page link
++ if (($image_index + $max_number) < count($folderList)) {
++ echo '<a href="'.root.'gallery/gallery.php?'.
++ '&'.path.'='.$current_path.
++ '&'.index.'='.($image_index + $max_number).
++ '&'.viewsize.'='.$image_viewsize.'">'."\n".
++ // display the right arrow
++ '<img src="'.root.skin_dir.'/img/gallery/next_page.png">'.
++ '</a>'."\n";
++ } else {
++ echo '<img src="'.root.skin_dir.'/img/gallery/next_page_disabled.png">'."\n";
++ }
++ // display the goto last page link
++ if (($image_index + $max_number) < count($folderList)) {
++ echo '<a href="'.root.'gallery/gallery.php?'.
++ '&'.path.'='.$current_path.
++ '&'.index.'='.
++ (count($folderList) - (count($folderList) % $max_number)+1).
++ '&'.viewsize.'='.$image_viewsize.'">'."\n".
++ // display the right arrow
++ '<img src="'.root.skin_dir.'/img/gallery/last_page.png">'.
++ '</a>'."\n";
++ } else {
++ echo '<img src="'.root.skin_dir.'/img/gallery/last_page_disabled.png">'."\n";
++ }
++ echo '</td>'."\n".
++ '<td class="image_navigation">&nbsp;'."\n".
++ '</td>'."\n".
++ '</tr>'."\n".
++ '</table>'."\n";
++ }
++
++ // =======================================================
++ function showFullsizeImage( $current_path, $folderList, $image_index ) {
++ echo '<html>'."\n".
++ '<head>'."\n".
++ '<title>'.$folderList[$image_index].'</title>'."\n".
++ '</head>'."\n".
++ '<body>'."\n".
++ '<div>'."\n".
++ '<img src="'."\n".
++ $this->config['cache_path'].$current_path.'/'.
++ fullsize.'_'.$folderList[$image_index].'">'."\n".
++ '</div>'."\n".
++ '</body>'."\n".
++ '</html>';
++ }
++
++ // =======================================================
++}
+diff -Naur ../mythweb-orig/modules/gallery/includes/objects/Settings.php ./modules/gallery/includes/objects/Settings.php
+--- ../mythweb-orig/modules/gallery/includes/objects/Settings.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/includes/objects/Settings.php 2007-08-20 22:28:02.000000000 -0400
+@@ -0,0 +1,243 @@
++<?php
++/**
++ * Gallery Settings Functions
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/set_prefs.php $
++ * @date $Date: 2006-12-19 09:17:33 +0100 (Di, 19 Dez 2006) $
++ * @version $Revision: 12295 $
++ * @author $Author: xris $
++ * @license GPL
++ *
++ * @package MythWeb
++ * @subpackage Gallery
++/**/
++
++// Load the available configuration from the session variable
++// or if this one is empty then form the database
++function loadGalleryConfig()
++{
++ $_SESSION['gallery']['image_path'] = getGalleryImagePath();
++ $_SESSION['gallery']['cache_path'] = getGalleryCachePath();
++ $_SESSION['gallery']['default_viewsize'] = getGalleryDefaultViewSize();
++ $_SESSION['gallery']['screen_width'] = getGalleryScreenWidth();
++ $_SESSION['gallery']['viewsizes'] = getGalleryViewSizes();
++ $_SESSION['gallery']['valid_image_files'] = getGalleryValidImageFiles();
++}
++
++
++// Load all of the known mythtv frontend hosts
++function getGalleryHostnames()
++{
++ $Settings_Hosts = array('' => t('MythWeb Session'));
++ global $db;
++ $sh = $db->query('SELECT DISTINCT hostname FROM settings WHERE value="locale" ORDER BY hostname');
++
++ // add all the found hosts into an array
++ while (list($host) = $sh->fetch_row())
++ {
++ if (empty($host))
++ continue;
++ $Settings_Hosts[$host] = $host;
++ }
++ $sh->finish();
++ return $Settings_Hosts;
++}
++
++
++// update the values in the database if necessary
++function saveGalleryConfig( $Settings_Hosts )
++{
++ // Make sure we have a valid host selected
++ if (!isset( $Settings_Hosts[$_SESSION['settings']['host']]) )
++ {
++ // we have no valid host, reset the array
++ $_SESSION['settings']['host'] = reset(array_keys($Settings_Hosts));
++ } else {
++ // we have a valid host, check if the data should be saved
++ if ($_POST['save'] && isset($_POST['host']))
++ {
++ // Changing settings for this MythWeb session
++ if (empty($_POST['host']))
++ {
++ // save the image path in the session variable
++ $_SESSION['gallery']['image_path'] = $_POST['image_path'];
++ $_SESSION['gallery']['cache_path'] = $_POST['cache_path'];
++ $_SESSION['gallery']['default_viewsize'] = $_POST['default_viewsize'];
++ $_SESSION['gallery']['screen_width'] = $_POST['screen_width'];
++ $_SESSION['gallery']['viewsizes'] = $_POST['viewsizes'];
++ $_SESSION['gallery']['valid_image_files'] = $_POST['valid_image_files'];
++ } else {
++ // save the settings in the database
++// setGalleryImagePath( $_POST['image_path'], $_POST['host'] );
++ setGalleryCachePath( $_POST['cache_path'], $_POST['host'] );
++ setGalleryDefaultViewSize( $_POST['default_viewsize'], $_POST['host'] );
++ setGalleryScreenWidth( $_POST['screen_width'], $_POST['host'] );
++ setGalleryViewSizes( $_POST['viewsizes'], $_POST['host'] );
++ setGalleryValidImageFiles( $_POST['valid_image_files'],$_POST['host'] );
++ }
++ // Make sure the session host gets updated to the posted one.
++ $_SESSION['settings']['host'] = $_POST['host'];
++ }
++ }
++}
++
++// the absolute path where the images are
++// get it from the database or the session variable
++function getGalleryImagePath()
++{
++ global $db;
++ if (!empty($_SESSION['settings']['host'])) {
++ $imagePath = $db->query_col('SELECT data FROM settings
++ WHERE value="GalleryDir" AND hostname=?', $_SESSION['settings']['host']);
++ }
++
++ if (!$imagePath)
++ {
++ $imagePath = _or($_SESSION['gallery']['image_path'], '/myth/gallery');
++ }
++
++ return $imagePath;
++}
++
++// directory where the cached images are stored
++// this directory is relative to the htdocs directory
++function getGalleryCachePath()
++{
++ global $db;
++ if (!empty($_SESSION['settings']['host'])) {
++ $cachePath = $db->query_col('SELECT data FROM settings
++ WHERE value="GalleryCachePath" AND hostname=?', $_SESSION['settings']['host']);
++ }
++
++ if (!$cachePath)
++ {
++ $cachePath = _or($_SESSION['gallery']['cache_path'], '/mythweb/data/cache');
++ }
++
++ return $cachePath;
++}
++
++
++// defines the default view mode
++// default is 4 columns and 4 rows per page
++function getGalleryDefaultViewSize()
++{
++ global $db;
++ if (!empty($_SESSION['settings']['host'])) {
++ $defaultViewSize = $db->query_col('SELECT data FROM settings
++ WHERE value="GalleryDefaultViewSize" AND hostname=?', $_SESSION['settings']['host']);
++ }
++
++ if (!$defaultViewSize)
++ {
++ $defaultViewSize = _or($_SESSION['gallery']['default_viewsize'], '4,3');
++ }
++
++ return $defaultViewSize;
++}
++
++
++// width if the screen-200 (example 1024-200)
++// this is needed to calculate the width of the images
++function getGalleryScreenWidth()
++{
++ global $db;
++ if (!empty($_SESSION['settings']['host'])) {
++ $screenWidth = $db->query_col('SELECT data FROM settings
++ WHERE value="GalleryScreenWidth" AND hostname=?', $_SESSION['settings']['host']);
++ }
++
++ if (!$screenWidth)
++ {
++ $screenWidth = _or($_SESSION['gallery']['screen_width'], '1024');
++ }
++
++ return $screenWidth;
++}
++
++
++// columns and rows that are shown on one page, ; separates another mode
++function getGalleryViewSizes()
++{
++ global $db;
++ if (!empty($_SESSION['settings']['host'])) {
++ $viewSizes = $db->query_col('SELECT data FROM settings
++ WHERE value="GalleryViewSizes" AND hostname=?', $_SESSION['settings']['host']);
++ }
++
++ if (!$viewSizes)
++ {
++ $viewSizes = _or($_SESSION['gallery']['viewsizes'], '5,4 ; 4,4 ; 4,3 ; 3,3 ; 2,2 ; 1,1');
++ }
++
++ return $viewSizes;
++}
++
++
++// image extensions that will be shown, everything else
++// will not work, currently there four are supported
++function getGalleryValidImageFiles()
++{
++ global $db;
++ if (!empty($_SESSION['settings']['host'])) {
++ $validImageFiles = $db->query_col('SELECT data FROM settings
++ WHERE value="GalleryValidImageFiles" AND hostname=?', $_SESSION['settings']['host']);
++ }
++
++ if (!$validImageFiles)
++ {
++ $validImageFiles = _or($_SESSION['gallery']['valid_image_files'], 'jpg,png,gif,bmp');
++ }
++
++ return $validImageFiles;
++}
++
++
++// save the image path in the database
++//function setGalleryImagePath( $imagePath, $host )
++//{
++// global $db;
++// $db->query('UPDATE settings SET data = ?
++// WHERE value="GalleryDir" AND hostname=?', $imagePath, $host);
++//}
++
++function setGalleryCachePath( $cachePath, $host )
++{
++ global $db;
++ $db->query('UPDATE settings SET data = ?
++ WHERE value="GalleryCachePath" AND hostname=?', $cachePath, $host);
++}
++
++
++function setGalleryDefaultViewSize( $defaultViewSize, $host )
++{
++ global $db;
++ $db->query('UPDATE settings SET data = ?
++ WHERE value="GalleryDefaultViewSize" AND hostname=?', $defaultViewSize, $host);
++}
++
++
++function setGalleryScreenWidth( $screenWidth, $host )
++{
++ global $db;
++ $db->query('UPDATE settings SET data = ?
++ WHERE value="GalleryScreenWidth" AND hostname=?', $screenWidth, $host);
++}
++
++
++function setGalleryViewSizes( $viewSizes, $host )
++{
++ global $db;
++ $db->query('UPDATE settings SET data = ?
++ WHERE value="GalleryViewSizes" AND hostname=?', $viewSizes, $host);
++}
++
++
++function setGalleryValidImageFiles( $validImageFiles, $host )
++{
++ global $db;
++ $db->query('UPDATE settings SET data = ?
++ WHERE value="GalleryValidImageFiles" AND hostname=?', $validImageFiles, $host);
++}
++
++
+diff -Naur ../mythweb-orig/modules/gallery/init.php ./modules/gallery/init.php
+--- ../mythweb-orig/modules/gallery/init.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/init.php 2007-08-19 23:21:33.000000000 -0400
+@@ -0,0 +1,38 @@
++<?php
++/**
++ * Initialization routines for the MythWeb Gallery module
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/init.php $
++ * @date $Date: 2006-12-19 09:17:33 +0100 (Di, 19 Dez 2006) $
++ * @version $Revision: 12295 $
++ * @author $Author: rsiebert $
++ * @license GPL
++ *
++ * @package MythWeb
++ * @subpackage Gallery
++ *
++/**/
++
++// Settings options
++ $Settings['gallery'] = array('name' => t('Gallery'),
++ 'choices' => array('prefs' => t('Preferences'), ),
++ 'default' => 'prefs',
++ );
++
++// First, we should check to see that MythGallery is configured.
++ $has_gallery = $_SESSION['locale']
++ ? true
++ : $db->query_col('SELECT COUNT(data)
++ FROM settings
++ WHERE value="locale"');
++
++
++
++// If gallery is enabled, add it to the list.
++ if ($has_gallery) {
++ $Modules['gallery'] = array('path' => 'gallery',
++ 'sort' => 5,
++ 'name' => t('Gallery'),
++ 'description' => t('Local Image Gallery')
++ );
++ }
+diff -Naur ../mythweb-orig/modules/gallery/set_prefs.php ./modules/gallery/set_prefs.php
+--- ../mythweb-orig/modules/gallery/set_prefs.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/set_prefs.php 2007-08-20 22:29:12.000000000 -0400
+@@ -0,0 +1,24 @@
++<?php
++/**
++ * Gallery settings
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/set_prefs.php $
++ * @date $Date: 2006-12-19 09:17:33 +0100 (Di, 19 Dez 2006) $
++ * @version $Revision: 12295 $
++ * @author $Author: xris $
++ * @license GPL
++ *
++ * @package MythWeb
++ * @subpackage Gallery
++/**/
++
++// Load functions
++require_once 'includes/objects/Settings.php';
++
++// Load all of the known mythtv frontend hosts
++$Settings_Hosts = getGalleryHostnames();
++
++// update the values in the database if necessary
++saveGalleryConfig( $Settings_Hosts );
++loadGalleryConfig();
++
+diff -Naur ../mythweb-orig/modules/gallery/tmpl/default/gallery.php ./modules/gallery/tmpl/default/gallery.php
+--- ../mythweb-orig/modules/gallery/tmpl/default/gallery.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/tmpl/default/gallery.php 2007-08-22 00:21:05.000000000 -0400
+@@ -0,0 +1,39 @@
++<?php
++/**
++ * Display template for the Gallery module
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/tmpl/default/gallery.php $
++ * @date $Date: 2006-12-19 09:17:33 +0100 (Di, 19 Dez 2006) $
++ * @version $Revision: 12295 $
++ * @author $Author: xris $
++ * @license GPL
++ *
++ * @package MythWeb
++ *
++/**/
++
++// Page title
++$page_title = 'MythWeb - '.t('Gallery');
++
++// the current viewsize mode
++$image_viewsize = $gallery->getImageViewSize();
++
++// If displaying full size image don't display header and footer
++if ($image_viewsize == 'fullsize') {
++ // Print the gallery part
++ $gallery->start();
++}
++else
++{
++ // Load this page's custom stylesheet
++ $headers[] = '<link rel="stylesheet" type="text/css" href="'.root.skin_dir.'/gallery.css" />';
++
++ // Print the page header
++ require 'modules/_shared/tmpl/'.tmpl.'/header.php';
++
++ // Print the gallery part
++ $gallery->start();
++
++ // Print the page footer
++ require 'modules/_shared/tmpl/'.tmpl.'/footer.php';
++}
+\ No newline at end of file
+diff -Naur ../mythweb-orig/modules/gallery/tmpl/default/set_prefs.php ./modules/gallery/tmpl/default/set_prefs.php
+--- ../mythweb-orig/modules/gallery/tmpl/default/set_prefs.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/tmpl/default/set_prefs.php 2007-08-19 23:21:33.000000000 -0400
+@@ -0,0 +1,93 @@
++<?php
++/**
++ * Display/save MythGallery settings
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/tmpl/default/set_prefs.php $
++ * @date $Date: 2007-01-09 07:37:34 +0100 (Di, 09 Jan 2007) $
++ * @version $Revision: 12460 $
++ * @author $Author: xris $
++ * @license GPL
++ *
++ * @package MythWeb
++ * @subpackage Gallery
++ *
++/**/
++
++// Display the gui for the settings
++$galleryConfigTheme = new GalleryConfigTheme();
++$galleryConfigTheme->showConfig();
++
++class GalleryConfigTheme
++{
++ function GalleryConfigTheme()
++ {
++
++ }
++
++ function showConfig()
++ {
++ echo '<form class="form" method="post" action="'. form_action .'">'.
++ '<input type="hidden" name="host" value="'. html_entities($_SESSION['settings']['host']) .'"/>'.
++ '<table border="0" cellspacing="0" cellpadding="0">'.
++ '<tr class="_sep">'.
++ '<td>'.
++ t('Gallery image path').':&nbsp;'.
++ '</td>'.
++ '<td>'.
++ '<input class="_text" type="text" name="image_path" value="'.getGalleryImagePath().'">'.
++ '</td>'.
++ '</tr>'.
++ '<tr class="_sep">'.
++ '<td>'.
++ t('Path where the thumbnails are').':&nbsp;'.
++ '</td>'.
++ '<td>'.
++ '<input class="_text" type="text" name="cache_path" value="'.getGalleryCachePath().'">'.
++ '</td>'.
++ '</tr>'.
++ '<tr class="_sep">'.
++ '<td>'.
++ t('Default view size').':&nbsp;'.
++ '</td>'.
++ '<td>'.
++ '<input class="_text" type="text" name="default_viewsize" value="'.getGalleryDefaultViewSize().'">'.
++ '</td>'.
++ '</tr>'.
++ '<tr class="_sep">'.
++ '<td>'.
++ t('Horizontal screen resolution').':&nbsp;'.
++ '</td>'.
++ '<td>'.
++ '<input class="_text" type="text" name="screen_width" value="'.getGalleryScreenWidth().'">'.
++ '</td>'.
++ '</tr>'.
++ '<tr class="_sep">'.
++ '<td>'.
++ t('List of available view sizes').':&nbsp;'.
++ '</td>'.
++ '<td>'.
++ '<input class="_text" type="text" name="viewsizes" value="'.getGalleryViewSizes().'">'.
++ '</td>'.
++ '</tr>'.
++ '<tr class="_sep">'.
++ '<td>'.
++ t('List of allowed image formats').':&nbsp;'.
++ '</td>'.
++ '<td>'.
++ '<input class="_text" type="text" name="valid_image_files" value="'.getGalleryValidImageFiles().'">'.
++ '</td>'.
++ '</tr>'.
++ '<tr>'.
++ '<td align="center">'.
++ '<input class="_button" type="reset" class="submit" value="'.t('Reset').'">'.
++ '</td>'.
++ '<td align="center">'.
++ '<input class="_button" type="submit" class="submit" name="save" value="'.t('Save') .'">'.
++ '</td>'.
++ '</tr>'.
++ '</table>'.
++ '</form>';
++ }
++}
++
++?>
+\ No newline at end of file
+diff -Naur ../mythweb-orig/modules/gallery/tmpl/default/welcome.php ./modules/gallery/tmpl/default/welcome.php
+--- ../mythweb-orig/modules/gallery/tmpl/default/welcome.php 1969-12-31 19:00:00.000000000 -0500
++++ ./modules/gallery/tmpl/default/welcome.php 2007-08-19 23:21:33.000000000 -0400
+@@ -0,0 +1,26 @@
++<?php
++/**
++ * Welcome page description of the Gallery module.
++ *
++ * @url $URL: http://svn.mythtv.org/svn/trunk/mythplugins/mythweb/modules/gallery/tmpl/default/welcome.php $
++ * @date $Date: 2005-12-13 08:23:18 +0100 (Di, 13 Dez 2005) $
++ * @version $Revision: 8252 $
++ * @author $Author: xris $
++ * @license GPL
++ *
++ * @package MythWeb
++ *
++/**/
++
++// Open with a div and an image
++ echo '<div id="info_gallery" class="hidden">',
++ '<img src="', skin_url, '/img/gallery.png" class="module_icon" />',
++
++// Print a basic overview of what this module does
++ t('welcome: gallery'),
++
++// Next, print a list of possible subsectons
++ ####
++
++// Close the div
++ "</div>\n";
+\ No newline at end of file
+diff -Naur ../mythweb-orig/modules/_shared/lang/English.lang ./modules/_shared/lang/English.lang
+--- ../mythweb-orig/modules/_shared/lang/English.lang 2007-08-19 23:20:01.000000000 -0400
++++ ./modules/_shared/lang/English.lang 2007-08-19 23:26:41.000000000 -0400
+@@ -153,6 +153,7 @@
+ "Create Schedule"
+ "Current Conditions"
+ "Current recordings"
++"Current path"
+ "Currently Browsing: $1"
+ "Currently Recording: Edit"
+ "Custom"
+@@ -164,6 +165,7 @@
+ "Deactivated"
+ "Default"
+ "Default MythVideo View"
++"Default view size"
+ "Delete"
+ "delete"
+ "Delete $1"
+@@ -242,6 +244,8 @@
+ "freqid"
+ "Friday"
+ "Frontends"
++"Gallery"
++"Gallery image path"
+ "generic_date"
+ %a %b %e, %Y
+ "generic_time"
+@@ -269,6 +273,7 @@
+ "Hide"
+ "High"
+ "Home"
++"Horizontal screen resolution"
+ "Host"
+ "Hosted by"
+ "Hosts"
+@@ -276,6 +281,7 @@
+ "Hour Format"
+ "hue"
+ "Humidity"
++"Images per page"
+ "IMDB"
+ "imdb rating"
+ "IMDBTYPE"
+@@ -318,6 +324,8 @@
+ "length"
+ "Length"
+ "Length (min)"
++"List of allowed image formats"
++"List of available view sizes"
+ "Listing &quot;Jump to&quot;"
+ "Listing Time Key"
+ "Listings"
+@@ -367,6 +375,7 @@
+ "mythvideo.sort_ignores_case"
+ "MythWeb"
+ "MythWeb Defaults"
++"MythWeb Gallery."
+ "MythWeb Global Defaults"
+ "MythWeb Session"
+ "MythWeb session settings"
+@@ -401,6 +410,7 @@
+ "Number of shows"
+ "Number of Songs"
+ "Number of timeslots"
++"of"
+ "Only display favourite channels"
+ "Only match commercial-free channels"
+ "Only match HD programs"
+@@ -415,6 +425,7 @@
+ "Past Month"
+ "Past Week"
+ "Past Year"
++"Path where the thumbnails are"
+ "Paused"
+ "Pending"
+ "People"
+@@ -673,6 +684,7 @@
+ "Subtitles Available"
+ "Sunday"
+ "Surround Sound"
++"Switch view mode"
+ "Tab"
+ "The requested recording schedule has been deleted."
+ "There are no items in this Playlist!"
+@@ -690,6 +702,7 @@
+ "Title Match"
+ "Title search"
+ "Title Search"
++"to"
+ "Today"
+ "Tomorrow"
+ "Too Many"
+@@ -784,6 +797,8 @@
+ "Wednesday"
+ "welcome: backend_log"
+ Show the server logs.
++"welcome: gallery"
++ Browse your picture collection.
+ "welcome: music"
+ Browse your music collection.
+ "welcome: remote"
+diff -Naur ../mythweb-orig/modules/_shared/lang/German.lang ./modules/_shared/lang/German.lang
+--- ../mythweb-orig/modules/_shared/lang/German.lang 2007-08-19 23:20:01.000000000 -0400
++++ ./modules/_shared/lang/German.lang 2007-08-19 23:27:54.000000000 -0400
+@@ -209,6 +209,8 @@
+ "Create a Random Mix"
+ "Create Schedule"
+ Speichern
++"Current path"
++ Aktueller Pfad
+ "Current Conditions"
+ Das aktuelle Wetter
+ "Current recordings"
+@@ -231,6 +233,8 @@
+ "Default"
+ Standard
+ "Default MythVideo View"
++"Default view size"
++ Standardansicht
+ "Delete"
+ Löschen
+ "delete"
+@@ -343,6 +347,10 @@
+ "Friday"
+ Freitag
+ "Frontends"
++"Gallery"
++ Gallerie
++"Gallery image path"
++ Pfad der Bilder
+ "generic_date"
+ %e.%m.%Y
+ "generic_time"
+@@ -379,6 +387,8 @@
+ "High"
+ Max
+ "Home"
++"Horizontal screen resolution"
++ Horizontale Bildschirmauflösung
+ "Host"
+ "Hosted by"
+ "Hosts"
+@@ -390,6 +400,8 @@
+ Farbton
+ "Humidity"
+ Luftfeuchtigkeit
++"Images per page"
++ Bilder pro Seite
+ "IMDB"
+ IMDB
+ "imdb rating"
+@@ -438,6 +450,10 @@
+ Dauer
+ "Length (min)"
+ Dauer (Min.)
++"List of allowed image formats"
++ Liste der erlaubten Bildformate
++"List of available view sizes"
++ Liste der möglichen Ansichten
+ "Listing &quot;Jump to&quot;"
+ TV Programm &quot;Gehe zu&quot;
+ "Listing Time Key"
+@@ -502,6 +518,8 @@
+ "mythvideo.sort_ignores_case"
+ "MythWeb"
+ "MythWeb Defaults"
++"MythWeb Gallery."
++ Gallerie
+ "MythWeb Global Defaults"
+ "MythWeb Session"
+ "MythWeb session settings"
+@@ -548,6 +566,8 @@
+ "Number of shows"
+ "Number of Songs"
+ "Number of timeslots"
++"of"
++ von
+ "Only display favourite channels"
+ Nur Favoriten anzeigen
+ "Only match commercial-free channels"
+@@ -562,6 +582,8 @@
+ "Override"
+ "Page Down"
+ "Page Up"
++"Path where the thumbnails are"
++ Thumbnails speichern unter
+ "Part $1 of $2"
+ Teil $1 von $2
+ "Past Month"
+@@ -870,6 +892,10 @@
+ "Streaming"
+ "Sub and Desc (Empty matches)"
+ Untertitel & Beschr. (kein Ergebnis)
++"subfolder"
++ Unterordner
++"subfolders"
++ Unterordner
+ "Submit Search"
+ "subtitle"
+ "Subtitle"
+@@ -882,6 +908,8 @@
+ "Subtitles Available"
+ "Sunday"
+ Sonntag
++"Switch view mode"
++ Ansichtsmodus wechseln
+ "Surround Sound"
+ "Tab"
+ "The requested recording schedule has been deleted."
+@@ -907,6 +935,8 @@
+ "Title search"
+ "Title Search"
+ Titel Suche
++"to"
++ bis
+ "Today"
+ Heute
+ "Tomorrow"
+@@ -1024,6 +1054,8 @@
+ Mittwoch
+ "welcome: backend_log"
+ Backend Log
++"welcome: gallery"
++ Gallerie
+ "welcome: music"
+ Musik
+ "welcome: remote"
+diff -Naur ../mythweb-orig/modules/_shared/tmpl/default/header.php ./modules/_shared/tmpl/default/header.php
+--- ../mythweb-orig/modules/_shared/tmpl/default/header.php 2007-08-19 23:20:01.000000000 -0400
++++ ./modules/_shared/tmpl/default/header.php 2007-08-19 23:21:33.000000000 -0400
+@@ -96,6 +96,13 @@
+ </a>
+ <?php
+ }
++ if ($Modules['gallery']) {
++?>
++ <a id="gallery_link"<?php if ($Path[0] == 'gallery') echo ' class="current_section"' ?> href="<?php echo root ?>gallery" onmouseover="return help_text('<?php echo str_replace("'", "\\'", t('MythWeb Gallery.')) ?>')" onmouseout="return help_text()">
++ <img src="<?php echo skin_url ?>img/gallery.png" width="48" height="48" class="alpha_png" alt="MythGallery" />
++ </a>
++<?php
++ }
+ ?>
+ <a id="settings_link"<?php if ($Path[0] == 'settings') echo ' class="current_section"' ?> href="<?php echo root ?>settings" onmouseover="return help_text('<?php echo str_replace("'", "\\'", t('Edit MythWeb and some MythTV settings.')) ?>')" onmouseout="return help_text()">
+ <img src="<?php echo skin_url ?>img/settings.png" width="48" height="48" class="alpha_png" alt="<?php echo t('Settings') ?>" />
+diff -Naur ../mythweb-orig/skins/default/gallery.css ./skins/default/gallery.css
+--- ../mythweb-orig/skins/default/gallery.css 1969-12-31 19:00:00.000000000 -0500
++++ ./skins/default/gallery.css 2007-08-19 23:21:33.000000000 -0400
+@@ -0,0 +1,108 @@
++img {
++ border: 0px;
++ border-color: #000000;
++}
++
++table.current_path_and_viewsize {
++ margin-top:5px;
++ border:1px solid #626262;
++ padding:5px;
++ width:100%;
++}
++
++a {
++ color:#000000;
++ text-decoration:none;
++}
++
++a.header {
++ font-weight:bold;
++ font-style:italic;
++}
++
++a.folderlist {
++ font-style:italic;
++}
++
++td.current_path {
++ text-align:left;
++ width:auto;
++}
++
++td.change_viewsize_text {
++ text-align:right;
++ width:160px;
++}
++
++td.change_viewsize_selection {
++ text-align:right;
++ width:140px;
++}
++
++select.change_viewsize {
++ border:1px solid #323232;
++ background-color: #191c26;
++ color: #FFFFFF;
++}
++
++td.folder_navigation {
++ width:200px;
++ vertical-align:top;
++}
++
++table.folder_navigation {
++ margin-top:5px;
++ border:1px solid #626262;
++ padding:4px;
++ width:100%;
++}
++
++div.folder_navigation_active {
++ background-color: #224477;
++ border:1px solid #191c26;
++ text-align:left;
++ padding:4px;
++}
++
++div.folder_navigation {
++ border:1px solid #191c26;
++ text-align:left;
++ padding:4px;
++}
++
++td.image_listing {
++ width:auto;
++ vertical-align:top;
++}
++
++table.imagelist_and_navigation {
++ margin-top:5px;
++ margin-left:5px;
++ border:1px solid #626262;
++ padding:5px;
++ width:100%;
++}
++
++td.image_navigation {
++ text-align:center;
++ vertical-align:middle;
++ width:20%;
++ border-width: 0px;
++}
++
++td.single_image {
++ font-size:9pt;
++ padding:5px;
++ text-align:center;
++}
++
++img.single_image {
++ padding:7px;
++ border:1px solid #323232;
++}
++
++img.single_image_active {
++ background-color: #224477;
++ padding:7px;
++ border:1px solid #323232;
++}
+\ No newline at end of file
+diff -Naur ../mythweb-orig/skins/grey/gallery.css ./skins/grey/gallery.css
+--- ../mythweb-orig/skins/grey/gallery.css 1969-12-31 19:00:00.000000000 -0500
++++ ./skins/grey/gallery.css 2007-08-19 23:21:33.000000000 -0400
+@@ -0,0 +1,107 @@
++img {
++ border: 0px;
++ border-color: #000000;
++}
++
++table.current_path_and_viewsize {
++ margin-top:5px;
++ border:1px solid #626262;
++ padding:5px;
++ width:100%;
++}
++
++a {
++ color:#000000;
++ text-decoration:none;
++}
++
++a.header {
++ font-weight:bold;
++ font-style:italic;
++}
++
++a.folderlist {
++ font-style:italic;
++}
++
++td.current_path {
++ text-align:left;
++ width:auto;
++}
++
++td.change_viewsize_text {
++ text-align:right;
++ width:160px;
++}
++
++td.change_viewsize_selection {
++ text-align:right;
++ width:140px;
++}
++
++select.change_viewsize {
++ border:1px solid #323232;
++ background-color: #212121;
++}
++
++td.folder_navigation {
++ width:200px;
++ vertical-align:top;
++}
++
++table.folder_navigation {
++ margin-top:5px;
++ border:1px solid #626262;
++ padding:4px;
++ width:100%;
++}
++
++div.folder_navigation_active {
++ background-color: #626262;
++ border:1px solid #212121;
++ text-align:left;
++ padding:4px;
++}
++
++div.folder_navigation {
++ border:1px solid #212121;
++ text-align:left;
++ padding:4px;
++}
++
++td.image_listing {
++ width:auto;
++ vertical-align:top;
++}
++
++table.imagelist_and_navigation {
++ margin-top:5px;
++ margin-left:5px;
++ border:1px solid #626262;
++ padding:5px;
++ width:100%;
++}
++
++td.image_navigation {
++ text-align:center;
++ vertical-align:middle;
++ width:20%;
++ border-width: 0px;
++}
++
++td.single_image {
++ font-size:9pt;
++ padding:5px;
++ text-align:center;
++}
++
++img.single_image {
++ padding:7px;
++ border:1px solid #323232;
++}
++
++img.single_image_active {
++ background-color: #626262;
++ padding:7px;
++ border:1px solid #323232;
++}
+\ No newline at end of file
+diff -Naur ../mythweb-orig/skins/grey/settings.css ./skins/grey/settings.css
+--- ../mythweb-orig/skins/grey/settings.css 2007-08-19 23:20:00.000000000 -0400
++++ ./skins/grey/settings.css 2007-08-19 23:21:33.000000000 -0400
+@@ -94,7 +94,7 @@
+
+ #settings .-host {
+ text-align: right;
+- border-bottom: 2px solid #eee;
++ border-bottom: 2px solid #aaa;
+ }
+
+ /* A notification/warning */
+@@ -115,3 +115,33 @@
+ border: 2px solid #999;
+ border-top: none;
+ }
++
++ #settings ._content input._text {
++ margin: 2px;
++ padding: 2px;
++ border: 1px solid #333333;
++ }
++
++ #settings ._content input._button {
++ margin: 2px;
++ padding: 2px;
++ border: 1px solid #333333;
++ color: #DDDDDD;
++ }
++
++ #settings ._content table {
++ width: 100%;
++ }
++ #settings ._content table th, #settings ._content table td {
++ padding: .5em;
++ }
++
++ #settings ._content th, #settings ._content td {
++ text-align: right;
++ font-weight: normal;
++ white-space: nowrap;
++ }
++
++ #settings ._content tr._sep th, #settings ._content tr._sep td {
++ border-bottom: 1px solid #304943;
++ }
diff --git a/abs/core/mythtv/stable/mythweb/transcoders.patch b/abs/core/mythtv/stable/mythweb/transcoders.patch
new file mode 100644
index 0000000..c1aeb6c
--- /dev/null
+++ b/abs/core/mythtv/stable/mythweb/transcoders.patch
@@ -0,0 +1,23 @@
+diff -ruaN mythweb.orig/modules/_shared/lang/English.lang mythweb/modules/_shared/lang/English.lang
+--- mythweb.orig/modules/_shared/lang/English.lang 2009-01-09 02:44:23.000000000 +0000
++++ mythweb/modules/_shared/lang/English.lang 2009-07-31 06:29:11.000000000 +0000
+@@ -816,3 +816,5 @@
+ "Year"
+ "Yes"
+ "Yesterday"
++"Myth2iPod"
++"Myt2XviD3"
+diff -ruaN mythweb.orig/modules/_shared/tmpl/default/header.php mythweb/modules/_shared/tmpl/default/header.php
+--- mythweb.orig/modules/_shared/tmpl/default/header.php 2009-01-09 02:44:23.000000000 +0000
++++ mythweb/modules/_shared/tmpl/default/header.php 2009-07-31 06:28:54.000000000 +0000
+@@ -171,6 +171,10 @@
+ <a href="<?php echo root ?>tv/recorded"><?php echo t('Recorded Programs') ?></a>
+ &nbsp; | &nbsp;
+ <a href="<?php echo root ?>status"><?php echo t('Backend Status') ?></a>
++ &nbsp; | &nbsp;
++ <a href="/ipodfeed/m2iweb.php"><?php echo t('Myth2iPod') ?></a>
++ &nbsp; | &nbsp;
++ <a href="/archive/archive.php"><?php echo t('Myt2XviD3') ?></a>
+ <?php if ($Modules['backend_log']) { ?>
+ &nbsp; | &nbsp;
+ <a href="<?php echo root ?>backend_log"><?php echo t('Backend Logs') ?></a>
diff --git a/abs/core/mythtv/stable/mythweb/wiiweb.tar.bz2 b/abs/core/mythtv/stable/mythweb/wiiweb.tar.bz2
new file mode 100644
index 0000000..200b8c3
--- /dev/null
+++ b/abs/core/mythtv/stable/mythweb/wiiweb.tar.bz2
Binary files differ
diff --git a/abs/core/mythtv/stable/mythzoneminder/PKGBUILD b/abs/core/mythtv/stable/mythzoneminder/PKGBUILD
new file mode 100644
index 0000000..45e0bac
--- /dev/null
+++ b/abs/core/mythtv/stable/mythzoneminder/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: kleptophobiac@gmail.com
+
+pkgname=mythzoneminder
+pkgver=0.21
+pkgrel=4
+pkgdesc="Integrates ZoneMinder into MythTV"
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org"
+license=('GPL')
+depends=("mythtv>=${pkgver}" 'zoneminder=1.23.3')
+source=("ftp://ftp.knoppmyth.net/R6/sources/mythplugins-$pkgver-fixes.tar.bz2")
+md5sums=('1b3e2a97b7ecf7373e162fe20b6faabe')
+groups=('mythtv-extras')
+
+build() {
+ cd $startdir/src/mythplugins
+ . /etc/profile.d/qt3.sh
+
+ # use QT3 qmake
+ export PATH=$QTDIR/bin:$PATH
+
+ ./configure --prefix=/usr --enable-opengl --disable-all --enable-mythzoneminder --zm-version=1.23.3
+
+ qmake mythplugins.pro
+ make qmake || return 1
+ make -j 2 || return 1
+
+ make INSTALL_ROOT=$startdir/pkg install
+}
+