diff options
| author | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
| commit | 2648e999d277eac5c3d331a3609bcc73fafbea71 (patch) | |
| tree | 40951fb8e7fdbe28a0baa324ae615055203f1e2e /abs/core/mythtv | |
| parent | c759b5e0c4aa6fc37412b4dee2cf9ad993fd376d (diff) | |
| parent | 7e6f7ca174e1af67178dc5293a312a4a733eb095 (diff) | |
| download | linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.zip linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.gz linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.bz2 | |
Merge branch 'testing'
# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
LinHES-config: during install don't kill off lirc. This keeps the remote active all the way to the finish
Change version numbers to 8.0 to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
LinHES-conifig: mv_install.py for the last partition don't go all the way to the end. Gotta leave room for gpt tables.
xf86-video-ati: xorg ati driver.
LinHES-config: timezip.py add syncing up of parental lvl passwords and starting level with MBE.
LinHES-system: correct the logic for breaking out of the wmctrl loop. As written it would break out of the inner loop..but not the 60 iteration loop.
e16_theme_settings: remove slide-in prop for new windows. For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
LinHES-config, mythinstall: change case of hd_pvr and serial to all lower refs #902
zilog-firmware: firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters but including the firmware just in case someone really wants to
linhes-udev-rules: added hdprv_lirc rule. All of these lirc rules are limited to exactly one device. If more then one device is present then only the last device in init will get the symlink
runit-scripts: fix logging for igdeamon, add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
LinHES-system: add lh_system_restore and lh_system_backup. These scripts are called from the mythmenu. refs #900
iguanair: rebuild with python 2.7
LinHES-system: msg_daemon.py fix init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
linhes-udev-rules: add rules for mce,streamzap,serial lirc devices.
mythinstall: recompile for matching libs
mythtv: latest .25-fixes and change mythbackup/restore call lh_system_$op to replace mythbackup/mythrestore. mythbackup no longer works correctly with the new windowmanager
linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
LinHES-config, supplimental-web: Fix proxy numbering for Ceton infiniTV
linhes-system: add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
...
Diffstat (limited to 'abs/core/mythtv')
107 files changed, 815 insertions, 5461 deletions
diff --git a/abs/core/mythtv/stable-0.24/morethemes/PKGBUILD b/abs/core/mythtv/stable-0.24/morethemes/PKGBUILD deleted file mode 100644 index c6368bc..0000000 --- a/abs/core/mythtv/stable-0.24/morethemes/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -pkgname=morethemes -pkgver=0.24 -pkgrel=6 -pkgdesc="Additional themes for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('any') -depends=('mythtv') -groups=('mythtv-extras') -source=(#'ftp://ftp.knoppmyth.net/R6/sources/morethemes-0.23.tar.bz2' - 'ftp://miroku.no-ip.com/blue-abstract-wide.2010.09.16.tar.bz2' - 'http://elkin.de/mythtv/2010.09.08-blootube-ng.tar.bz2' - 'http://elkin.de/mythtv/2010.11.04-Willi.tar.lzma' - 'http://elkin.de/mythtv/2010.03.13-bando-blue.tar.bz2' - 'http://www.thepetersclan.com/files/TintedGlass-1.18.tbz2' - 'http://www.thepetersclan.com/files/Mod-Gray-OSD.tar.bz2' - 'http://www.thepetersclan.com/files/Bluebar-Hires-OSD.tar.bz2' - 'http://www.thepetersclan.com/files/BlueCurves-OSD.tar.bz2' - 'http://www.thepetersclan.com/files/SimplyBlue-OSD.tbz2' - 'http://www.thepetersclan.com/files/BlueCurves2-OSD.tbz2' - 'http://www.thepetersclan.com/files/BlueCurves-2.1-OSD.tbz2' - 'http://www.mythtv.org/themes/LCARS.tar.gz' - 'http://www.mythtv.org/themes/TransBlue.tar.gz' - 'http://www.westnet.com/~chris/Mythtv/Retro-wide.tar.gz' - 'retro-wide_video-ui.xml-filetypes.patch' - 'http://capnbry.net/~bmayland/fi/pvr150/SimpleGray-OSD-0.4.tar.bz2' - 'http://www.jobs-khakis-chicks.com/MythTV/IsthmusBlue-OSD.tar.gz' - 'http://static.castlesblog.com/public/Glass-OSD-V1.3.zip' - 'http://static.castlesblog.com/public/Minimal-OSD-V1.1.zip') - -build() { - cd ${srcdir} - mkdir -p ${pkgdir}/usr/share/mythtv/themes - - msg "Copying files..." - for d in `ls -d */` - do - cp -a "${d}" ${pkgdir}/usr/share/mythtv/themes - done - - # Housekeeping - rm -fr "${pkgdir}/usr/share/mythtv/themes/__MACOSX" || return 1 - # Little fix - cd ${pkgdir}/usr/share/mythtv/themes/Retro-wide || return 1 - patch -p0 <${srcdir}/retro-wide_video-ui.xml-filetypes.patch || return 1 -} - -md5sums=('878605505599a0f49c44f3df9affe10f' - '7c2a2b238b7d44e52b7a8a0361d395aa' - '2890f3b991db805a88a48eb6c7048f91' - 'c6d90fb469bc30a94e32f76c82122dd3' - '80d250bf87c8f72ee238a91c854c0a11' - 'c973d0779967034f7a5bc0043574d6f9' - 'fb32ddd900e54cff62a62a21025b2585' - '79247cf87bbee10363bb214325b7f671' - '67c501b80afdefeca623261634dafd9c' - '7b2f2eca37f2d9598b00bce85a193bae' - '9793dc85a486e1ad9d0c0b6684efd245' - 'a36bb7b2597a44128401b1aba9106122' - '21d6f967631e45b7039b965a63755282' - 'bfc56ffe1c872989f7a1cb7ae20aea49' - 'e05bb3d77a11f97a1d547b2f5bc1ddf7' - '09dd8679b56794f9850a2382b4e1ea62' - 'b6c187b233778abacce102fe609d4e09' - 'f8d4fd90f1e45512ea5237de59d5090d' - '5646e1df6f593f7116cbdec656146266') diff --git a/abs/core/mythtv/stable-0.24/morethemes/retro-wide_video-ui.xml-filetypes.patch b/abs/core/mythtv/stable-0.24/morethemes/retro-wide_video-ui.xml-filetypes.patch deleted file mode 100644 index c98487f..0000000 --- a/abs/core/mythtv/stable-0.24/morethemes/retro-wide_video-ui.xml-filetypes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- video-ui.xml.orig 2010-07-04 06:21:18.000000000 +0000 -+++ video-ui.xml 2010-07-04 06:22:22.000000000 +0000 -@@ -967,14 +967,17 @@ - - <button name="done_button" from="basebutton"> - <position>700,550</position> -+ <value>Done</value> - </button> - - <button name="new_button" from="basebutton"> -- <position>600,550</position> -+ <position>400,550</position> -+ <value>New</value> - </button> - - <button name="delete_button" from="basebutton"> -- <position>0,550</position> -+ <position>100,550</position> -+ <value>Delete</value> - </button> - </window> - diff --git a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD deleted file mode 100644 index 760948f..0000000 --- a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD +++ /dev/null @@ -1,129 +0,0 @@ -# $Id: PKGBUILD 91281 2010-09-26 06:04:21Z remy $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgbase=mythplugins -pkgname=('mytharchive' - 'mythbrowser' - 'mythgallery' - 'mythgame' - 'mythmusic' - 'mythnetvision' - 'mythnews' - 'mythvideo' - 'mythweather' - 'mythzoneminder') -pkgver=0.24 -pkgrel=20 -arch=('i686' 'x86_64') -url="http://www.mythtv.org" -license=('GPL') -conflicts=('mythmovies') -makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw2' 'dvdauthor' 'libexif' - 'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple' 'dcraw' - 'libvisual' 'perl-xml-xpath' 'perl-image-size' 'perl-json' - 'perl-class-inspector' 'perl-datetime-format-iso8601' - 'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth') -source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-0.24-fixes.tar.bz2 - mythburn.py.patch) -_gitroot="https://github.com/MythTV/mythtv.git" -_gitname="mythtv" - -build() { - cd "${srcdir}/${_gitname}" - msg "Updating from GIT..." - git pull - msg "The local files are updated." - find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - cd ${srcdir}/${_gitname}/${pkgbase} - ./configure --prefix=/usr \ - --enable-all - - qmake mythplugins.pro || return 1 - make || return 1 -} - -package_mytharchive() { - pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows" - depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor' 'm2vrequantiser') -# replaces=('mytharchive') - cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive" - patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py.patch || return 1 - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythbrowser() { - pkgdesc="Mini web browser for MythTV" - depends=("mythtv>=${pkgver}") -# replaces=('mythbrowser') - cd "${srcdir}/${_gitname}/${pkgbase}/mythbrowser" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythgallery() { - pkgdesc="Image gallery plugin for MythTV" - depends=("mythtv>=${pkgver}" 'libexif') -# replaces=('mythgallery') - cd "${srcdir}/${_gitname}/${pkgbase}/mythgallery" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythgame() { - pkgdesc="Game emulator module for MythTV" - depends=("mythtv>=${pkgver}" 'zlib') -# replaces=('mythgame') - cd "${srcdir}/${_gitname}/${pkgbase}/mythgame" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythmusic() { - pkgdesc="Music playing plugin for MythTV" - depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual-plugins' 'projectm') -# replaces=('mythmusic') - cd "${srcdir}/${_gitname}/${pkgbase}/mythmusic" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythnetvision() { - pkgdesc="MythNetvision plugin for MythTV" - depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth') -# replaces=('mythnetvision') - cd "${srcdir}/${_gitname}/${pkgbase}/mythnetvision" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythnews() { - pkgdesc="News checking plugin for MythTV" - depends=("mythtv>=${pkgver}") -# replaces=('mythnews') - cd "${srcdir}/${_gitname}/${pkgbase}/mythnews" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythvideo() { - pkgdesc="Video playback and browsing plugin for MythTV" - depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple') -# replaces=('mythvideo') - cd "${srcdir}/${_gitname}/${pkgbase}/mythvideo" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythweather() { - pkgdesc="Weather checking plugin for MythTV" - depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size' - 'perl-class-inspector' 'perl-datetime-format-iso8601' - 'perl-date-manip' 'perl-json') -# replaces=('mythweather') - cd "${srcdir}/${_gitname}/${pkgbase}/mythweather" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} - -package_mythzoneminder() { - pkgdesc="Allows for viewing of CCTV cameras through zoneminder" - depends=("mythtv>=${pkgver}" zoneminder) -# replaces=('mythzoneminder') -# install=mythplugins-mythzoneminder.install - cd "${srcdir}/${_gitname}/${pkgbase}/mythzoneminder" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} -md5sums=('91488a6b1b05d14c5c5c601908b699e5' - 'cc7e6887acda167fcc5336af33f29411') diff --git a/abs/core/mythtv/stable-0.24/mythplugins/mythburn.py.patch b/abs/core/mythtv/stable-0.24/mythplugins/mythburn.py.patch deleted file mode 100644 index abac7df..0000000 --- a/abs/core/mythtv/stable-0.24/mythplugins/mythburn.py.patch +++ /dev/null @@ -1,303 +0,0 @@ ---- mythburn.py.orig 2011-09-16 13:41:43.000000000 -0500 -+++ mythburn.py 2011-09-17 10:51:36.000000000 -0500 -@@ -38,7 +38,7 @@ - #****************************************************************************** - - # version of script - change after each update --VERSION="0.1.20101206-1" -+VERSION="0.1.20110821-1" - - # keep all temporary files for debugging purposes - # set this to True before a first run through when testing -@@ -75,6 +75,7 @@ - from fcntl import ioctl - import CDROM - from shutil import copy -+from subprocess import Popen, PIPE - - # media types (should match the enum in mytharchivewizard.h) - DVD_SL = 0 -@@ -606,7 +607,7 @@ - # of a video file from its stream info file - - def getVideoParams(folder): -- """Returns the video resolution, fps and aspect ratio for the video file from the streamindo.xml file""" -+ """Returns the video resolution, fps and aspect ratio for the video file from the streaminfo.xml file""" - - #open the XML containing information about this file - infoDOM = xml.dom.minidom.parse(os.path.join(folder, 'streaminfo.xml')) -@@ -642,14 +643,14 @@ - # Gets the aspect ratio of a video file from its stream info file - - def getAspectRatioOfVideo(index): -- """Returns the aspect ratio of the video file (1.333, 1.778, etc)""" -+ """Returns the aspect ratio of the original video file (1.333, 1.778, etc)""" - - #open the XML containing information about this file -- infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo.xml')) -+ infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo_orig.xml')) - - #error out if its the wrong XML - if infoDOM.documentElement.tagName != "file": -- fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo.xml')) -+ fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo_orig.xml')) - video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0] - if video.attributes["aspectratio"].value != 'N/A': - aspect_ratio = float(video.attributes["aspectratio"].value) -@@ -1762,6 +1763,37 @@ - - - ############################################################# -+# Finds the path of a video file from the local video path -+# or Storage Group -+ -+def getVideoPath(filename): -+ # connect -+ db = getDatabaseConnection() -+ # create a cursor -+ cursor = db.cursor() -+ # execute SQL statement -+ cursor.execute("""SELECT dirname -+ FROM storagegroup -+ WHERE groupname='Videos'""") -+ # get the resultset as a tuple -+ result = cursor.fetchall() -+ # make result a list and add local video path if exists -+ result = [videopath] + list(result) -+ -+ # iterate through result set -+ for sg in result: -+ if doesFileExist(os.path.join("".join(sg), filename)) == True: -+ filepath = "".join(sg) -+ write("Video Path: %s" % filepath) -+ return (filepath) -+ break -+ -+ db.close() -+ del db -+ del cursor -+ -+ -+############################################################# - # Pre-process a single video/recording file - - def preProcessFile(file, folder, count): -@@ -1775,11 +1807,11 @@ - #3. Extract a single frame from the video to use as a thumbnail and resolution check - mediafile="" - -- if file.attributes["type"].value == "recording": -+ if file.attributes["type"].value=="recording": - mediafile = file.attributes["filename"].value -- elif file.attributes["type"].value == "video": -- mediafile = os.path.join(videopath, file.attributes["filename"].value) -- elif file.attributes["type"].value == "file": -+ elif file.attributes["type"].value=="video": -+ mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) -+ elif file.attributes["type"].value=="file": - mediafile = file.attributes["filename"].value - else: - fatalError("Unknown type of video file it must be 'recording', 'video' or 'file'.") -@@ -1935,9 +1967,39 @@ - - if result <> 0: - fatalError("Failed while running mytharchivehelper to get stream information from %s" % filename) -+ -+ #open the XML containing information about this file -+ infoDOM = xml.dom.minidom.parse(xmlFilename) -+ -+ #error out if its the wrong XML -+ if infoDOM.documentElement.tagName != "file": -+ fatalError("This info file doesn't look right (%s)." % xmlFilename) -+ -+ file = infoDOM.getElementsByTagName("file")[0] -+ video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0] -+ -+ #use ffmpeg to get display aspect ratio (DAR) of video -+ cmd = path_ffmpeg[0] + " -i " + quoteFilename(file.attributes["filename"].value) + " 2>&1" -+ aspect_ratio = Popen(cmd, shell=True, stdout=PIPE).stdout.read() -+ if "DAR" in aspect_ratio: -+ #clean DAR string -+ aspect_ratio = aspect_ratio.split("DAR ")[-1].split(",")[0] -+ aspect_ratio = ''.join([c for c in aspect_ratio if c in '1234567890:']).split(":") -+ else: -+ #calculate aspect from video size -+ aspect_ratio = getVideoSize(xmlFilename) -+ -+ #convert to decimal -+ aspect_ratio = float(aspect_ratio[0]) / float(aspect_ratio[1]) -+ -+ write("Video %s aspect ratio is: %s" % (filename, aspect_ratio)) -+ -+ #set aspect ratio -+ video.setAttribute("aspectratio",str(aspect_ratio)) -+ -+ WriteXMLToFile (infoDOM,xmlFilename) - - # print out the streaminfo.xml file to the log -- infoDOM = xml.dom.minidom.parse(xmlFilename) - write("streaminfo.xml :-\n" + infoDOM.toprettyxml(" ", ""), False) - - ############################################################# -@@ -2322,7 +2384,7 @@ - ############################################################# - # Re-encodes a file to mpeg2 - --def encodeVideoToMPEG2(source, destvideofile, video, audio1, audio2, aspectratio, profile): -+def encodeVideoToMPEG2(source, destvideofile, video, folder, audio1, audio2, aspectratio, profile): - """Encodes an unknown video source file eg. AVI to MPEG2 video and AC3 audio, use ffmpeg""" - - profileNode = findEncodingProfile(profile) -@@ -2347,6 +2409,18 @@ - value = quoteFilename(destvideofile) - if value == "%aspect": - value = aspectratio -+ if value == "720x480" or value == "720x576": -+ #add padding to correct for aspects > than 1.9:1 -+ videores, fps, videoAR = getVideoParams(folder) -+ if float(videoAR) >= 1.9: -+ if videomode == "ntsc": -+ videoheight = 480 -+ else: -+ videoheight = 576 -+ -+ croppixels = videoheight - (720 / float(videoAR)) -+ write("CropPixels Total: %s" % croppixels) -+ value = "720x%d -vf pad=720:%d:0:%d:black" % (videoheight - croppixels, videoheight, croppixels / 2) - - # only re-encode the audio if it is not already in AC3 format - if audio1[AUDIO_CODEC] == "AC3": -@@ -2383,12 +2457,12 @@ - command += " -newaudio" - - #make sure we get the correct stream(s) that we want -- command += " -map 0:%d -map 0:%d " % (video[VIDEO_INDEX], audio1[AUDIO_INDEX]) -+ command += " -map 0:%d -map 0:%d" % (video[VIDEO_INDEX], audio1[AUDIO_INDEX]) - if audio2[AUDIO_ID] != -1: - command += "-map 0:%d" % (audio2[AUDIO_INDEX]) - - if passes == 1: -- write(command) -+ write("Running ffmpeg: %s" % command) - result = runCommand(command) - if result!=0: - fatalError("Failed while running ffmpeg to re-encode video.\n" -@@ -2399,7 +2473,7 @@ - - pass1 = string.replace(command, "%passno","1") - pass1 = string.replace(pass1, "%passlogfile", passLog) -- write("Pass 1 - " + pass1) -+ write("Running ffmpeg Pass 1: %s" % pass1) - result = runCommand(pass1) - - if result!=0: -@@ -2411,7 +2485,7 @@ - - pass2 = string.replace(command, "%passno","2") - pass2 = string.replace(pass2, "%passlogfile", passLog) -- write("Pass 2 - " + pass2) -+ write("Running ffmpeg Pass 2: %s" % pass2) - result = runCommand(pass2) - - if result!=0: -@@ -2443,10 +2517,6 @@ - outaudiosamplerate = 48000 - outaudiocodec = "ac3" - deinterlace = 0 -- croptop = 0 -- cropright = 0 -- cropbottom = 0 -- cropleft = 0 - qmin = 5 - qmax = 31 - qdiff = 31 -@@ -2470,14 +2540,6 @@ - outvideores = value - if name == "-deinterlace": - deinterlace = 1 -- if name == "-croptop": -- croptop = value -- if name == "-cropright": -- cropright = value -- if name == "-cropbottom": -- cropbottom = value -- if name == "-cropleft": -- cropleft = value - if name == "-qmin": - qmin = value - if name == "-qmax": -@@ -2526,7 +2588,6 @@ - command += "-aspect %s -r %s " % (aspectratio, fps) - if (deinterlace == 1): - command += "-deinterlace " -- command += "-croptop %s -cropright %s -cropbottom %s -cropleft %s " % (croptop, cropright, cropbottom, cropleft) - command += "-s %s -b %s -vcodec mpeg2video " % (outvideores, outvideobitrate) - command += "-qmin %s -qmax %s -qdiff %s " % (qmin, qmax, qdiff) - command += "-ab %s -ar %s -acodec %s " % (outaudiobitrate, outaudiosamplerate, outaudiocodec) -@@ -2543,7 +2604,7 @@ - if (not(doesFileExist(os.path.join(folder, "audout")) and doesFileExist(os.path.join(folder, "vidout")))): - fatalError("Waited too long for mythtranscode to create the fifos - giving up!!") - -- write("Running ffmpeg") -+ write("Running ffmpeg: %s" % command) - result = runCommand(command) - if result != 0: - os.kill(PID, signal.SIGKILL) -@@ -4724,7 +4785,7 @@ - elif file.attributes["type"].value=="recording": - mediafile = file.attributes["filename"].value - elif file.attributes["type"].value=="video": -- mediafile=os.path.join(videopath, file.attributes["filename"].value) -+ mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) - elif file.attributes["type"].value=="file": - mediafile=file.attributes["filename"].value - else: -@@ -4834,8 +4895,7 @@ - starttime = -1 - usecutlist = -1 - -- encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, -- profile, usecutlist) -+ encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, profile, usecutlist) - mediafile = os.path.join(folder, 'newfile2.mpg') - else: - #we need to re-encode the file, make sure we get the right video/audio streams -@@ -4861,8 +4921,7 @@ - profile = defaultEncodingProfile - - #do the re-encode -- encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, -- audio1, audio2, aspectratio, profile) -+ encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, folder, audio1, audio2, aspectratio, profile) - mediafile = os.path.join(folder, 'newfile2.mpg') - - #remove the old mediafile that was run through mythtranscode -@@ -4936,7 +4995,7 @@ - elif file.attributes["type"].value=="recording": - mediafile = file.attributes["filename"].value - elif file.attributes["type"].value=="video": -- mediafile=os.path.join(videopath, file.attributes["filename"].value) -+ mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) - elif file.attributes["type"].value=="file": - mediafile=file.attributes["filename"].value - else: -@@ -4988,8 +5047,7 @@ - starttime = -1 - usecutlist = -1 - -- encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, -- profile, usecutlist) -+ encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, profile, usecutlist) - mediafile = os.path.join(folder, 'newfile2.mpg') - else: - #we need to re-encode the file, make sure we get the right video/audio streams -@@ -5015,8 +5073,7 @@ - profile = defaultEncodingProfile - - #do the re-encode -- encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, -- audio1, audio2, aspectratio, profile) -+ encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, folder, audio1, audio2, aspectratio, profile) - mediafile = os.path.join(folder, 'newfile2.mpg') - - #remove an intermediate file diff --git a/abs/core/mythtv/stable-0.24/mythplugins/mythplugins-mythzoneminder.install b/abs/core/mythtv/stable-0.24/mythplugins/mythplugins-mythzoneminder.install deleted file mode 100644 index 142212b..0000000 --- a/abs/core/mythtv/stable-0.24/mythplugins/mythplugins-mythzoneminder.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo "If you want to use this plugin, install zoneminder from AUR." -} diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD b/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD deleted file mode 100644 index c145741..0000000 --- a/abs/core/mythtv/stable-0.24/mythsmolt/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=mythsmolt -pkgver=0.24 -pkgrel=9 -pkgdesc="mythsmolt, a hardware profileing tool" -arch=('i686' 'x86_64') -url="http://www.mythvantage.com" -license=('GPL') -depends=("mythtv>=${pkgver}" urlgrabber python-simplejson python-pycurl) -#source=("http://jmeyer.us/download/mythsmolt.tar.gz" 'smolt_init_login.sh' 'mythsmolt.patch') -source=("http://jmeyer.us/download/mythsmolt.tar.gz" 'smolt_init_login.sh' ) - -groups=('mythtv-extras') - -build() { - cd $startdir/src/mythsmolt -# patch -p1 < ../mythsmolt.patch || return 1 - ./configure.sh - make || return 1 - make INSTALL_ROOT=$startdir/pkg install - install -D -m 755 $srcdir/smolt_init_login.sh $pkgdir/etc/profile.d/smolt_init_login.sh -} -md5sums=('17d740c348301ab47ac557ad7402115b' - '57a3416d90e59abbd5062436583c17e1') diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/mythsmolt.patch b/abs/core/mythtv/stable-0.24/mythsmolt/mythsmolt.patch deleted file mode 100644 index 4767865..0000000 --- a/abs/core/mythtv/stable-0.24/mythsmolt/mythsmolt.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -ruaN mythsmolt.orig/settings.pro mythsmolt/settings.pro ---- mythsmolt.orig/settings.pro 2010-01-06 15:49:59.000000000 +0000 -+++ mythsmolt/settings.pro 2010-05-28 03:30:59.000000000 +0000 -@@ -1,3 +1,3 @@ - --LIBVERSION = 0.24 -+LIBVERSION = 0.24 - diff --git a/abs/core/mythtv/stable-0.24/mythsmolt/smolt_init_login.sh b/abs/core/mythtv/stable-0.24/mythsmolt/smolt_init_login.sh deleted file mode 100644 index 0b76305..0000000 --- a/abs/core/mythtv/stable-0.24/mythsmolt/smolt_init_login.sh +++ /dev/null @@ -1,39 +0,0 @@ -if [ $UID = 0 -o $UID = 1000 ] -then - INIT=`ps -p 1 -o comm=` - if [ x$INIT = xrunit ] - then - if [[ -f /home/mythtv/.configure && $- = *i* ]] - then - if [ ! -z "$PS1" ] - then - if [ $0 = "-bash" ] - then - if [ ! -e /home/mythtv/.mythtv/MythSmolt/hw-uuid ] - then - echo "" - echo "####################################################" - echo "It appears you have not yet run smolt" - echo "Please take the time to submit your hardware profile" - echo "" - echo "press any key to continue:" - echo "####################################################" - read a - mkdir -p /home/mythtv/.mythtv/MythSmolt - chown -R mythtv:users /home/mythtv/.mythtv/MythSmolt - - if [ $UID = 0 ] - then - su mythtv -c "/usr/share/mythtv/mythsmolt/scripts/sendProfile.py" && su mythtv -c "touch /home/mythtv/.mythtv/MythSmolt/hw-uuid" - else - /usr/share/mythtv/mythsmolt/scripts/sendProfile.py && touch /home/mythtv/.mythtv/MythSmolt/hw-uuid - fi - fi - fi - fi - fi - fi -fi - - - diff --git a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD deleted file mode 100644 index 96fa147..0000000 --- a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 86938 2010-08-06 21:53:33Z ibiru $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: kleptophobiac@gmail.com - -pkgname=myththemes -pkgver=0.24 -pkgrel=9 -pkgdesc="Themes for MythTV" -arch=('any') -url="http://www.mythtv.org/" -license=('GPL') -depends=("mythtv>=${pkgver}") -source=('ftp://ftp.knoppmyth.net/R6/sources/myththemes-0.24-fixes.tar.bz2' `echo ${patches[@]:0}`) -_gitroot="https://github.com/MythTV/myththemes.git" -_gitname="${pkgname}" -build() { - cd $srcdir/myththemes - git pull - rm -fr Mythbuntu - # apply patches - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patchs[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - cd "${srcdir}/${pkgname}" - ./configure --prefix=/usr || return 1 -} -package() { - cd "${srcdir}/${pkgname}" - make INSTALL_ROOT="${pkgdir}" install || return 1 -} -md5sums=('a5c9475a6d29c313cd9ae77566ee277a') diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD deleted file mode 100755 index e9d9a12..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD +++ /dev/null @@ -1,109 +0,0 @@ -# $Id: PKGBUILD 91139 2010-09-23 10:45:09Z remy $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: <kleptophobiac@gmail.com> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=mythtv -pkgver=0.24 -pkgrel=30 -pkgdesc="A Homebrew PVR project" -arch=('i686' 'x86_64') -url="http://www.mythtv.org/" -license=('GPL') -depends=('mysql-clients' 'qt' 'lame' 'lirc-utils' 'ffmpeg-svn' 'libxvmc' - 'fribidi' 'perl-soap-lite' 'perl-date-manip' 'perl-xml-sax' - 'perl-math-round' 'perl-net-upnp' 'perl-dbd-mysql' 'perl-time-hires' - 'libavc1394' 'wget' 'libiec61883' 'mysql-python' 'python-lxml' - 'mesa' 'libxinerama' 'libxrandr' 'faad2' 'libvdpau' 'libcrystalhd-git') -makedepends=('yasm' 'libgl' 'git' 'rsync') -replaces=() -groups=('pvr') -#backup=(/usr/share/mythtv/is.xml) -#options=(!strip) -#MAKEFLAGS="-j6" -install='mythtv.install' -patchs=('smolt_jump.patch' 'git_version.patch') -optdepends=('xmltv: to download tv listings') -#replaces=('mythtv-contrib') -#conflicts=('mythtv-contrib') -source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-0.24-fixes.tar.bz2 - 'mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty' - 'http://www.ronfrazier.net/mythtv/0.24/downloads/ceton_ver008.patch') -_gitroot="https://github.com/MythTV/mythtv.git" -_gitname="${pkgname}" -build() { - - cd "${srcdir}/${pkgname}"/mythtv - msg "Updating from GIT..." - #git checkout -b 0.24-fixes origin/fixes/0.24 - git pull - msg "The local files are updated." - # apply patches - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patchs[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo Applying patch for Ceton InfinTV4 - patch -p2 < ${startdir}/src//ceton_ver008.patch - echo "--------------------------done applying patches-----------------------------------------------" - - sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro - find bindings/python contrib -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - - ARCH=${CARCH/_/-} - ./configure --prefix=/usr --cpu=${ARCH} \ - --disable-audio-jack \ - --disable-audio-pulse \ - --disable-altivec \ - --disable-distcc \ - --disable-ccache \ - --enable-vdpau \ - --enable-crystalhd \ - --dvb-path=/usr/include \ - --enable-opengl-vsync \ - --with-bindings=perl,python --python=python2 || return 1 - - make all || return 1 -} - -package() { - cd "${srcdir}/${pkgname}"/mythtv - # basic install - make INSTALL_ROOT="${pkgdir}" install - # install contrib files - rsync -arp --exclude .svn --delete-excluded contrib ${pkgdir}/usr/share/mythtv/ || return 1 - # install database structure - rsync -arp --exclude .svn --delete-excluded database ${pkgdir}/usr/share/mythtv/ || return 1 - # install docs - rsync -arp --exclude .svn --delete-excluded docs ${pkgdir}/usr/share/mythtv/ || return 1 - - # patch the xml LinHES style - cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/ -# mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/ - cd ${pkgdir}/usr/share/mythtv - patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1 - patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1 - patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1 - patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1 - - # make log dir - mkdir -p ${pkgdir}/var/log/mythtv - chown 1000.1000 ${pkgdir}/var/log/mythtv - mkdir -p ${pkgdir}/etc/logrotate.d - cp ${srcdir}/*.lr ${pkgdir}/etc/logrotate.d - mkdir -p ${pkgdir}/etc/cron.hourly/ - install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/ -} -md5sums=('91488a6b1b05d14c5c5c601908b699e5' - '7ef6de58240e7aad389a0b13d91b1cf6' - '2babd4b8e146a7538d18dcd55695b0be' - 'a837de9ccc201994320071e48952b17d' - 'd048fd37d5061c853b5712d5f187b25d' - 'f735805a80b0d1180dee01f9df1b7004' - 'f407d6af23e74a49540755420f84fa58' - '5469d9921b726db750b991c87d226158' - '8837b2305030a2326b22f4330968e29a') diff --git a/abs/core/mythtv/stable-0.24/mythtv/__changelog b/abs/core/mythtv/stable-0.24/mythtv/__changelog deleted file mode 100644 index 940f84b..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/__changelog +++ /dev/null @@ -1 +0,0 @@ -update to 0.24-fixes diff --git a/abs/core/mythtv/stable-0.24/mythtv/git_version.patch b/abs/core/mythtv/stable-0.24/mythtv/git_version.patch deleted file mode 100644 index 1cdfaa9..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/git_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruaN mythtv.orig/mythtv/version.sh mythtv/mythtv/version.sh ---- version.sh 2010-12-29 22:27:10.000000000 +0000 -+++ version.sh 2010-12-29 23:36:19.000000000 +0000 -@@ -22,7 +22,7 @@ - - cd ${GITTREEDIR} - --SOURCE_VERSION=$(git describe --dirty || git describe || echo Unknown) -+SOURCE_VERSION=$(git describe | cut -d- -f 3 || echo Unknown) - - case "${SOURCE_VERSION}" in - exported|Unknown) diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml deleted file mode 100644 index ac52497..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/HOST_SETTINGS.xml +++ /dev/null @@ -1,94 +0,0 @@ -<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-0.24/mythtv/menu-xml/is.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/is.xml deleted file mode 100644 index 88b7e6b..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/is.xml +++ /dev/null @@ -1,3 +0,0 @@ -<mythmenu name="Internet Steams"> - -</mythmenu> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/library.xml.patch deleted file mode 100644 index be06e34..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/library.xml.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- themes/defaultmenu/library.xml.orig 2010-11-06 00:39:51.000000000 +0000 -+++ themes/defaultmenu/library.xml 2010-11-06 00:44:54.000000000 +0000 -@@ -44,8 +44,7 @@ - <type>STREAM</type> - <text>Play Online Streams</text> - <description></description> -- <action>PLUGIN mythstream</action> -- <depends>mythstream</depends> -+ <action>MENU is.xml</action> - </button> - - <button> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml deleted file mode 100644 index 01b6ffa..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/linhes.xml +++ /dev/null @@ -1,59 +0,0 @@ -<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="DE">Zubehör / Konfiguration</text> - <text lang="DA">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">è¨å®~Z</text> - <text lang="FI">Oheis/Asetukset</text> - <text lang="ZH_TW">å·¥å~E·/è¨å®~Z</text> - <text lang="SL">Nastavitve</text> - <text lang="ET">Utiliidid / sätted</text> - <text lang="RU">УÑ~BилиÑ~BÑ~K / Ð~]аÑ~AÑ~BÑ~@ойки</text> - <text lang="AR">تضبÙ~Jطات</text> - <text lang="PL">NarzÄ~Ydzia / ustawienia</text> - <text lang="HE">×¢×~Vר×~Y×~] / ×~T×~R×~Sר×~Uת</text> - <text lang="HU">Eszközök / BeállÃtások</text> - <alttext lang="DE">Verschiedenes</alttext> - <alttext lang="SV">Inställningar</alttext> - <alttext lang="ET">Sätted</alttext> - <alttext lang="RU">Ð~]аÑ~AÑ~BÑ~@ойки</alttext> - <alttext lang="AR">تضبÙ~Jطات</alttext> - <description>Configure MythTV and plugins</description> - <description lang="DE">MythTV und Plugins konfigurieren</description> - <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>Update LinHES</text> - <action>MENU update.xml</action> - </button> -<!--#Check for updates--> -</mythmenu> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mainmenu.xml.patch deleted file mode 100644 index 0491803..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mainmenu.xml.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- themes/defaultmenu/mainmenu.xml.orig 2010-11-08 22:30:08.000000000 +0000 -+++ themes/defaultmenu/mainmenu.xml 2010-11-08 22:35:51.000000000 +0000 -@@ -2,6 +2,13 @@ - <mythmenu name="MAIN"> - - <button> -+ <type>TV_WATCH_TV</type> -+ <text>Watch TV</text> -+ <description>Watch live television</description> -+ <action>TV_WATCH_LIVE</action> -+ </button> -+ -+ <button> - <type>MENU_MEDIA_LIBRARY</type> - <text>Media Library</text> - <action>MENU library.xml</action> -@@ -31,17 +38,10 @@ - </button> - - <button> -- <type>TV_WATCH_TV</type> -- <text>Watch TV</text> -- <description>Watch live television</description> -- <action>TV_WATCH_LIVE</action> -- </button> -- -- <button> - <type>MENU_UTILITIES_SETUP</type> -- <text>Utilities / Setup</text> -- <description>Configure MythTV and plugins</description> -- <action>MENU util_menu.xml</action> -+ <text>Service Menu</text> -+ <description>Configure your system</description> -+ <action>MENU linhes.xml</action> - </button> - - </mythmenu> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythbackup.xml deleted file mode 100644 index 5914b33..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythbackup.xml +++ /dev/null @@ -1,20 +0,0 @@ -<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-0.24/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythrestore.xml deleted file mode 100644 index 8f5c285..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/mythrestore.xml +++ /dev/null @@ -1,20 +0,0 @@ -<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-0.24/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/optical_menu.xml.patch deleted file mode 100644 index 143424f..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/optical_menu.xml.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- themes/defaultmenu/optical_menu.xml.orig 2010-11-06 00:39:43.000000000 +0000 -+++ themes/defaultmenu/optical_menu.xml 2010-11-06 00:42:59.000000000 +0000 -@@ -26,6 +26,13 @@ - </button> - - <button> -+ <type>DVD_RIP</type> -+ <text>Import video files from DVD</text> -+ <description>Import video files from a data DVD</description> -+ <action>EXEC /usr/LH/bin/importfiles.sh</action> -+ </button> -+ -+ <button> - <type>MUSIC_RIP</type> - <text>Import CD</text> - <description>Import music from an audio CD</description> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/original/create_patch.sh b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/original/create_patch.sh deleted file mode 100755 index 34d8b8c..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/original/create_patch.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -for i in *.xml -do - diff -u $i.orig $i > ../$i.patch -done diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/setup.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/setup.xml deleted file mode 100644 index f56bb6f..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/setup.xml +++ /dev/null @@ -1,111 +0,0 @@ -<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-0.24/mythtv/menu-xml/siriusmenu.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/siriusmenu.xml deleted file mode 100644 index e317b36..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/siriusmenu.xml +++ /dev/null @@ -1,419 +0,0 @@ -<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 & 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-0.24/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml deleted file mode 100644 index d2ac3fe..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update.xml +++ /dev/null @@ -1,9 +0,0 @@ -<mythmenu name="LinHES"> - - <button> - <type>UPGRADE</type> - <text>Check for Updates</text> - <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action> - </button> - -</mythmenu> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml deleted file mode 100644 index 64388cb..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/update2.xml +++ /dev/null @@ -1,20 +0,0 @@ -<mythmenu name="LinHES"> - - <button> - <type>UPGRADE</type> - <text>Install Updates</text> - <action>EXEC sudo /usr/LH/bin/linhes_update2.sh install</action> - </button> - - <button> - <type>UPGRADE</type> - <text>Cancel Updates</text> - <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action> - </button> - - <button> - <type>UPGRADE</type> - <text>View Updates</text> - <action>MENU update3.xml</action> - </button> -</mythmenu> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/util_menu.xml.patch b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/util_menu.xml.patch deleted file mode 100644 index 82d303e..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/util_menu.xml.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- themes/defaultmenu/util_menu.xml.orig 2010-11-06 00:40:01.000000000 +0000 -+++ themes/defaultmenu/util_menu.xml 2010-11-06 00:45:42.000000000 +0000 -@@ -17,6 +17,13 @@ - </button> - - <button> -+ <type>VIDEO_SCREENSHOOTER</type> -+ <text>Thumbnail Generator</text> -+ <description>Generate thumbnail images for videos</description> -+ <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action> -+ </button> -+ -+ <button> - <type>SETUP_MENU</type> - <text>Setup</text> - <description>Configure MythTV and plugins</description> diff --git a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml deleted file mode 100644 index 6b26d11..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/menu-xml/xmmenu.xml +++ /dev/null @@ -1,574 +0,0 @@ -<!-- 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-0.24/mythtv/myth.sh b/abs/core/mythtv/stable-0.24/mythtv/myth.sh deleted file mode 100755 index fb7122c..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/myth.sh +++ /dev/null @@ -1,4 +0,0 @@ -export PATH=$PATH:/usr/local/bin -# set core file size to 0 -ulimit -c 0 -export MALLOC_CHECK_=0
\ No newline at end of file diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythbackend b/abs/core/mythtv/stable-0.24/mythtv/mythbackend deleted file mode 100755 index 93773a2..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/mythbackend +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/mythbackend` -case "$1" in - start) - stat_busy "Starting MythTV Backend" - [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit - [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -v important - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/mythbackend.pid - add_daemon mythbackend - stat_done - fi - ;; - stop) - stat_busy "Stopping MythTV Backend" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mythbackend - stat_done - fi - ;; - restart) - $0 stop - sleep 1s - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr b/abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr deleted file mode 100644 index 4f218bc..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/mythbackend.lr +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/mythtv/mythbackend.log { - copytruncate - daily - size 10M - missingok - rotate 7 - compress - notifempty -} diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh b/abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh deleted file mode 100755 index e7a7b70..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/mythbackend.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash -# -# /etc/rc.d/init.d/mythbackend -# -# Starts the mythbackend as a daemon -# -# chkconfig: 345 90 10 -# description: Starts the mythbackend process as a daemon after the XWindows \ -# system is started, in runlevel 5. This allows scheduled \ -# recordings to occur without manual intervention. -# processname: mythbackend - -# Copyright (c) by Michael Thomson <linux at m-thomson dot net> -# With thanks to Stu Tomlinson <stu at nosnilmot dot com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -# Default values to use if none are supplied in the config file. -# User who should start the mythbackend processes -MBE_USER="root" -# Directory holding the mythbackend binary -MBE_LOCATION="/usr/local/bin/" -# Name of mythbackend binary -MBE_PROG="mythbackend" -# Full path to mythbackend log file -MBE_LOGFILE="/var/log/mythtv/mythbackend.log" - -# Source function library. -. /etc/init.d/functions - -# Source config file if available -if [ -f "/etc/sysconfig/mythbackend" ]; then - . /etc/sysconfig/mythbackend -fi - -test -x ${MBE_LOCATION}${MBE_PROG} || exit 0 - -RETVAL=0 - -# -# See how we were called. -# - -start() { - # Check if mythbackend is already running - if [ ! -f /var/lock/subsys/${MBE_PROG} ]; then - echo -n "Starting ${MBE_PROG}: " - # /usr/local/bin/mythbackend -d -l /some/log/file - #daemon --user ${MBE_USER} ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE} - ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE} - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${MBE_PROG} - echo - fi - return $RETVAL -} - -stop() { - echo -n "Stopping ${MBE_PROG}: " - killproc ${MBE_LOCATION}${MBE_PROG} - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${MBE_PROG} - echo - return $RETVAL -} - - -restart() { - stop - start -} - -reload() { - restart -} - -status_at() { - status ${MBE_LOCATION}${MBE_PROG} -} - -case "$1" in -start) - start - ;; -stop) - stop - ;; -reload|restart) - restart - ;; -condrestart) - if [ -f /var/lock/subsys/${MBE_PROG} ]; then - restart - fi - ;; -status) - status_at - ;; -*) - echo "Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 -esac - -exit $? -exit $RETVAL diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr b/abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr deleted file mode 100644 index 1580533..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/mythfrontend.lr +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/mythtv/mythfrontend.log { - copytruncate - daily - size 10M - missingok - rotate 7 - compress - notifempty -} diff --git a/abs/core/mythtv/stable-0.24/mythtv/mythtv.install b/abs/core/mythtv/stable-0.24/mythtv/mythtv.install deleted file mode 100755 index 3f2e304..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/mythtv.install +++ /dev/null @@ -1,63 +0,0 @@ -# arg 1: the new package version -post_install() { - 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 - ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml -} - -pre_upgrade() { - if [ ! -L /usr/share/mythtv/is.xml ] - then - mv /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.pre - else - mv /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/themes/defaultmenu/is.xml.pre - fi -} - -post_upgrade() { - if [ ! -d /var/log/mythtv ] - then - mkdir -p /var/log/mythv - chown -R mythtv /var/log/mythtv - fi - if [ -e /usr/share/mythtv/is.xml.pre ] - then - rm -fr /usr/share/mythtv/themes/defaultmenu/is.xml - mv /usr/share/mythtv/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml - ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml - else - mv /usr/share/mythtv/themes/defaultmenu/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml - fi - pacxmbc=`pacman -Q xbmc` - if [ -z "$pacxbmc" ] - then - mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp - grep -v -e /mythmenu /tmp/library.xml > /tmp/library.xml.tmp - echo "<!--#XBMC-->" >> /tmp/library.xml.tmp - echo " <button>" >> /tmp/library.xml.tmp - echo " <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp - echo " <text>Launch XBMC</text>" >> /tmp/library.xml.tmp - echo " <action>EXEC /usr/bin/xbmc</action>" >> /tmp/library.xml.tmp - echo " </button>" >> /tmp/library.xml.tmp - echo "<!--#XBMC-->" >> /tmp/library.xml.tmp - echo "" >> /tmp/library.xml.tmp - echo "</mythmenu>" >> /tmp/library.xml.tmp - mv /tmp/library.xml.tmp /usr/share/mythtv/themes/defaultmenu/library.xml - fi -} - - -# arg 1: the old package version -post_remove() { - /bin/true - -} - -op=$1 -shift -$op $* diff --git a/abs/core/mythtv/stable-0.24/mythtv/pretty b/abs/core/mythtv/stable-0.24/mythtv/pretty deleted file mode 100755 index 7e0ab21..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/pretty +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ] -then - su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /myth/pretty" -elif [ -f /usr/share/mythtv/contrib/user_jobs/mythrename.pl ] -then - su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty" -fi - diff --git a/abs/core/mythtv/stable-0.24/mythtv/smolt_jump.patch b/abs/core/mythtv/stable-0.24/mythtv/smolt_jump.patch deleted file mode 100644 index 76f884c..0000000 --- a/abs/core/mythtv/stable-0.24/mythtv/smolt_jump.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/mythfrontend/networkcontrol.cpp.orig 2010-11-08 23:07:04.000000000 +0000 -+++ programs/mythfrontend/networkcontrol.cpp 2010-11-08 23:08:06.000000000 +0000 -@@ -88,6 +88,7 @@ - jumpMap["zoneminderliveview"] = "ZoneMinder Live View"; - jumpMap["zoneminderevents"] = "ZoneMinder Events"; - jumpMap["snapshot"] = "ScreenShot"; -+ jumpMap["mythsmolt"] = "MythSmolt"; - - jumpMap["channelrecpriority"] = "Channel Recording Priorities"; - jumpMap["viewscheduled"] = "Manage Recordings / Fix Conflicts"; diff --git a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD deleted file mode 100644 index cab8fbd..0000000 --- a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -pkgname=mythweb -pkgver=0.24 -pkgrel=16 -pkgdesc="Web interface for MythTV's backend" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv>=0.24' 'lighttpd' 'php' 'local-website') -groups=('mythtv-extras') - -patches=() -source=('ftp://ftp.knoppmyth.net/R6/sources/mythweb-0.24-fixes.tar.bz2' `echo ${patches[@]:0}`) - -DOCROOT=/data/srv/httpd/htdocs/mythweb -_gitroot="https://github.com/mythtv/mythweb.git" -_gitname="${pkgname}" -build() { - - cd $startdir/src/mythweb - git pull - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${srcdir}/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data} - rsync -arp --exclude .git --delete-excluded $startdir/src/mythweb/* $startdir/pkg/$DOCROOT - rm $startdir/pkg/$DOCROOT/README - chown -R http:http $startdir/pkg/$DOCROOT - chmod g+rw $pkgdir/$DOCROOT/{image_cache,php_sessions,data} - - # mythweb modules_path fix for 0.24 - # http://code.mythtv.org/trac/ticket/9255 - cd ${pkgdir}/${DOCROOT} - ln -s modules modules_path -} -md5sums=('45703fa3899c4ee84d1b087bfcc6654e') diff --git a/abs/core/mythtv/stable-0.24/mythweb/mythweb.php.patch b/abs/core/mythtv/stable-0.24/mythweb/mythweb.php.patch deleted file mode 100644 index 4525e68..0000000 --- a/abs/core/mythtv/stable-0.24/mythweb/mythweb.php.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mythweb.php.orig 2011-02-01 03:33:56.000000000 +0000 -+++ mythweb.php 2011-02-01 03:34:20.000000000 +0000 -@@ -30,7 +30,7 @@ - if (Modules::getModule($Path[0])) { - // Add the current module directory to our search path, so modules can - // define includes, etc. -- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]); -+ ini_set('include_path', ini_get('include_path').':'.modules.'/'.$Path[0]); - // Load the module handler - require_once 'handler.php'; - } diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash index ae0574c..e29adf1 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -1 +1 @@ -f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63 +79a24c90efd3308895880cbad4a4e550986aedda diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash_web b/abs/core/mythtv/stable-0.25/git_src/git_hash_web index 814e09b..bf76f69 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash_web @@ -1 +1 @@ -8c43d8da31d738c75ec6abc9daff2772b16310c8 +89a347c85284c5cf3ca3ad7250f21c7e698af858 diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD index 2ebe525..e5dea15 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.25 -pkgrel=4 +pkgrel=17 arch=('i686' 'x86_64') url="http://www.mythtv.org" @@ -49,7 +49,7 @@ build() { #find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' cd ${srcdir}/${pkgbase} ./configure --prefix=/usr \ - --enable-all + --enable-all --python=/usr/bin/python2 qmake mythplugins.pro || return 1 make || return 1 @@ -57,11 +57,11 @@ build() { package_mytharchive() { pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows" - depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor' 'm2vrequantiser') + depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor' 'm2vrequantiser' 'mjpegtools' 'cdrkit' 'dvd+rw-tools') # replaces=('mytharchive') cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive" -# patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py.patch || return 1 + patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py.patch || return 1 make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -99,9 +99,7 @@ package_mythmusic() { package_mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" - - - depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth' 'python-lxml' ) + depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth' 'python2-lxml' 'python2' ) # replaces=('mythnetvision') cd "${srcdir}/${_gitname}/${pkgbase}/mythnetvision" make INSTALL_ROOT="${pkgdir}" install || return 1 @@ -127,11 +125,11 @@ package_mythweather() { package_mythzoneminder() { pkgdesc="Allows for viewing of CCTV cameras through zoneminder" - depends=("mythtv>=${pkgver}" zoneminder) + depends=("mythtv>=${pkgver}") # replaces=('mythzoneminder') # install=mythplugins-mythzoneminder.install cd "${srcdir}/${_gitname}/${pkgbase}/mythzoneminder" make INSTALL_ROOT="${pkgdir}" install || return 1 } -md5sums=('cc7e6887acda167fcc5336af33f29411') +md5sums=('19446f65722769926bafad220bbc6551') diff --git a/abs/core/mythtv/stable-0.25/mythplugins/__changelog b/abs/core/mythtv/stable-0.25/mythplugins/__changelog new file mode 100644 index 0000000..48cdce8 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythplugins/__changelog @@ -0,0 +1 @@ +placeholder diff --git a/abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch b/abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch index abac7df..380385b 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch +++ b/abs/core/mythtv/stable-0.25/mythplugins/mythburn.py.patch @@ -1,23 +1,32 @@ ---- mythburn.py.orig 2011-09-16 13:41:43.000000000 -0500 -+++ mythburn.py 2011-09-17 10:51:36.000000000 -0500 -@@ -38,7 +38,7 @@ - #****************************************************************************** +--- mythburn.py.orig 2012-12-16 15:23:41.000000000 -0600 ++++ mythburn.py 2012-12-18 14:23:56.000000000 -0600 +@@ -44,7 +44,7 @@ + # version of script - change after each update --VERSION="0.1.20101206-1" -+VERSION="0.1.20110821-1" +-VERSION="0.1.20120304-1" ++VERSION="0.1.20121218-1" # keep all temporary files for debugging purposes # set this to True before a first run through when testing -@@ -75,6 +75,7 @@ +@@ -93,6 +93,7 @@ from fcntl import ioctl import CDROM from shutil import copy +from subprocess import Popen, PIPE - # media types (should match the enum in mytharchivewizard.h) - DVD_SL = 0 -@@ -606,7 +607,7 @@ + import MythTV + from MythTV.altdict import OrdDict +@@ -425,7 +426,7 @@ + os.remove(os.path.join(root, name)) + + ############################################################# +-# Romoves all the objects from a directory ++# Removes all the objects from a directory + + def deleteEverythingInFolder(folder): + for root, dirs, files in os.walk(folder, topdown=False): +@@ -615,7 +616,7 @@ # of a video file from its stream info file def getVideoParams(folder): @@ -26,7 +35,7 @@ #open the XML containing information about this file infoDOM = xml.dom.minidom.parse(os.path.join(folder, 'streaminfo.xml')) -@@ -642,14 +643,14 @@ +@@ -651,14 +652,14 @@ # Gets the aspect ratio of a video file from its stream info file def getAspectRatioOfVideo(index): @@ -44,65 +53,85 @@ video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0] if video.attributes["aspectratio"].value != 'N/A': aspect_ratio = float(video.attributes["aspectratio"].value) -@@ -1762,6 +1763,37 @@ +@@ -679,7 +680,7 @@ + + #error out if its the wrong XML + if infoDOM.documentElement.tagName != "file": +- fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo_orig.xml')) ++ fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo.xml')) + + video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0] + video_start = float(video.attributes["start_time"].value) +@@ -1432,9 +1433,23 @@ + + data.rating = str(vid.userrating) + +- if doesFileExist(vid.coverfile): +- data.coverfile = vid.coverfile ++ data.coverfile = None + ++ #Check filename for valid path. If valid return nothing. ++ if os.path.isfile(str(vid.coverfile)): ++ write("Coverart is in local directory: %s" % vid.coverfile) ++ data.coverfile = vid.coverfile ++ else: ++ # iterate through storage group directories to get Coverart ++ for sg in DB.getStorageGroup(groupname='Coverart', hostname=DB.gethostname()): ++ if os.path.isfile(os.path.join(sg.dirname, str(vid.coverfile))): ++ write("Coverart is in Storage Groups: %s%s" % (sg.dirname, vid.coverfile)) ++ data.coverfile = os.path.join(sg.dirname, str(vid.coverfile)) ++ break ++ ++ if data.coverfile == None: ++ write("No Coverart Found") ++ + elif file.attributes["type"].value=="file": + data.type = file.attributes["type"].value + data.filename = file.attributes["filename"].value +@@ -1485,6 +1500,30 @@ ############################################################# -+# Finds the path of a video file from the local video path -+# or Storage Group ++# Finds the path of a video file from a Storage Group + +def getVideoPath(filename): -+ # connect -+ db = getDatabaseConnection() -+ # create a cursor -+ cursor = db.cursor() -+ # execute SQL statement -+ cursor.execute("""SELECT dirname -+ FROM storagegroup -+ WHERE groupname='Videos'""") -+ # get the resultset as a tuple -+ result = cursor.fetchall() -+ # make result a list and add local video path if exists -+ result = [videopath] + list(result) -+ -+ # iterate through result set -+ for sg in result: -+ if doesFileExist(os.path.join("".join(sg), filename)) == True: -+ filepath = "".join(sg) -+ write("Video Path: %s" % filepath) -+ return (filepath) -+ break -+ -+ db.close() -+ del db -+ del cursor ++ ++ filepath = None + ++ #Check filename for valid path. If valid return nothing. ++ if os.path.isfile(filename): ++ write("Video is in local video directory: %s" % filename) ++ return (filepath) ++ else: ++ # iterate through storage group directories ++ for sg in DB.getStorageGroup(groupname='Videos', hostname=DB.gethostname()): ++ wholepath = os.path.join(sg.dirname, filename) ++ if os.path.isfile(wholepath): ++ write("Video is in Storage Groups: %s" % wholepath) ++ filepath = "".join(sg.dirname) ++ return (filepath) ++ break ++ ++ if filepath == None: ++ write("Video is not in local video directory or Storage Groups") + +############################################################# # Pre-process a single video/recording file def preProcessFile(file, folder, count): -@@ -1775,11 +1807,11 @@ - #3. Extract a single frame from the video to use as a thumbnail and resolution check - mediafile="" - -- if file.attributes["type"].value == "recording": -+ if file.attributes["type"].value=="recording": +@@ -1501,7 +1540,7 @@ + if file.attributes["type"].value == "recording": mediafile = file.attributes["filename"].value -- elif file.attributes["type"].value == "video": + elif file.attributes["type"].value == "video": - mediafile = os.path.join(videopath, file.attributes["filename"].value) -- elif file.attributes["type"].value == "file": -+ elif file.attributes["type"].value=="video": + mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) -+ elif file.attributes["type"].value=="file": + elif file.attributes["type"].value == "file": mediafile = file.attributes["filename"].value else: - fatalError("Unknown type of video file it must be 'recording', 'video' or 'file'.") -@@ -1935,9 +1967,39 @@ +@@ -1661,6 +1700,37 @@ + fatalError("Failed while running mytharchivehelper to get stream information.\n" + "Result: %d, Command was %s" % (result, command)) - if result <> 0: - fatalError("Failed while running mytharchivehelper to get stream information from %s" % filename) -+ + #open the XML containing information about this file + infoDOM = xml.dom.minidom.parse(xmlFilename) + @@ -114,7 +143,7 @@ + video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0] + + #use ffmpeg to get display aspect ratio (DAR) of video -+ cmd = path_ffmpeg[0] + " -i " + quoteFilename(file.attributes["filename"].value) + " 2>&1" ++ cmd = "mythffmpeg -i " + quoteCmdArg(file.attributes["filename"].value) + " 2>&1" + aspect_ratio = Popen(cmd, shell=True, stdout=PIPE).stdout.read() + if "DAR" in aspect_ratio: + #clean DAR string @@ -133,74 +162,66 @@ + video.setAttribute("aspectratio",str(aspect_ratio)) + + WriteXMLToFile (infoDOM,xmlFilename) - ++ # print out the streaminfo.xml file to the log -- infoDOM = xml.dom.minidom.parse(xmlFilename) - write("streaminfo.xml :-\n" + infoDOM.toprettyxml(" ", ""), False) + infoDOM = xml.dom.minidom.parse(xmlFilename) + write(xmlFilename + ":-\n" + infoDOM.toprettyxml(" ", ""), False) +@@ -1707,7 +1777,7 @@ + write("Using cutlist: %s" % cutlist_s) - ############################################################# -@@ -2322,7 +2384,7 @@ + if (localfile != ""): +- localfile = quoteFilename(localfile) ++ localfile = quoteCmdArg(localfile) + if usecutlist == True: + command = "mythtranscode --mpeg2 --honorcutlist %s --infile %s --outfile %s" % (cutlist_s, quoteCmdArg(localfile), quoteCmdArg(destination)) + else: +@@ -1973,7 +2043,7 @@ ############################################################# # Re-encodes a file to mpeg2 -def encodeVideoToMPEG2(source, destvideofile, video, audio1, audio2, aspectratio, profile): +def encodeVideoToMPEG2(source, destvideofile, video, folder, audio1, audio2, aspectratio, profile): - """Encodes an unknown video source file eg. AVI to MPEG2 video and AC3 audio, use ffmpeg""" + """Encodes an unknown video source file eg. AVI to MPEG2 video and AC3 audio, use mythffmpeg""" profileNode = findEncodingProfile(profile) -@@ -2347,6 +2409,18 @@ - value = quoteFilename(destvideofile) +@@ -1998,7 +2068,36 @@ + value = quoteCmdArg(destvideofile) if value == "%aspect": value = aspectratio + if value == "720x480" or value == "720x576": -+ #add padding to correct for aspects > than 1.9:1 + videores, fps, videoAR = getVideoParams(folder) ++ videoWidth = int(videores.split("x")[0]) ++ videoHeight = int(videores.split("x")[1]) ++ ++ #add padding to correct for aspects > than 1.9:1 + if float(videoAR) >= 1.9: ++ #check which video type and set the correct height + if videomode == "ntsc": -+ videoheight = 480 ++ videoModeHeight = 480 + else: -+ videoheight = 576 -+ -+ croppixels = videoheight - (720 / float(videoAR)) -+ write("CropPixels Total: %s" % croppixels) -+ value = "720x%d -vf pad=720:%d:0:%d:black" % (videoheight - croppixels, videoheight, croppixels / 2) ++ videoModeHeight = 576 ++ #calculate the video height based on the aspect ratio of the video ++ #multiply by 1.185 to compensate for dvds non-square pixels ++ calVideoHeight = int(round((720 / float(videoAR)) * 1.185)) ++ if calVideoHeight % 2 == 1: ++ calVideoHeight = calVideoHeight + 1 ++ #write("calVideoHeight: %s" % calVideoHeight) ++ ++ #use original video height if the calculated video height is close ++ if (calVideoHeight + 20 < videoHeight) or (calVideoHeight - 20 > videoHeight): ++ videoHeight = calVideoHeight ++ ++ cropPixels = videoModeHeight - videoHeight ++ ++ write("Crop Pixels Total: %s" % cropPixels) ++ name = "-vf" ++ value = "\"scale=720:%d, setsar=1:1, pad=720:%d:0:%d:black\"" % (videoModeHeight - cropPixels, videoModeHeight, cropPixels / 2) ++ # only re-encode the audio if it is not already in AC3 format if audio1[AUDIO_CODEC] == "AC3": -@@ -2383,12 +2457,12 @@ - command += " -newaudio" - - #make sure we get the correct stream(s) that we want -- command += " -map 0:%d -map 0:%d " % (video[VIDEO_INDEX], audio1[AUDIO_INDEX]) -+ command += " -map 0:%d -map 0:%d" % (video[VIDEO_INDEX], audio1[AUDIO_INDEX]) - if audio2[AUDIO_ID] != -1: - command += "-map 0:%d" % (audio2[AUDIO_INDEX]) - - if passes == 1: -- write(command) -+ write("Running ffmpeg: %s" % command) - result = runCommand(command) - if result!=0: - fatalError("Failed while running ffmpeg to re-encode video.\n" -@@ -2399,7 +2473,7 @@ - - pass1 = string.replace(command, "%passno","1") - pass1 = string.replace(pass1, "%passlogfile", passLog) -- write("Pass 1 - " + pass1) -+ write("Running ffmpeg Pass 1: %s" % pass1) - result = runCommand(pass1) - - if result!=0: -@@ -2411,7 +2485,7 @@ - - pass2 = string.replace(command, "%passno","2") - pass2 = string.replace(pass2, "%passlogfile", passLog) -- write("Pass 2 - " + pass2) -+ write("Running ffmpeg Pass 2: %s" % pass2) - result = runCommand(pass2) - - if result!=0: -@@ -2443,10 +2517,6 @@ + if name == "-acodec": +@@ -2094,10 +2193,6 @@ outaudiosamplerate = 48000 outaudiocodec = "ac3" deinterlace = 0 @@ -211,7 +232,7 @@ qmin = 5 qmax = 31 qdiff = 31 -@@ -2470,14 +2540,6 @@ +@@ -2121,14 +2216,6 @@ outvideores = value if name == "-deinterlace": deinterlace = 1 @@ -226,78 +247,39 @@ if name == "-qmin": qmin = value if name == "-qmax": -@@ -2526,7 +2588,6 @@ - command += "-aspect %s -r %s " % (aspectratio, fps) - if (deinterlace == 1): - command += "-deinterlace " -- command += "-croptop %s -cropright %s -cropbottom %s -cropleft %s " % (croptop, cropright, cropbottom, cropleft) - command += "-s %s -b %s -vcodec mpeg2video " % (outvideores, outvideobitrate) - command += "-qmin %s -qmax %s -qdiff %s " % (qmin, qmax, qdiff) - command += "-ab %s -ar %s -acodec %s " % (outaudiobitrate, outaudiosamplerate, outaudiocodec) -@@ -2543,7 +2604,7 @@ - if (not(doesFileExist(os.path.join(folder, "audout")) and doesFileExist(os.path.join(folder, "vidout")))): - fatalError("Waited too long for mythtranscode to create the fifos - giving up!!") - -- write("Running ffmpeg") -+ write("Running ffmpeg: %s" % command) - result = runCommand(command) - if result != 0: - os.kill(PID, signal.SIGKILL) -@@ -4724,7 +4785,7 @@ +@@ -4409,7 +4496,7 @@ elif file.attributes["type"].value=="recording": mediafile = file.attributes["filename"].value elif file.attributes["type"].value=="video": - mediafile=os.path.join(videopath, file.attributes["filename"].value) -+ mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) ++ mediafile=os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) elif file.attributes["type"].value=="file": mediafile=file.attributes["filename"].value else: -@@ -4834,8 +4895,7 @@ - starttime = -1 - usecutlist = -1 - -- encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, -- profile, usecutlist) -+ encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, profile, usecutlist) - mediafile = os.path.join(folder, 'newfile2.mpg') - else: - #we need to re-encode the file, make sure we get the right video/audio streams -@@ -4861,8 +4921,7 @@ - profile = defaultEncodingProfile +@@ -4547,7 +4634,7 @@ #do the re-encode -- encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, + encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, - audio1, audio2, aspectratio, profile) -+ encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, folder, audio1, audio2, aspectratio, profile) ++ folder, audio1, audio2, aspectratio, profile) mediafile = os.path.join(folder, 'newfile2.mpg') #remove the old mediafile that was run through mythtranscode -@@ -4936,7 +4995,7 @@ +@@ -4621,7 +4708,7 @@ elif file.attributes["type"].value=="recording": mediafile = file.attributes["filename"].value elif file.attributes["type"].value=="video": - mediafile=os.path.join(videopath, file.attributes["filename"].value) -+ mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) ++ mediafile=os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value) elif file.attributes["type"].value=="file": mediafile=file.attributes["filename"].value else: -@@ -4988,8 +5047,7 @@ - starttime = -1 - usecutlist = -1 - -- encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, -- profile, usecutlist) -+ encodeNuvToMPEG2(chanid, starttime, mediafile, os.path.join(folder, "newfile2.mpg"), folder, profile, usecutlist) - mediafile = os.path.join(folder, 'newfile2.mpg') - else: - #we need to re-encode the file, make sure we get the right video/audio streams -@@ -5015,8 +5073,7 @@ - profile = defaultEncodingProfile +@@ -4701,7 +4788,7 @@ #do the re-encode -- encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, + encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, - audio1, audio2, aspectratio, profile) -+ encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, folder, audio1, audio2, aspectratio, profile) ++ folder, audio1, audio2, aspectratio, profile) mediafile = os.path.join(folder, 'newfile2.mpg') #remove an intermediate file diff --git a/abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install b/abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install index 142212b..a4e0c0d 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install +++ b/abs/core/mythtv/stable-0.25/mythplugins/mythplugins-mythzoneminder.install @@ -1,3 +1,11 @@ post_install() { - echo "If you want to use this plugin, install zoneminder from AUR." + . /etc/systemconfig + if [ $SystemType = Master_backend -o $SystemType = Standalone ] + then + echo "This looks a zoneminder server install" + echo "Installing zoneminder" + #for reference the pacman statement below will not work because of a db lock. + pacman -S zoneminder + fi + } diff --git a/abs/core/mythtv/stable-0.25/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch b/abs/core/mythtv/stable-0.25/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch new file mode 100644 index 0000000..d8f4a0c --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch @@ -0,0 +1,52 @@ +From b20171597097f8b933065ef3291c63194d310fbf Mon Sep 17 00:00:00 2001 +From: George Nassas <george@nassas.com> +Date: Sun, 10 Jun 2012 13:36:42 -0400 +Subject: [PATCH] protect metadata loads from multiple threads + +--- + mythtv/libs/libmythmetadata/dbaccess.cpp | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/mythtv/libs/libmythmetadata/dbaccess.cpp b/mythtv/libs/libmythmetadata/dbaccess.cpp +index 67cd904..46adb7a 100644 +--- a/mythtv/libs/libmythmetadata/dbaccess.cpp ++++ b/mythtv/libs/libmythmetadata/dbaccess.cpp +@@ -47,8 +47,11 @@ class SingleValueImp + + virtual ~SingleValueImp() {} + ++ mutable QMutex mutex; ++ + void load_data() + { ++ QMutexLocker locker(&mutex); + if (!m_ready) + { + fill_from_db(); +@@ -271,8 +274,11 @@ class MultiValueImp + .arg(m_value_name).arg(m_table_name).arg(m_id_name); + } + ++ mutable QMutex mutex; ++ + void load_data() + { ++ QMutexLocker locker(&mutex); + if (!m_ready) + { + fill_from_db(); +@@ -730,8 +736,11 @@ class FileAssociationsImp + } + } + ++ mutable QMutex mutex; ++ + void load_data() + { ++ QMutexLocker locker(&mutex); + if (!m_ready) + { + fill_from_db(); +-- +1.7.2.5 + diff --git a/abs/core/mythtv/stable-0.25/mythtv/0004-restore-fe-netcontrol-play-resume-functionality.patch b/abs/core/mythtv/stable-0.25/mythtv/0004-restore-fe-netcontrol-play-resume-functionality.patch new file mode 100644 index 0000000..440a37a --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/0004-restore-fe-netcontrol-play-resume-functionality.patch @@ -0,0 +1,27 @@ +From 2fb4b7bb111d7ec256f0b0f96c7271bcc0f61766 Mon Sep 17 00:00:00 2001 +From: George Nassas <george@nassas.com> +Date: Fri, 24 Aug 2012 00:17:08 -0400 +Subject: [PATCH 4/4] restore fe netcontrol play/resume functionality + +--- + mythtv/programs/mythfrontend/playbackbox.cpp | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp +index 734cce1..44bb343 100644 +--- a/mythtv/programs/mythfrontend/playbackbox.cpp ++++ b/mythtv/programs/mythfrontend/playbackbox.cpp +@@ -3723,7 +3723,9 @@ void PlaybackBox::processNetworkControlCommand(const QString &command) + + pginfo.SetPathname(pginfo.GetPlaybackURL()); + +- PlayX(pginfo, true, true); ++ bool ignoreBookmark = tokens[1] == "PLAY"; ++ ++ PlayX(pginfo, ignoreBookmark, true); + } + else + { +-- +1.7.2.5 + diff --git a/abs/core/mythtv/stable-0.25/mythtv/MythBase.php.patch b/abs/core/mythtv/stable-0.25/mythtv/MythBase.php.patch new file mode 100644 index 0000000..ff1f4b6 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/MythBase.php.patch @@ -0,0 +1,19 @@ +*** a/mythtv/bindings/php/MythBase.php.old 2011-04-03 06:05:31.000000000 -0500 +--- b/mythtv/bindings/php/MythBase.php 2012-03-27 05:05:16.000000000 -0500 +*************** +*** 51,57 **** + + public function __destruct() { + if (!is_null($this->cacheKey)) +! Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime); + $this->cacheKey = null; + } + +--- 51,57 ---- + + public function __destruct() { + if (!is_null($this->cacheKey)) +! Cache::setObject($this->cacheKey, $this, $this->cacheLifetime); + $this->cacheKey = null; + } + diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 0d5f979..3da2079 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,30 +6,31 @@ pkgname=mythtv pkgver=0.25 -pkgrel=9 +pkgrel=25 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') -depends=('mysql-clients' +depends=('mysql-clients' 'qt' + 'qtwebkit' 'lame' 'lirc-utils' - 'ffmpeg-svn' + 'ffmpeg' 'fribidi' 'perl-soap-lite' - 'perl-date-manip' + 'perl-date-manip' 'perl-xml-sax' 'perl-math-round' 'perl-net-upnp' 'perl-dbd-mysql' 'perl-time-hires' - 'libavc1394' - 'wget' + 'libavc1394' + 'wget' 'libiec61883' 'mysql-python' - 'python-lxml' + 'python2-lxml' 'mesa' 'libxinerama' 'libxrandr' @@ -43,7 +44,10 @@ depends=('mysql-clients' 'perl-io-socket-inet6' 'glew' 'openssl' - 'libxml2') + 'libxml2' + 'lsdvd' + 'dvdbackup' + 'x264') #glew for gpu commerical flagging #openssl for roap @@ -57,7 +61,16 @@ groups=('pvr') #options=(!strip) #MAKEFLAGS="-j6" install='mythtv.install' -patchs=('myth_settings.patch') + +#http://code.mythtv.org/trac/ticket/10504 mythweb php +#http://code.mythtv.org/trac/ticket/10773 mythexpress +#http://code.mythtv.org/trac/ticket/10825 mythexpress +#http://code.mythtv.org/trac/ticket/11032 mythexpress +patchs=('myth_settings.patch' 'MythBase.php.patch' + 'bonjour-correction.patch' + '0001-protect-metadata-loads-from-multiple-threads.patch' + '0004-restore-fe-netcontrol-play-resume-functionality.patch') + optdepends=('xmltv: to download tv listings') replaces=('mythvideo' 'myththemes') conflicts=('mythvideo' 'myththemes') @@ -90,6 +103,9 @@ build() { #sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro #find bindings/python contrib -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + #Fix Python DepreciationWarning + sed -i 's/return super(Artwork, cls).__new__(cls, attr, parent, imagetype)/return super(Artwork, cls).__new__(cls)/' ${srcdir}/mythtv/bindings/python/MythTV/dataheap.py + ARCH=${CARCH/_/-} ./configure --prefix=/usr --cpu=${ARCH} \ --disable-audio-jack \ @@ -100,6 +116,8 @@ build() { --enable-vdpau \ --enable-crystalhd \ --dvb-path=/usr/include \ + --enable-libmp3lame \ + --enable-libx264 \ --with-bindings=perl,python --python=python2 || return 1 make all || return 1 @@ -123,7 +141,7 @@ package() { patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1 patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1 patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1 - patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1 + #patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1 # make log dir mkdir -p ${pkgdir}/var/log/mythtv @@ -136,7 +154,11 @@ package() { md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' '2babd4b8e146a7538d18dcd55695b0be' - 'c4db7784c5107ae846fd795a4dabe0bc' + '322f48528b350f0e6aebfff6eab4c4ee' + '9ec33d6956464283636c1f9a781dd4fd' + '8e2a055bb3beae04c88a8e603e080422' + '67f7316c750fba17fa578d10840b9dbd' + 'ae23e6a8cffbe335fa37bf59978bf7a2' 'f735805a80b0d1180dee01f9df1b7004' 'f407d6af23e74a49540755420f84fa58' '5469d9921b726db750b991c87d226158') diff --git a/abs/core/mythtv/stable-0.25/mythtv/bonjour-correction.patch b/abs/core/mythtv/stable-0.25/mythtv/bonjour-correction.patch new file mode 100644 index 0000000..9456809 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/bonjour-correction.patch @@ -0,0 +1,32 @@ +From 8929314e77dfc5fe9bcc58f4ace4e7ba6fea9bef Mon Sep 17 00:00:00 2001 +From: George Nassas <george@nassas.com> +Date: Tue, 29 May 2012 10:11:38 -0400 +Subject: [PATCH] make backend's bonjour service name dns-compliant + +--- + mythtv/programs/mythbackend/mediaserver.cpp | 7 ++----- + 1 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/mythtv/programs/mythbackend/mediaserver.cpp b/mythtv/programs/mythbackend/mediaserver.cpp +index 043140d..19d0eb9 100644 +--- a/mythtv/programs/mythbackend/mediaserver.cpp ++++ b/mythtv/programs/mythbackend/mediaserver.cpp +@@ -256,13 +256,10 @@ void MediaServer::Init(bool bIsMaster, bool bDisableUPnp /* = false */) + m_bonjour = new BonjourRegister(); + if (m_bonjour) + { +- QByteArray dummy; + QByteArray name("Mythbackend on "); + name.append(gCoreContext->GetHostName()); +- m_bonjour->Register(nPort, +- bIsMaster ? "_mythbackend-master._tcp" : +- "_mythbackend-slave._tcp", +- name, dummy); ++ QByteArray txt(bIsMaster ? "\x0Clevel=master" : "\x0Blevel=slave"); ++ m_bonjour->Register(nPort, "_mythbackend._tcp", name, txt); + } + #endif + } +-- +1.7.2.5 + diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml index c436423..b1fa6b5 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml @@ -1,96 +1,98 @@ <mythmenu name="HOST_SETTINGS"> + <button> + <type>MV_ACCESS_SETUP_MENU</type> + <text>Access Control</text> + <action>EXEC mythinstall -s accesscontrol </action> + </button> + + <button> + <type>MV_SOFTWARE_MENU</type> + <text>Add/Remove software</text> + <action>EXEC mythinstall -s plugins,software </action> + </button> + + <button> + <type>MV_ADVANCED_SETUP_MENU</type> + <text>Advanced</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_ADVANCED_X_SETUP_MENU</type> + <text>Display</text> + <action>EXEC mythinstall -s advancedX</action> + </button> + + <button> + <type>MV_NETWORK_SETUP_MENU</type> + <text>Dynamic DNS</text> + <action>EXEC mythinstall -s ddns </action> + </button> <button> - <type>MV_NETWORK_SETUP_MENU</type> - <text>Network Settings</text> - <action>EXEC mythinstall -s network </action> + <type>MV_FILESHARES_MENU</type> + <text>File Shares</text> + <action>EXEC mythinstall -s fileshare</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> + <type>MV_MISC_SETUP_MENU</type> + <text>Miscellanous</text> + <action>EXEC mythinstall -s misc </action> </button> <button> - <type>MV_SCREENSAVER_SETUP_MENU</type> - <text>Screensaver Settings</text> - <action>EXEC mythinstall -s screensaver </action> + <type>MV_NETWORK_SETUP_MENU</type> + <text>Network</text> + <action>EXEC mythinstall -s network </action> </button> <button> - <type>MV_IR_SETUP_MENU</type> - <text>Remotes</text> + <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,software </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> + <type>MV_SCREENSAVER_SETUP_MENU</type> + <text>Screensaver</text> + <action>EXEC mythinstall -s screensaver </action> </button> <button> - <type>MV_AUDIO_SETUP_MENU</type> - <text>Audio Settings</text> - <action>EXEC mythinstall -s sound </action> + <type>MV_SHUTDOWN_SETUP_MENU</type> + <text>Shutdown Settings</text> + <action>EXEC mythinstall -s sleep </action> </button> <button> - <type>MV_ACCESS_SETUP_MENU</type> - <text>Access Control</text> - <action>EXEC mythinstall -s accesscontrol </action> + <type>MV_SYSTEM_SETUP_MENU</type> + <text>System Type</text> + <action>EXEC mythinstall -s hostype </action> </button> <button> - <type>MV_USER_SETUP_MENU</type> - <text>User Accounts</text> - <action>EXEC mythinstall -s user </action> + <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> + <type>MV_VNC_SETUP_MENU</type> + <text>VNC Service</text> + <action>EXEC mythinstall -s vnc </action> </button> - <!-- <button> - <type>SETUP_MENU</type> - <text>Settings Profile Manager</text> - <action>EXEC mythinstall -t </action> + <type>MV_WEBACCESS_SETUP_MENU</type> + <text>Web Security</text> + <action>EXEC mythinstall -s webuser </action> </button> - --> </mythmenu> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml new file mode 100644 index 0000000..2647d81 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<mythmenu name="OPTICAL_DISK"> + + <button> + <type>DVD_RIP</type> + <text>Mirror DVD</text> + <description>Creates a mirror of your DVD</description> + <action>EXEC /usr/LH/bin/ripD_eject.sh m &</action> + </button> + + <button> + <type>DVD_RIP</type> + <text>ISO of DVD</text> + <description>Creates an ISO of your DVD</description> + <action>EXEC /usr/LH/bin/ripD_eject.sh i &</action> + </button> + + <button> + <type>DVD_RIP</type> + <text>High Quality</text> + <description>Creates a high quality MPEG4 of your DVD</description> + <action>EXEC /usr/LH/bin/ripD_eject.sh h &</action> + </button> + + <button> + <type>DVD_RIP</type> + <text>Normal Quality</text> + <description>Creates a normal quality MPEG4 of your DVD</description> + <action>EXEC /usr/LH/bin/ripD_eject.sh n &</action> + </button> + + <button> + <type>DVD_RIP</type> + <text>Low Quality</text> + <description>Creates a low quality MPEG4 of your DVD</description> + <action>EXEC /usr/LH/bin/ripD_eject.sh l &</action> + </button> + +</mythmenu> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml new file mode 100644 index 0000000..017f90b --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/info_menu.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<mythmenu name="INFO"> + + <button> + <type>NEWS</type> + <text>News Feeds</text> + <description>Keep up with the news</description> + <action>PLUGIN mythnews</action> + <depends>mythnews</depends> + </button> + + <button> + <type>MYTHTWITTER_TIMELINE</type> + <text>Twitter</text> + <description>Send and receive tweets</description> + <action>JUMP MythTwitter_Timeline</action> + <depends>mythtwitter</depends> + </button> + + <button> + <type>WEATHER</type> + <text>Weather</text> + <action>PLUGIN mythweather</action> + <description>Local weather forecast</description> + <depends>mythweather</depends> + </button> + + <button> + <type>WEATHER</type> + <text>Weather Station</text> + <action>PLUGIN mythwstation</action> + <depends>mythwstation</depends> + </button> + + <button> + <type>WEBPAGE</type> + <text>Web</text> + <description>Browse the web</description> + <action>PLUGIN mythbrowser</action> + <depends>mythbrowser</depends> + </button> + + <button> + <type>RECIPE</type> + <text>Recipes</text> + <description>Start cooking!</description> + <action>PLUGIN mythRecipe</action> + <depends>mythrecipe</depends> + </button> + + <button> + <type>TV_STATUS</type> + <text>System Status</text> + <description>See what your system is doing</description> + <action>TV_STATUS</action> + </button> + + <button> + <type>ZONEMINDER</type> + <text>ZoneMinder</text> + <description>Home surveillance</description> + <action>PLUGIN mythzoneminder</action> + <depends>mythzoneminder</depends> + </button> + +<!-- + <button> + <type>SMOLT</type> + <text>Hardware profile</text> + <description>Tell us what hardware you have so we can support it</description> + <action>PLUGIN mythsmolt</action> + <depends>mythsmolt</depends> + </button> + --> + +</mythmenu> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch index fb695f0..8c36a62 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch @@ -7,7 +7,7 @@ + <type>STREAM</type> + <text>Play Online Streams</text> + <description></description> -+ <action>MENU is.xml</action> ++ <action>MENU gen_is.xml</action> + </button> + + <button> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml index 01b6ffa..342766d 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/linhes.xml @@ -34,6 +34,7 @@ <button> <type>LINHES_SETUP</type> <text>LinHES Configuration</text> + <description>Configure LinHES</description> <action>MENU HOST_SETTINGS.xml</action> </button> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch index 9b083ac..73a8940 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch @@ -1,5 +1,5 @@ ---- themes/defaultmenu/mainmenu.xml.orig 2012-04-21 17:33:52.176349680 +0000 -+++ themes/defaultmenu/mainmenu.xml 2012-04-21 17:35:03.369680109 +0000 +--- themes/defaultmenu/mainmenu.xml.orig 2012-07-29 21:39:46.000000000 +0000 ++++ themes/defaultmenu/mainmenu.xml 2012-07-29 21:41:50.000000000 +0000 @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <mythmenu name="MAIN"> @@ -12,7 +12,7 @@ <button> <type>MENU_MEDIA_LIBRARY</type> -@@ -30,17 +36,10 @@ +@@ -30,18 +36,11 @@ </button> <button> @@ -27,9 +27,11 @@ - <text>Setup</text> - <description>Configure MythTV and plugins</description> - <action>MENU main_settings.xml</action> +- <password>SetupPinCode</password> + <text>Service Menu</text> + <description>Configure your system</description> -+ <action>MENU linhes.xml</action> ++ <action>MENU linhes.xml</action> ++ <password>SetupPinCode</password> </button> </mythmenu> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml index 5914b33..7890d88 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythbackup.xml @@ -1,17 +1,17 @@ <mythmenu name="LinHES"> - <button> <type>BACKUP</type> <text>Do you wish to backup?</text> + <description></description> <action>NONE</action> </button> <button> <type>BACKUP</type> <text>Yes</text> - <action>EXEC sudo /usr/LH/bin/mythbackup</action> + <action>EXEC sudo /usr/LH/bin/lh_system_backup &</action> </button> - + <button> <type>BACKUP</type> <text>No</text> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml index 8f5c285..161f13f 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mythrestore.xml @@ -3,15 +3,16 @@ <button> <type>RESTORE</type> <text>Do you wish to restore?</text> + <description>This will restore from most recent backup.</description> <action>NONE</action> </button> <button> <type>RESTORE</type> <text>Yes</text> - <action>EXEC sudo /usr/LH/bin/mythrestore</action> + <action>EXEC sudo /usr/LH/bin/lh_system_restore &</action> </button> - + <button> <type>BACKUP</type> <text>No</text> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch index 143424f..1ff2db2 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch @@ -1,10 +1,17 @@ ---- themes/defaultmenu/optical_menu.xml.orig 2010-11-06 00:39:43.000000000 +0000 -+++ themes/defaultmenu/optical_menu.xml 2010-11-06 00:42:59.000000000 +0000 -@@ -26,6 +26,13 @@ +--- themes/defaultmenu/optical_menu.xml.orig 2012-05-02 18:41:38.000000000 +0000 ++++ themes/defaultmenu/optical_menu.xml 2012-07-30 05:33:03.000000000 +0000 +@@ -17,6 +17,20 @@ </button> <button> + <type>DVD_RIP</type> ++ <text>Backup DVD</text> ++ <description>Backup your DVDs</description> ++ <action>MENU dvd_backup.xml</action> ++ </button> ++ ++ <button> ++ <type>DVD_RIP</type> + <text>Import video files from DVD</text> + <description>Import video files from a data DVD</description> + <action>EXEC /usr/LH/bin/importfiles.sh</action> diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml deleted file mode 100644 index f56bb6f..0000000 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/setup.xml +++ /dev/null @@ -1,111 +0,0 @@ -<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-0.25/mythtv/myth_settings.patch b/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch index ebc6264..a96051b 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch +++ b/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch @@ -1,5 +1,13 @@ +commit 9b4205fa320c06afde8c6d866b854cb12d3ec99c +Author: root <root@localhost.localdomain> +Date: Fri Sep 28 14:25:06 2012 -0500 + + new patch + + Signed-off-by: root <root@localhost.localdomain> + diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp -index ad58f59..809d662 100644 +index 84cb01a..6e3c54a 100644 --- a/mythtv/libs/libmythbase/mythcorecontext.cpp +++ b/mythtv/libs/libmythbase/mythcorecontext.cpp @@ -1260,6 +1260,90 @@ void MythCoreContext::ResetLanguage(void) @@ -80,11 +88,11 @@ index ad58f59..809d662 100644 +QMap<QString, QMap<QString,QString> > MythCoreContext::export_settings( + QString src_hostname, + QString saved_settingsgroupname, -+ QStringList table_list) ++ QStringList table_list, bool skip_host ) +{ + return d->m_database->export_settings(src_hostname, + saved_settingsgroupname, -+ table_list); ++ table_list , skip_host ); +} + +//END JM ADDED @@ -94,10 +102,10 @@ index ad58f59..809d662 100644 { if (!d->m_locale) diff --git a/mythtv/libs/libmythbase/mythcorecontext.h b/mythtv/libs/libmythbase/mythcorecontext.h -index 0917313..db3bbb9 100644 +index 0917313..3f6d5f8 100644 --- a/mythtv/libs/libmythbase/mythcorecontext.h +++ b/mythtv/libs/libmythbase/mythcorecontext.h -@@ -168,6 +168,39 @@ class MBASE_PUBLIC MythCoreContext : public MythObservable, public MythSocketCBs +@@ -168,6 +168,40 @@ class MBASE_PUBLIC MythCoreContext : public MythObservable, public MythSocketCBs QString GetLanguageAndVariant(void); void ResetLanguage(void); @@ -131,14 +139,15 @@ index 0917313..db3bbb9 100644 + QMap<QString,QMap <QString,QString> > export_settings( + QString src_hostname, + QString saved_settingsgroupname, -+ QStringList table_list); ++ QStringList table_list, ++ bool skip_host = FALSE ); + //END JM ADDED + private: MythCoreContextPrivate *d; diff --git a/mythtv/libs/libmythbase/mythdb.cpp b/mythtv/libs/libmythbase/mythdb.cpp -index ea30783..730fc3e 100644 +index ea30783..e4c1781 100644 --- a/mythtv/libs/libmythbase/mythdb.cpp +++ b/mythtv/libs/libmythbase/mythdb.cpp @@ -774,7 +774,7 @@ void MythDB::OverrideSettingForSession( @@ -150,7 +159,7 @@ index ea30783..730fc3e 100644 QString("ERROR: Refusing to allow override for '%1'.").arg(key)); return; } -@@ -1055,6 +1055,901 @@ void MythDB::WriteDelayedSettings(void) +@@ -1055,6 +1055,1015 @@ void MythDB::WriteDelayedSettings(void) } } @@ -168,6 +177,7 @@ index ea30783..730fc3e 100644 + QString hostname_clause; + table_list.append("settings"); + table_list.append("keybindings"); ++ table_list.append("jumppoints"); + if ( src_hostname == "GLOBAL" ) + hostname_clause = "hostname IS NULL"; + else @@ -228,6 +238,7 @@ index ea30783..730fc3e 100644 + + table_list.append("settings"); + table_list.append("keybindings"); ++ table_list.append("jumppoints"); + QString hostname_clause; + if ( delete_hostname == "GLOBAL" ) + hostname_clause = "hostname IS NULL"; @@ -490,6 +501,7 @@ index ea30783..730fc3e 100644 + { + table_list.append("settings"); + table_list.append("keybindings"); ++ table_list.append("jumppoints"); + } + + for ( it = table_list.begin(); it != table_list.end(); ++it ) @@ -587,7 +599,14 @@ index ea30783..730fc3e 100644 + else + hostname_clause ="hostname = :HOSTNAME"; + -+ if ( settings_check ( dest_hostname , saved_settingsgroupname ) ) ++ bool table_check; ++ if ( saved_settingsgroupname == "distro_default" ) ++ table_check = settings_check ( "distro_default" , saved_settingsgroupname ); ++ else ++ table_check = settings_check ( dest_hostname , saved_settingsgroupname ); ++ ++ ++ if ( table_check == TRUE ) + { + MSqlQuery query(MSqlQuery::InitCon()); + QStringList::Iterator it; @@ -596,6 +615,7 @@ index ea30783..730fc3e 100644 + { + table_list.append("settings"); + table_list.append("keybindings"); ++ table_list.append("jumppoints"); + } + + for ( it = table_list.begin(); it != table_list.end(); ++it ) @@ -606,22 +626,54 @@ index ea30783..730fc3e 100644 + saved_settingsgroupname); + + QString temptable="temp_table_" + src_tablename; -+ ++ if ( ! does_table_exist(src_tablename)) ++ { ++ LOG(VB_GENERAL, LOG_NOTICE, QString("table does not exist: %1") ++ .arg(src_tablename)); ++ continue; ++ } + // create temp table for merging settings + create_temp_table(temptable, current_table ); + + //could copy in current settings here to account for new stuff + ++ ++ + // copy in stored settings -+ QString query_string = QString("REPLACE INTO %1 " -+ "(SELECT * from %2 WHERE %3)") -+ .arg(temptable) -+ .arg(src_tablename) -+ .arg(hostname_clause); ++ QString query_string; ++ if ( saved_settingsgroupname == "distro_default" ) ++ { //special case for restoring default settings ++ query_string = QString("REPLACE INTO %1 " ++ "(SELECT * from %2 WHERE %3)") ++ .arg(temptable) ++ .arg(src_tablename) ++ .arg(hostname_clause); + -+ query.prepare(query_string); -+ query.bindValue(":HOSTNAME",dest_hostname ); -+ query.exec(); ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME", "distro_default" ); ++ query.exec(); ++ ++ // update hostname in temp table from distro_default ++ query_string = QString("UPDATE %1 set hostname = :HOSTNAME") ++ .arg(temptable); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME" , dest_hostname ); ++ query.exec(); ++ ++ } ++ else ++ { //normal use case ++ query_string = QString("REPLACE INTO %1 " ++ "(SELECT * from %2 WHERE %3)") ++ .arg(temptable) ++ .arg(src_tablename) ++ .arg(hostname_clause); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME",dest_hostname ); ++ query.exec(); ++ } + + //Remove current settings. + //Need to remove because the old table allows for duplicates @@ -875,13 +927,69 @@ index ea30783..730fc3e 100644 + } + } + } ++ //JUMP POINTS ++ else if (table.startsWith("jumppoints")) ++ { ++ if ( table != "jumppoints" ) ++ create_new_table(table,"jumppoints"); ++ QString hostname = vp_map.value("hostname"); ++ QString description = vp_map.value("description"); ++ QString destination = vp_map.value("destination"); ++ QString keylist = vp_map.value("keylist"); ++ ++ QString query_string=QString("SELECT destination, keylist " ++ "FROM %1 " ++ "WHERE hostname = :HOSTNAME AND " ++ "destination = :DESTINATION " ++ "AND keylist = :KEYLIST ").arg(table); ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME", hostname); ++ query.bindValue(":DESTINATION", destination); ++ query.bindValue(":KEYLIST", keylist); ++ ++ if (query.exec() && query.isActive()) ++ { ++ MSqlQuery sub_query(MSqlQuery::InitCon()); ++ if ( query.size() > 0 ) ++ { ++ query_string = QString("UPDATE " ++ " %1 " ++ "set keylist = :KEYLIST " ++ "WHERE hostname = :HOSTNAME AND " ++ "destination = :DESTINATION ").arg(table); ++ ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", hostname); ++ sub_query.bindValue(":KEYLIST", keylist); ++ sub_query.bindValue(":DESTINATION", destination); ++ sub_query.exec(); ++ } ++ else ++ { ++ query_string = QString("INSERT INTO " ++ " %1 " ++ " (description , destination, keylist , hostname) " ++ " VALUES( " ++ " :DESCRIPTION ," ++ " :DESTINATION , " ++ " :KEYLIST , " ++ " :HOSTNAME)").arg(table) ; + ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", hostname); ++ sub_query.bindValue(":KEYLIST", keylist); ++ sub_query.bindValue(":DESTINATION", destination); ++ sub_query.bindValue(":DESCRIPTION", description); ++ sub_query.exec(); ++ } ++ } ++ } +}; //end import_settings + +QMap<QString, QMap<QString,QString> > + MythDB::export_settings(QString src_hostname, + QString saved_settingsgroupname, -+ QStringList table_list) ++ QStringList table_list, bool skip_host ) +{ + QMap<QString, QMap<QString,QString> > result_set; + QStringList::Iterator it; @@ -892,6 +1000,7 @@ index ea30783..730fc3e 100644 + { + table_list.append("settings"); + table_list.append("keybindings"); ++ table_list.append("jumppoints"); + } + + MSqlQuery query(MSqlQuery::InitCon()); @@ -909,10 +1018,11 @@ index ea30783..730fc3e 100644 + saved_settingsgroupname); + + QString hostname_clause; -+ if ( src_hostname == "GLOBAL" ) -+ hostname_clause = "hostname IS NULL"; -+ else -+ hostname_clause ="hostname = :HOSTNAME"; ++ if ( src_hostname == "GLOBAL" ) ++ hostname_clause = "hostname IS NULL"; ++ else ++ hostname_clause ="hostname = :HOSTNAME"; ++ + // find field names + query_string = QString("SHOW COLUMNS from %1").arg(table_name); + query.prepare(query_string); @@ -929,12 +1039,25 @@ index ea30783..730fc3e 100644 + field_query += tempItem; + } + } ++ // when working with settings table skip HOST if skip_host is true ++ if ( current_table == "settings" && skip_host == TRUE ) ++ { ++ QString skip_host_clause; ++ skip_host_clause = " VALUE not like 'HOST%' AND DATA not like 'HardwareProfile%UUID'" ; ++ query_string = QString("SELECT %1 FROM %2 WHERE %3 AND %4") ++ .arg(field_query) ++ .arg(table_name) ++ .arg(hostname_clause) ++ .arg(skip_host_clause); + -+ query_string = QString("SELECT %1 FROM %2 WHERE %3") -+ .arg(field_query) -+ .arg(table_name) -+ .arg(hostname_clause); -+ ++ } ++ else ++ { ++ query_string = QString("SELECT %1 FROM %2 WHERE %3") ++ .arg(field_query) ++ .arg(table_name) ++ .arg(hostname_clause); ++ } + query.prepare(query_string); + query.bindValue(":HOSTNAME" , src_hostname); + @@ -986,7 +1109,7 @@ index ea30783..730fc3e 100644 +void MythDB::drop_temp_table (QString table_name) +{ + MSqlQuery query(MSqlQuery::InitCon()); -+ if (table_name == "settings" | table_name == "keybindings") ++ if (table_name == "settings" | table_name == "keybindings" | table_name == "jumppoints") + return; + QString query_string = QString("DROP TABLE %1").arg(table_name); + query.prepare(query_string); @@ -1053,10 +1176,10 @@ index ea30783..730fc3e 100644 * \brief Set a flag indicating we have successfully connected to the database */ diff --git a/mythtv/libs/libmythbase/mythdb.h b/mythtv/libs/libmythbase/mythdb.h -index 79abe56..fe3c91c 100644 +index 79abe56..fd6044e 100644 --- a/mythtv/libs/libmythbase/mythdb.h +++ b/mythtv/libs/libmythbase/mythdb.h -@@ -75,6 +75,48 @@ class MBASE_PUBLIC MythDB +@@ -75,6 +75,49 @@ class MBASE_PUBLIC MythDB void WriteDelayedSettings(void); @@ -1090,7 +1213,8 @@ index 79abe56..fe3c91c 100644 + QMap<QString,QMap <QString,QString> > export_settings( + QString src_hostname, + QString saved_settingsgroupname, -+ QStringList table_list); ++ QStringList table_list, ++ bool skip_host = FALSE); + + void create_new_table (QString create_table_name,QString like_name); + void drop_temp_table (QString table_name); @@ -1106,10 +1230,10 @@ index 79abe56..fe3c91c 100644 void SetHaveSchema(bool schema); bool HaveSchema(void) const; diff --git a/mythtv/programs/mythutil/commandlineparser.cpp b/mythtv/programs/mythutil/commandlineparser.cpp -index 7f00e50..6fb2fc2 100644 +index f4a6035..fdeeb8e 100644 --- a/mythtv/programs/mythutil/commandlineparser.cpp +++ b/mythtv/programs/mythutil/commandlineparser.cpp -@@ -114,6 +114,37 @@ void MythUtilCommandLineParser::LoadArguments(void) +@@ -118,6 +118,37 @@ void MythUtilCommandLineParser::LoadArguments(void) << add("--print-template", "printtemplate", false, "Print the template to be sent to the frontend", "") ->SetGroup("Messaging") @@ -1147,7 +1271,7 @@ index 7f00e50..6fb2fc2 100644 ); // mpegutils.cpp -@@ -136,6 +167,59 @@ void MythUtilCommandLineParser::LoadArguments(void) +@@ -140,6 +171,59 @@ void MythUtilCommandLineParser::LoadArguments(void) add("--bcastaddr", "bcastaddr", "127.0.0.1", "(optional) IP address to send to", "") ->SetChildOf("message"); @@ -1229,10 +1353,10 @@ index 418ea01..bd4a1f4 100644 bool cmdFound = false; int cmdResult = GENERIC_EXIT_OK; diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/mythutil.pro -index 774528f..5be3ec7 100644 +index 066e618..87d7952 100644 --- a/mythtv/programs/mythutil/mythutil.pro +++ b/mythtv/programs/mythutil/mythutil.pro -@@ -10,7 +11,7 @@ TARGET = mythutil +@@ -10,7 +10,7 @@ TARGET = mythutil target.path = $${PREFIX}/bin INSTALLS = target @@ -1241,7 +1365,7 @@ index 774528f..5be3ec7 100644 INCLUDEPATH += ../../libs/libmythbase QMAKE_CLEAN += $(TARGET) -@@ -19,8 +20,10 @@ QMAKE_CLEAN += $(TARGET) +@@ -19,8 +19,10 @@ QMAKE_CLEAN += $(TARGET) HEADERS += mythutil.h commandlineparser.h HEADERS += backendutils.h fileutils.h jobutils.h markuputils.h HEADERS += messageutils.h mpegutils.h @@ -1255,10 +1379,10 @@ index 774528f..5be3ec7 100644 mingw: LIBS += -lwinmm -lws2_32 diff --git a/mythtv/programs/mythutil/settingsutils.cpp b/mythtv/programs/mythutil/settingsutils.cpp new file mode 100644 -index 0000000..ff7e509 +index 0000000..8fc7b0e --- /dev/null +++ b/mythtv/programs/mythutil/settingsutils.cpp -@@ -0,0 +1,566 @@ +@@ -0,0 +1,586 @@ +// C++ includes +#include <iostream> + @@ -1643,6 +1767,17 @@ index 0000000..ff7e509 + else + value_pair_map[record_element.nodeName()] = record_element.text(); + } ++ if (import_filename.endsWith("syssettings.xml")) ++ { ++ if ( value_pair_map["value"] == "BackendServerIP") ++ { ++ out_string = "sysettings, ignoring backendserver ip record"; ++ cout << out_string.toLocal8Bit().constData() << endl; ++ } ++ else ++ gCoreContext->import_settings(value_pair_map,table_name); ++ } ++ else + //perform insert + gCoreContext->import_settings(value_pair_map,table_name); + } @@ -1659,6 +1794,10 @@ index 0000000..ff7e509 + QString tablestring; + bool distro_default = FALSE; + bool generic = FALSE; ++ bool skip_host = FALSE; ++ ++ ++ + QDomDocument doc("mythutils_exported_settings"); + + if (cmdline.toBool("groupname")) @@ -1672,18 +1811,22 @@ index 0000000..ff7e509 + src_hostname = gCoreContext->GetHostName(); + + if (cmdline.toBool("distro-default")) ++ { + distro_default = TRUE; -+ ++ skip_host = TRUE; ++ } + if (cmdline.toBool("generic")) ++ { + generic = TRUE; -+ ++ //skip_host = TRUE; ++ } + if (cmdline.toBool("table_list")) + { + tablestring = QString(cmdline.toString("table_list")); + table_list = tablestring.split(",", QString::SkipEmptyParts); + } + else -+ table_list << "settings" <<"keybindings" ; ++ table_list << "settings" <<"keybindings" <<"jumppoints" ; + + if (cmdline.toString("outfile").isEmpty()) + { @@ -1693,7 +1836,8 @@ index 0000000..ff7e509 + + QString export_filename = cmdline.toString("outfile"); + -+ records = gCoreContext->export_settings(src_hostname,groupname,table_list); ++ records = gCoreContext->export_settings(src_hostname,groupname, ++ table_list, skip_host); + + QDomElement exported_xml = doc.createElement("exported_xml"); + doc.appendChild(exported_xml); @@ -1715,7 +1859,6 @@ index 0000000..ff7e509 + QDomElement tag = doc.createElement(y.key()); + record.appendChild(tag); + QDomText t; -+ + if ( distro_default == TRUE ) + { // If exporting distro_default then change hostname + table + if ( y.key() == "hostname" ) @@ -1761,6 +1904,7 @@ index 0000000..ff7e509 + } + } + QFile file( export_filename ); ++ + if( !file.open(QIODevice::WriteOnly) ) + return -1; + diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install b/abs/core/mythtv/stable-0.25/mythtv/mythtv.install index 3f2e304..3b44668 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install +++ b/abs/core/mythtv/stable-0.25/mythtv/mythtv.install @@ -1,60 +1,22 @@ # arg 1: the new package version post_install() { - 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 - ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml + gen_is_xml.py + gen_lib_xml.py } pre_upgrade() { - if [ ! -L /usr/share/mythtv/is.xml ] - then - mv /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.pre - else - mv /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/themes/defaultmenu/is.xml.pre - fi + /bin/true } post_upgrade() { - if [ ! -d /var/log/mythtv ] - then - mkdir -p /var/log/mythv - chown -R mythtv /var/log/mythtv - fi - if [ -e /usr/share/mythtv/is.xml.pre ] - then - rm -fr /usr/share/mythtv/themes/defaultmenu/is.xml - mv /usr/share/mythtv/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml - ln -s /usr/share/mythtv/themes/defaultmenu/is.xml /usr/share/mythtv/is.xml - else - mv /usr/share/mythtv/themes/defaultmenu/is.xml.pre /usr/share/mythtv/themes/defaultmenu/is.xml - fi - pacxmbc=`pacman -Q xbmc` - if [ -z "$pacxbmc" ] - then - mv /usr/share/mythtv/themes/defaultmenu/library.xml /tmp - grep -v -e /mythmenu /tmp/library.xml > /tmp/library.xml.tmp - echo "<!--#XBMC-->" >> /tmp/library.xml.tmp - echo " <button>" >> /tmp/library.xml.tmp - echo " <type>MENU_XBMC</type>" >> /tmp/library.xml.tmp - echo " <text>Launch XBMC</text>" >> /tmp/library.xml.tmp - echo " <action>EXEC /usr/bin/xbmc</action>" >> /tmp/library.xml.tmp - echo " </button>" >> /tmp/library.xml.tmp - echo "<!--#XBMC-->" >> /tmp/library.xml.tmp - echo "" >> /tmp/library.xml.tmp - echo "</mythmenu>" >> /tmp/library.xml.tmp - mv /tmp/library.xml.tmp /usr/share/mythtv/themes/defaultmenu/library.xml - fi + gen_is_xml.py + gen_lib_xml.py } # arg 1: the old package version post_remove() { - /bin/true + /bin/true } diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD index 6ec3453..5e1c853 100644 --- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.25 -pkgrel=3 +pkgrel=6 commit_hash=`cat ../git_src/git_hash_web` @@ -11,25 +11,26 @@ arch=('i686' 'x86_64') depends=('mythtv>=0.25' 'lighttpd' 'php' 'local-website') groups=('mythtv-extras') +install=mythweb.install +#http://code.mythtv.org/trac/ticket/10504 +patches=(schedules.php.patch sorting.php.patch tv-schedules.php.patch) +source=(`echo ${patches[@]:0}` mythweb.include mythweb_gen_light.conf) -patches=() -source=(`echo ${patches[@]:0}`) - -DOCROOT=/data/srv/httpd/htdocs/mythweb +DOCROOT=/data/srv/httpd/mythweb build() { if [ -e ${srcdir}/mythweb ] then rm -rf ${srcdir}/mythweb fi - + cd ${startdir} msg "copy in myth web src" cp -rp ../git_src/mythweb $srcdir cd ${srcdir}/${pkgbase} - - - + + + msg "The local files are updated." @@ -45,7 +46,7 @@ build() { patch -Np0 -i ${srcdir}/$i || return 1 done echo "--------------------------done applying patches-----------------------------------------------" - + [ "$CARCH" = "i686" ] && ARCH="i686" [ "$CARCH" = "x86_64" ] && ARCH="x86-64" @@ -59,5 +60,16 @@ build() { # http://code.mythtv.org/trac/ticket/9255 cd ${pkgdir}/${DOCROOT} ln -s modules modules_path + + #install conf files for lighttpd + mkdir -p $pkgdir/etc/lighttpd + install -D -m 644 $srcdir/mythweb.include $pkgdir/etc/lighttpd/ + #gen_light_conf + install -D -m0744 ${srcdir}/mythweb_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/mythweb.conf + } -md5sums=('45703fa3899c4ee84d1b087bfcc6654e') +md5sums=('392e570594859c026ac12194920246d8' + '53cc59d6a8bf144027b25d5dcbfffc66' + '515e29fda503c199888a91553e1815a0' + '7645a6399434cbba35639713ac5d88e0' + 'df190116b3aba35720fb6631885f973f') diff --git a/abs/core/mythtv/stable-0.25/mythweb/mythweb.include b/abs/core/mythtv/stable-0.25/mythweb/mythweb.include new file mode 100644 index 0000000..18e9be1 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythweb/mythweb.include @@ -0,0 +1,8 @@ +alias.url += ( "/mythweb" => "/data/srv/httpd/mythweb/") + +url.rewrite-once = ( +"^/{1,2}mythweb/(css|data|images|js|themes|skins|[a-z_]+\.(php|pl)).*" => "$0", +"^/{1,2}mythweb/(pl(/.*)?)$" => "/mythweb/mythweb.pl/$1", +"^/{1,2}mythweb/(.+)$" => "/mythweb/mythweb.php/$1", +"^/{1,2}mythweb/(.*)$" => "/mythweb/mythweb.php" +)
\ No newline at end of file diff --git a/abs/core/mythtv/stable-0.25/mythweb/mythweb.install b/abs/core/mythtv/stable-0.25/mythweb/mythweb.install new file mode 100644 index 0000000..0073499 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythweb/mythweb.install @@ -0,0 +1,18 @@ +post_install() { + gen_light_include.py + /sbin/sv hup /service/lighttpd +} +post_upgrade() { + post_install + +} + +post_remove() { + gen_light_include.py + echo + echo "==> Forcing a re-read of lighttpd's configuration file." + echo "" + /sbin/sv hup /service/lighttpd +#-- + +} diff --git a/abs/core/mythtv/stable-0.25/mythweb/mythweb.php.patch b/abs/core/mythtv/stable-0.25/mythweb/mythweb.php.patch deleted file mode 100644 index 4525e68..0000000 --- a/abs/core/mythtv/stable-0.25/mythweb/mythweb.php.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mythweb.php.orig 2011-02-01 03:33:56.000000000 +0000 -+++ mythweb.php 2011-02-01 03:34:20.000000000 +0000 -@@ -30,7 +30,7 @@ - if (Modules::getModule($Path[0])) { - // Add the current module directory to our search path, so modules can - // define includes, etc. -- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]); -+ ini_set('include_path', ini_get('include_path').':'.modules.'/'.$Path[0]); - // Load the module handler - require_once 'handler.php'; - } diff --git a/abs/core/mythtv/stable-0.25/mythweb/mythweb_gen_light.conf b/abs/core/mythtv/stable-0.25/mythweb/mythweb_gen_light.conf new file mode 100644 index 0000000..ddf0d2f --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythweb/mythweb_gen_light.conf @@ -0,0 +1 @@ +include "/etc/lighttpd/mythweb.include" diff --git a/abs/core/mythtv/stable-0.25/mythweb/schedules.php.patch b/abs/core/mythtv/stable-0.25/mythweb/schedules.php.patch new file mode 100644 index 0000000..1d41711 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythweb/schedules.php.patch @@ -0,0 +1,16 @@ +*** modules/tv/tmpl/default/schedules.php.old 2011-04-03 06:05:31.000000000 -0500 +--- modules/tv/tmpl/default/schedules.php 2012-03-27 05:37:40.000000000 -0500 +*************** +*** 90,95 **** +--- 90,100 ---- + </tr> + </thead> + <?php ++ // Hack: Disable warnings about "Creating default ++ // object from empty value" from below line ++ // "$schedule->channel->name = '[ '.t('Any').' ]';" ++ ini_set('error_reporting', E_ERROR); ++ + $prev_group = ''; + $cur_group = ''; + foreach ($the_schedules as $schedule) { diff --git a/abs/core/mythtv/stable-0.25/mythweb/sorting.php.patch b/abs/core/mythtv/stable-0.25/mythweb/sorting.php.patch new file mode 100644 index 0000000..2f76216 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythweb/sorting.php.patch @@ -0,0 +1,19 @@ +*** includes/sorting.php.old 2011-04-03 06:05:31.000000000 -0500 +--- includes/sorting.php 2012-03-27 05:05:51.000000000 -0500 +*************** +*** 123,129 **** + function by_user_choice(&$a, &$b) { + foreach ($GLOBALS['user_sort_choice'] as $sort) { + $function = 'by_'.$sort['field']; +! $response = $function(&$a, &$b); + // Identical response, go on to the next sort choice + if (!$response) + continue; +--- 123,129 ---- + function by_user_choice(&$a, &$b) { + foreach ($GLOBALS['user_sort_choice'] as $sort) { + $function = 'by_'.$sort['field']; +! $response = $function($a, $b); + // Identical response, go on to the next sort choice + if (!$response) + continue; diff --git a/abs/core/mythtv/stable-0.25/mythweb/tv-schedules.php.patch b/abs/core/mythtv/stable-0.25/mythweb/tv-schedules.php.patch new file mode 100644 index 0000000..29e4ccb --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythweb/tv-schedules.php.patch @@ -0,0 +1,15 @@ +*** modules/tv/schedules.php.orig 2012-06-05 09:05:32.935946957 +0200 +--- modules/tv/schedules.php 2012-06-05 09:05:36.633022229 +0200 +*************** +*** 47,52 **** +--- 47,56 ---- + if (count($the_schedules)) + sort_programs($the_schedules, 'schedules_sortby'); + ++ // Hack: Disable warnings about "Creating default ++ // object from empty value" from below line ++ // "$schedule->channel->name = '[ '.t('Any').' ]';" ++ ini_set('error_reporting', E_ERROR); + // Load the class for this page + require_once tmpl_dir.'schedules.php'; + diff --git a/abs/core/mythtv/trunk/morethemes/PKGBUILD b/abs/core/mythtv/trunk/morethemes/PKGBUILD deleted file mode 100644 index c8f892e..0000000 --- a/abs/core/mythtv/trunk/morethemes/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -pkgname=morethemes-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Additional themes for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn') -conflicts=('morethemes') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/themes -_svnmod=themes - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure -# ./configure --prefix=/usr || return 1 - ./configure --prefix=/usr - - # build and install - . /etc/profile -# make || return 1 -# make INSTALL_ROOT=$startdir/pkg install || return 1 - make - make INSTALL_ROOT=$startdir/pkg install - return 0 -#### THIS PKGBUILD IS HACKED TO BUILD WITH ZERO CONTENT RIGHT NOW #### -} diff --git a/abs/core/mythtv/trunk/mytharchive/PKGBUILD b/abs/core/mythtv/trunk/mytharchive/PKGBUILD deleted file mode 100644 index 20e9904..0000000 --- a/abs/core/mythtv/trunk/mytharchive/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mytharchive-svn -pkgver=23790 -pkgrel=1 -pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows." -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'libxmu' 'mysql-python' 'pil' 'dvdauthor' 'mjpegtools' 'transcode') -conflicts=('mytharchive') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mytharchive || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core/mythtv/trunk/mythbrowser/PKGBUILD deleted file mode 100644 index fdcefe0..0000000 --- a/abs/core/mythtv/trunk/mythbrowser/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythbrowser-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Mini web browser for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'wget') -conflicts=('mythbrowser') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythbrowser || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythgallery/PKGBUILD b/abs/core/mythtv/trunk/mythgallery/PKGBUILD deleted file mode 100644 index 6415b96..0000000 --- a/abs/core/mythtv/trunk/mythgallery/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythgallery-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Image gallery plugin for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'libexif' 'libtiff') -conflicts=('mythgallery') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythgallery || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythgame/PKGBUILD b/abs/core/mythtv/trunk/mythgame/PKGBUILD deleted file mode 100644 index e7d09ab..0000000 --- a/abs/core/mythtv/trunk/mythgame/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythgame-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Emulation plugin for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'zlib') -conflicts=('mythgame') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythgame || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythmovies/PKGBUILD b/abs/core/mythtv/trunk/mythmovies/PKGBUILD deleted file mode 100644 index f05180c..0000000 --- a/abs/core/mythtv/trunk/mythmovies/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythmovies-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Displays information about movies playing in the area." -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn') -conflicts=('mythmovies') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythmovies || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythmusic/PKGBUILD b/abs/core/mythtv/trunk/mythmusic/PKGBUILD deleted file mode 100644 index 3d9f5ce..0000000 --- a/abs/core/mythtv/trunk/mythmusic/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -pkgname=mythmusic-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Music playing plugin for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'libid3tag' 'libmad' 'libvorbis' 'flac>=1.1.4' 'libcdaudio' \ - 'cdparanoia' 'fftw2' 'sdl' 'faad2>=2.6.1' 'lame' 'taglib' \ - 'libvisual-plugins' 'libvisual-projectm') -conflicts=('mythmusic') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythmusic --enable-libvisual --enable-fftw --enable-sdl \ - --enable-aac || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythnetvision/PKGBUILD b/abs/core/mythtv/trunk/mythnetvision/PKGBUILD deleted file mode 100644 index c820ac5..0000000 --- a/abs/core/mythtv/trunk/mythnetvision/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythnetvision-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Internet video plugin for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'python-pycurl' 'flashplugin') -conflicts=('mythnetvision') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythnetvision || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythnews/PKGBUILD b/abs/core/mythtv/trunk/mythnews/PKGBUILD deleted file mode 100644 index 630325c..0000000 --- a/abs/core/mythtv/trunk/mythnews/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythnews-svn -pkgver=23790 -pkgrel=1 -pkgdesc="News checking plugin for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn') -conflicts=('mythnews') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythnews || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/myththemes/PKGBUILD b/abs/core/mythtv/trunk/myththemes/PKGBUILD deleted file mode 100755 index 9e10ba2..0000000 --- a/abs/core/mythtv/trunk/myththemes/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -pkgname=myththemes-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Themes for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn') -conflicts=('myththemes') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/myththemes -_svnmod=myththemes - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythtv/PKGBUILD b/abs/core/mythtv/trunk/mythtv/PKGBUILD deleted file mode 100755 index 65b12db..0000000 --- a/abs/core/mythtv/trunk/mythtv/PKGBUILD +++ /dev/null @@ -1,97 +0,0 @@ -pkgname=mythtv-svn -pkgver=23790 -pkgrel=1 -pkgdesc="A personal video recorder for Linux" -url="http://www.mythtv.org" -license="GPL" -depends=('bash' 'mysql-clients>=5.0' 'qt' 'lame' 'lirc-utils' 'ffmpeg' \ - 'faad2' 'libxv' 'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883' \ - 'perl-net-upnp' 'libvdpau') -makedepends=('libgl' 'subversion') -conflicts=('mythtv') -replaces=() -groups=('pvr') -#backup=() -#options=(!strip) -#MAKEFLAGS="-j6" -install='mythtv.install' - -patchs=() -#patchs=('smolt_jump.patch') -source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty') -arch=('i686' 'x86_64') -#md5sums=() - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythtv -_svnmod=mythtv - -build() { - - # get clean copy from SVN repo - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/mythtv - - # apply patches - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patchs[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up from last build - make distclean - - # configure - ./configure --prefix=/usr --arch=${ARCH} \ - --enable-vdpau --enable-xvmc --enable-xvmc-pro \ - --enable-opengl-vsync --enable-libfaad --enable-dvb --enable-firewire \ - --compile-type=release --with-bindings=perl,python \ - --enable-audio-alsa --disable-audio-jack --disable-audio-pulseoutput || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - - # install db schema, scripts and docs - install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ || return 1 - install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend || return 1 -# cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1 - rsync -arp --exclude .svn --delete-excluded docs $startdir/pkg/usr/share/mythtv/ || return 1 - - # install contrib - rsync -arp --exclude .svn --delete-excluded contrib $startdir/pkg/usr/share/mythtv/ || return 1 - #cp -r contrib $startdir/pkg/usr/share/mythtv/ || return 1 - - # patch the xml LinHES style - cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv/themes/defaultmenu/ - cd $startdir/pkg/usr/share/mythtv/themes/defaultmenu - patch -p0 < $startdir/menu-xml/mainmenu.xml.patch || return 1 - patch -p0 < $startdir/menu-xml/optical_menu.xml.patch || return 1 - patch -p0 < $startdir/menu-xml/library.xml.patch || return 1 - patch -p0 < $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/logrotate.d - cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d - mkdir -p $startdir/pkg/etc/cron.hourly/ - install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/ -} - -md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' - '2babd4b8e146a7538d18dcd55695b0be' - 'f735805a80b0d1180dee01f9df1b7004' - 'f407d6af23e74a49540755420f84fa58' - 'ca547c201e3dd4bf3882bebf7c648652') diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml deleted file mode 100644 index ac52497..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml +++ /dev/null @@ -1,94 +0,0 @@ -<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/trunk/mythtv/menu-xml/is.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/is.xml deleted file mode 100644 index 88b7e6b..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/is.xml +++ /dev/null @@ -1,3 +0,0 @@ -<mythmenu name="Internet Steams"> - -</mythmenu> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch deleted file mode 100644 index 81ea604..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/library.xml.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- library.xml.orig 2009-10-16 12:45:44.000000000 +0000 -+++ library.xml 2009-10-16 17:21:44.000000000 +0000 -@@ -123,8 +123,7 @@ - <text lang="HU">Online folyam lejátszása</text> - <description></description> - <description lang="DE"></description> -- <action>PLUGIN mythstream</action> -- <depends>mythstream</depends> -+ <action>MENU is.xml</action> - </button> - - <button> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml deleted file mode 100644 index ebc848b..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/linhes.xml +++ /dev/null @@ -1,59 +0,0 @@ -<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="DE">Zubehör / Konfiguration</text> - <text lang="DA">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">è¨å®~Z</text> - <text lang="FI">Oheis/Asetukset</text> - <text lang="ZH_TW">å·¥å~E·/è¨å®~Z</text> - <text lang="SL">Nastavitve</text> - <text lang="ET">Utiliidid / sätted</text> - <text lang="RU">УÑ~BилиÑ~BÑ~K / Ð~]аÑ~AÑ~BÑ~@ойки</text> - <text lang="AR">تضبÙ~Jطات</text> - <text lang="PL">NarzÄ~Ydzia / ustawienia</text> - <text lang="HE">×¢×~Vר×~Y×~] / ×~T×~R×~Sר×~Uת</text> - <text lang="HU">Eszközök / BeállÃtások</text> - <alttext lang="DE">Verschiedenes</alttext> - <alttext lang="SV">Inställningar</alttext> - <alttext lang="ET">Sätted</alttext> - <alttext lang="RU">Ð~]аÑ~AÑ~BÑ~@ойки</alttext> - <alttext lang="AR">تضبÙ~Jطات</alttext> - <description>Configure MythTV and plugins</description> - <description lang="DE">MythTV und Plugins konfigurieren</description> - <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/trunk/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch deleted file mode 100644 index 74ace7b..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- mainmenu.xml.orig 2010-03-24 13:11:27.223119163 -0400 -+++ mainmenu.xml 2010-03-24 14:18:33.922746799 -0400 -@@ -151,32 +151,9 @@ - - <button> - <type>MENU_UTILITIES_SETUP</type> -- <text>Utilities / Setup</text> -- <text lang="IT">Impostazioni</text> -- <text lang="ES">Configuración</text> -- <text lang="DE">Zubehör / Konfiguration</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="SL">Nastavitve</text> -- <text lang="ET">Utiliidid / sätted</text> -- <text lang="RU">Утилиты / ÐаÑтройки</text> -- <text lang="AR">تضبيطات</text> -- <text lang="PL">NarzÄ™dzia / ustawienia</text> -- <text lang="HE">×¢×–×¨×™× / הגדרות</text> -- <text lang="HU">Eszközök / BeállÃtások</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> -- <description>Configure MythTV and plugins</description> -- <description lang="DE">MythTV und Plugins konfigurieren</description> -- <action>MENU util_menu.xml</action> -+ <text>Service Menu</text> -+ <description>LinHES Service Menu</description> -+ <action>MENU linhes.xml</action> - </button> - - <!-- <button> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml deleted file mode 100644 index 5914b33..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/mythbackup.xml +++ /dev/null @@ -1,20 +0,0 @@ -<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/trunk/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml deleted file mode 100644 index 8f5c285..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/mythrestore.xml +++ /dev/null @@ -1,20 +0,0 @@ -<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/trunk/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch deleted file mode 100644 index b4b1411..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/optical_menu.xml.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- optical_menu.xml.orig 2009-03-23 20:05:43.000000000 +0000 -+++ optical_menu.xml 2009-03-23 20:10:02.000000000 +0000 -@@ -134,6 +134,13 @@ - </button> - - <button> -+ <type>DVD_RIP</type> -+ <text>Import video files from DVD</text> -+ <description>Import video files from a data DVD</description> -+ <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/trunk/mythtv/menu-xml/original/create_patch.sh b/abs/core/mythtv/trunk/mythtv/menu-xml/original/create_patch.sh deleted file mode 100755 index 34d8b8c..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/original/create_patch.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -for i in *.xml -do - diff -u $i.orig $i > ../$i.patch -done diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/setup.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/setup.xml deleted file mode 100644 index f56bb6f..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/setup.xml +++ /dev/null @@ -1,111 +0,0 @@ -<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/trunk/mythtv/menu-xml/siriusmenu.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml deleted file mode 100644 index e317b36..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/siriusmenu.xml +++ /dev/null @@ -1,419 +0,0 @@ -<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 & 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/trunk/mythtv/menu-xml/update.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/update.xml deleted file mode 100644 index 5b28833..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/update.xml +++ /dev/null @@ -1,20 +0,0 @@ -<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/trunk/mythtv/menu-xml/update2.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/update2.xml deleted file mode 100644 index 2ab82ea..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/update2.xml +++ /dev/null @@ -1,26 +0,0 @@ -<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/trunk/mythtv/menu-xml/util_menu.xml.patch b/abs/core/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch deleted file mode 100644 index 3a1072a..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/util_menu.xml.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- util_menu.xml.orig 2009-03-23 18:43:18.000000000 +0000 -+++ util_menu.xml 2009-03-23 20:16:56.000000000 +0000 -@@ -56,6 +56,13 @@ - </button> - - <button> -+ <type>VIDEO_SCREENSHOOTER</type> -+ <text>Thumbnail Generator</text> -+ <description>Generate thumbnail images for videos</description> -+ <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action> -+ </button> -+ -+ <button> - <type>SETUP_KEYS</type> - <text>Edit Keys</text> - <text lang="IT">Modifica Tasti</text> diff --git a/abs/core/mythtv/trunk/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/trunk/mythtv/menu-xml/xmmenu.xml deleted file mode 100644 index 6b26d11..0000000 --- a/abs/core/mythtv/trunk/mythtv/menu-xml/xmmenu.xml +++ /dev/null @@ -1,574 +0,0 @@ -<!-- 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/trunk/mythtv/myth.sh b/abs/core/mythtv/trunk/mythtv/myth.sh deleted file mode 100755 index fb7122c..0000000 --- a/abs/core/mythtv/trunk/mythtv/myth.sh +++ /dev/null @@ -1,4 +0,0 @@ -export PATH=$PATH:/usr/local/bin -# set core file size to 0 -ulimit -c 0 -export MALLOC_CHECK_=0
\ No newline at end of file diff --git a/abs/core/mythtv/trunk/mythtv/mythbackend b/abs/core/mythtv/trunk/mythtv/mythbackend deleted file mode 100755 index 93773a2..0000000 --- a/abs/core/mythtv/trunk/mythtv/mythbackend +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/mythbackend` -case "$1" in - start) - stat_busy "Starting MythTV Backend" - [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit - [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -v important - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/mythbackend.pid - add_daemon mythbackend - stat_done - fi - ;; - stop) - stat_busy "Stopping MythTV Backend" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mythbackend - stat_done - fi - ;; - restart) - $0 stop - sleep 1s - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/abs/core/mythtv/trunk/mythtv/mythbackend.lr b/abs/core/mythtv/trunk/mythtv/mythbackend.lr deleted file mode 100644 index 4f218bc..0000000 --- a/abs/core/mythtv/trunk/mythtv/mythbackend.lr +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/mythtv/mythbackend.log { - copytruncate - daily - size 10M - missingok - rotate 7 - compress - notifempty -} diff --git a/abs/core/mythtv/trunk/mythtv/mythbackend.sh b/abs/core/mythtv/trunk/mythtv/mythbackend.sh deleted file mode 100755 index e7a7b70..0000000 --- a/abs/core/mythtv/trunk/mythtv/mythbackend.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash -# -# /etc/rc.d/init.d/mythbackend -# -# Starts the mythbackend as a daemon -# -# chkconfig: 345 90 10 -# description: Starts the mythbackend process as a daemon after the XWindows \ -# system is started, in runlevel 5. This allows scheduled \ -# recordings to occur without manual intervention. -# processname: mythbackend - -# Copyright (c) by Michael Thomson <linux at m-thomson dot net> -# With thanks to Stu Tomlinson <stu at nosnilmot dot com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -# Default values to use if none are supplied in the config file. -# User who should start the mythbackend processes -MBE_USER="root" -# Directory holding the mythbackend binary -MBE_LOCATION="/usr/local/bin/" -# Name of mythbackend binary -MBE_PROG="mythbackend" -# Full path to mythbackend log file -MBE_LOGFILE="/var/log/mythtv/mythbackend.log" - -# Source function library. -. /etc/init.d/functions - -# Source config file if available -if [ -f "/etc/sysconfig/mythbackend" ]; then - . /etc/sysconfig/mythbackend -fi - -test -x ${MBE_LOCATION}${MBE_PROG} || exit 0 - -RETVAL=0 - -# -# See how we were called. -# - -start() { - # Check if mythbackend is already running - if [ ! -f /var/lock/subsys/${MBE_PROG} ]; then - echo -n "Starting ${MBE_PROG}: " - # /usr/local/bin/mythbackend -d -l /some/log/file - #daemon --user ${MBE_USER} ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE} - ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE} - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${MBE_PROG} - echo - fi - return $RETVAL -} - -stop() { - echo -n "Stopping ${MBE_PROG}: " - killproc ${MBE_LOCATION}${MBE_PROG} - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${MBE_PROG} - echo - return $RETVAL -} - - -restart() { - stop - start -} - -reload() { - restart -} - -status_at() { - status ${MBE_LOCATION}${MBE_PROG} -} - -case "$1" in -start) - start - ;; -stop) - stop - ;; -reload|restart) - restart - ;; -condrestart) - if [ -f /var/lock/subsys/${MBE_PROG} ]; then - restart - fi - ;; -status) - status_at - ;; -*) - echo "Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 -esac - -exit $? -exit $RETVAL diff --git a/abs/core/mythtv/trunk/mythtv/mythfrontend.lr b/abs/core/mythtv/trunk/mythtv/mythfrontend.lr deleted file mode 100644 index 1580533..0000000 --- a/abs/core/mythtv/trunk/mythtv/mythfrontend.lr +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/mythtv/mythfrontend.log { - copytruncate - daily - size 10M - missingok - rotate 7 - compress - notifempty -} diff --git a/abs/core/mythtv/trunk/mythtv/mythtv.install b/abs/core/mythtv/trunk/mythtv/mythtv.install deleted file mode 100755 index 87507a5..0000000 --- a/abs/core/mythtv/trunk/mythtv/mythtv.install +++ /dev/null @@ -1,30 +0,0 @@ -# arg 1: the new package version -post_install() { - 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 -} - -post_upgrade() { - if [ ! -d /var/log/mythtv ] - then - mkdir -p /var/log/mythv - chown -R mythtv /var/log/mythtv - fi -} - - -# arg 1: the old package version -post_remove() { - /bin/true - -} - -op=$1 -shift -$op $* diff --git a/abs/core/mythtv/trunk/mythtv/pretty b/abs/core/mythtv/trunk/mythtv/pretty deleted file mode 100755 index 7e0ab21..0000000 --- a/abs/core/mythtv/trunk/mythtv/pretty +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ] -then - su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /myth/pretty" -elif [ -f /usr/share/mythtv/contrib/user_jobs/mythrename.pl ] -then - su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythrename.pl --link /myth/pretty" -fi - diff --git a/abs/core/mythtv/trunk/mythtv/smolt_jump.patch b/abs/core/mythtv/trunk/mythtv/smolt_jump.patch deleted file mode 100644 index 0fc452a..0000000 --- a/abs/core/mythtv/trunk/mythtv/smolt_jump.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: programs/mythfrontend/networkcontrol.cpp -=================================================================== ---- programs/mythfrontend/networkcontrol.cpp (revision 19291) -+++ programs/mythfrontend/networkcontrol.cpp (working copy) -@@ -83,6 +83,7 @@ - jumpMap["zoneminderliveview"] = "ZoneMinder Live View"; - jumpMap["zoneminderevents"] = "ZoneMinder Events"; - jumpMap["snapshot"] = "ScreenShot"; -+ jumpMap["mythsmolt"] = "MythSmolt"; - - // These jump point names match the (lowercased) locations from gContext - jumpMap["channelrecpriority"] = "Channel Recording Priorities"; -@@ -191,7 +192,7 @@ - pthread_create(&command_thread, NULL, CommandThread, this); - - gContext->addListener(this); -- -+ - connect(this, SIGNAL(newConnection()), this, SLOT(newConnection())); - } - -@@ -307,7 +308,7 @@ - cs = new QTextStream(s); - cs->setCodec("UTF-8"); - } -- -+ - if (client) - { - closedOldConn = true; diff --git a/abs/core/mythtv/trunk/mythvideo/PKGBUILD b/abs/core/mythtv/trunk/mythvideo/PKGBUILD deleted file mode 100644 index 951a427..0000000 --- a/abs/core/mythtv/trunk/mythvideo/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythvideo-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Video playback and browsing plugin for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'mplayer' 'perlxml' 'perl-libwww' 'perl-uri' 'perl-xml-simple' 'ffmpeg') -conflicts=('mythvideo') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythvideo || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythweather/PKGBUILD b/abs/core/mythtv/trunk/mythweather/PKGBUILD deleted file mode 100644 index 1bc8430..0000000 --- a/abs/core/mythtv/trunk/mythweather/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythweather-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Weather checking plugin for MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'wget') -conflicts=('mythweather') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythweather || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} diff --git a/abs/core/mythtv/trunk/mythweb/PKGBUILD b/abs/core/mythtv/trunk/mythweb/PKGBUILD deleted file mode 100644 index dedfcf5..0000000 --- a/abs/core/mythtv/trunk/mythweb/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -pkgname=mythweb-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Web interface for MythTV's backend" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'lighttpd' 'php' 'local-website') -conflicts=('mythweb') -groups=('mythtv-extras-svn') -install=mythweb.install - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - -DOCROOT=/data/srv/httpd/htdocs/mythweb - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions} - -# cp -r $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT -# cp $startdir/src/mythplugins-$pkgver/mythweb/data/.htaccess $startdir/pkg/$DOCROOT - rsync -arp --exclude .svn --delete-excluded $startdir/src/mythplugins/mythweb/* $startdir/pkg/$DOCROOT - rm $startdir/pkg/$DOCROOT/README - chown -R http:users $startdir/pkg/$DOCROOT - chmod g+rw $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data} - -} diff --git a/abs/core/mythtv/trunk/mythweb/mythweb.install b/abs/core/mythtv/trunk/mythweb/mythweb.install deleted file mode 100644 index 470cbd1..0000000 --- a/abs/core/mythtv/trunk/mythweb/mythweb.install +++ /dev/null @@ -1,10 +0,0 @@ -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." -} - -op=$1 -shift -$op $* diff --git a/abs/core/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core/mythtv/trunk/mythzoneminder/PKGBUILD deleted file mode 100644 index 038007b..0000000 --- a/abs/core/mythtv/trunk/mythzoneminder/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -pkgname=mythzoneminder-svn -pkgver=23790 -pkgrel=1 -pkgdesc="Integrates ZoneMinder into MythTV" -url="http://www.mythtv.org" -license="GPL" -arch=('i686' 'x86_64') - -depends=('mythtv-svn' 'zoneminder=1.23.3') -conflicts=('mythzoneminder') -groups=('mythtv-extras-svn') - -patches=() -source=(`echo ${patches[@]:0}`) - -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins -_svnmod=mythplugins - - -build() { - - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - svn revert -R $_svnmod - - cd $startdir/src/$_svnmod - - echo "--------------------------applying patches----------------------------------------------------" - for i in `echo ${patches[@]:0} ` - do - echo applying $i - echo "-----------------------------" - patch -Np0 -i ${startdir}/src/$i || return 1 - done - echo "--------------------------done applying patches-----------------------------------------------" - - [ "$CARCH" = "i686" ] && ARCH="i686" - [ "$CARCH" = "x86_64" ] && ARCH="x86-64" - - # clean up - make distclean - - # configure - ./configure --prefix=/usr --cpu=${ARCH} --disable-all --enable-opengl \ - --enable-mythzoneminder || return 1 - - # build and install - . /etc/profile - make || return 1 - make INSTALL_ROOT=$startdir/pkg install || return 1 - -} |