diff options
author | jmcneill <jmcneill> | 2009-01-08 01:08:37 +0000 |
---|---|---|
committer | jmcneill <jmcneill> | 2009-01-08 01:08:37 +0000 |
commit | 8e1f62f56358a371c3b8809c57594233547b96d2 (patch) | |
tree | 897293ce0196b75fe959a5ff8896e9e075061b1d /graphics | |
parent | ccb474389a0b70156d0eec6766500e4628471394 (diff) | |
download | pkgsrc-8e1f62f56358a371c3b8809c57594233547b96d2.tar.gz |
Update unicap to 0.9.3.
0.9.3:
- optionally use libv4l to support more cameras
- fix installation directory of plugins for x64 systems
- fix scaling of ogg/theora video
- use categories for v4l2 properties
0.9.2:
- Severall small bug fixes and improvements ( see ChangeLog )
- The EeePC packages got updated
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/unicap/Makefile | 5 | ||||
-rw-r--r-- | graphics/unicap/PLIST | 4 | ||||
-rw-r--r-- | graphics/unicap/distinfo | 42 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-aa | 18 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ab | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ac | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ad | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ae | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-af | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ag | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ah | 10 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ai | 10 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-aj | 14 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ak | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-al | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-am | 6 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-an | 17 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ao | 26 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ap | 75 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-aq | 10 | ||||
-rw-r--r-- | graphics/unicap/patches/patch-ar | 6 |
21 files changed, 139 insertions, 152 deletions
diff --git a/graphics/unicap/Makefile b/graphics/unicap/Makefile index a8450fec3df..93f5a80d81f 100644 --- a/graphics/unicap/Makefile +++ b/graphics/unicap/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2008/12/18 17:28:16 bjs Exp $ +# $NetBSD: Makefile,v 1.5 2009/01/08 01:08:37 jmcneill Exp $ -DISTNAME= unicap-0.9.1 -PKGREVISION= 1 +DISTNAME= unicap-0.9.3 CATEGORIES= graphics MASTER_SITES= http://unicap-imaging.org/downloads/ diff --git a/graphics/unicap/PLIST b/graphics/unicap/PLIST index 610c4f31401..961937c9ed0 100644 --- a/graphics/unicap/PLIST +++ b/graphics/unicap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ include/unicap/ucil.h include/unicap/ucil_png.h include/unicap/ucil_version.h @@ -18,7 +18,7 @@ lib/libunicapgtk.la lib/pkgconfig/libucil.pc lib/pkgconfig/libunicap.pc lib/pkgconfig/libunicapgtk.pc -lib/unicap2/cpi/libv4l2.la +lib/unicap2/cpi/libv4l2cpi.la share/gtk-doc/html/libucil/ch01.html share/gtk-doc/html/libucil/home.png share/gtk-doc/html/libucil/index.html diff --git a/graphics/unicap/distinfo b/graphics/unicap/distinfo index 5ff7c3c1773..d04ab392490 100644 --- a/graphics/unicap/distinfo +++ b/graphics/unicap/distinfo @@ -1,23 +1,21 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: distinfo,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ -SHA1 (unicap-0.9.1.tar.gz) = d0e8265ab5dd924626f59ce421798081e92d833f -RMD160 (unicap-0.9.1.tar.gz) = bfb5a8659fd4b76be86c8c31fd2de7615c7f235e -Size (unicap-0.9.1.tar.gz) = 1320764 bytes -SHA1 (patch-aa) = daafd02550b56a538b81669b5e792238e7d739a9 -SHA1 (patch-ab) = 7731b1dbd1f6dd8bf640e20bb70a2fbf231b3088 -SHA1 (patch-ac) = 30f65b1c48aade6d2515b54e55fbc89bfc252c2d -SHA1 (patch-ad) = d7b60e7c54c6ac9e9160bae089fb2b44ffc61818 -SHA1 (patch-ae) = 83d0f86b305f732effa45e609c3e4b067796e331 -SHA1 (patch-af) = 13e400f7197dfdf69fa253a50618c3152566df8e -SHA1 (patch-ag) = 5e5bd6fbbc0eb9263a2aa5eb2641bb16ee58a413 -SHA1 (patch-ah) = 554dfb541809d4c54fd155cd2fe263330b3f5b3d -SHA1 (patch-ai) = ced51a4b5b98793375c8a024a076e56006d3dfc6 -SHA1 (patch-aj) = 1bbe0b055538adb99a4ec29ce3a53b95c17e4fe7 -SHA1 (patch-ak) = 1bfdf9e4b989ea847c1971956860128afd17cdb5 -SHA1 (patch-al) = 007aec2cb6c9b7fcaea70ba48a52a50d48d767c1 -SHA1 (patch-am) = b11ef1b3f8133e88142ea89361370d9791fa3a10 -SHA1 (patch-an) = 9cd622733b177b6cfc39f73a518686ecb7c39e54 -SHA1 (patch-ao) = d88378597bff3a535fdcb5d3bce5e4b7700800fd -SHA1 (patch-ap) = 37678ec66287b172cefddbb11677753f2ca5abef -SHA1 (patch-aq) = b3f2a2f63e18578567a343824cbdd0e9d4e955e9 -SHA1 (patch-ar) = 1ff2ae9191573022fe716053990aed0726c1318f +SHA1 (unicap-0.9.3.tar.gz) = b9d1580a9e10d15a8ab86400a0200b72e582dc4d +RMD160 (unicap-0.9.3.tar.gz) = dd2b687197ac81534d2adbc5db8dcc2bdc3e3aad +Size (unicap-0.9.3.tar.gz) = 1324790 bytes +SHA1 (patch-aa) = 080a2e5f3a38bdc1b1567f3cda73916ec5ce2f2f +SHA1 (patch-ab) = 16385141151b2973b9cf0e00fe122388e0e93797 +SHA1 (patch-ac) = 49c8fdd5fce8c81dd4b97cf35ba05c4377bc2d3c +SHA1 (patch-ad) = 96ec900cd2afefc6d611b35b304989ca1275be77 +SHA1 (patch-ae) = ba19f88df154be2b401b5d63fd2700c7bb62ed95 +SHA1 (patch-af) = 7a334380a70306205d156b130e50571d71d8438c +SHA1 (patch-ag) = 3d89e6f7ec3b9d72f086a9354bad12b1428d4126 +SHA1 (patch-ah) = a309bba2e721fe15c91960b46355dce9fc674c9f +SHA1 (patch-ai) = 3e60f4d817fc506573103982201a0b05f76df3f5 +SHA1 (patch-aj) = c04fa9aeb3c6fc93524019b1d69f6b3da6b62bc6 +SHA1 (patch-ak) = 41025b0d650d8e06a2f4950b5113414f5a4d6ec1 +SHA1 (patch-al) = cc6b286f54b902907e49028797e644af9eaff132 +SHA1 (patch-am) = 32c85d4c7353a9f2130a7105067f555365fcc883 +SHA1 (patch-ap) = f80854eb8708e950384e18cad0d04fda66ca5267 +SHA1 (patch-aq) = 396dae0f7695bd816479117b50f577d67aa6efbc +SHA1 (patch-ar) = d0a2b4411ca9df52b0041cd532779ccb9fc1efdf diff --git a/graphics/unicap/patches/patch-aa b/graphics/unicap/patches/patch-aa index 37065771f1c..f744f4fd4f8 100644 --- a/graphics/unicap/patches/patch-aa +++ b/graphics/unicap/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-aa,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libucil/colorspace.c.orig 2008-08-12 04:31:15.000000000 -0400 -+++ libucil/colorspace.c 2008-09-09 00:10:25.000000000 -0400 +--- libucil/colorspace.c.orig 2008-10-01 04:14:46.000000000 -0400 ++++ libucil/colorspace.c @@ -25,7 +25,12 @@ #endif //HAVE_AVCODEC @@ -16,15 +16,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ #include <glib.h> #include <string.h> -@@ -1595,9 +1600,8 @@ - } - else - { -- g_message( "Could not convert format: %c%c%c%c %08x to %c%c%c%c %08x\n", -- src->format.fourcc, src->format.fourcc, -- dest->format.fourcc, dest->format.fourcc ); -+ g_message( "Could not convert format: %08x to %08x\n", -+ src->format.fourcc, dest->format.fourcc ); - } - - } diff --git a/graphics/unicap/patches/patch-ab b/graphics/unicap/patches/patch-ab index 674142a632d..e42590c389c 100644 --- a/graphics/unicap/patches/patch-ab +++ b/graphics/unicap/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ab,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libucil/colorspace.h.orig 2008-09-08 23:02:38.000000000 -0400 -+++ libucil/colorspace.h 2008-09-08 23:02:51.000000000 -0400 +--- libucil/colorspace.h.orig 2008-09-10 12:09:59.000000000 -0400 ++++ libucil/colorspace.h @@ -21,7 +21,9 @@ #define __COLORSPACE_H__ diff --git a/graphics/unicap/patches/patch-ac b/graphics/unicap/patches/patch-ac index 9fff11899af..1a765a681fc 100644 --- a/graphics/unicap/patches/patch-ac +++ b/graphics/unicap/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ac,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libucil/yuvops.c.orig 2008-09-08 23:04:54.000000000 -0400 -+++ libucil/yuvops.c 2008-09-08 23:05:22.000000000 -0400 +--- libucil/yuvops.c.orig 2008-06-12 11:25:11.000000000 -0400 ++++ libucil/yuvops.c @@ -13,8 +13,12 @@ #include "ucil.h" diff --git a/graphics/unicap/patches/patch-ad b/graphics/unicap/patches/patch-ad index 757ba5f108a..ca72f25d77c 100644 --- a/graphics/unicap/patches/patch-ad +++ b/graphics/unicap/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ad,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libucil/rgbops.c.orig 2008-09-08 23:05:48.000000000 -0400 -+++ libucil/rgbops.c 2008-09-08 23:05:59.000000000 -0400 +--- libucil/rgbops.c.orig 2008-06-12 11:25:11.000000000 -0400 ++++ libucil/rgbops.c @@ -13,7 +13,9 @@ #include "ucil.h" diff --git a/graphics/unicap/patches/patch-ae b/graphics/unicap/patches/patch-ae index d72e6b8bb5b..ff88bd5e631 100644 --- a/graphics/unicap/patches/patch-ae +++ b/graphics/unicap/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ae,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libucil/avi.h.orig 2008-09-08 23:09:57.000000000 -0400 -+++ libucil/avi.h 2008-09-08 23:10:19.000000000 -0400 +--- libucil/avi.h.orig 2008-06-12 11:25:11.000000000 -0400 ++++ libucil/avi.h @@ -21,7 +21,12 @@ # define AVI_H_ diff --git a/graphics/unicap/patches/patch-af b/graphics/unicap/patches/patch-af index b1a82688c28..a6be04d8be9 100644 --- a/graphics/unicap/patches/patch-af +++ b/graphics/unicap/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-af,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libucil/ucil_rawavi.c.orig 2008-09-08 23:10:46.000000000 -0400 -+++ libucil/ucil_rawavi.c 2008-09-08 23:10:54.000000000 -0400 +--- libucil/ucil_rawavi.c.orig 2008-08-20 12:31:37.000000000 -0400 ++++ libucil/ucil_rawavi.c @@ -27,7 +27,9 @@ #include <arpa/inet.h> diff --git a/graphics/unicap/patches/patch-ag b/graphics/unicap/patches/patch-ag index 328446987aa..8041f9049d2 100644 --- a/graphics/unicap/patches/patch-ag +++ b/graphics/unicap/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ag,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libunicapgtk/backend_xv.c.orig 2008-09-08 23:11:35.000000000 -0400 -+++ libunicapgtk/backend_xv.c 2008-09-08 23:12:34.000000000 -0400 +--- libunicapgtk/backend_xv.c.orig 2008-09-17 05:43:20.000000000 -0400 ++++ libunicapgtk/backend_xv.c @@ -20,9 +20,10 @@ #include "config.h" diff --git a/graphics/unicap/patches/patch-ah b/graphics/unicap/patches/patch-ah index 0c2990d0889..8823019f3ba 100644 --- a/graphics/unicap/patches/patch-ah +++ b/graphics/unicap/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ah,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- cpi/v4l2/v4l2.c.orig 2008-07-30 01:25:30.000000000 -0400 -+++ cpi/v4l2/v4l2.c 2008-09-09 00:00:02.000000000 -0400 +--- cpi/v4l2cpi/v4l2.c.orig 2008-10-03 12:20:06.000000000 -0400 ++++ cpi/v4l2cpi/v4l2.c @@ -43,8 +43,12 @@ #include <errno.h> #include <pthread.h> @@ -16,7 +16,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ #include "v4l2.h" #include "tisuvccam.h" -@@ -2288,11 +2292,15 @@ +@@ -2396,11 +2400,15 @@ static void v4l2_capture_thread( v4l2_ha old_index = handle->dqindex; @@ -32,7 +32,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ if( ( ( handle->dqindex + 1 ) % handle->buffer_count ) == handle->qindex ) { -@@ -2395,7 +2403,11 @@ +@@ -2503,7 +2511,11 @@ static void v4l2_capture_thread( v4l2_ha if( handle->io_method == CPI_V4L2_IO_METHOD_MMAP ) { diff --git a/graphics/unicap/patches/patch-ai b/graphics/unicap/patches/patch-ai index 9e31f92b17e..1ad6114974c 100644 --- a/graphics/unicap/patches/patch-ai +++ b/graphics/unicap/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ai,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- cpi/v4l2/tisuvccam.h.orig 2008-09-08 23:14:26.000000000 -0400 -+++ cpi/v4l2/tisuvccam.h 2008-09-08 23:14:38.000000000 -0400 +--- cpi/v4l2cpi/tisuvccam.h.orig 2008-09-18 05:42:49.000000000 -0400 ++++ cpi/v4l2cpi/tisuvccam.h @@ -13,8 +13,12 @@ #include <sys/types.h> @@ -10,9 +10,9 @@ $NetBSD: patch-ai,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +#ifdef __linux__ #include <linux/types.h> #include <linux/videodev2.h> -+#else ++#elif defined(__NetBSD__) +#include <sys/videoio.h> +#endif #include <unicap.h> + #include "v4l2.h" - int tisuvccam_probe( int fd, const char *path ); diff --git a/graphics/unicap/patches/patch-aj b/graphics/unicap/patches/patch-aj index 3c3d3d7a9f9..b5cb216713e 100644 --- a/graphics/unicap/patches/patch-aj +++ b/graphics/unicap/patches/patch-aj @@ -1,17 +1,17 @@ -$NetBSD: patch-aj,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-aj,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- cpi/v4l2/tiseuvccam.h.orig 2008-09-08 23:15:04.000000000 -0400 -+++ cpi/v4l2/tiseuvccam.h 2008-09-08 23:15:19.000000000 -0400 -@@ -8,7 +8,11 @@ - # define TISEUVCCAM_H_ +--- cpi/v4l2cpi/tiseuvccam.h.orig 2008-09-18 05:44:35.000000000 -0400 ++++ cpi/v4l2cpi/tiseuvccam.h +@@ -9,7 +9,11 @@ #include <unicap.h> + #include <unicap_cpi.h> +#ifdef __linux__ #include <linux/videodev2.h> +#elif defined(__NetBSD__) +#include <sys/videoio.h> +#endif + #include "v4l2.h" - int tiseuvccam_probe( int fd, const char *path ); - int tiseuvccam_count_ext_property( int fd ); + int tiseuvccam_probe( v4l2_handle_t handle, const char *path ); diff --git a/graphics/unicap/patches/patch-ak b/graphics/unicap/patches/patch-ak index 756f1681f5f..bb2712ea16d 100644 --- a/graphics/unicap/patches/patch-ak +++ b/graphics/unicap/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ak,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- cpi/v4l2/uvcvideo.h.orig 2008-09-08 23:16:20.000000000 -0400 -+++ cpi/v4l2/uvcvideo.h 2008-09-08 23:16:37.000000000 -0400 +--- cpi/v4l2cpi/uvcvideo.h.orig 2008-06-12 11:25:05.000000000 -0400 ++++ cpi/v4l2cpi/uvcvideo.h @@ -1,8 +1,12 @@ #ifndef _USB_VIDEO_H_ #define _USB_VIDEO_H_ diff --git a/graphics/unicap/patches/patch-al b/graphics/unicap/patches/patch-al index 900e6ef684b..a0c2e65a5bd 100644 --- a/graphics/unicap/patches/patch-al +++ b/graphics/unicap/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-al,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- cpi/v4l2/uvc_compat.h.orig 2008-09-08 23:16:59.000000000 -0400 -+++ cpi/v4l2/uvc_compat.h 2008-09-08 23:18:15.000000000 -0400 +--- cpi/v4l2cpi/uvc_compat.h.orig 2008-06-12 11:25:05.000000000 -0400 ++++ cpi/v4l2cpi/uvc_compat.h @@ -1,7 +1,12 @@ #ifndef _UVC_COMPAT_H #define _UVC_COMPAT_H diff --git a/graphics/unicap/patches/patch-am b/graphics/unicap/patches/patch-am index 677e946bc26..c070a4e15f6 100644 --- a/graphics/unicap/patches/patch-am +++ b/graphics/unicap/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-am,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- cpi/v4l2/tiseuvccam.c.orig 2008-09-08 23:19:03.000000000 -0400 -+++ cpi/v4l2/tiseuvccam.c 2008-09-08 23:19:25.000000000 -0400 +--- cpi/v4l2cpi/tiseuvccam.c.orig 2008-10-03 02:56:40.000000000 -0400 ++++ cpi/v4l2cpi/tiseuvccam.c @@ -12,7 +12,6 @@ #include <limits.h> diff --git a/graphics/unicap/patches/patch-an b/graphics/unicap/patches/patch-an deleted file mode 100644 index 8e2ae4ca889..00000000000 --- a/graphics/unicap/patches/patch-an +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ - - ---- cpi/v4l2/isight.h.orig 2008-09-08 23:19:54.000000000 -0400 -+++ cpi/v4l2/isight.h 2008-09-08 23:20:08.000000000 -0400 -@@ -8,7 +8,11 @@ - # define ISIGHT_H_ - - #include <unicap.h> -+#ifdef __linux__ - #include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#endif - - int isight_probe( int fd, const char *path ); - int isight_count_ext_property( int fd ); diff --git a/graphics/unicap/patches/patch-ao b/graphics/unicap/patches/patch-ao deleted file mode 100644 index e2b362cec52..00000000000 --- a/graphics/unicap/patches/patch-ao +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ - - ---- cpi/v4l2/isight.c.orig 2008-09-08 23:20:31.000000000 -0400 -+++ cpi/v4l2/isight.c 2008-09-08 23:20:46.000000000 -0400 -@@ -12,7 +12,6 @@ - - #include <limits.h> - #include <stdlib.h> --#include <linux/types.h> - #include <string.h> - #include <libgen.h> - #include <stdio.h> -@@ -20,7 +19,12 @@ - #include <sys/types.h> - #include <sys/ioctl.h> - #include <fcntl.h> -+#ifdef __linux__ -+#include <linux/types.h> - #include <linux/videodev2.h> -+#elif defined(__NetBSD__) -+#include <sys/videoio.h> -+#endif - - #include "uvc_compat.h" - diff --git a/graphics/unicap/patches/patch-ap b/graphics/unicap/patches/patch-ap index 483f76ecad4..2619d1640ec 100644 --- a/graphics/unicap/patches/patch-ap +++ b/graphics/unicap/patches/patch-ap @@ -1,9 +1,9 @@ -$NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ap,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- configure.orig 2008-09-08 23:50:50.000000000 -0400 -+++ configure 2008-09-08 23:50:52.000000000 -0400 -@@ -23068,7 +23068,7 @@ +--- configure.orig 2008-10-01 12:15:58.000000000 -0400 ++++ configure +@@ -23079,7 +23079,7 @@ _ACEOF fi @@ -12,7 +12,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ HAVE_AVCODEC_TRUE= HAVE_AVCODEC_FALSE='#' else -@@ -23190,7 +23190,7 @@ +@@ -23201,7 +23201,7 @@ _ACEOF fi @@ -21,7 +21,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ HAVE_THEORA_TRUE= HAVE_THEORA_FALSE='#' else -@@ -23312,7 +23312,7 @@ +@@ -23323,7 +23323,7 @@ _ACEOF fi @@ -30,7 +30,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ HAVE_ALSA_TRUE= HAVE_ALSA_FALSE='#' else -@@ -23434,7 +23434,7 @@ +@@ -23445,7 +23445,7 @@ _ACEOF fi @@ -39,7 +39,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ HAVE_PNG_TRUE= HAVE_PNG_FALSE='#' else -@@ -25322,7 +25322,7 @@ +@@ -25333,7 +25333,7 @@ else echo "${ECHO_T}yes" >&6; } HAVE_LIBRAW1394="yes";LIBRAW1394_VERSION="RAW1394_1_1_API" fi @@ -48,7 +48,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define RAW1394_1_1_API 1 -@@ -25719,7 +25719,7 @@ +@@ -25730,7 +25730,7 @@ echo "${ECHO_T} video-to-1394 plugin req fi fi @@ -57,7 +57,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define BUILD_VID21394 1 -@@ -25748,7 +25748,7 @@ +@@ -25759,7 +25759,7 @@ echo "${ECHO_T} IIDC 1394 camera plugin fi fi @@ -66,7 +66,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define BUILD_DCAM 1 -@@ -25771,7 +25771,7 @@ +@@ -25782,7 +25782,7 @@ else fi @@ -75,7 +75,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define BUILD_V4L 1 -@@ -25794,7 +25794,7 @@ +@@ -25805,7 +25805,7 @@ else fi @@ -84,7 +84,34 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define BUILD_V4L2 1 -@@ -25820,7 +25820,7 @@ +@@ -25827,7 +25827,7 @@ else + fi + + +-if test "x$USE_LIBV4L" == "xyes"; then ++if test "x$USE_LIBV4L" = "xyes"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for LIBV4L" >&5 +@@ -25899,7 +25899,7 @@ else + echo "${ECHO_T}yes" >&6; } + HAVE_LIBV4L="yes" + fi +- if test "x$HAVE_LIBV4L" == "xyes"; then ++ if test "x$HAVE_LIBV4L" = "xyes"; then + { echo "$as_me:$LINENO: result: enable enable enable " >&5 + echo "${ECHO_T}enable enable enable " >&6; } + +@@ -25917,7 +25917,7 @@ _ACEOF + fi + + +-if test x$HAVE_LIBV4L == "xyes" ; then ++if test x$HAVE_LIBV4L = "xyes" ; then + HAVE_LIBV4L_TRUE= + HAVE_LIBV4L_FALSE='#' + else +@@ -25944,7 +25944,7 @@ fi # Check whether --enable-static-cpi was given. if test "${enable_static_cpi+set}" = set; then enableval=$enable_static_cpi; { @@ -93,7 +120,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define ENABLE_STATIC_CPI 1 -@@ -25848,7 +25848,7 @@ +@@ -25972,7 +25972,7 @@ fi # Check whether --enable-thread-locking was given. if test "${enable_thread_locking+set}" = set; then enableval=$enable_thread_locking; { @@ -102,7 +129,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define UNICAP_THREAD_LOCKING 1 -@@ -25868,7 +25868,7 @@ +@@ -25992,7 +25992,7 @@ fi # Check whether --enable-unicap-threads was given. if test "${enable_unicap_threads+set}" = set; then enableval=$enable_unicap_threads; { @@ -111,3 +138,21 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ cat >>confdefs.h <<\_ACEOF #define UNICAP_THREADS 1 +@@ -26728,6 +26728,8 @@ do + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; +@@ -27969,7 +27971,7 @@ if test x$VID21394_VISCA = xyes; then + VID21394="$VID21394 with visca support" + fi + +-if test x$HAVE_LIBV4L == xyes && test x$V4L2 == xyes; then ++if test x$HAVE_LIBV4L = xyes && test x$V4L2 = xyes; then + V4L2="yes, with libv4l2 support" + fi + diff --git a/graphics/unicap/patches/patch-aq b/graphics/unicap/patches/patch-aq index c8755049d83..f0db8158ef2 100644 --- a/graphics/unicap/patches/patch-aq +++ b/graphics/unicap/patches/patch-aq @@ -1,9 +1,9 @@ -$NetBSD: patch-aq,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-aq,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libucil/ucil_theora.c.orig 2008-09-08 23:57:33.000000000 -0400 -+++ libucil/ucil_theora.c 2008-09-08 23:58:33.000000000 -0400 -@@ -1026,6 +1026,9 @@ +--- libucil/ucil_theora.c.orig 2008-09-30 12:21:36.000000000 -0400 ++++ libucil/ucil_theora.c +@@ -1035,6 +1035,9 @@ static void *ucil_theora_worker_thread( } gettimeofday( &ctime, NULL ); @@ -13,7 +13,7 @@ $NetBSD: patch-aq,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ abs_timeout.tv_sec = ctime.tv_sec + 1; abs_timeout.tv_nsec = ctime.tv_usec * 1000; if( sem_timedwait( &vobj->sema, &abs_timeout ) ) -@@ -1033,6 +1036,7 @@ +@@ -1042,6 +1045,7 @@ static void *ucil_theora_worker_thread( TRACE( "SEM_WAIT FAILED\n" ); continue; } diff --git a/graphics/unicap/patches/patch-ar b/graphics/unicap/patches/patch-ar index e78be95e218..3aea2843c1a 100644 --- a/graphics/unicap/patches/patch-ar +++ b/graphics/unicap/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1.1.1 2008/09/09 11:50:18 jmcneill Exp $ +$NetBSD: patch-ar,v 1.2 2009/01/08 01:08:37 jmcneill Exp $ ---- libunicapgtk/unicapgtk_device_property.c.orig 2008-09-09 00:02:03.000000000 -0400 -+++ libunicapgtk/unicapgtk_device_property.c 2008-09-09 00:02:59.000000000 -0400 +--- libunicapgtk/unicapgtk_device_property.c.orig 2008-08-06 12:37:54.000000000 -0400 ++++ libunicapgtk/unicapgtk_device_property.c @@ -49,7 +49,17 @@ #endif #include "debug.h" |