fix the includes for the linux/ivtv.h header

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

4 files changed, 59 insertions, 7 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 87424f92f330..181fe3ccfda6 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.105 2008/06/30 19:38:41 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.106 2008/07/03 16:22:24 cardoe Exp $
+
+*ivtv-1.1.0-r1 (03 Jul 2008)
+
+  03 Jul 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/ivtv-1.1.0-headers.patch, -ivtv-1.1.0.ebuild,
+  +ivtv-1.1.0-r1.ebuild:
+  fix the includes for the linux/ivtv.h header
 
   30 Jun 2008; Doug Goldstein <cardoe@gentoo.org>
   +files/ivtv-1.2.0-v4l2-dbg-include.patch, ivtv-1.2.0.ebuild:
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index d85300ee69e8..b66ed389a8ae 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX ivtv 152 RMD160 0261d991ec2e1db04f4408e3ce30b7e2088057f7 SHA1 1bbd5f926be903e759e16a4e5a11dbbf2f806693 SHA256 828831443387297fbad1e21cbd979c378a0f16063cde8e0abcf86f4cf01e31d9
+AUX ivtv-1.1.0-headers.patch 1287 RMD160 92b317002eb4f09d761968c03928046c641a5330 SHA1 423daeb5ef4f87ab28389f5e5d6fd81ba00e99f8 SHA256 4bf24a2e6d1e033dc30b735b2b37192f3c149be070cd7f0d2465f34f4269bc25
 AUX ivtv-1.2.0-v4l2-dbg-include.patch 272 RMD160 572525f6d52b00330dcacc7c6a7760ef6152e621 SHA1 dcf973befc410733048b48636b3b9e4975de97d2 SHA256 3a5876e7982ad8d24bdd3dfebc93106bb4ea84608201526d3807d5c7057d7c85
 DIST ivtv-1.0.1.tar.gz 302883 RMD160 c7259d94513bab12ffc99cb369e9e37e085e9806 SHA1 212c2bb217fda7e3adaf6ff8d2bceabecaa88fbd SHA256 93c15a46b283f1d4c2ff2514752cfc21de089a6e76479b556f521222642a8896
 DIST ivtv-1.0.2.tar.gz 303754 RMD160 8064a395f975a96869593ee9146967cff20994bd SHA1 32cbc3f891cad54f8705f61780c05bd7bc536bba SHA256 7acfc2264ea6788076e4d8202c81c5f884958418b79b3f3ac0cf6eb271e5c510
@@ -12,14 +13,14 @@ EBUILD ivtv-1.0.1.ebuild 4508 RMD160 6ee134cd6b4140710b54c4efd7b447c181c85ff7 SH
 EBUILD ivtv-1.0.2.ebuild 4537 RMD160 4aac1c3ea4f5a7f80e1077388981952344e0e229 SHA1 16134bd38b4c912d5aac5738ecaec9247e5b2d1f SHA256 ed80e5662a05e5e38f69f2f8c5c5cbaeedec2b73229d4981dc7a1fd698206483
 EBUILD ivtv-1.0.3-r1.ebuild 4519 RMD160 b63440fbfe8e720aec0ef56c68b8ecb5b2087d96 SHA1 beb7381e555b1cf2f33279cacb98e6cce0005640 SHA256 901dab1aad3345ece2f1dcec2ac8bfccfa0b5cc74270895443080c3deb53c974
 EBUILD ivtv-1.0.3-r2.ebuild 4690 RMD160 3112eaf4792894c7c5c7a267b117753e93e0a476 SHA1 2748971f4a8477973f15ec66066c831cbc254d30 SHA256 15680245f170e47be0490c7f9a8685622f17c638a4799b45042b77a9503eeb0a
-EBUILD ivtv-1.1.0.ebuild 3509 RMD160 6ea3dfa747ba2891ba1ded9260b8a8ed6ab71081 SHA1 d0b4258bbbcb217c49776bd10c000faaed85cbb7 SHA256 ae89fd29df3563207b0e6c1de89e8bd3c04e2f0333fb85bea910786031b4018d
+EBUILD ivtv-1.1.0-r1.ebuild 3595 RMD160 6da1ad16135bce8076016bfce7a91fcac793c435 SHA1 fe2a2a8ff19d819df0be526e2e7ab04a93addbfe SHA256 ad27408a34f1b01789c7cbd4305ac55a9d19eb83ebb95507544eadf88798416e
 EBUILD ivtv-1.2.0.ebuild 3609 RMD160 0d6aaa8d4e2facbd3545bf307e8f706388dc0a7c SHA1 334fb24f0e65ed2eb5e476919d981e8e820f4900 SHA256 3693bcef70102aac973649edf6747e59477247197596ad4788b7184391164577
-MISC ChangeLog 18485 RMD160 8db78c6761ec98f8aad5fb95e54bffcc90b898ae SHA1 4f8044703fde741f24fb3f362a825a2671037752 SHA256 7d0a688b67adb06541c991e2f6f4104e2f6ebb0f30b041eda48c76a8c2386f04
+MISC ChangeLog 18693 RMD160 03155e6510861fe8461f335cfacd3e55edd85340 SHA1 d2b30e0d25afc277d48746e0e40050046ffe218e SHA256 063bf2cebf709f1cc85c0ee0f8ac892ade235f934e49528f249cba32a281ba27
 MISC metadata.xml 494 RMD160 a8c45c9e2ad783198d04b68c755398d915270499 SHA1 1a04f1e7b3be80d5a875559fddbc5b681ba9254b SHA256 99e7a214b2abd11188552236eb67309ccde04d0a66209ed0fd48589eed258bb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhpNk0ACgkQoeSe8B0zEfzx5ACcC3F0cjFYku8EzqeUnn2tNFU/
-vGoAoIaxLDKARe7+xJ/3438vr4o1YS2e
-=wkwb
+iEYEARECAAYFAkhs/NgACgkQoeSe8B0zEfwiSQCfaolpLZN6tIfYdkDKRuCUn9ft
+DhoAoIuoSsh9nw0D8LyGLT/K/2BxCVKz
+=3Gch
 -----END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/files/ivtv-1.1.0-headers.patch b/media-tv/ivtv/files/ivtv-1.1.0-headers.patch
new file mode 100644
index 000000000000..c03088cfb27b
--- /dev/null
+++ b/media-tv/ivtv/files/ivtv-1.1.0-headers.patch
@@ -0,0 +1,36 @@
+diff -Nur ivtv-1.1.0/utils/ivtvctl.c ivtv-1.1.0-headers/utils/ivtvctl.c
+--- ivtv-1.1.0/utils/ivtvctl.c	2008-05-24 08:21:16.000000000 -0400
++++ ivtv-1.1.0-headers/utils/ivtvctl.c	2008-07-03 12:11:38.000000000 -0400
+@@ -63,7 +63,7 @@
+ 
+ #define VIDIOC_INT_RESET            	_IOW ('d', 102, __u32)
+ 
+-#include <linux/ivtv.h>
++#include "linux/ivtv.h"
+ 
+ #define __stringify_1(x)	#x
+ #define __stringify(x)		__stringify_1(x)
+diff -Nur ivtv-1.1.0/utils/ivtvplay.cc ivtv-1.1.0-headers/utils/ivtvplay.cc
+--- ivtv-1.1.0/utils/ivtvplay.cc	2008-05-24 08:21:16.000000000 -0400
++++ ivtv-1.1.0-headers/utils/ivtvplay.cc	2008-07-03 12:10:43.000000000 -0400
+@@ -41,7 +41,7 @@
+ #include <linux/types.h>
+ #include <linux/videodev2.h>
+ #include <linux/dvb/video.h>
+-#include <linux/ivtv.h>
++#include "linux/ivtv.h"
+ 
+ typedef unsigned long W32;
+ typedef unsigned long long W64;
+diff -Nur ivtv-1.1.0/utils/ivtv-radio.c ivtv-1.1.0-headers/utils/ivtv-radio.c
+--- ivtv-1.1.0/utils/ivtv-radio.c	2008-05-24 08:21:16.000000000 -0400
++++ ivtv-1.1.0-headers/utils/ivtv-radio.c	2008-07-03 12:10:08.000000000 -0400
+@@ -39,7 +39,7 @@
+ 
+ #include <linux/videodev2.h>
+ #include <linux/dvb/video.h>
+-#include <linux/ivtv.h>
++#include "linux/ivtv.h"
+ 
+ #define RADIO_DEV "/dev/radio0"
+ #define AUDIO_IN_DEV "/dev/video24"
diff --git a/media-tv/ivtv/ivtv-1.1.0.ebuild b/media-tv/ivtv/ivtv-1.1.0-r1.ebuild
index f60aa99b363f..84320503d903 100644
--- a/media-tv/ivtv/ivtv-1.1.0.ebuild
+++ b/media-tv/ivtv/ivtv-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-1.1.0.ebuild,v 1.1 2008/06/27 16:40:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-1.1.0-r1.ebuild,v 1.1 2008/07/03 16:22:24 cardoe Exp $
 
 inherit eutils linux-mod
 
@@ -52,6 +52,14 @@ pkg_setup() {
 	BUILD_PARAMS="KDIR=${KV_DIR}"
 }
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch "${FILESDIR}"/${P}-headers.patch
+}
+
 src_compile() {
 	linux-mod_src_compile || die "failed to build driver"