pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/libv4l Add libv4l1 compatibility support, bum...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1fb705870270
branches: trunk
changeset: 552840:1fb705870270
user: jmcneill <jmcneill%pkgsrc.org@localhost>
date: Sat Jan 10 21:04:22 2009 +0000
description:
Add libv4l1 compatibility support, bump PKGREVISION.
diffstat:
graphics/libv4l/Makefile | 8 +-
graphics/libv4l/PLIST | 7 +-
graphics/libv4l/buildlink3.mk | 6 +-
graphics/libv4l/distinfo | 7 +-
graphics/libv4l/files/videodev.h | 356 +++++++++++++++++++++++++++++++++++++++
graphics/libv4l/patches/patch-ag | 13 -
graphics/libv4l/patches/patch-aj | 15 +
graphics/libv4l/patches/patch-ak | 40 ++++
graphics/libv4l/patches/patch-al | 32 +++
graphics/libv4l/patches/patch-am | 15 +
10 files changed, 478 insertions(+), 21 deletions(-)
diffs (truncated from 584 to 300 lines):
diff -r 14f73526d660 -r 1fb705870270 graphics/libv4l/Makefile
--- a/graphics/libv4l/Makefile Sat Jan 10 21:03:58 2009 +0000
+++ b/graphics/libv4l/Makefile Sat Jan 10 21:04:22 2009 +0000
@@ -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 @@
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 -r 14f73526d660 -r 1fb705870270 graphics/libv4l/PLIST
--- a/graphics/libv4l/PLIST Sat Jan 10 21:03:58 2009 +0000
+++ b/graphics/libv4l/PLIST Sat Jan 10 21:04:22 2009 +0000
@@ -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 -r 14f73526d660 -r 1fb705870270 graphics/libv4l/buildlink3.mk
--- a/graphics/libv4l/buildlink3.mk Sat Jan 10 21:03:58 2009 +0000
+++ b/graphics/libv4l/buildlink3.mk Sat Jan 10 21:04:22 2009 +0000
@@ -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_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 -r 14f73526d660 -r 1fb705870270 graphics/libv4l/distinfo
--- a/graphics/libv4l/distinfo Sat Jan 10 21:03:58 2009 +0000
+++ b/graphics/libv4l/distinfo Sat Jan 10 21:04:22 2009 +0000
@@ -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-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 -r 14f73526d660 -r 1fb705870270 graphics/libv4l/files/videodev.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libv4l/files/videodev.h Sat Jan 10 21:04:22 2009 +0000
@@ -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 */
Home |
Main Index |
Thread Index |
Old Index