[arch-commits] Commit in mythtv/repos (8 files)
Giovanni Scafora
giovanni at archlinux.org
Wed Nov 18 21:06:16 UTC 2009
Date: Wednesday, November 18, 2009 @ 16:06:15
Author: giovanni
Revision: 58998
Merged revisions 58366,58524,58535,58560-58561,58563,58565,58634,58963 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mythtv/trunk
........
r58366 | juergen | 2009-11-07 03:01:35 -0800 (sab, 07 nov 2009) | 1 line
prepare 0.22 release
........
r58524 | juergen | 2009-11-08 13:50:55 -0800 (dom, 08 nov 2009) | 5 lines
explicitly set configure options (--enable*/--disable*) based on depends()
cleanup for 0.22 release
........
r58535 | juergen | 2009-11-08 14:02:43 -0800 (dom, 08 nov 2009) | 4 lines
added missing dependency
added fedora-based config file (See FS#11890)
........
r58560 | juergen | 2009-11-08 15:05:14 -0800 (dom, 08 nov 2009) | 2 lines
clean rewrite of initscript (based on fedora initscript)
........
r58561 | juergen | 2009-11-08 15:09:47 -0800 (dom, 08 nov 2009) | 1 line
typo in sourcing config file
........
r58563 | juergen | 2009-11-08 15:24:42 -0800 (dom, 08 nov 2009) | 1 line
fix FS#11890
........
r58565 | juergen | 2009-11-08 15:32:09 -0800 (dom, 08 nov 2009) | 1 line
fix FS#12328 (enable firewire support)
........
r58634 | juergen | 2009-11-10 13:32:01 -0800 (mar, 10 nov 2009) | 1 line
fix invalid/duplicate configure options
........
r58963 | andrea | 2009-11-18 08:42:03 -0800 (mer, 18 nov 2009) | 2 lines
upgpkg: mythtv 0.22-2
rebuilt mysql 5.1.41
........
Added:
mythtv/repos/extra-x86_64/archlinux.conf.d.mythbackend
(from rev 58963, mythtv/trunk/archlinux.conf.d.mythbackend)
Modified:
mythtv/repos/extra-x86_64/ (properties)
mythtv/repos/extra-x86_64/PKGBUILD
mythtv/repos/extra-x86_64/mythbackend
Deleted:
mythtv/repos/extra-x86_64/QUICKSTART.archlinux
mythtv/repos/extra-x86_64/mythtv-0.20.2.20071129-lm_sensors-3-fix.patch
mythtv/repos/extra-x86_64/mythtv-dvb.patch
mythtv/repos/extra-x86_64/mythtv-ffmpeg.patch
-----------------------------------------------+
PKGBUILD | 85 ++++++++----------
QUICKSTART.archlinux | 69 --------------
archlinux.conf.d.mythbackend | 92 +++++++++++++++++++
mythbackend | 102 +++++++++++++++------
mythtv-0.20.2.20071129-lm_sensors-3-fix.patch | 113 ------------------------
mythtv-dvb.patch | 21 ----
mythtv-ffmpeg.patch | 18 ---
7 files changed, 205 insertions(+), 295 deletions(-)
Property changes on: mythtv/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /mythtv/trunk:1-38571
+ /mythtv/trunk:1-58997
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-11-18 19:29:01 UTC (rev 58997)
+++ extra-x86_64/PKGBUILD 2009-11-18 21:06:15 UTC (rev 58998)
@@ -1,70 +1,63 @@
# $Id$
# Contributor: <kleptophobiac at gmail.com>
# Contributor: dorphell <dorphell at archlinux.org>
-# Maintainer: Paul Mattal <paul at archlinux.org>
+# Maintainer: Juergen Hoetzel <juergen at archlinux.org>
pkgname=mythtv
-pkgver=0.21
+pkgver=0.22
pkgrel=2
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
url="http://www.mythtv.org/"
license=('GPL2')
groups=('pvr')
-depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
- 'libxvmc')
-makedepends=(libgl)
-backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt)
+depends=('mysql-clients>=5.1.41' 'qt' 'lame' 'lirc-utils' 'ffmpeg' 'libxvmc' 'fribidi')
+backup=('etc/conf.d/mythbackend')
install=mythtv.install
source=(ftp://ftp.osuosl.org/pub/mythtv/${pkgname}-${pkgver}.tar.bz2
- mythtv-dvb.patch
- mythtv-ffmpeg.patch
mythbackend
- QUICKSTART.archlinux)
-md5sums=('49fc135e1cde90cd935c1229467fa37e'
- '64e065ae63711935575665a1f60d51e1'
- '47399b97437fdf2ed26e7b0cdac80afd'
- '75614f43b579fcae870a7c128038f147'
- 'a0ecb7f476cb71c0c1ac90d349fc7695')
+ archlinux.conf.d.mythbackend)
+md5sums=('e8f8b5b6a51cd7be700e215b2a1bf2c0'
+ '0228c7b3aca06f04b7584913ebe76d68'
+ 'bb8e4033d82428d827570fae9ba15e6a')
build() {
- cd $srcdir/${pkgname}-${pkgver} || return 1
- patch -Np1 -i $srcdir/mythtv-dvb.patch
- patch -Np1 -i $srcdir/mythtv-ffmpeg.patch
+ cd $srcdir/${pkgname}-${pkgver}
+
+ ARCH=${CARCH/_/-}
+ ./configure --prefix=/usr --cpu=${ARCH} \
+ --enable-mmx \
+ --enable-audio-oss \
+ --enable-audio-alsa \
+ --disable-audio-jack \
+ --disable-audio-pulse \
+ --disable-audio-arts \
+ --disable-vdpau \
+ --enable-dvb \
+ --enable-lirc \
+ --enable-joystick-menu \
+ --enable-v4l \
+ --enable-ivtv \
+ --enable-dvb \
+ --dvb-path=/usr/include/linux/dvb \
+ --enable-xvmc \
+ --enable-ffmpeg \
+ --enable-xvmc-pro \
+ --enable-xvmc-vld \
+ --enable-opengl-vsync \
+ --enable-firewire \
+ --enable-fribidi
- . /etc/profile.d/qt3.sh
-
- # use QT3 qmake
- export PATH=$QTDIR/bin:$PATH
- [ "$CARCH" = "i686" ] && ARCH="i686"
- [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
-
- ./configure --prefix=/usr --cpu=${ARCH} --enable-mmx --enable-audio-oss \
- --enable-audio-alsa --enable-dvb --enable-lirc --enable-joystick-menu \
- --disable-firewire --enable-v4l --enable-ivtv --enable-dvb \
- --dvb-path=/usr/include/linux/dvb --enable-xvmc --disable-ffmpeg \
- --enable-xvmc-pro --enable-xvmc-vld --enable-opengl-vsync \
- --disable-audio-jack --disable-audio-arts || return 1
-
# build
- qmake mythtv.pro || return 1
- make qmake || return 1
- make || return 1
+ qmake mythtv.pro
+ make
# basic install
- make INSTALL_ROOT=$pkgdir install || return 1
+ make INSTALL_ROOT=$pkgdir install
- # install db schema
- install -m0644 database/mc.sql $pkgdir/usr/share/mythtv/ || return 1
- install -D -m0755 ../mythbackend $pkgdir/etc/rc.d/mythbackend || return 1
- cp -r docs $pkgdir/usr/share/mythtv/ || return 1
- cp ../QUICKSTART.archlinux $pkgdir/usr/share/mythtv/ || return 1
+ install -D -m0755 $srcdir/mythbackend $pkgdir/etc/rc.d/mythbackend
- # install contrib
- mkdir -p $pkgdir/usr/share/mythtv/contrib || return 1
- install -m0755 contrib/* $pkgdir/usr/share/mythtv/contrib
-
- # set suid on mythfrontend
- chmod a+s $pkgdir/usr/bin/mythfrontend
+ # config file
+ install -D -m644 $srcdir/archlinux.conf.d.mythbackend $pkgdir/etc/conf.d/mythbackend
}
Deleted: extra-x86_64/QUICKSTART.archlinux
===================================================================
--- extra-x86_64/QUICKSTART.archlinux 2009-11-18 19:29:01 UTC (rev 58997)
+++ extra-x86_64/QUICKSTART.archlinux 2009-11-18 21:06:15 UTC (rev 58998)
@@ -1,69 +0,0 @@
-MythTV QUICKSTART
-=================
-This Arch Linux package provides a generic MythTV installation. It
-requires extensive user configuration. This is a skeletal document, and
-more extensive information is available in /usr/share/mythtv/docs.
-
-MythTV is split into a backend and a frontend. The backend records
-television programming, keeps up with scheduling, does commercial
-flagging, transcoding, and other such jobs. The frontend provides a
-pretty GUI which allows playback and edition of the recorded programs.
-It also provides a means to schedule recordings. There are a number of
-plugins available for MythTV, and most of the official ones are
-available as Arch packages. There are two configurations; the backend
-and frontend can be on the same machine, or on two different machines on
-the same network.
-
-Backend Configuration
----------------------
-MythTV keeps the majority of its settings and program information in a
-mysql database. Before running the backend configuration program, it is
-necessary to initialize the datase. Make sure mysql is running properly.
-
-# mysql < /usr/share/mythtv/mc.sql
-
-If your frontend is going to be remote, you must allow other computers
-on your network to have access to your database. Substitute 192.168.1.%
-with whatever IP range you use. If you have a root mysql password (as
-you should), leave the -p in the mysql command line. Otherwise remove
-the switch.
-
-# mysql -u root -p
- mysql> connect mythconverg;
- mysql> grant all on mythconverg.* to mythtv@"192.168.1.%" identified by "mythtv";
- mysql> flush privileges;
- mysql> quit
-
-In order to configure the MythTV backend, you will need to run the
-mythtv-setup program. Note that this requires X. If your backend is
-headless, considering using vnc as a quick and dirty "fix".
-
-# mythtv-setup
-
-Go through all the menus. You will need to know information like your
-capture card device (/dev/v4l/video[0-9]) and your program information
-acquisition method. United States users will most likely subscribe to
-Zap2it Labs' DataDirect service. It requires that users take a survey
-every three months in order to continue service. This isn't as hard as
-it sounds.
-
-It is necessary to update the database with all the current TV listings.
-Run the mythfilldatabase program to grab the listings using whatever
-method you specified in mythtv-setup.
-
-# mythfilldatabase
-
-Run mythbackend from the command line to make sure everything starts ok.
-
-# mythbackend
-
-If so, you may kill the task with "ctrl-c" on your keyboard, and add the
-backend to /etc/rc.conf. In the DAEMONS line, just add "mythbackend" to
-the list.
-
-In the future, you will need to run mythfilldatabase regularly. I allow
-my frontend computer to do this, as it runs continuously, and it is an
-option within MythTV. Otherwise, you can set up a cron job, or move
-mythfilldatabasecron to /etc/cron.daily
-
-cp /usr/share/mythtv/mythfilldatabasecron /etc/cron.daily
Copied: mythtv/repos/extra-x86_64/archlinux.conf.d.mythbackend (from rev 58963, mythtv/trunk/archlinux.conf.d.mythbackend)
===================================================================
--- extra-x86_64/archlinux.conf.d.mythbackend (rev 0)
+++ extra-x86_64/archlinux.conf.d.mythbackend 2009-11-18 21:06:15 UTC (rev 58998)
@@ -0,0 +1,92 @@
+#!/bin/bash
+#
+# Rename this file to:
+#
+# /etc/config.d/mythbackend
+#
+###############################################################################
+#
+# 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
+#
+###############################################################################
+#
+# Config variables for the mythbackend startup script, which is usually
+# located in /etc/rc.d/mythbackend
+#
+# When the startup script is executed, it sources this file if it exists,
+# otherwise it will fall back on default values.
+#
+# Leave variables commented out to use default values in init script
+# (/etc/rc.d/mythbackend).
+#
+# To override defaults, uncomment the relevant variable definition and
+# edit as required.
+#
+
+#
+# User who should start the mythbackend processes
+#
+# 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'
+
+#
+# Directory holding the mythbackend binary (empty means autodetect).
+#
+# MBE_DIR=''
+
+#
+# Name of mythbackend binary.
+#
+# MBE_PROG='mythbackend'
+
+#
+# Other startup options for mythbackend (see 'mythbackend --help' for a list).
+#
+# MBE_OPTIONS=''
+
+#
+# Directory holding the mythbackend log file
+#
+# LOG_DIR='/var/log/mythtv'
+
+#
+# Name of mythbackend log file.
+#
+# NOTE: If you are running as non-root take care to ensure the mythbackend user
+# has permission to write to this log file.
+#
+# LOG_FILE='mythbackend.log'
+
+#
+# Logging options for mythbackend (see 'mythbackend -v help' for a list)
+#
+# LOG_OPTS=''
Modified: extra-x86_64/mythbackend
===================================================================
--- extra-x86_64/mythbackend 2009-11-18 19:29:01 UTC (rev 58997)
+++ extra-x86_64/mythbackend 2009-11-18 21:06:15 UTC (rev 58998)
@@ -3,34 +3,80 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=`pidof -o %PPID /usr/bin/mythbackend`
+# Default values to use if none are supplied in the config file.
+
+# 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.
+#
+# User who should start the mythbackend processes
+MBE_USER='root'
+
+# Startup options for mythbackend
+MBE_OPTIONS=''
+
+# Name of mythbackend log file
+LOG_FILE='/var/log/mythbackend.log'
+
+# Logging options for mythbackend (empty means '-v important,general')
+LOG_OPTS=''
+
+###############################################################################
+
+CONFIG_FILE=/etc/conf.d/mythbackend
+PIDFILE=/var/run/mythbackend.pid
+
+if [[ -f ${CONFIG_FILE} ]]; then
+ . ${CONFIG_FILE}
+fi
+
+pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
+
+# fix FS#11890
+mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
+
case "$1" in
- start)
- stat_busy "Starting MythTV Backend"
- [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -p /var/run/mythbackend.pid -v important
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon mythbackend
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping MythTV Backend"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mythbackend
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1s
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
+ start)
+ stat_busy "Starting MythTV Backend"
+
+ # already running ?
+ if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then
+ stat_fail
+ exit 1;
+ fi
+ touch "/var/run/mythbackend.pid"
+ chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
+ if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
+ --daemon \
+ --logfile $LOG_FILE $LOG_OPTS \
+ --pidfile ${PIDFILE} $MBE_OPTIONS";
+ 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 ${PIDFILE} 2>/dev/null
+ else
+ stat_fail
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
esac
exit 0
Deleted: extra-x86_64/mythtv-0.20.2.20071129-lm_sensors-3-fix.patch
===================================================================
--- extra-x86_64/mythtv-0.20.2.20071129-lm_sensors-3-fix.patch 2009-11-18 19:29:01 UTC (rev 58997)
+++ extra-x86_64/mythtv-0.20.2.20071129-lm_sensors-3-fix.patch 2009-11-18 21:06:15 UTC (rev 58998)
@@ -1,113 +0,0 @@
-diff -urN mythtv/programs/mythbackend/httpstatus.cpp mythtv-fixed/programs/mythbackend/httpstatus.cpp
---- mythtv/programs/mythbackend/httpstatus.cpp 2007-08-23 12:09:51.000000000 -0400
-+++ mythtv-fixed/programs/mythbackend/httpstatus.cpp 2007-11-29 23:05:44.000000000 -0500
-@@ -4,7 +4,7 @@
- // Purpose - Html & XML status HttpServerExtension
- //
- // Created By : David Blain Created On : Oct. 24, 2005
--// Modified By : Modified On:
-+// Modified By : Stephen Lewis Modified On: Nov. 27, 2007
- //
- //////////////////////////////////////////////////////////////////////////////
-
-@@ -26,7 +26,9 @@
- #ifdef HAVE_LMSENSORS
- #define LMSENSOR_DEFAULT_CONFIG_FILE "/etc/sensors.conf"
- #include <sensors/sensors.h>
-+#if ( SENSORS_API_VERSION < 0x400 )
- #include <sensors/chips.h>
-+#endif
- #endif
-
- /////////////////////////////////////////////////////////////////////////////
-@@ -428,6 +430,7 @@
- }
-
- #ifdef HAVE_LMSENSORS
-+#if ( SENSORS_API_VERSION < 0x400 ) // Use old SENSORS_API
- m_settingLock.lock();
-
- if (!found_acpi)
-@@ -464,6 +467,46 @@
- sensors_cleanup();
- }
- m_settingLock.unlock();
-+#else // Use New SENSORS_API
-+ m_settingLock.lock();
-+
-+ if (!found_acpi)
-+ {
-+ int chip_nr, a, b;
-+ char *label = NULL;
-+ double value;
-+ const sensors_chip_name *chip;
-+ const sensors_feature *data;
-+ const sensors_subfeature *sdata;
-+ char* lmsensorConfigName = LMSENSOR_DEFAULT_CONFIG_FILE;
-+ a = b = 0;
-+ FILE *lmsensorConfigFile = fopen(lmsensorConfigName, "r");
-+ sensors_init(lmsensorConfigFile);
-+ fclose(lmsensorConfigFile);
-+ for (chip_nr = 0 ; (chip = sensors_get_detected_chips(NULL, &chip_nr)) ; )
-+ {
-+ while ((data = sensors_get_features(chip, &a)))
-+ {
-+ if (data->type == SENSORS_FEATURE_TEMP)
-+ {
-+ while ((sdata = sensors_get_all_subfeatures(chip, data, &b)))
-+ {
-+ if (sdata->type == SENSORS_SUBFEATURE_TEMP_INPUT)
-+ {
-+ sensors_get_value(chip, sdata->number, &value);
-+ QString temp = QString("%1").arg(value);
-+ temp += " ℃";
-+ mInfo.appendChild(thermal);
-+ thermal.setAttribute("temperature", temp);
-+ }
-+ }
-+ }
-+ }
-+ }
-+ sensors_cleanup();
-+ }
-+ m_settingLock.unlock();
-+#endif // ( SENSORS_API_VERSION < 0x400 )
- #endif
-
- // Guide Data ---------------------
-diff -urN mythtv/programs/mythbackend/mainserver.cpp mythtv-fixed/programs/mythbackend/mainserver.cpp
---- mythtv/programs/mythbackend/mainserver.cpp 2007-08-27 21:22:44.000000000 -0400
-+++ mythtv-fixed/programs/mythbackend/mainserver.cpp 2007-11-29 23:09:24.000000000 -0500
-@@ -47,8 +47,10 @@
- #ifdef HAVE_LMSENSORS
- #define LMSENSOR_DEFAULT_CONFIG_FILE "/etc/sensors.conf"
- #include <sensors/sensors.h>
-+#if ( SENSORS_API_VERSION < 0x400 )
- #include <sensors/chips.h>
- #endif
-+#endif
-
-
- /** Milliseconds to wait for an existing thread from
-diff -urN mythtv/programs/mythbackend/mythxml.cpp mythtv-fixed/programs/mythbackend/mythxml.cpp
---- mythtv/programs/mythbackend/mythxml.cpp 2007-08-23 12:09:51.000000000 -0400
-+++ mythtv-fixed/programs/mythbackend/mythxml.cpp 2007-11-29 23:07:07.000000000 -0500
-@@ -4,7 +4,7 @@
- // Purpose - Html & XML status HttpServerExtension
- //
- // Created By : David Blain Created On : Oct. 24, 2005
--// Modified By : Modified On:
-+// Modified By : Stephen Lewis Modified On: Nov. 27, 2007
- //
- //////////////////////////////////////////////////////////////////////////////
-
-@@ -25,7 +25,9 @@
- #ifdef HAVE_LMSENSORS
- #define LMSENSOR_DEFAULT_CONFIG_FILE "/etc/sensors.conf"
- #include <sensors/sensors.h>
-+#if ( SENSORS_API_VERSION < 0x400 )
- #include <sensors/chips.h>
-+#endif
- #endif
-
- /////////////////////////////////////////////////////////////////////////////
Deleted: extra-x86_64/mythtv-dvb.patch
===================================================================
--- extra-x86_64/mythtv-dvb.patch 2009-11-18 19:29:01 UTC (rev 58997)
+++ extra-x86_64/mythtv-dvb.patch 2009-11-18 21:06:15 UTC (rev 58998)
@@ -1,21 +0,0 @@
-diff -Naur mythtv-0.21-old/libs/libmythtv/dvbtypes.h mythtv-0.21/libs/libmythtv/dvbtypes.h
---- mythtv-0.21-old/libs/libmythtv/dvbtypes.h 2007-01-08 01:29:30.000000000 +1000
-+++ mythtv-0.21/libs/libmythtv/dvbtypes.h 2009-05-09 18:00:29.000000000 +1000
-@@ -19,7 +19,7 @@
- #include <linux/dvb/frontend.h>
- #include <linux/dvb/dmx.h>
-
--#if (DVB_API_VERSION != 3)
-+#if (DVB_API_VERSION != 3 && DVB_API_VERSION != 5)
- # error "DVB driver includes with API version 3 not found!"
- #endif
-
-@@ -27,7 +27,7 @@
- # define DVB_API_VERSION_MINOR 0
- #endif
-
--#if (DVB_API_VERSION >= 3 && DVB_API_VERSION_MINOR >= 1)
-+#if ((DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1) || (DVB_API_VERSION > 3))
- # define USE_ATSC
- #else
- #warning DVB API version < 3.1
Deleted: extra-x86_64/mythtv-ffmpeg.patch
===================================================================
--- extra-x86_64/mythtv-ffmpeg.patch 2009-11-18 19:29:01 UTC (rev 58997)
+++ extra-x86_64/mythtv-ffmpeg.patch 2009-11-18 21:06:15 UTC (rev 58998)
@@ -1,18 +0,0 @@
-diff -Naur mythtv-0.21-old/libs/libmythtv/mpeg/pespacket.cpp mythtv-0.21/libs/libmythtv/mpeg/pespacket.cpp
---- mythtv-0.21-old/libs/libmythtv/mpeg/pespacket.cpp 2006-09-08 04:55:03.000000000 +1000
-+++ mythtv-0.21/libs/libmythtv/mpeg/pespacket.cpp 2009-05-09 19:46:15.000000000 +1000
-@@ -6,10 +6,10 @@
-
- extern "C" {
- #include "mythconfig.h"
--#include "../libavcodec/avcodec.h"
--#include "../libavformat/avformat.h"
--#include "../libavutil/crc.h"
--#include "../libavutil/bswap.h"
-+#include "libavcodec/avcodec.h"
-+#include "libavformat/avformat.h"
-+#include "libavutil/crc.h"
-+#include "libavutil/bswap.h"
- }
-
- #include <vector>
More information about the arch-commits
mailing list