summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-07-18 08:09:36 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-07-18 08:09:36 +0000
commit33d3c96dc8753175327d1b19123e9f0953d28d17 (patch)
treec28e228fb714fa66628bc01fda3dd3f9ffac3995 /media-tv/linuxtv-dvb-apps
parentStable on ppc64; bug #185733 (diff)
downloadgentoo-2-33d3c96dc8753175327d1b19123e9f0953d28d17.tar.gz
gentoo-2-33d3c96dc8753175327d1b19123e9f0953d28d17.tar.bz2
gentoo-2-33d3c96dc8753175327d1b19123e9f0953d28d17.zip
Fixed compiling with linux-headers-2.6.22, thanks to Martin Jansa <Martin.Jansa@mk.cvut.cz> for the patch, Bug 185350.
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'media-tv/linuxtv-dvb-apps')
-rw-r--r--media-tv/linuxtv-dvb-apps/ChangeLog8
-rw-r--r--media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff11
-rw-r--r--media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild4
3 files changed, 21 insertions, 2 deletions
diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index 272310595f24..13e58289e0c9 100644
--- a/media-tv/linuxtv-dvb-apps/ChangeLog
+++ b/media-tv/linuxtv-dvb-apps/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-tv/linuxtv-dvb-apps
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.31 2007/06/08 10:31:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.32 2007/07/18 08:09:36 zzam Exp $
+
+ 18 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+ +files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff,
+ linuxtv-dvb-apps-1.1.1.20070114.ebuild:
+ Fixed compiling with linux-headers-2.6.22, thanks to Martin Jansa
+ <Martin.Jansa@mk.cvut.cz> for the patch, Bug 185350.
08 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
linuxtv-dvb-apps-1.1.1.20060917.ebuild,
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff
new file mode 100644
index 000000000000..e54bf141d1b8
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff
@@ -0,0 +1,11 @@
+diff -ru linuxtv-dvb-apps-20070114-orig/lib/libdvbapi/dvbvideo.c linuxtv-dvb-apps-20070114/lib/libdvbapi/dvbvideo.c
+--- linuxtv-dvb-apps-20070114-orig/lib/libdvbapi/dvbvideo.c 2007-07-18 10:03:47.902372374 +0200
++++ linuxtv-dvb-apps-20070114/lib/libdvbapi/dvbvideo.c 2007-07-18 10:04:15.404812842 +0200
+@@ -25,6 +25,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#include <linux/types.h>
+ #include <linux/dvb/video.h>
+ #include <errno.h>
+ #include "dvbvideo.h"
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
index ff050d5b74ab..49646e536874 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild,v 1.6 2007/06/08 10:31:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild,v 1.7 2007/07/18 08:09:36 zzam Exp $
inherit eutils versionator multilib
@@ -25,6 +25,8 @@ src_unpack()
unpack ${A}
cd ${S}
+ epatch "${FILESDIR}/${MY_P}-linux-headers-2.6.22.diff"
+
# disables compilation of ttusb_dec_reset which requires libusb
if ! use usb; then
sed -i util/Makefile \