Date: Saturday, May 9, 2009 @ 06:37:25
Author: allan
Revision: 38570
add patches to SVN...
Added:
mythtv/repos/extra-i686/mythtv-dvb.patch
(from rev 38569, mythtv/trunk/mythtv-dvb.patch)
mythtv/repos/extra-i686/mythtv-ffmpeg.patch
(from rev 38569, mythtv/trunk/mythtv-ffmpeg.patch)
Modified:
mythtv/repos/extra-i686/ (properties)
mythtv/repos/extra-i686/PKGBUILD
---------------------+
PKGBUILD | 1 +
mythtv-dvb.patch | 21 +++++++++++++++++++++
mythtv-ffmpeg.patch | 18 ++++++++++++++++++
3 files changed, 40 insertions(+)
Property changes on: mythtv/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /mythtv/trunk:1-38567
+ /mythtv/trunk:1-38569
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-05-09 10:34:03 UTC (rev 38569)
+++ extra-i686/PKGBUILD 2009-05-09 10:37:25 UTC (rev 38570)
@@ -23,6 +23,7 @@
QUICKSTART.archlinux)
md5sums=('49fc135e1cde90cd935c1229467fa37e'
'64e065ae63711935575665a1f60d51e1'
+ '47399b97437fdf2ed26e7b0cdac80afd'
'75614f43b579fcae870a7c128038f147'
'a0ecb7f476cb71c0c1ac90d349fc7695')
Copied: mythtv/repos/extra-i686/mythtv-dvb.patch (from rev 38569, mythtv/trunk/mythtv-dvb.patch)
===================================================================
--- extra-i686/mythtv-dvb.patch (rev 0)
+++ extra-i686/mythtv-dvb.patch 2009-05-09 10:37:25 UTC (rev 38570)
@@ -0,0 +1,21 @@
+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
Copied: mythtv/repos/extra-i686/mythtv-ffmpeg.patch (from rev 38569, mythtv/trunk/mythtv-ffmpeg.patch)
===================================================================
--- extra-i686/mythtv-ffmpeg.patch (rev 0)
+++ extra-i686/mythtv-ffmpeg.patch 2009-05-09 10:37:25 UTC (rev 38570)
@@ -0,0 +1,18 @@
+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>