Add libv4l1 compatibility support, bump PKGREVISION.

10 files changed, 478 insertions, 21 deletions

diff --git a/graphics/libv4l/Makefile b/graphics/libv4l/Makefile
index 4b1fa83f10e..44edacccb8f 100644
--- a/graphics/libv4l/Makefile
+++ b/graphics/libv4l/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/09/17 14:04:54 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/10 21:04:22 jmcneill Exp $
 
 DISTNAME=	libv4l-0.4.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.atrpms.net/~hdegoede/
 
@@ -22,9 +22,13 @@ INSTALLATION_DIRS+=	include/sys
 pre-configure:
 	${MKDIR} ${WRKSRC}/include/sys
 	cp ${FILESDIR}/videoio.h ${WRKSRC}/include/sys
+	cp ${FILESDIR}/videodev.h ${WRKSRC}/include/sys
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/videoio.h ${DESTDIR}${PREFIX}/include/sys
+.elif !exists(/usr/include/linux/videodev.h)
+pre-configure:
+	cp ${FILESDIR}/videodev.h ${WRKSRC}/include/videodev.h
 .endif
 
 PLIST_VARS=	needs_videoio
diff --git a/graphics/libv4l/PLIST b/graphics/libv4l/PLIST
index 1bc7bc83f8d..8f653eb71e4 100644
--- a/graphics/libv4l/PLIST
+++ b/graphics/libv4l/PLIST
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2008/09/17 14:04:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/01/10 21:04:23 jmcneill Exp $
+include/libv4l1.h
 include/libv4l2.h
 include/libv4lconvert.h
 ${PLIST.needs_videoio}include/sys/videoio.h
+lib/libv4l/v4l1compat.so
 lib/libv4l/v4l2convert.so
+lib/libv4l1.so
+lib/libv4l1.so.0
 lib/libv4l2.so
 lib/libv4l2.so.0
 lib/libv4lconvert.so
 lib/libv4lconvert.so.0
+lib/pkgconfig/libv4l1.pc
 lib/pkgconfig/libv4l2.pc
 lib/pkgconfig/libv4lconvert.pc
 @dirrm lib/libv4l
diff --git a/graphics/libv4l/buildlink3.mk b/graphics/libv4l/buildlink3.mk
index 9f59cc7ccd5..fc17139058d 100644
--- a/graphics/libv4l/buildlink3.mk
+++ b/graphics/libv4l/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/08 19:07:41 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/01/10 21:04:23 jmcneill Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBV4L_BUILDLINK3_MK:=		${LIBV4L_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libv4l
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libv4l
 
 .if !empty(LIBV4L_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libv4l+=		libv4l>=0.4.3
-BUILDLINK_ABI_DEPENDS.libv4l+=		libv4l>=0.4.3
+BUILDLINK_API_DEPENDS.libv4l+=		libv4l>=0.4.3nb2
+BUILDLINK_ABI_DEPENDS.libv4l+=		libv4l>=0.4.3nb2
 BUILDLINK_PKGSRCDIR.libv4l?=		../../graphics/libv4l
 .endif	# LIBV4L_BUILDLINK3_MK
 
diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo
index b8f7994388e..5df3ad065d6 100644
--- a/graphics/libv4l/distinfo
+++ b/graphics/libv4l/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2008/09/17 14:04:54 joerg Exp $
+$NetBSD: distinfo,v 1.5 2009/01/10 21:04:23 jmcneill Exp $
 
 SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
 RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
@@ -9,6 +9,9 @@ SHA1 (patch-ac) = ba6d3502793f380a6f448c42c84a500147b041bb
 SHA1 (patch-ad) = 053ec7cea81c916d172df6f6f450fec23638d38f
 SHA1 (patch-ae) = d1cadfdf41f7b46311e828600352bfac6c3d6c22
 SHA1 (patch-af) = ce15db36e94b0e386f86b4a024a5eb6d972d0958
-SHA1 (patch-ag) = 37489786e4d783e498493b41bf2c541457bedbf6
 SHA1 (patch-ah) = d32f2e6aa694d4f0d04e8afbf462b3e61a31bbcc
 SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5
+SHA1 (patch-aj) = 2545189ac57f97ff181645132c25b32aa51f6a47
+SHA1 (patch-ak) = af991dbb997c8b4fa7cdbed3aab105aef3edfa1b
+SHA1 (patch-al) = a6eae236be7e16e03047d09b58a6f6d8baafd193
+SHA1 (patch-am) = 6599640b9cd142af82167e3cf03920d8b18912bb
diff --git a/graphics/libv4l/files/videodev.h b/graphics/libv4l/files/videodev.h
new file mode 100644
index 00000000000..cda5b29bb93
--- /dev/null
+++ b/graphics/libv4l/files/videodev.h
@@ -0,0 +1,356 @@
+/* This is the header file for video4linux ABI taken from kernel
+ * source 2.4.21.  There was no copyright notice in this file, but the
+ * copyright for the kernel (and hence this file) is GNU GPL version 2
+ * only.  This file is included here as COPYING, and applies to
+ * frameworks itself as well as this file.  See
+ * http://bytesex.org/v4l/ for video4linux information. -pat */
+
+#ifndef __LINUX_VIDEODEV_H
+#define __LINUX_VIDEODEV_H
+
+#include <sys/types.h>
+#include <stdint.h>
+
+typedef uint8_t   __u8;
+typedef int8_t    __s8;
+typedef uint16_t  __u16;
+typedef int16_t   __s16;
+typedef uint32_t  __u32;
+typedef int32_t   __s32;
+
+#define VID_TYPE_CAPTURE	1	/* Can capture */
+#define VID_TYPE_TUNER		2	/* Can tune */
+#define VID_TYPE_TELETEXT	4	/* Does teletext */
+#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
+#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
+#define VID_TYPE_CLIPPING	32	/* Can clip */
+#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
+#define VID_TYPE_SCALES		128	/* Scalable */
+#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
+#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
+#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
+#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
+#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
+#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
+
+struct video_capability
+{
+	char name[32];
+	int type;
+	int channels;	/* Num channels */
+	int audios;	/* Num audio devices */
+	int maxwidth;	/* Supported width */
+	int maxheight;	/* And height */
+	int minwidth;	/* Supported width */
+	int minheight;	/* And height */
+};
+
+struct video_channel
+{
+	int channel;
+	char name[32];
+	int tuners;
+	__u32  flags;
+#define VIDEO_VC_TUNER		1	/* Channel has a tuner */
+#define VIDEO_VC_AUDIO		2	/* Channel has audio */
+	__u16  type;
+#define VIDEO_TYPE_TV		1
+#define VIDEO_TYPE_CAMERA	2	
+	__u16 norm;			/* Norm set by channel */
+};
+
+struct video_tuner
+{
+	int tuner;
+	char name[32];
+	unsigned long rangelow, rangehigh;	/* Tuner range */
+	__u32 flags;
+#define VIDEO_TUNER_PAL		1
+#define VIDEO_TUNER_NTSC	2
+#define VIDEO_TUNER_SECAM	4
+#define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
+#define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
+#define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
+#define VIDEO_TUNER_RDS_ON      256     /* Tuner is seeing an RDS datastream */
+#define VIDEO_TUNER_MBS_ON      512     /* Tuner is seeing an MBS datastream */
+	__u16 mode;			/* PAL/NTSC/SECAM/OTHER */
+#define VIDEO_MODE_PAL		0
+#define VIDEO_MODE_NTSC		1
+#define VIDEO_MODE_SECAM	2
+#define VIDEO_MODE_AUTO		3
+	__u16 signal;			/* Signal strength 16bit scale */
+};
+
+struct video_picture
+{
+	__u16	brightness;
+	__u16	hue;
+	__u16	colour;
+	__u16	contrast;
+	__u16	whiteness;	/* Black and white only */
+	__u16	depth;		/* Capture depth */
+	__u16   palette;	/* Palette in use */
+#define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
+#define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
+#define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
+#define VIDEO_PALETTE_RGB24	4	/* 24bit RGB */
+#define VIDEO_PALETTE_RGB32	5	/* 32bit RGB */	
+#define VIDEO_PALETTE_RGB555	6	/* 555 15bit RGB */
+#define VIDEO_PALETTE_YUV422	7	/* YUV422 capture */
+#define VIDEO_PALETTE_YUYV	8
+#define VIDEO_PALETTE_UYVY	9	/* The great thing about standards is ... */
+#define VIDEO_PALETTE_YUV420	10
+#define VIDEO_PALETTE_YUV411	11	/* YUV411 capture */
+#define VIDEO_PALETTE_RAW	12	/* RAW capture (BT848) */
+#define VIDEO_PALETTE_YUV422P	13	/* YUV 4:2:2 Planar */
+#define VIDEO_PALETTE_YUV411P	14	/* YUV 4:1:1 Planar */
+#define VIDEO_PALETTE_YUV420P	15	/* YUV 4:2:0 Planar */
+#define VIDEO_PALETTE_YUV410P	16	/* YUV 4:1:0 Planar */
+#define VIDEO_PALETTE_PLANAR	13	/* start of planar entries */
+#define VIDEO_PALETTE_COMPONENT 7	/* start of component entries */
+};
+
+struct video_audio
+{
+	int	audio;		/* Audio channel */
+	__u16	volume;		/* If settable */
+	__u16	bass, treble;
+	__u32	flags;
+#define VIDEO_AUDIO_MUTE	1
+#define VIDEO_AUDIO_MUTABLE	2
+#define VIDEO_AUDIO_VOLUME	4
+#define VIDEO_AUDIO_BASS	8
+#define VIDEO_AUDIO_TREBLE	16	
+#define VIDEO_AUDIO_BALANCE	32
+	char    name[16];
+#define VIDEO_SOUND_MONO	1
+#define VIDEO_SOUND_STEREO	2
+#define VIDEO_SOUND_LANG1	4
+#define VIDEO_SOUND_LANG2	8
+        __u16   mode;
+        __u16	balance;	/* Stereo balance */
+        __u16	step;		/* Step actual volume uses */
+};
+
+struct video_clip
+{
+	__s32	x,y;
+	__s32	width, height;
+	struct	video_clip *next;	/* For user use/driver use only */
+};
+
+struct video_window
+{
+	__u32	x,y;			/* Position of window */
+	__u32	width,height;		/* Its size */
+	__u32	chromakey;
+	__u32	flags;
+	struct	video_clip *clips;	/* Set only */
+	int	clipcount;
+#define VIDEO_WINDOW_INTERLACE	1
+#define VIDEO_WINDOW_CHROMAKEY	16	/* Overlay by chromakey */
+#define VIDEO_CLIP_BITMAP	-1
+/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
+#define VIDEO_CLIPMAP_SIZE	(128 * 625)
+};
+
+struct video_capture
+{
+	__u32 	x,y;			/* Offsets into image */
+	__u32	width, height;		/* Area to capture */
+	__u16	decimation;		/* Decimation divider */
+	__u16	flags;			/* Flags for capture */
+#define VIDEO_CAPTURE_ODD		0	/* Temporal */
+#define VIDEO_CAPTURE_EVEN		1
+};
+
+struct video_buffer
+{
+	void	*base;
+	int	height,width;
+	int	depth;
+	int	bytesperline;
+};
+
+struct video_mmap
+{
+	unsigned	int frame;		/* Frame (0 - n) for double buffer */
+	int		height,width;
+	unsigned	int format;		/* should be VIDEO_PALETTE_* */
+};
+
+struct video_key
+{
+	__u8	key[8];
+	__u32	flags;
+};
+
+
+#define VIDEO_MAX_FRAME		32
+
+struct video_mbuf
+{
+	int	size;		/* Total memory to map */
+	int	frames;		/* Frames */
+	int	offsets[VIDEO_MAX_FRAME];
+};
+	
+
+#define 	VIDEO_NO_UNIT	(-1)
+
+	
+struct video_unit
+{
+	int 	video;		/* Video minor */
+	int	vbi;		/* VBI minor */
+	int	radio;		/* Radio minor */
+	int	audio;		/* Audio minor */
+	int	teletext;	/* Teletext minor */
+};
+
+struct vbi_format {
+	__u32	sampling_rate;	/* in Hz */
+	__u32	samples_per_line;
+	__u32	sample_format;	/* VIDEO_PALETTE_RAW only (1 byte) */
+	__s32	start[2];	/* starting line for each frame */
+	__u32	count[2];	/* count of lines for each frame */
+	__u32	flags;
+#define	VBI_UNSYNC	1	/* can distingues between top/bottom field */
+#define	VBI_INTERLACED	2	/* lines are interlaced */
+};
+
+/* video_info is biased towards hardware mpeg encode/decode */
+/* but it could apply generically to any hardware compressor/decompressor */
+struct video_info
+{
+	__u32	frame_count;	/* frames output since decode/encode began */
+	__u32	h_size;		/* current unscaled horizontal size */
+	__u32	v_size;		/* current unscaled veritcal size */
+	__u32	smpte_timecode;	/* current SMPTE timecode (for current GOP) */
+	__u32	picture_type;	/* current picture type */
+	__u32	temporal_reference;	/* current temporal reference */
+	__u8	user_data[256];	/* user data last found in compressed stream */
+	/* user_data[0] contains user data flags, user_data[1] has count */
+};
+
+/* generic structure for setting playback modes */
+struct video_play_mode
+{
+	int	mode;
+	int	p1;
+	int	p2;
+};
+
+/* for loading microcode / fpga programming */
+struct video_code
+{
+	char	loadwhat[16];	/* name or tag of file being passed */
+	int	datasize;
+	__u8	*data;
+};
+
+#define VIDIOCGCAP		_IOR('v',1,struct video_capability)	/* Get capabilities */
+#define VIDIOCGCHAN		_IOWR('v',2,struct video_channel)	/* Get channel info (sources) */
+#define VIDIOCSCHAN		_IOW('v',3,struct video_channel)	/* Set channel 	*/
+#define VIDIOCGTUNER		_IOWR('v',4,struct video_tuner)		/* Get tuner abilities */
+#define VIDIOCSTUNER		_IOW('v',5,struct video_tuner)		/* Tune the tuner for the current channel */
+#define VIDIOCGPICT		_IOR('v',6,struct video_picture)	/* Get picture properties */
+#define VIDIOCSPICT		_IOW('v',7,struct video_picture)	/* Set picture properties */
+#define VIDIOCCAPTURE		_IOW('v',8,int)				/* Start, end capture */
+#define VIDIOCGWIN		_IOR('v',9, struct video_window)	/* Get the video overlay window */
+#define VIDIOCSWIN		_IOW('v',10, struct video_window)	/* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
+#define VIDIOCGFBUF		_IOR('v',11, struct video_buffer)	/* Get frame buffer */
+#define VIDIOCSFBUF		_IOW('v',12, struct video_buffer)	/* Set frame buffer - root only */
+#define VIDIOCKEY		_IOR('v',13, struct video_key)		/* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
+#define VIDIOCGFREQ		_IOR('v',14, unsigned long)		/* Set tuner */
+#define VIDIOCSFREQ		_IOW('v',15, unsigned long)		/* Set tuner */
+#define VIDIOCGAUDIO		_IOR('v',16, struct video_audio)	/* Get audio info */
+#define VIDIOCSAUDIO		_IOW('v',17, struct video_audio)	/* Audio source, mute etc */
+#define VIDIOCSYNC		_IOW('v',18, int)			/* Sync with mmap grabbing */
+#define VIDIOCMCAPTURE		_IOW('v',19, struct video_mmap)		/* Grab frames */
+#define VIDIOCGMBUF		_IOR('v',20, struct video_mbuf)		/* Memory map buffer info */
+#define VIDIOCGUNIT		_IOR('v',21, struct video_unit)		/* Get attached units */
+#define VIDIOCGCAPTURE		_IOR('v',22, struct video_capture)	/* Get subcapture */
+#define VIDIOCSCAPTURE		_IOW('v',23, struct video_capture)	/* Set subcapture */
+#define VIDIOCSPLAYMODE		_IOW('v',24, struct video_play_mode)	/* Set output video mode/feature */
+#define VIDIOCSWRITEMODE	_IOW('v',25, int)			/* Set write mode */
+#define VIDIOCGPLAYINFO		_IOR('v',26, struct video_info)		/* Get current playback info from hardware */
+#define VIDIOCSMICROCODE	_IOW('v',27, struct video_code)		/* Load microcode into hardware */
+#define	VIDIOCGVBIFMT		_IOR('v',28, struct vbi_format)		/* Get VBI information */
+#define	VIDIOCSVBIFMT		_IOW('v',29, struct vbi_format)		/* Set VBI information */
+
+
+#define BASE_VIDIOCPRIVATE	192		/* 192-255 are private */
+
+/* VIDIOCSWRITEMODE */
+#define VID_WRITE_MPEG_AUD		0
+#define VID_WRITE_MPEG_VID		1
+#define VID_WRITE_OSD			2
+#define VID_WRITE_TTX			3
+#define VID_WRITE_CC			4
+#define VID_WRITE_MJPEG			5
+
+/* VIDIOCSPLAYMODE */
+#define VID_PLAY_VID_OUT_MODE		0
+	/* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */
+#define VID_PLAY_GENLOCK		1
+	/* p1: 0 = OFF, 1 = ON */
+	/* p2: GENLOCK FINE DELAY value */ 
+#define VID_PLAY_NORMAL			2
+#define VID_PLAY_PAUSE			3
+#define VID_PLAY_SINGLE_FRAME		4
+#define VID_PLAY_FAST_FORWARD		5
+#define VID_PLAY_SLOW_MOTION		6
+#define VID_PLAY_IMMEDIATE_NORMAL	7
+#define VID_PLAY_SWITCH_CHANNELS	8
+#define VID_PLAY_FREEZE_FRAME		9
+#define VID_PLAY_STILL_MODE		10
+#define VID_PLAY_MASTER_MODE		11
+	/* p1: see below */
+#define		VID_PLAY_MASTER_NONE	1
+#define		VID_PLAY_MASTER_VIDEO	2
+#define		VID_PLAY_MASTER_AUDIO	3
+#define VID_PLAY_ACTIVE_SCANLINES	12
+	/* p1 = first active; p2 = last active */
+#define VID_PLAY_RESET			13
+#define VID_PLAY_END_MARK		14
+
+
+
+#define VID_HARDWARE_BT848	1
+#define VID_HARDWARE_QCAM_BW	2
+#define VID_HARDWARE_PMS	3
+#define VID_HARDWARE_QCAM_C	4
+#define VID_HARDWARE_PSEUDO	5
+#define VID_HARDWARE_SAA5249	6
+#define VID_HARDWARE_AZTECH	7
+#define VID_HARDWARE_SF16MI	8
+#define VID_HARDWARE_RTRACK	9
+#define VID_HARDWARE_ZOLTRIX	10
+#define VID_HARDWARE_SAA7146    11
+#define VID_HARDWARE_VIDEUM	12	/* Reserved for Winnov videum */
+#define VID_HARDWARE_RTRACK2	13
+#define VID_HARDWARE_PERMEDIA2	14	/* Reserved for Permedia2 */
+#define VID_HARDWARE_RIVA128	15	/* Reserved for RIVA 128 */
+#define VID_HARDWARE_PLANB	16	/* PowerMac motherboard video-in */
+#define VID_HARDWARE_BROADWAY	17	/* Broadway project */
+#define VID_HARDWARE_GEMTEK	18
+#define VID_HARDWARE_TYPHOON	19
+#define VID_HARDWARE_VINO	20	/* SGI Indy Vino */
+#define VID_HARDWARE_CADET	21	/* Cadet radio */
+#define VID_HARDWARE_TRUST	22	/* Trust FM Radio */
+#define VID_HARDWARE_TERRATEC	23	/* TerraTec ActiveRadio */
+#define VID_HARDWARE_CPIA	24
+#define VID_HARDWARE_ZR36120	25	/* Zoran ZR36120/ZR36125 */
+#define VID_HARDWARE_ZR36067	26	/* Zoran ZR36067/36060 */
+#define VID_HARDWARE_OV511	27	
+#define VID_HARDWARE_ZR356700	28	/* Zoran 36700 series */
+#define VID_HARDWARE_W9966	29
+#define VID_HARDWARE_SE401	30	/* SE401 USB webcams */
+#define VID_HARDWARE_PWC	31	/* Philips webcams */
+#define VID_HARDWARE_MEYE	32	/* Sony Vaio MotionEye cameras */
+#define VID_HARDWARE_CPIA2	33
+#define VID_HARDWARE_VICAM	34	/* ViCam, 3Com Homeconnect */
+#define VID_HARDWARE_SF16FMR2	35
+
+#endif /* __LINUX_VIDEODEV_H */
diff --git a/graphics/libv4l/patches/patch-ag b/graphics/libv4l/patches/patch-ag
deleted file mode 100644
index d0315675ed8..00000000000
--- a/graphics/libv4l/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2008/09/17 14:04:54 joerg Exp $
-
---- Makefile.orig	2008-09-03 11:25:25.000000000 +0200
-+++ Makefile
-@@ -4,7 +4,7 @@ V4L2_LIB_VERSION=$(LIB_RELEASE).4.3
- all clean install:
- 	$(MAKE) -C libv4lconvert V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
- 	$(MAKE) -C libv4l2 V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
--	$(MAKE) -C libv4l1 V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
-+	#$(MAKE) -C libv4l1 V4L2_LIB_VERSION=$(V4L2_LIB_VERSION) $@
- 
- export: clean
- 	mkdir /tmp/libv4l-$(V4L2_LIB_VERSION)
diff --git a/graphics/libv4l/patches/patch-aj b/graphics/libv4l/patches/patch-aj
new file mode 100644
index 00000000000..30c236c5a3a
--- /dev/null
+++ b/graphics/libv4l/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
+
+--- include/libv4l1.h.orig	2009-01-10 15:36:53.000000000 -0500
++++ include/libv4l1.h	2009-01-10 15:37:29.000000000 -0500
+@@ -57,6 +57,10 @@ LIBV4L_PUBLIC extern FILE *v4l1_log_file
+    capture formats, like hw specific bayer compression methods).
+ */
+ 
++#ifndef __off64_t
++#define __off64_t off_t
++#endif
++
+ LIBV4L_PUBLIC int v4l1_open (const char *file, int oflag, ...);
+ LIBV4L_PUBLIC int v4l1_close(int fd);
+ LIBV4L_PUBLIC int v4l1_dup(int fd);
diff --git a/graphics/libv4l/patches/patch-ak b/graphics/libv4l/patches/patch-ak
new file mode 100644
index 00000000000..4164421bf57
--- /dev/null
+++ b/graphics/libv4l/patches/patch-ak
@@ -0,0 +1,40 @@
+$NetBSD: patch-ak,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
+
+--- libv4l1/libv4l1.c.orig	2009-01-10 15:34:52.000000000 -0500
++++ libv4l1/libv4l1.c	2009-01-10 15:35:47.000000000 -0500
+@@ -44,12 +44,13 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <syscall.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/mman.h>
++#ifdef __linux__
++#include <syscall.h>
+ /* These headers are not needed by us, but by linux/videodev2.h,
+    which is broken on some systems and doesn't include them itself :( */
+ #include <sys/time.h>
+@@ -58,10 +59,20 @@
+ /* end broken header workaround includes */
+ #include <linux/videodev.h>
+ #include <linux/videodev2.h>
++#else
++#include <sys/syscall.h>
++#include <sys/ioctl.h>
++#include "videodev.h"
++#include <sys/videoio.h>
++#endif
+ #include <libv4l2.h>
+ #include "libv4l1.h"
+ #include "libv4l1-priv.h"
+ 
++#ifndef MAP_ANONYMOUS
++#define MAP_ANONYMOUS MAP_ANON
++#endif
++
+ #define V4L1_SUPPORTS_ENUMINPUT 0x01
+ #define V4L1_SUPPORTS_ENUMSTD   0x02
+ #define V4L1_PIX_FMT_TOUCHED    0x04
diff --git a/graphics/libv4l/patches/patch-al b/graphics/libv4l/patches/patch-al
new file mode 100644
index 00000000000..f8acd2722ed
--- /dev/null
+++ b/graphics/libv4l/patches/patch-al
@@ -0,0 +1,32 @@
+$NetBSD: patch-al,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
+
+--- libv4l1/log.c.orig	2008-08-06 04:46:13.000000000 -0400
++++ libv4l1/log.c	2009-01-10 15:56:48.000000000 -0500
+@@ -18,6 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef __linux__
+ #include <linux/ioctl.h>
+ /* These headers are not needed by us, but by linux/videodev2.h,
+    which is broken on some systems and doesn't include them itself :( */
+@@ -25,8 +26,19 @@
+ #include <asm/types.h>
+ /* end broken header workaround includes */
+ #include <linux/videodev.h>
++#else
++#include <sys/ioctl.h>
++#include "videodev.h"
++#endif
+ #include "libv4l1-priv.h"
+ 
++#ifndef _IOC_NR
++#define _IOC_NR(x)	((x) & 0xff)
++#endif
++#ifndef _IOC_TYPE
++#define _IOC_TYPE	IOCGROUP
++#endif
++
+ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+ 
+ FILE *v4l1_log_file = NULL;
diff --git a/graphics/libv4l/patches/patch-am b/graphics/libv4l/patches/patch-am
new file mode 100644
index 00000000000..78ddf2b4b8c
--- /dev/null
+++ b/graphics/libv4l/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2009/01/10 21:04:23 jmcneill Exp $
+
+--- libv4l1/v4l1compat.c.orig	2009-01-10 15:37:56.000000000 -0500
++++ libv4l1/v4l1compat.c	2009-01-10 15:38:45.000000000 -0500
+@@ -40,6 +40,10 @@
+ #define LIBV4L_PUBLIC
+ #endif
+ 
++#ifndef O_LARGEFILE
++#define O_LARGEFILE 0
++#endif
++
+ LIBV4L_PUBLIC int open (const char *file, int oflag, ...)
+ {
+   int fd;