diff options
| author | kamil <kamil@pkgsrc.org> | 2018-03-21 18:00:51 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2018-03-21 18:00:51 +0000 |
| commit | d78ac333bb6ee03b0d2b9b27268df8935e5791ef (patch) | |
| tree | a39968a9c77ef3c1744717c206b7b46b4fbb2354 | |
| parent | 01920667b987871101f582d86c1cfbb0bf990804 (diff) | |
| download | pkgsrc-d78ac333bb6ee03b0d2b9b27268df8935e5791ef.tar.gz | |
gst-plugins0.10-v4l2: Fix one build issue on NetBSD
Don't use V4L2_FRMIVAL_TYPE_CONTINUOUS uncontionally.
| -rw-r--r-- | multimedia/gst-plugins0.10-good/distinfo | 9 | ||||
| -rw-r--r-- | multimedia/gst-plugins0.10-good/patches/patch-sys_v4l2_gstv4l2object.c | 21 |
2 files changed, 22 insertions, 8 deletions
diff --git a/multimedia/gst-plugins0.10-good/distinfo b/multimedia/gst-plugins0.10-good/distinfo index 0050f0db072..4a134efae83 100644 --- a/multimedia/gst-plugins0.10-good/distinfo +++ b/multimedia/gst-plugins0.10-good/distinfo @@ -1,12 +1,7 @@ -$NetBSD: distinfo,v 1.41 2016/07/16 04:35:13 markd Exp $ +$NetBSD: distinfo,v 1.42 2018/03/21 18:00:51 kamil Exp $ SHA1 (gst-plugins-good-0.10.31.tar.bz2) = b45fc01b133fc23617fa501dd9307a90f467b396 RMD160 (gst-plugins-good-0.10.31.tar.bz2) = d9fed957ba26d055f7bccb9079bd43faae15b7e5 SHA512 (gst-plugins-good-0.10.31.tar.bz2) = dc81eb37cdd9f656419d967347a9b85ce51ae5733680317ac2c84d82816b6dbd1117ae3ef1a5c7d01e90cdc791d3d27ee9e8355a2793ea381a873809c9566bbe Size (gst-plugins-good-0.10.31.tar.bz2) = 3390378 bytes -SHA1 (patch-ab) = d0d8b7fbd373d300e1808b8b106257d87dd85f7a -SHA1 (patch-ba) = 0f2cc16c39f8bc2a4854ec928b7c0b60d0559eb5 -SHA1 (patch-bb) = b71b740e106b5fc932cc50a7994e491da27909be -SHA1 (patch-gst_goom_mmx.h) = b940bfcd0599fa83fbe574ca9059c7f626d23663 -SHA1 (patch-sys_v4l2_gstv4l2object.c) = d0ca0f9f001e6719c64eda0a2eff40ed7da68b65 -SHA1 (patch-sys_v4l2_v4l2_calls.c) = 4eb5d965a821c6b9e7a6ae84f86b256eb7e56e4c +SHA1 (patch-sys_v4l2_gstv4l2object.c) = c2b842af0d4f91f45e60d2e5622b7122781e54a8 diff --git a/multimedia/gst-plugins0.10-good/patches/patch-sys_v4l2_gstv4l2object.c b/multimedia/gst-plugins0.10-good/patches/patch-sys_v4l2_gstv4l2object.c index 14df5135b7e..998571b3785 100644 --- a/multimedia/gst-plugins0.10-good/patches/patch-sys_v4l2_gstv4l2object.c +++ b/multimedia/gst-plugins0.10-good/patches/patch-sys_v4l2_gstv4l2object.c @@ -1,7 +1,8 @@ -$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.1 2012/03/06 04:42:51 obache Exp $ +$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.2 2018/03/21 18:00:51 kamil Exp $ * take care some video standard macros added by V4L2 in Linux 2.6.17 (not in NetBSD) +* don't use V4L2_FRMIVAL_TYPE_CONTINUOUS uncontionally (needed on NetBSD) --- sys/v4l2/gstv4l2object.c.orig 2011-12-30 13:59:13.000000000 +0000 +++ sys/v4l2/gstv4l2object.c @@ -35,3 +36,21 @@ $NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.1 2012/03/06 04:42:51 obache Exp $ {0, NULL, NULL} }; +@@ -1546,7 +1554,7 @@ gst_v4l2_object_get_nearest_size (GstV4l + + + /* The frame interval enumeration code first appeared in Linux 2.6.19. */ +-#ifdef VIDIOC_ENUM_FRAMEINTERVALS ++#if defined(VIDIOC_ENUM_FRAMEINTERVALS) && defined(V4L2_FRMIVAL_TYPE_CONTINUOUS) + static GstStructure * + gst_v4l2_object_probe_caps_for_format_and_size (GstV4l2Object * v4l2object, + guint32 pixelformat, +@@ -1754,7 +1762,7 @@ unknown_type: + return NULL; + } + } +-#endif /* defined VIDIOC_ENUM_FRAMEINTERVALS */ ++#endif /* defined VIDIOC_ENUM_FRAMEINTERVALS && defined V4L2_FRMIVAL_TYPE_CONTINUOUS */ + + #ifdef VIDIOC_ENUM_FRAMESIZES + static gint |