diff options
Diffstat (limited to 'abs/core/mythtv')
8 files changed, 69 insertions, 60 deletions
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 f8b7cbb..bd4a40c 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD @@ -101,7 +101,7 @@ 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' ) # replaces=('mythnetvision') cd "${srcdir}/${_gitname}/${pkgbase}/mythnetvision" make INSTALL_ROOT="${pkgdir}" install || return 1 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/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 9ccfdbd..f50bd5c 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=13 +pkgrel=12 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' @@ -44,9 +45,10 @@ depends=('mysql-clients' 'glew' 'openssl' 'libxml2' - 'lsdvd' - 'dvdbackup' - 'x264') + 'lsdvd' + 'libass' + 'dvdbackup' + 'x264') #glew for gpu commerical flagging #openssl for roap @@ -60,7 +62,7 @@ groups=('pvr') #options=(!strip) #MAKEFLAGS="-j6" install='mythtv.install' -patchs=('myth_settings.patch') +patchs=('myth_settings.patch' 'myth_settings-2.patch') optdepends=('xmltv: to download tv listings') replaces=('mythvideo' 'myththemes') conflicts=('mythvideo' 'myththemes') @@ -103,8 +105,8 @@ build() { --enable-vdpau \ --enable-crystalhd \ --dvb-path=/usr/include \ - --enable-libmp3lame \ - --enable-libx264 \ + --enable-libmp3lame \ + --enable-libx264 \ --with-bindings=perl,python --python=python2 || return 1 make all || return 1 @@ -142,6 +144,7 @@ package() { md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' '2babd4b8e146a7538d18dcd55695b0be' 'c4db7784c5107ae846fd795a4dabe0bc' + '08634edc00f738b8732bfa7f574e22fd' 'f735805a80b0d1180dee01f9df1b7004' 'f407d6af23e74a49540755420f84fa58' '5469d9921b726db750b991c87d226158') 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 895c337..844647b 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 @@ -84,6 +84,11 @@ <action>EXEC mythinstall -s webuser </action> </button> + <button> + <type>MV_VNC_SETUP_MENU</type> + <text>VNC</text> + <action>EXEC mythinstall -s vnc </action> + </button> <!-- <button> <type>SETUP_MENU</type> 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/myth_settings-2.patch b/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch new file mode 100755 index 0000000..4e83473 --- /dev/null +++ b/abs/core/mythtv/stable-0.25/mythtv/myth_settings-2.patch @@ -0,0 +1,38 @@ +diff --git a/mythtv/programs/mythutil/settingsutils.cpp b/mythtv/programs/mythutil/settingsutils.cpp +index ff7e509..d229f27 100644 +--- a/mythtv/programs/mythutil/settingsutils.cpp ++++ b/mythtv/programs/mythutil/settingsutils.cpp +@@ -382,6 +382,17 @@ static int ImportSettings(const MythUtilCommandLineParser &cmdline) + 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); + } +@@ -454,7 +465,6 @@ static int ExportSettings(const MythUtilCommandLineParser &cmdline) + 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" ) +@@ -500,6 +510,7 @@ static int ExportSettings(const MythUtilCommandLineParser &cmdline) + } + } + 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 } |