Mon Feb 25 00:04:58 PST 2013

3 files changed, 3 insertions, 135 deletions

diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index a5587a7c2..cbf283cb0 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84359 2013-02-16 22:50:37Z ioni $
+# $Id: PKGBUILD 84826 2013-02-24 23:03:43Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=mythtv
 pkgver=0.26.0
-pkgrel=6
+pkgrel=7
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
 	 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
 	 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
 	 'x264')
-makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'openssl' 'yasm')
+makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm')
 optdepends=('glew: for GPU commercial flagging'
             'libcec: for consumer electronics control capabilities'
 	    'libxml2: to read blu-ray metadata'
@@ -30,14 +30,10 @@ backup=('etc/conf.d/mythbackend')
 install='mythtv.install'
 source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
         'alsa.patch'
-        'mythbackend.rc'
-        'mythbackend.conf'
 	'mythbackend.service'
 	'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch')
 md5sums=('f57066bf75e6f14824c494d41639f4f9'
          'f64b8219e3d27a2edf96733b851e576b'
-         'c8f935d42fb8617e9279bd539811ca5f'
-         'ab962d83614cbd0ac11ce3fcc929829d'
          'e4d572dcc307d6d8ae26bee5aebf9f3a'
          '6e156c9fc0b369346d93ccafad46cba3')
 
@@ -67,8 +63,6 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make INSTALL_ROOT="$pkgdir" install
 
-  install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
-  install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
   install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
   install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
 
diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf
deleted file mode 100644
index 49bbca877..000000000
--- a/community/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-#     Michael Thomson <linux at m-thomson dot net>
-#     Stu Tomlinson <stu at nosnilmot dot com>
-#     Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-#     Jürgen Hoetzel <juergen@archinux.org>
-#
-#  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
-#
-###############################################################################
-#
-# User who should start the mythbackend process
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_PATH='/var/log/mythtv'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community/mythtv/mythbackend.rc b/community/mythtv/mythbackend.rc
deleted file mode 100644
index 488b4cb8e..000000000
--- a/community/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/profile
-
-###############################################################################
-# Default values to use if none are supplied in the config file.
-#
-# User who should start the mythbackend process
-MBE_USER='mythtv'
-
-# Startup options for mythbackend
-MBE_OPTS=''
-
-# Directory holding the mythbackend log file
-LOG_PATH='/var/log/mythtv'
-
-# Logging options for mythbackend
-LOG_OPTS=''
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -r "$CONFIG_FILE" ]]; then
-  . "$CONFIG_FILE"
-fi
-
-PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)"
-export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)"
-
-case "$1" in
-  start)
-    stat_busy "Starting MythTV Backend"
-
-    if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then
-      stat_fail
-      exit 0
-    fi
-
-    touch "$PIDFILE"
-    chown "$MBE_USER" "$PIDFILE" "$LOG_PATH"
-
-    MBE_CMD="/usr/bin/mythbackend --daemon \
-                                  --logpath "$LOG_PATH" $LOG_OPTS \
-                                  --pidfile "$PIDFILE" $MBE_OPTS"
-    if su "$MBE_USER" -c "$MBE_CMD"; then
-      add_daemon mythbackend
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MythTV Backend"
-    if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then
-      rm_daemon mythbackend
-      stat_done
-      rm -f "$PIDFILE"
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    "$0" stop
-    "$0" start
-    ;;
-  *)
-    echo "usage: $0 (start|stop|restart)"
-    ;;
-esac
-exit 0