Fixed compiling with linux-headers-2.6.22, thanks to Martin Jansa <Martin.Jansa@mk.cvut.cz> for the patch, Bug 185350.

Package-Manager: portage-2.1.3_rc8

4 files changed, 37 insertions, 14 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/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index def3956740c6..1acb2a6526e9 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485 RMD160 770c70019cecfcd4202aa7c59598bdfddfc3e3df SHA1 47fc8e8bae1fc3c53d522c20b509618bf6aa2bcc SHA256 a75badcabe081924d0fdcdfa844b81b429478e042c9902e619f95e929f8c81e8
+MD5 bb951a796c5204c79929a8d9e2a7ce56 files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485
+RMD160 770c70019cecfcd4202aa7c59598bdfddfc3e3df files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485
+SHA256 a75badcabe081924d0fdcdfa844b81b429478e042c9902e619f95e929f8c81e8 files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485
 DIST linuxtv-dvb-apps-1.1.0.tar.bz2 73973 RMD160 ba16fca5565568fc053586794466205c5314b0b9 SHA1 f57966f177eadd94253f9b92280fe00aa1bb3324 SHA256 5b3b6d16995cc31024f2340f9b56bdd28bc8569ac4bf75392575fe9605c1e1b9
 DIST linuxtv-dvb-apps-20060917.tar.bz2 278797 RMD160 7d4478f0baa698ed62327993c5d9fd2e51c852f8 SHA1 17d1281adede30215466edbaa5b521f963e3ea60 SHA256 535f9d68e5f49650f12ec39aa3b7f4c9a5a07af9a7cd7addc210d8083743aaf0
 DIST linuxtv-dvb-apps-20070114.tar.bz2 311657 RMD160 7903be5c782d76829d00f16345e1f869e663bbc9 SHA1 026c3e45fb778e399384f23d4eab7dc03c66dd9c SHA256 c4fbe3df4cf02a63fb8b6c6343b33b13cfa0400559224e40421f227fa27e5afd
@@ -12,14 +16,14 @@ EBUILD linuxtv-dvb-apps-1.1.1.20060917.ebuild 2443 RMD160 d4b9aa13182b1535a18ee5
 MD5 81c08d8cd8650aad722d15d96b561dbb linuxtv-dvb-apps-1.1.1.20060917.ebuild 2443
 RMD160 d4b9aa13182b1535a18ee5e1720e8a9b92a3852f linuxtv-dvb-apps-1.1.1.20060917.ebuild 2443
 SHA256 0119f45c16ae97a967e768e15933c5b7c84ddaea9da270903a10bb9b44fda666 linuxtv-dvb-apps-1.1.1.20060917.ebuild 2443
-EBUILD linuxtv-dvb-apps-1.1.1.20070114.ebuild 2332 RMD160 1a08500c5a930b7afaf918d692f3b519b50c2b96 SHA1 13249f9546e2dc8118da7f167194a511b6744ba3 SHA256 065b6089a6839f0dcdb2b631f3ea3390998326fe98c047966bf3be3f6b0c6f39
-MD5 da0b75c5296693238c73ac39c34efc04 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2332
-RMD160 1a08500c5a930b7afaf918d692f3b519b50c2b96 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2332
-SHA256 065b6089a6839f0dcdb2b631f3ea3390998326fe98c047966bf3be3f6b0c6f39 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2332
-MISC ChangeLog 5939 RMD160 47a570c3a02079dd9a5878f56c402f7ed35277bc SHA1 6c6a997004e32bc200ac6adde3900c9e9fbc739c SHA256 289f76640b264a2850515c2b0f8af91627ad1b2e7858f65f5a6bb4393e1f901d
-MD5 ed5a1e91aa466838abb7adfbdfabbcac ChangeLog 5939
-RMD160 47a570c3a02079dd9a5878f56c402f7ed35277bc ChangeLog 5939
-SHA256 289f76640b264a2850515c2b0f8af91627ad1b2e7858f65f5a6bb4393e1f901d ChangeLog 5939
+EBUILD linuxtv-dvb-apps-1.1.1.20070114.ebuild 2389 RMD160 b8ab05f13f9c9caefe048db43a1303ee436bbd72 SHA1 d28f525fe19d7682b4f044bcbffc744660ed5d30 SHA256 e383882d76651c0f8706d3b95a45b51e2738ac71457c570b401367711f2e1dc8
+MD5 8aa1ac6abedbdd2908e46b1cadf6053f linuxtv-dvb-apps-1.1.1.20070114.ebuild 2389
+RMD160 b8ab05f13f9c9caefe048db43a1303ee436bbd72 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2389
+SHA256 e383882d76651c0f8706d3b95a45b51e2738ac71457c570b401367711f2e1dc8 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2389
+MISC ChangeLog 6220 RMD160 725c11e360ff8257dc329a5443790d2324a4be4a SHA1 cb19e46d7c984cca6430dd97e9c3724c3736d021 SHA256 8d06440240ade207106ca7baf2f6513aaef32324545e08222e35de8ddc89efc3
+MD5 325e694fb65f246a9c5ad7a8806c2942 ChangeLog 6220
+RMD160 725c11e360ff8257dc329a5443790d2324a4be4a ChangeLog 6220
+SHA256 8d06440240ade207106ca7baf2f6513aaef32324545e08222e35de8ddc89efc3 ChangeLog 6220
 MISC metadata.xml 251 RMD160 c065cf1ec58e88e891b34257ea9af16f7b902b08 SHA1 423dea543053ebe8ad5583b6e21870d9a70ff295 SHA256 9e1ffea7a6d01ecd008e6f8475b9d5bbb136bbce993014d8da7582ad14df6d0a
 MD5 5e69fa8fee86381022d8085b73238a47 metadata.xml 251
 RMD160 c065cf1ec58e88e891b34257ea9af16f7b902b08 metadata.xml 251
@@ -34,9 +38,9 @@ MD5 f98301d2521cbdcd70856f6a5067716d files/digest-linuxtv-dvb-apps-1.1.1.2007011
 RMD160 e6625cfe06f39348ee0b5d5610ce74c37a509d42 files/digest-linuxtv-dvb-apps-1.1.1.20070114 280
 SHA256 f37a77c3e22d98871dd59b2e0297b24d96648b5c97c5311de89d35c71da96ef0 files/digest-linuxtv-dvb-apps-1.1.1.20070114 280
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGaS/ut2vP6XvVdOcRAhSjAJ9D3KaYLGMHeo+BxyweW3mQwiRXwACgjwm1
-q2vzr6z62mHo+CakV4cphMA=
-=gWvA
+iD8DBQFGncrBt2vP6XvVdOcRAm6sAJ0T/NqXG05pt9svluGtV+H3H0hg5gCgt1ja
+es7hB6la0PhI6i/wZ6nyeGE=
+=qTRL
 -----END PGP SIGNATURE-----
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 \