diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-08-03 08:29:22 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-08-03 08:29:22 +0000 |
| commit | fd9c2d8b8aca821b45231082e89f54c5b62e0eda (patch) | |
| tree | e17f4770e17833e10d8bc6c19b8d90d80e07a7ef /multimedia | |
| parent | 1c0c962644f694d771ec61f299831796aafddd5f (diff) | |
| download | pkgsrc-fd9c2d8b8aca821b45231082e89f54c5b62e0eda.tar.gz | |
Fix build of gst-plugins1-v4l2.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gst-plugins1-good/Makefile.common | 5 | ||||
| -rw-r--r-- | multimedia/gst-plugins1-good/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c | 17 |
3 files changed, 18 insertions, 8 deletions
diff --git a/multimedia/gst-plugins1-good/Makefile.common b/multimedia/gst-plugins1-good/Makefile.common index 924755de706..f90451fdaaf 100644 --- a/multimedia/gst-plugins1-good/Makefile.common +++ b/multimedia/gst-plugins1-good/Makefile.common @@ -1,8 +1,9 @@ -# $NetBSD: Makefile.common,v 1.6 2013/07/22 14:29:43 drochner Exp $ +# $NetBSD: Makefile.common,v 1.7 2013/08/03 08:29:22 ryoon Exp $ # # used by audio/gst-plugins1-flac/Makefile -## used by multimedia/gst-plugins1-v4l2/Makefile (broken) +# used by multimedia/gst-plugins1-v4l2/Makefile # used by audio/gst-plugins1-jack/Makefile +# used by graphics/gst-plugins1-cairo/Makefile # used by graphics/gst-plugins1-jpeg/Makefile # used by graphics/gst-plugins1-png/Makefile # used by audio/gst-plugins1-oss/Makefile diff --git a/multimedia/gst-plugins1-good/distinfo b/multimedia/gst-plugins1-good/distinfo index 4ddf75256c0..faeb2a288a6 100644 --- a/multimedia/gst-plugins1-good/distinfo +++ b/multimedia/gst-plugins1-good/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2013/07/22 14:29:43 drochner Exp $ +$NetBSD: distinfo,v 1.6 2013/08/03 08:29:22 ryoon Exp $ SHA1 (gst-plugins-good-1.0.8.tar.xz) = 786a7481ba8dbee3fe780778d00196fe1727c4b1 RMD160 (gst-plugins-good-1.0.8.tar.xz) = 004e35ab20c0f996c7c5cd7cf00558810d45d01d @@ -6,4 +6,4 @@ Size (gst-plugins-good-1.0.8.tar.xz) = 2729744 bytes SHA1 (patch-ab) = 69fbd1268ee0c448341bfbd2590769785cd27604 SHA1 (patch-ba) = b9a4b1f6ef0df2c1c286218edcf8b592a9839b24 SHA1 (patch-bb) = 2b448778acd9ce6c4cd6a22a894bcee457cd0360 -SHA1 (patch-sys_v4l2_gstv4l2object.c) = b19a02ff26c49f8ced260f738d7e8973b2201b10 +SHA1 (patch-sys_v4l2_gstv4l2object.c) = 9ea3ce3b49c13af27aeded8358ec34d244c646b6 diff --git a/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c b/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c index 8ceb821137f..a37be5d1bfe 100644 --- a/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c +++ b/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c @@ -1,9 +1,8 @@ -$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.1 2012/11/29 08:24:42 ryoon Exp $ +$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.2 2013/08/03 08:29:22 ryoon Exp $ -* take care some video standard macros added by V4L2 in Linux 2.6.17 - (not in NetBSD) +* take care some video standard macros added by V4L2 ---- sys/v4l2/gstv4l2object.c.orig 2012-10-25 10:55:59.000000000 +0000 +--- sys/v4l2/gstv4l2object.c.orig 2013-04-26 09:30:32.000000000 +0000 +++ sys/v4l2/gstv4l2object.c @@ -338,8 +338,12 @@ gst_v4l2_tv_norm_get_type (void) {V4L2_STD_NTSC, "NTSC", "NTSC"}, @@ -35,3 +34,13 @@ $NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.1 2012/11/29 08:24:42 ryoon Exp $ {0, NULL, NULL} }; +@@ -1500,8 +1508,8 @@ gst_v4l2_object_get_caps_info (GstV4l2Ob + #ifdef V4L2_PIX_FMT_PWC2 + } else if (g_str_equal (mimetype, "video/x-pwc2")) { + fourcc = V4L2_PIX_FMT_PWC2; +- } + #endif ++ } + + if (dimensions) { + const gchar *interlace_mode; |