[arch-commits] Commit in mythtv/trunk (5 files)
Juergen Hoetzel
juergen at archlinux.org
Sat Nov 7 11:01:35 UTC 2009
Date: Saturday, November 7, 2009 @ 06:01:35
Author: juergen
Revision: 58366
prepare 0.22 release
Modified:
mythtv/trunk/PKGBUILD
Deleted:
mythtv/trunk/QUICKSTART.archlinux
mythtv/trunk/mythtv-0.20.2.20071129-lm_sensors-3-fix.patch
mythtv/trunk/mythtv-dvb.patch
mythtv/trunk/mythtv-ffmpeg.patch
-----------------------------------------------+
PKGBUILD | 51 +++-------
QUICKSTART.archlinux | 69 --------------
mythtv-0.20.2.20071129-lm_sensors-3-fix.patch | 113 ------------------------
mythtv-dvb.patch | 21 ----
mythtv-ffmpeg.patch | 18 ---
5 files changed, 17 insertions(+), 255 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-11-07 10:56:02 UTC (rev 58365)
+++ PKGBUILD 2009-11-07 11:01:35 UTC (rev 58366)
@@ -1,44 +1,29 @@
# $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
-pkgrel=2
+pkgver=0.22
+pkgrel=1
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' \
+depends=('bash' 'mysql-clients' 'qt' 'lame' 'lirc-utils' 'ffmpeg' \
'libxvmc')
makedepends=(libgl)
backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt)
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')
+source=(ftp://ftp.osuosl.org/pub/mythtv/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('913c93028f557441de6908b749bc3d0c')
+#
build() {
- cd $srcdir/${pkgname}-${pkgver} || return 1
- patch -Np1 -i $srcdir/mythtv-dvb.patch
- patch -Np1 -i $srcdir/mythtv-ffmpeg.patch
-
- . /etc/profile.d/qt3.sh
-
- # use QT3 qmake
- export PATH=$QTDIR/bin:$PATH
- [ "$CARCH" = "i686" ] && ARCH="i686"
- [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
-
+ cd $srcdir/${pkgname}-${pkgver}
+
+ ARCH=${CARCH/_/-}
./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 \
@@ -48,21 +33,19 @@
# 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 -m0644 database/mc.sql $pkgdir/usr/share/mythtv/
+ install -D -m0755 ../mythbackend $pkgdir/etc/rc.d/mythbackend
+ cp -r docs $pkgdir/usr/share/mythtv/
# install contrib
- mkdir -p $pkgdir/usr/share/mythtv/contrib || return 1
+ mkdir -p $pkgdir/usr/share/mythtv/contrib
install -m0755 contrib/* $pkgdir/usr/share/mythtv/contrib
# set suid on mythfrontend
Deleted: QUICKSTART.archlinux
===================================================================
--- QUICKSTART.archlinux 2009-11-07 10:56:02 UTC (rev 58365)
+++ QUICKSTART.archlinux 2009-11-07 11:01:35 UTC (rev 58366)
@@ -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
Deleted: mythtv-0.20.2.20071129-lm_sensors-3-fix.patch
===================================================================
--- mythtv-0.20.2.20071129-lm_sensors-3-fix.patch 2009-11-07 10:56:02 UTC (rev 58365)
+++ mythtv-0.20.2.20071129-lm_sensors-3-fix.patch 2009-11-07 11:01:35 UTC (rev 58366)
@@ -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: mythtv-dvb.patch
===================================================================
--- mythtv-dvb.patch 2009-11-07 10:56:02 UTC (rev 58365)
+++ mythtv-dvb.patch 2009-11-07 11:01:35 UTC (rev 58366)
@@ -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: mythtv-ffmpeg.patch
===================================================================
--- mythtv-ffmpeg.patch 2009-11-07 10:56:02 UTC (rev 58365)
+++ mythtv-ffmpeg.patch 2009-11-07 11:01:35 UTC (rev 58366)
@@ -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