From 42fbe2d214b850ded06b23ca33f3aa2880e60dbb Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Sep 2013 02:18:37 -0700 Subject: Fri Sep 20 02:14:49 PDT 2013 --- community/mythtv/PKGBUILD | 64 +++++++++++++++++++++---------------------- community/mythtv/alsa.patch | 66 --------------------------------------------- 2 files changed, 31 insertions(+), 99 deletions(-) delete mode 100644 community/mythtv/alsa.patch (limited to 'community/mythtv') diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index f3c23c0cc..a61dbdd84 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96148 2013-08-20 11:25:49Z jconder $ +# $Id: PKGBUILD 97419 2013-09-19 04:04:04Z jconder $ # Maintainer: Jonathan Conder # Contributor: Giovanni Scafora # Contributor: Juergen Hoetzel @@ -6,7 +6,7 @@ # Contributor: dorphell pkgname=mythtv -pkgver=0.26.1 +pkgver=0.27 pkgrel=1 epoch=1 pkgdesc="A Homebrew PVR project" @@ -14,56 +14,54 @@ 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' - 'mariadb-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' - 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' - 'x264') + 'libpulse' 'libva' 'libvpx' 'libxinerama' 'lirc-utils' 'mariadb-clients' + 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' + 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'taglib' 'urlgrabber' 'x264') 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' - 'openssl: for AirTunes (RAOP) support' + '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=() install='mythtv.install' -source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - 'alsa.patch' - 'mythbackend.service' - 'libva-compat.patch::https://github.com/garybuhrmaster/mythtv/commit/2add868d2f18b8b47d9747e043f052e88869bfc3.patch' - 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch') -md5sums=('ef25a9b86f4a23d6f07d83791a1e5c9e' - 'f64b8219e3d27a2edf96733b851e576b' - 'e4d572dcc307d6d8ae26bee5aebf9f3a' - 'ae88a16e9f42a913f395bf71af18e931' - '6e156c9fc0b369346d93ccafad46cba3') +source=("http://www.$pkgname.org/download/$pkgname/$pkgver" + 'mythbackend.service' + 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch') +sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8' + 'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f' + '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3') + +prepare() { + cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" -build() { - cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np2 -i "$srcdir/libcec-2-support.2.patch" +} - patch -Np1 -i "$srcdir/alsa.patch" - patch -Np2 -i "$srcdir/libva-compat.patch" - patch -Np2 -i "$srcdir/libcec-2-support.patch" +build() { + cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" 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 + --disable-altivec \ + --disable-audio-jack \ + --disable-ccache \ + --disable-distcc \ + --enable-libfftw3 \ + --enable-libmp3lame \ + --enable-libvpx \ + --enable-libx264 \ + --enable-vaapi \ + --python=python2 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname" make INSTALL_ROOT="$pkgdir" install install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service" diff --git a/community/mythtv/alsa.patch b/community/mythtv/alsa.patch deleted file mode 100644 index 07cf1c3a9..000000000 --- a/community/mythtv/alsa.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 - #include - #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 - #include - #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 - #include - - #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 - #include - #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 - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API - #include -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 - #include - #else - typedef int snd_pcm_t; -- cgit v1.2.3-54-g00ecf