Added linux-headers 2.6.0 support.

4 files changed, 140 insertions, 9 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 4acaaf80bd91..97b303deb2a0 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.60 2003/12/26 23:34:51 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.61 2003/12/26 23:51:35 plasmaroo Exp $
 
   26 Dec 2003; Jason Wever <weeve@gentoo.org> avifile-0.7.38.20030710.ebuild:
   Added patch for sparc to fix bug #36040.
 
+  26 Dec 2003; <plasmaroo@gentoo.org> avifile-0.7.38.20030710.ebuild,
+  files/avifile-0.7.38.20030710-2.6.patch:
+  Added a patch which allows avifile to compile successfully on 2.6 series
+  kernels - note; this patch requires compatible, patched 2.6.0 linux-headers.
+
   14 Dec 2003; Martin Holzer <mholzer@gentoo.org> files/flvenc-patch:
   chaning patch. Closes #35802
 
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index ad166b595cf0..6abde2b708f6 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,12 +1,13 @@
-MD5 66c87afefae305c842a80bc77105da0e ChangeLog 10774
+MD5 feaf88da228759546ed3e6e8189654d6 ChangeLog 11046
 MD5 efccd1cbc5f953a5ec211a0827273b21 avifile-0.7.32.20030219.ebuild 4085
-MD5 c82cdb670e55f006d41dba5bcbe3ab9c avifile-0.7.37.20030522-r2.ebuild 4426
-MD5 d8c497ba314d2fac726dde4bcf3222b9 avifile-0.7.38.20030710.ebuild 4337
 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
-MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
-MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
-MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
-MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
+MD5 e1a27dd5aad2c70e167cc504dc1844fb avifile-0.7.38.20030710.ebuild 4376
+MD5 c82cdb670e55f006d41dba5bcbe3ab9c avifile-0.7.37.20030522-r2.ebuild 4426
 MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
+MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
+MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
+MD5 22ab302315360de9383d631e7ca3b83c files/avifile-0.7.38.20030710-2.6.patch 4071
 MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
+MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
+MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
diff --git a/media-video/avifile/avifile-0.7.38.20030710.ebuild b/media-video/avifile/avifile-0.7.38.20030710.ebuild
index db8f6b324bb8..ad5bf2a9f219 100644
--- a/media-video/avifile/avifile-0.7.38.20030710.ebuild
+++ b/media-video/avifile/avifile-0.7.38.20030710.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710.ebuild,v 1.7 2003/12/26 23:34:51 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.38.20030710.ebuild,v 1.8 2003/12/26 23:51:35 plasmaroo Exp $
 
 MAJ_PV=${PV:0:3}
 MIN_PV=${PV:0:6}
@@ -42,6 +42,7 @@ src_unpack() {
 	use qt || sed -i 's/qt[a-z]*//g' ${S}/samples/Makefile.am
 
 	epatch ${FILESDIR}/flvenc-patch
+	epatch ${FILESDIR}/${P}-2.6.patch
 	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
 	use sparc && epatch ${FILESDIR}/${P}-sparc.patch
 }
diff --git a/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch b/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch
new file mode 100644
index 000000000000..df9a82e8d936
--- /dev/null
+++ b/media-video/avifile/files/avifile-0.7.38.20030710-2.6.patch
@@ -0,0 +1,124 @@
+diff -ur avifile-0.7-0.7.38/ffmpeg/libavformat/grab.c avifile-0.7-0.7.38.plasmaroo/ffmpeg/libavformat/grab.c
+--- avifile-0.7-0.7.38/ffmpeg/libavformat/grab.c	2003-06-26 20:14:31.000000000 +0100
++++ avifile-0.7-0.7.38.plasmaroo/ffmpeg/libavformat/grab.c	2003-12-26 21:41:48.000000000 +0000
+@@ -16,14 +16,24 @@
+  * License along with this library; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
++
+ #include "avformat.h"
++
++#if defined(__linux__) 
++	#include <linux/version.h>
++	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) 
++		#include <sys/time.h>
++	#endif
++#else
++	#include <sys/time.h>
++#endif
++#include <time.h>
++
+ #include <linux/videodev.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+-#include <sys/time.h>
+-#include <time.h>
+ 
+ typedef struct {
+     int fd;
+diff -ur avifile-0.7-0.7.38/plugins/libwin32/loader/ldt_keeper.c avifile-0.7-0.7.38.plasmaroo/plugins/libwin32/loader/ldt_keeper.c
+--- avifile-0.7-0.7.38/plugins/libwin32/loader/ldt_keeper.c	2002-08-08 10:05:51.000000000 +0100
++++ avifile-0.7-0.7.38.plasmaroo/plugins/libwin32/loader/ldt_keeper.c	2003-12-26 21:54:33.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #ifdef __linux__
++#include <linux/version.h>
+ #include <asm/unistd.h>
+ #include <asm/ldt.h>
+ /* prototype it here, so we won't depend on kernel headers */
+@@ -109,8 +110,13 @@
+ #ifdef __linux__
+ /* XXX: why is this routine from libc redefined here? */
+ /* NOTE: the redefined version ignores the count param, count is hardcoded as 16 */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++static int LDT_Modify( int func, struct user_desc *ptr,
++		       unsigned long count )
++#else
+ static int LDT_Modify( int func, struct modify_ldt_ldt_s *ptr,
+ 		       unsigned long count )
++#endif
+ {
+     int res;
+ #ifdef __PIC__
+@@ -141,7 +147,15 @@
+ #endif
+ 
+ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+-static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
++#if defined(__linux__) 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++		static void LDT_EntryToBytes( unsigned long *buffer, const struct user_desc *content )
++	#else
++		static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
++	#endif
++#else
++	static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
++#endif
+ {
+     *buffer++ = ((content->base_addr & 0x0000ffff) << 16) |
+ 	(content->limit & 0x0ffff);
+@@ -158,7 +172,15 @@
+ 
+ ldt_fs_t* Setup_LDT_Keeper(void)
+ {
+-    struct modify_ldt_ldt_s array;
++    #if defined(__linux__) 
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++ 	    struct user_desc array;
++	#else
++	    struct modify_ldt_ldt_s array;
++	#endif
++    #else
++	    struct modify_ldt_ldt_s array;
++    #endif
+     int ret;
+     ldt_fs_t* ldt_fs = (ldt_fs_t*) malloc(sizeof(ldt_fs_t));
+ 
+@@ -190,7 +212,11 @@
+     array.limit_in_pages=0;
+ #ifdef __linux__
+     //ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s));
+-    ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s));
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++	ret=modify_ldt(0x1, &array, sizeof(struct user_desc));
++    #else
++	ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s));
++    #endif
+     if(ret<0)
+     {
+ 	perror("install_fs");
+diff -ur avifile-0.7-0.7.38/samples/qtvidcap/main.cpp avifile-0.7-0.7.38.plasmaroo/samples/qtvidcap/main.cpp
+--- avifile-0.7-0.7.38/samples/qtvidcap/main.cpp	2003-06-08 18:26:04.000000000 +0100
++++ avifile-0.7-0.7.38.plasmaroo/samples/qtvidcap/main.cpp	2003-12-26 19:21:20.000000000 +0000
+@@ -1,9 +1,6 @@
+-
+-#include "v4lwindow.h"
+ #include "vidconf.h"
+ 
+ #include <aviplay.h>
+-#include "v4lxif.h"
+ #include <avm_except.h>
+ #include <avm_cpuinfo.h>
+ #include <videoencoder.h>
+@@ -27,6 +24,8 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++#include "v4lwindow.h"
++#include "v4lxif.h"
+ 
+ unsigned int m_iMemory;
+ const char* g_pcProgramName = "AviCap";