Do not abort compilation wwhen detecting dvb api 5 (headers installed by linux-headers-2.6.28) as that is backward compatible to api version 3, Bug #254269

(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r1 i686)

12 files changed, 56 insertions, 22 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 2902b669881b..470240a6f102 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/vdr
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.122 2008/11/11 12:25:46 zzam Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.123 2009/01/12 13:23:01 zzam Exp $
+
+  12 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-dvb-api-5-is-fine.diff, vdr-1.4.6.ebuild, vdr-1.4.7-r10.ebuild,
+  vdr-1.4.7-r11.ebuild, vdr-1.4.7-r12.ebuild, vdr-1.6.0.ebuild,
+  vdr-1.6.0-r1.ebuild, vdr-1.6.0-r2.ebuild, vdr-1.6.0_p1.ebuild,
+  vdr-1.6.0_p1-r1.ebuild, vdr-1.6.0_p2.ebuild:
+  Do not abort compilation wwhen detecting dvb api 5 (headers installed by
+  linux-headers-2.6.28) as that is backward compatible to api version 3, Bug
+  #254269
 
   11 Nov 2008; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.7-r12.ebuild:
   Mark stable on x86.
diff --git a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
new file mode 100644
index 000000000000..b5657e84636a
--- /dev/null
+++ b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
@@ -0,0 +1,14 @@
+Nur in vdr-1.6.0: audio.o.
+Nur in vdr-1.6.0: .dependencies.
+diff -ru vdr-1.6.0-orig/dvbdevice.h vdr-1.6.0/dvbdevice.h
+--- vdr-1.6.0-orig/dvbdevice.h	2009-01-12 14:05:10.000000000 +0100
++++ vdr-1.6.0/dvbdevice.h	2009-01-12 14:05:52.000000000 +0100
+@@ -15,7 +15,7 @@
+ #include "device.h"
+ #include "dvbspu.h"
+ 
+-#if DVB_API_VERSION != 3
++#if (DVB_API_VERSION != 3) && (DVB_API_VERSION != 5)
+ #error VDR requires Linux DVB driver API version 3!
+ #endif
+ 
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
index 616fd75d258d..dd9153349380 100644
--- a/media-video/vdr/vdr-1.4.6.ebuild
+++ b/media-video/vdr/vdr-1.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.11 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.12 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -71,6 +71,7 @@ src_unpack() {
 	fi
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 309389ee4ce5..a1c3fc397407 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.8 2008/11/11 12:10:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.9 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -165,6 +165,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.4.7-r11.ebuild b/media-video/vdr/vdr-1.4.7-r11.ebuild
index a4e9c0d30992..1835c0b84d08 100644
--- a/media-video/vdr/vdr-1.4.7-r11.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.2 2008/11/11 12:10:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.3 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -165,6 +165,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.4.7-r12.ebuild b/media-video/vdr/vdr-1.4.7-r12.ebuild
index 847c36d825fb..02d0c7d91aef 100644
--- a/media-video/vdr/vdr-1.4.7-r12.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.3 2008/11/11 12:25:46 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.4 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -165,6 +165,7 @@ src_unpack() {
 
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0-r1.ebuild b/media-video/vdr/vdr-1.6.0-r1.ebuild
index db3996567247..7a6b72de3468 100644
--- a/media-video/vdr/vdr-1.6.0-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.4 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.5 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -159,6 +159,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0-r2.ebuild b/media-video/vdr/vdr-1.6.0-r2.ebuild
index 47347444e50c..c9dc7649c19b 100644
--- a/media-video/vdr/vdr-1.6.0-r2.ebuild
+++ b/media-video/vdr/vdr-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.6 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.7 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -159,6 +159,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0.ebuild b/media-video/vdr/vdr-1.6.0.ebuild
index ef153da2d2f9..27e592e033af 100644
--- a/media-video/vdr/vdr-1.6.0.ebuild
+++ b/media-video/vdr/vdr-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.6 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.7 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -168,6 +168,7 @@ src_unpack() {
 	epatch "${WORKDIR}/vdr-extensions-patch-55-atsc.diff"
 
 	cd "${S}"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0_p1-r1.ebuild b/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
index 9c0daefc84f4..7e255e4bda0a 100644
--- a/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1-r1.ebuild,v 1.3 2008/06/27 13:09:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1-r1.ebuild,v 1.4 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -166,6 +166,7 @@ src_unpack() {
 	cd "${S}"
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0_p1.ebuild b/media-video/vdr/vdr-1.6.0_p1.ebuild
index 7f8455f27a15..138e89621aba 100644
--- a/media-video/vdr/vdr-1.6.0_p1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.7 2008/06/15 09:00:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.8 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -166,6 +166,7 @@ src_unpack() {
 	cd "${S}"
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
diff --git a/media-video/vdr/vdr-1.6.0_p2.ebuild b/media-video/vdr/vdr-1.6.0_p2.ebuild
index 7df245fee404..5ed0335e8be8 100644
--- a/media-video/vdr/vdr-1.6.0_p2.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.2 2008/09/16 18:10:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.3 2009/01/12 13:23:01 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -169,6 +169,7 @@ src_unpack() {
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
 	epatch "${DISTDIR}/${MY_P}-2.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
 
 	ebegin "Changing pathes for gentoo"
 
@@ -196,6 +197,7 @@ src_unpack() {
 	eend 0
 
 	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
+
 	if use dxr3; then
 		einfo "Applying dxr3 subtitle hack"
 		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff