[arch-commits] Commit in mythtv/repos (14 files)
Jelle van der Waa
jelle at nymeria.archlinux.org
Sun Feb 10 11:24:42 UTC 2013
Date: Sunday, February 10, 2013 @ 12:24:42
Author: jelle
Revision: 84086
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
mythtv/repos/community-staging-i686/
mythtv/repos/community-staging-i686/PKGBUILD
(from rev 84085, mythtv/trunk/PKGBUILD)
mythtv/repos/community-staging-i686/alsa.patch
(from rev 84085, mythtv/trunk/alsa.patch)
mythtv/repos/community-staging-i686/mythbackend.conf
(from rev 84085, mythtv/trunk/mythbackend.conf)
mythtv/repos/community-staging-i686/mythbackend.rc
(from rev 84085, mythtv/trunk/mythbackend.rc)
mythtv/repos/community-staging-i686/mythbackend.service
(from rev 84085, mythtv/trunk/mythbackend.service)
mythtv/repos/community-staging-i686/mythtv.install
(from rev 84085, mythtv/trunk/mythtv.install)
mythtv/repos/community-staging-x86_64/
mythtv/repos/community-staging-x86_64/PKGBUILD
(from rev 84085, mythtv/trunk/PKGBUILD)
mythtv/repos/community-staging-x86_64/alsa.patch
(from rev 84085, mythtv/trunk/alsa.patch)
mythtv/repos/community-staging-x86_64/mythbackend.conf
(from rev 84085, mythtv/trunk/mythbackend.conf)
mythtv/repos/community-staging-x86_64/mythbackend.rc
(from rev 84085, mythtv/trunk/mythbackend.rc)
mythtv/repos/community-staging-x86_64/mythbackend.service
(from rev 84085, mythtv/trunk/mythbackend.service)
mythtv/repos/community-staging-x86_64/mythtv.install
(from rev 84085, mythtv/trunk/mythtv.install)
----------------------------------------------+
community-staging-i686/PKGBUILD | 78 +++++++++++++++++++++++++
community-staging-i686/alsa.patch | 66 +++++++++++++++++++++
community-staging-i686/mythbackend.conf | 53 ++++++++++++++++
community-staging-i686/mythbackend.rc | 73 +++++++++++++++++++++++
community-staging-i686/mythbackend.service | 14 ++++
community-staging-i686/mythtv.install | 22 +++++++
community-staging-x86_64/PKGBUILD | 78 +++++++++++++++++++++++++
community-staging-x86_64/alsa.patch | 66 +++++++++++++++++++++
community-staging-x86_64/mythbackend.conf | 53 ++++++++++++++++
community-staging-x86_64/mythbackend.rc | 73 +++++++++++++++++++++++
community-staging-x86_64/mythbackend.service | 14 ++++
community-staging-x86_64/mythtv.install | 22 +++++++
12 files changed, 612 insertions(+)
Copied: mythtv/repos/community-staging-i686/PKGBUILD (from rev 84085, mythtv/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: <kleptophobiac at gmail.com>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=mythtv
+pkgver=0.26.0
+pkgrel=6
+epoch=1
+pkgdesc="A Homebrew PVR project"
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org/"
+license=('GPL')
+depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
+ 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils'
+ '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')
+optdepends=('glew: for GPU commercial flagging'
+ 'libcec: for consumer electronics control capabilities'
+ 'libxml2: to read blu-ray metadata'
+ 'openssl: for AirTunes (RAOP) support'
+ 'xmltv: to download tv listings')
+conflicts=('myththemes' 'mythplugins-mythvideo')
+replaces=('myththemes' 'mythplugins-mythvideo')
+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')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+ patch -Np1 -i "$srcdir/alsa.patch"
+ patch -Np2 -i "$srcdir/libcec-2-support.patch"
+
+ ARCH="${CARCH/_/-}"
+ ./configure --prefix=/usr \
+ --cpu="$ARCH" \
+ --disable-altivec \
+ --disable-audio-jack \
+ --disable-ccache \
+ --disable-distcc \
+ --enable-libfftw3 \
+ --enable-libmp3lame \
+ --enable-libx264 \
+ --enable-vaapi \
+ --python=python2
+ make
+}
+
+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"
+
+ mkdir -p "$pkgdir/usr/share/mythtv"
+ cp -R 'contrib' "$pkgdir/usr/share/mythtv"
+ mkdir -p "$pkgdir/var/log/mythtv"
+}
Copied: mythtv/repos/community-staging-i686/alsa.patch (from rev 84085, mythtv/trunk/alsa.patch)
===================================================================
--- community-staging-i686/alsa.patch (rev 0)
+++ community-staging-i686/alsa.patch 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,66 @@
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-common.c b/external/FFmpeg/libavdevice/alsa-audio-common.c
+--- a/external/FFmpeg/libavdevice/alsa-audio-common.c 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio-common.c 2013-01-09 13:23:49.704360811 +1300
+@@ -28,6 +28,7 @@
+ * @author Nicolas George ( nicolas george normalesup org )
+ */
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #include "avdevice.h"
+ #include "libavutil/avassert.h"
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-dec.c b/external/FFmpeg/libavdevice/alsa-audio-dec.c
+--- a/external/FFmpeg/libavdevice/alsa-audio-dec.c 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio-dec.c 2013-01-09 13:23:47.911005108 +1300
+@@ -45,6 +45,7 @@
+ * plugin.
+ */
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #include "libavformat/internal.h"
+ #include "libavutil/opt.h"
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-enc.c b/external/FFmpeg/libavdevice/alsa-audio-enc.c
+--- a/external/FFmpeg/libavdevice/alsa-audio-enc.c 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio-enc.c 2013-01-09 13:23:46.880992286 +1300
+@@ -37,6 +37,7 @@
+ * which gives a low latency suitable for real-time playback.
+ */
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+
+ #include "libavformat/internal.h"
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio.h b/external/FFmpeg/libavdevice/alsa-audio.h
+--- a/external/FFmpeg/libavdevice/alsa-audio.h 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio.h 2013-01-09 13:23:51.121045145 +1300
+@@ -30,6 +30,7 @@
+ #ifndef AVDEVICE_ALSA_AUDIO_H
+ #define AVDEVICE_ALSA_AUDIO_H
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #include "config.h"
+ #include "libavutil/log.h"
+diff -Nru a/libs/libmyth/audio/audiooutputalsa.h b/libs/libmyth/audio/audiooutputalsa.h
+--- a/libs/libmyth/audio/audiooutputalsa.h 2012-10-02 23:30:24.000000000 +1300
++++ b/libs/libmyth/audio/audiooutputalsa.h 2013-01-09 13:22:13.313180438 +1300
+@@ -1,6 +1,7 @@
+ #ifndef AUDIOOUTPUTALSA
+ #define AUDIOOUTPUTALSA
+
++#include <sys/types.h>
+ #define ALSA_PCM_NEW_HW_PARAMS_API
+ #define ALSA_PCM_NEW_SW_PARAMS_API
+ #include <alsa/asoundlib.h>
+diff -Nru a/libs/libmythtv/audioinputalsa.h b/libs/libmythtv/audioinputalsa.h
+--- a/libs/libmythtv/audioinputalsa.h 2012-10-02 23:30:24.000000000 +1300
++++ b/libs/libmythtv/audioinputalsa.h 2013-01-09 13:22:44.470223553 +1300
+@@ -24,6 +24,7 @@
+ #include "audioinput.h"
+
+ #ifdef USING_ALSA
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #else
+ typedef int snd_pcm_t;
Copied: mythtv/repos/community-staging-i686/mythbackend.conf (from rev 84085, mythtv/trunk/mythbackend.conf)
===================================================================
--- community-staging-i686/mythbackend.conf (rev 0)
+++ community-staging-i686/mythbackend.conf 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,53 @@
+#
+# 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 at 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=''
Copied: mythtv/repos/community-staging-i686/mythbackend.rc (from rev 84085, mythtv/trunk/mythbackend.rc)
===================================================================
--- community-staging-i686/mythbackend.rc (rev 0)
+++ community-staging-i686/mythbackend.rc 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,73 @@
+#!/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
Copied: mythtv/repos/community-staging-i686/mythbackend.service (from rev 84085, mythtv/trunk/mythbackend.service)
===================================================================
--- community-staging-i686/mythbackend.service (rev 0)
+++ community-staging-i686/mythbackend.service 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,14 @@
+[Unit]
+Description=MythTV Backend
+After=network.target mysqld.service
+
+[Service]
+Type=simple
+Environment=HOME=/var/lib/mythtv
+User=mythtv
+ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv
+ExecStop=/usr/bin/mythshutdown --setscheduledwakeup
+#ExecStop=/usr/bin/mythshutdown --shutdown
+
+[Install]
+WantedBy=multi-user.target
Copied: mythtv/repos/community-staging-i686/mythtv.install (from rev 84085, mythtv/trunk/mythtv.install)
===================================================================
--- community-staging-i686/mythtv.install (rev 0)
+++ community-staging-i686/mythtv.install 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,22 @@
+post_upgrade() {
+ if ! getent passwd mythtv &>/dev/null; then
+ getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null
+ useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null
+ fi
+
+ echo -e "You may need to load time zone tables in MySQL.\nSee http://www.mythtv.org/wiki/MySQL_Time_Zone_Tables"
+}
+
+post_install() {
+ echo -e "For installation information, visit:\nhttps://wiki.archlinux.org/index.php/MythTV"
+
+ post_upgrade
+}
+
+post_remove() {
+ echo -e "The MythTV database was not removed. To remove it, run:\n mysql -u root -e 'drop database mythconverg;'"
+ [ -d var/lib/mythtv ] && echo "The MythTV home directory /var/lib/mythtv can also be removed."
+
+ getent passwd mythtv &>/dev/null && userdel mythtv >/dev/null
+ getent group mythtv &>/dev/null && groupdel mythtv >/dev/null
+}
Copied: mythtv/repos/community-staging-x86_64/PKGBUILD (from rev 84085, mythtv/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: <kleptophobiac at gmail.com>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=mythtv
+pkgver=0.26.0
+pkgrel=6
+epoch=1
+pkgdesc="A Homebrew PVR project"
+arch=('i686' 'x86_64')
+url="http://www.mythtv.org/"
+license=('GPL')
+depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
+ 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils'
+ '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')
+optdepends=('glew: for GPU commercial flagging'
+ 'libcec: for consumer electronics control capabilities'
+ 'libxml2: to read blu-ray metadata'
+ 'openssl: for AirTunes (RAOP) support'
+ 'xmltv: to download tv listings')
+conflicts=('myththemes' 'mythplugins-mythvideo')
+replaces=('myththemes' 'mythplugins-mythvideo')
+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')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+ patch -Np1 -i "$srcdir/alsa.patch"
+ patch -Np2 -i "$srcdir/libcec-2-support.patch"
+
+ ARCH="${CARCH/_/-}"
+ ./configure --prefix=/usr \
+ --cpu="$ARCH" \
+ --disable-altivec \
+ --disable-audio-jack \
+ --disable-ccache \
+ --disable-distcc \
+ --enable-libfftw3 \
+ --enable-libmp3lame \
+ --enable-libx264 \
+ --enable-vaapi \
+ --python=python2
+ make
+}
+
+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"
+
+ mkdir -p "$pkgdir/usr/share/mythtv"
+ cp -R 'contrib' "$pkgdir/usr/share/mythtv"
+ mkdir -p "$pkgdir/var/log/mythtv"
+}
Copied: mythtv/repos/community-staging-x86_64/alsa.patch (from rev 84085, mythtv/trunk/alsa.patch)
===================================================================
--- community-staging-x86_64/alsa.patch (rev 0)
+++ community-staging-x86_64/alsa.patch 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,66 @@
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-common.c b/external/FFmpeg/libavdevice/alsa-audio-common.c
+--- a/external/FFmpeg/libavdevice/alsa-audio-common.c 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio-common.c 2013-01-09 13:23:49.704360811 +1300
+@@ -28,6 +28,7 @@
+ * @author Nicolas George ( nicolas george normalesup org )
+ */
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #include "avdevice.h"
+ #include "libavutil/avassert.h"
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-dec.c b/external/FFmpeg/libavdevice/alsa-audio-dec.c
+--- a/external/FFmpeg/libavdevice/alsa-audio-dec.c 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio-dec.c 2013-01-09 13:23:47.911005108 +1300
+@@ -45,6 +45,7 @@
+ * plugin.
+ */
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #include "libavformat/internal.h"
+ #include "libavutil/opt.h"
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-enc.c b/external/FFmpeg/libavdevice/alsa-audio-enc.c
+--- a/external/FFmpeg/libavdevice/alsa-audio-enc.c 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio-enc.c 2013-01-09 13:23:46.880992286 +1300
+@@ -37,6 +37,7 @@
+ * which gives a low latency suitable for real-time playback.
+ */
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+
+ #include "libavformat/internal.h"
+diff -Nru a/external/FFmpeg/libavdevice/alsa-audio.h b/external/FFmpeg/libavdevice/alsa-audio.h
+--- a/external/FFmpeg/libavdevice/alsa-audio.h 2012-10-02 23:30:24.000000000 +1300
++++ b/external/FFmpeg/libavdevice/alsa-audio.h 2013-01-09 13:23:51.121045145 +1300
+@@ -30,6 +30,7 @@
+ #ifndef AVDEVICE_ALSA_AUDIO_H
+ #define AVDEVICE_ALSA_AUDIO_H
+
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #include "config.h"
+ #include "libavutil/log.h"
+diff -Nru a/libs/libmyth/audio/audiooutputalsa.h b/libs/libmyth/audio/audiooutputalsa.h
+--- a/libs/libmyth/audio/audiooutputalsa.h 2012-10-02 23:30:24.000000000 +1300
++++ b/libs/libmyth/audio/audiooutputalsa.h 2013-01-09 13:22:13.313180438 +1300
+@@ -1,6 +1,7 @@
+ #ifndef AUDIOOUTPUTALSA
+ #define AUDIOOUTPUTALSA
+
++#include <sys/types.h>
+ #define ALSA_PCM_NEW_HW_PARAMS_API
+ #define ALSA_PCM_NEW_SW_PARAMS_API
+ #include <alsa/asoundlib.h>
+diff -Nru a/libs/libmythtv/audioinputalsa.h b/libs/libmythtv/audioinputalsa.h
+--- a/libs/libmythtv/audioinputalsa.h 2012-10-02 23:30:24.000000000 +1300
++++ b/libs/libmythtv/audioinputalsa.h 2013-01-09 13:22:44.470223553 +1300
+@@ -24,6 +24,7 @@
+ #include "audioinput.h"
+
+ #ifdef USING_ALSA
++#include <sys/types.h>
+ #include <alsa/asoundlib.h>
+ #else
+ typedef int snd_pcm_t;
Copied: mythtv/repos/community-staging-x86_64/mythbackend.conf (from rev 84085, mythtv/trunk/mythbackend.conf)
===================================================================
--- community-staging-x86_64/mythbackend.conf (rev 0)
+++ community-staging-x86_64/mythbackend.conf 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,53 @@
+#
+# 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 at 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=''
Copied: mythtv/repos/community-staging-x86_64/mythbackend.rc (from rev 84085, mythtv/trunk/mythbackend.rc)
===================================================================
--- community-staging-x86_64/mythbackend.rc (rev 0)
+++ community-staging-x86_64/mythbackend.rc 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,73 @@
+#!/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
Copied: mythtv/repos/community-staging-x86_64/mythbackend.service (from rev 84085, mythtv/trunk/mythbackend.service)
===================================================================
--- community-staging-x86_64/mythbackend.service (rev 0)
+++ community-staging-x86_64/mythbackend.service 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,14 @@
+[Unit]
+Description=MythTV Backend
+After=network.target mysqld.service
+
+[Service]
+Type=simple
+Environment=HOME=/var/lib/mythtv
+User=mythtv
+ExecStart=/usr/bin/mythbackend --logpath /var/log/mythtv
+ExecStop=/usr/bin/mythshutdown --setscheduledwakeup
+#ExecStop=/usr/bin/mythshutdown --shutdown
+
+[Install]
+WantedBy=multi-user.target
Copied: mythtv/repos/community-staging-x86_64/mythtv.install (from rev 84085, mythtv/trunk/mythtv.install)
===================================================================
--- community-staging-x86_64/mythtv.install (rev 0)
+++ community-staging-x86_64/mythtv.install 2013-02-10 11:24:42 UTC (rev 84086)
@@ -0,0 +1,22 @@
+post_upgrade() {
+ if ! getent passwd mythtv &>/dev/null; then
+ getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null
+ useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null
+ fi
+
+ echo -e "You may need to load time zone tables in MySQL.\nSee http://www.mythtv.org/wiki/MySQL_Time_Zone_Tables"
+}
+
+post_install() {
+ echo -e "For installation information, visit:\nhttps://wiki.archlinux.org/index.php/MythTV"
+
+ post_upgrade
+}
+
+post_remove() {
+ echo -e "The MythTV database was not removed. To remove it, run:\n mysql -u root -e 'drop database mythconverg;'"
+ [ -d var/lib/mythtv ] && echo "The MythTV home directory /var/lib/mythtv can also be removed."
+
+ getent passwd mythtv &>/dev/null && userdel mythtv >/dev/null
+ getent group mythtv &>/dev/null && groupdel mythtv >/dev/null
+}
More information about the arch-commits
mailing list