Date: Tuesday, November 10, 2015 @ 22:28:06 Author: fyan Revision: 146540
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 146539, mythtv/trunk/PKGBUILD) mythtv/repos/community-staging-i686/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 146539, mythtv/trunk/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) mythtv/repos/community-staging-i686/mythbackend.service (from rev 146539, mythtv/trunk/mythbackend.service) mythtv/repos/community-staging-i686/mythtv.install (from rev 146539, mythtv/trunk/mythtv.install) mythtv/repos/community-staging-x86_64/ mythtv/repos/community-staging-x86_64/PKGBUILD (from rev 146539, mythtv/trunk/PKGBUILD) mythtv/repos/community-staging-x86_64/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 146539, mythtv/trunk/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) mythtv/repos/community-staging-x86_64/mythbackend.service (from rev 146539, mythtv/trunk/mythbackend.service) mythtv/repos/community-staging-x86_64/mythtv.install (from rev 146539, mythtv/trunk/mythtv.install) -------------------------------------------------------------------------------------+ community-staging-i686/PKGBUILD | 79 ++++++++++ community-staging-i686/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 +++++ community-staging-i686/mythbackend.service | 15 + community-staging-i686/mythtv.install | 22 ++ community-staging-x86_64/PKGBUILD | 79 ++++++++++ community-staging-x86_64/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 +++++ community-staging-x86_64/mythbackend.service | 15 + community-staging-x86_64/mythtv.install | 22 ++ 8 files changed, 314 insertions(+) Copied: mythtv/repos/community-staging-i686/PKGBUILD (from rev 146539, mythtv/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-11-10 21:28:06 UTC (rev 146540) @@ -0,0 +1,79 @@ +# $Id$ +# Maintainer: Jonathan Conder <jonno.con...@gmail.com> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@archlinux.org> +# Contributor: <kleptophob...@gmail.com> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=mythtv +pkgver=0.27.5 +pkgrel=3 +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' + 'libgl' 'libpulse' 'libva' 'libvpx' 'libxinerama' 'lirc' 'mariadb-clients' + 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' + 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'taglib' 'urlgrabber' + 'libx264' 'libvdpau') +makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm' 'x264' 'gdb') +optdepends=('glew: for GPU commercial flagging' + 'libcec: for consumer electronics control capabilities' + 'libxml2: to read blu-ray metadata' + 'openssl: for AirTunes (RAOP) support' + 'udisks: detect changes to removable media' + 'xmltv: to download tv listings') +conflicts=('myththemes' 'mythplugins-mythvideo') +replaces=('myththemes' 'mythplugins-mythvideo') +install='mythtv.install' +source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz" + 'mythbackend.service' + 'ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch' + 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch') +sha256sums=('7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b' + 'ecfde779ded8332cc62c86fac6b432b09cbf5d254135798287ada688af9a1302' + '277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a' + '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3') + +prepare() { + cd "$srcdir/$pkgname-$pkgver/$pkgname" + + patch -d external/FFmpeg -Np1 -i "$srcdir/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch" + + find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np2 -i "$srcdir/libcec-2-support.2.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver/$pkgname" + + ARCH="${CARCH/_/-}" + ./configure --prefix=/usr \ + --cpu="$ARCH" \ + --disable-altivec \ + --disable-audio-jack \ + --disable-ccache \ + --disable-distcc \ + --enable-libfftw3 \ + --enable-libmp3lame \ + --enable-libvpx \ + --enable-libx264 \ + --enable-vaapi \ + --python=python2 \ + --perl-config-opts=INSTALLDIRS=vendor + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/$pkgname" + make INSTALL_ROOT="$pkgdir" install + + 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/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 146539, mythtv/trunk/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) =================================================================== --- community-staging-i686/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (rev 0) +++ community-staging-i686/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-10 21:28:06 UTC (rev 146540) @@ -0,0 +1,41 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jz...@google.com> +Date: Mon, 19 Oct 2015 22:44:11 -0700 +Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings + +VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed +from libvpx and the remaining values were never used here + +Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc> +Signed-off-by: James Zern <jz...@google.com> +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", +-- +1.7.10.4 + Copied: mythtv/repos/community-staging-i686/mythbackend.service (from rev 146539, mythtv/trunk/mythbackend.service) =================================================================== --- community-staging-i686/mythbackend.service (rev 0) +++ community-staging-i686/mythbackend.service 2015-11-10 21:28:06 UTC (rev 146540) @@ -0,0 +1,15 @@ +[Unit] +Description=MythTV Backend +Wants=network-online.target +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 146539, mythtv/trunk/mythtv.install) =================================================================== --- community-staging-i686/mythtv.install (rev 0) +++ community-staging-i686/mythtv.install 2015-11-10 21:28:06 UTC (rev 146540) @@ -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 146539, mythtv/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-11-10 21:28:06 UTC (rev 146540) @@ -0,0 +1,79 @@ +# $Id$ +# Maintainer: Jonathan Conder <jonno.con...@gmail.com> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@archlinux.org> +# Contributor: <kleptophob...@gmail.com> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=mythtv +pkgver=0.27.5 +pkgrel=3 +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' + 'libgl' 'libpulse' 'libva' 'libvpx' 'libxinerama' 'lirc' 'mariadb-clients' + 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' + 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'taglib' 'urlgrabber' + 'libx264' 'libvdpau') +makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'mesa-libgl' 'openssl' 'yasm' 'x264' 'gdb') +optdepends=('glew: for GPU commercial flagging' + 'libcec: for consumer electronics control capabilities' + 'libxml2: to read blu-ray metadata' + 'openssl: for AirTunes (RAOP) support' + 'udisks: detect changes to removable media' + 'xmltv: to download tv listings') +conflicts=('myththemes' 'mythplugins-mythvideo') +replaces=('myththemes' 'mythplugins-mythvideo') +install='mythtv.install' +source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz" + 'mythbackend.service' + 'ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch' + 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch') +sha256sums=('7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b' + 'ecfde779ded8332cc62c86fac6b432b09cbf5d254135798287ada688af9a1302' + '277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a' + '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3') + +prepare() { + cd "$srcdir/$pkgname-$pkgver/$pkgname" + + patch -d external/FFmpeg -Np1 -i "$srcdir/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch" + + find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np2 -i "$srcdir/libcec-2-support.2.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver/$pkgname" + + ARCH="${CARCH/_/-}" + ./configure --prefix=/usr \ + --cpu="$ARCH" \ + --disable-altivec \ + --disable-audio-jack \ + --disable-ccache \ + --disable-distcc \ + --enable-libfftw3 \ + --enable-libmp3lame \ + --enable-libvpx \ + --enable-libx264 \ + --enable-vaapi \ + --python=python2 \ + --perl-config-opts=INSTALLDIRS=vendor + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/$pkgname" + make INSTALL_ROOT="$pkgdir" install + + 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/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (from rev 146539, mythtv/trunk/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch) =================================================================== --- community-staging-x86_64/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch (rev 0) +++ community-staging-x86_64/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch 2015-11-10 21:28:06 UTC (rev 146540) @@ -0,0 +1,41 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jz...@google.com> +Date: Mon, 19 Oct 2015 22:44:11 -0700 +Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings + +VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed +from libvpx and the remaining values were never used here + +Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc> +Signed-off-by: James Zern <jz...@google.com> +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", +-- +1.7.10.4 + Copied: mythtv/repos/community-staging-x86_64/mythbackend.service (from rev 146539, mythtv/trunk/mythbackend.service) =================================================================== --- community-staging-x86_64/mythbackend.service (rev 0) +++ community-staging-x86_64/mythbackend.service 2015-11-10 21:28:06 UTC (rev 146540) @@ -0,0 +1,15 @@ +[Unit] +Description=MythTV Backend +Wants=network-online.target +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 146539, mythtv/trunk/mythtv.install) =================================================================== --- community-staging-x86_64/mythtv.install (rev 0) +++ community-staging-x86_64/mythtv.install 2015-11-10 21:28:06 UTC (rev 146540) @@ -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 +}