merge

3 files changed, 10 insertions, 10 deletions

diff --git a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
index 83168af..e1e23a2 100644
--- a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD
@@ -13,14 +13,14 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=0.24
-pkgrel=18
+pkgrel=19
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
 conflicts=('mythmovies')
-makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw' 'dvdauthor' 'libexif'
+makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw2' 'dvdauthor' 'libexif'
              'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple' 'dcraw'
-             'libvisual' 'perl-xml-xpath' 'perl-image-size'
+             '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
@@ -111,7 +111,7 @@ 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-date-manip' 'perl-json')
 #  replaces=('mythweather')
   cd "${srcdir}/${_gitname}/${pkgbase}/mythweather"
   make INSTALL_ROOT="${pkgdir}" install || return 1
@@ -126,4 +126,4 @@ package_mythzoneminder() {
   make INSTALL_ROOT="${pkgdir}" install || return 1
 }
 md5sums=('91488a6b1b05d14c5c5c601908b699e5'
-         'adce485c4765e8d49b91b3ce9c9963ac')
+         '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
index 770119a..abac7df 100644
--- a/abs/core/mythtv/stable-0.24/mythplugins/mythburn.py.patch
+++ b/abs/core/mythtv/stable-0.24/mythplugins/mythburn.py.patch
@@ -161,7 +161,7 @@
 +                else:
 +                    videoheight = 576
 +        
-+                croppixels = videoheight - int(videores.split("x")[1])
++                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)
  
diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
index 3bbadc9..933936c 100755
--- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mythtv
 pkgver=0.24
-pkgrel=27
+pkgrel=28
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org/"
@@ -29,7 +29,7 @@ optdepends=('xmltv: to download tv listings')
 #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_ver007.patch')
+	'http://www.ronfrazier.net/mythtv/0.24/downloads/ceton_ver008.patch')
 _gitroot="https://github.com/MythTV/mythtv.git"
 _gitname="${pkgname}"
 build() {
@@ -48,7 +48,7 @@ build() {
                 patch -Np0  -i ${startdir}/src/$i  || return 1
         done
 	echo Applying patch for Ceton InfinTV4
-	patch -p2 < ${startdir}/src//ceton_ver007.patch
+	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
@@ -106,4 +106,4 @@ md5sums=('91488a6b1b05d14c5c5c601908b699e5'
          'f735805a80b0d1180dee01f9df1b7004'
          'f407d6af23e74a49540755420f84fa58'
          '5469d9921b726db750b991c87d226158'
-         'f4abf567356a1f99a0177ac914829bb8')
+         '8837b2305030a2326b22f4330968e29a')