Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/smalltalk/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/libpciaccess/PKGBUILD
	extra/postfix/PKGBUILD
	extra/samba/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/gstreamer0.10-bad-libre/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-libpciaccess/PKGBUILD

1 files changed, 16 insertions, 27 deletions

diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 8dbcc7b9a..f0e0c4bde 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 62800 2012-01-27 02:41:18Z jconder $
+# $Id: PKGBUILD 69264 2012-04-11 06:54:34Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -10,36 +10,36 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythmusic'
          'mythplugins-mythnetvision'
          'mythplugins-mythnews'
-         'mythplugins-mythvideo'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-pkgver=0.24.2
-pkgrel=2
+pkgver=0.25
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
 license=('GPL')
-makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac'
-             'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv'
-             'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
-             'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
-             'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'
-             'python-pycurl' 'sdl' 'taglib' 'zlib')
+makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
+             'libvorbis' 'mplayer' 'mythtv' 'perl-datetime-format-iso8601'
+	     'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww'
+	     'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath'
+	     'python2-oauth' 'python-imaging' 'python-pycurl' 'taglib' 'zlib')
 source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
         'mtd.rc')
-md5sums=('471836d48657afc488d560aee624931e'
+md5sums=('b3f2768372a38e92ca94841519daa05e'
          '476c12ba074794ad7f4ae092bdf949d6')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
   find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
+  sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i mythzoneminder/mythzmserver/zmserver.cpp
+
   ./configure --prefix=/usr \
               --enable-all \
-               --python=python2
+              --python=python2
   qmake mythplugins.pro
-  make
+  make -s
 }
 
 package_mythplugins-mytharchive() {
@@ -77,8 +77,7 @@ package_mythplugins-mythgame() {
 
 package_mythplugins-mythmusic() {
   pkgdesc="Music playing plugin for MythTV"
-  depends=('cdparanoia' 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'mythtv'
-           'sdl' 'taglib')
+  depends=('mythtv' 'taglib')
 
   cd "$srcdir/$pkgbase-$pkgver/mythmusic"
   make INSTALL_ROOT="$pkgdir" install
@@ -86,7 +85,7 @@ package_mythplugins-mythmusic() {
 
 package_mythplugins-mythnetvision() {
   pkgdesc="MythNetvision plugin for MythTV"
-  depends=('mythtv' 'python2-oauth' 'python-pycurl')
+  depends=('mythtv' 'python2-oauth')
 
   cd "$srcdir/$pkgbase-$pkgver/mythnetvision"
   make INSTALL_ROOT="$pkgdir" install
@@ -100,19 +99,9 @@ package_mythplugins-mythnews() {
   make INSTALL_ROOT="$pkgdir" install
 }
 
-package_mythplugins-mythvideo() {
-  pkgdesc="Video playback and browsing plugin for MythTV"
-  depends=('mplayer' 'mythtv')
-
-  cd "$srcdir/$pkgbase-$pkgver/mythvideo"
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -D -m755 "$srcdir/mtd.rc" "$pkgdir/etc/rc.d/mtd"
-}
-
 package_mythplugins-mythweather() {
   pkgdesc="Weather checking plugin for MythTV"
-  depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-libwww' 'perl-soap-lite'
+  depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-soap-lite'
            'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
            'perl-datetime-format-iso8601')