Take care come video standard macros added by V4L2 in Linux 2.6.17 (not in NetBSD).

2 files changed, 39 insertions, 1 deletions

diff --git a/multimedia/gst-plugins0.10-good/distinfo b/multimedia/gst-plugins0.10-good/distinfo
index 8ade71efa54..5e8147db807 100644
--- a/multimedia/gst-plugins0.10-good/distinfo
+++ b/multimedia/gst-plugins0.10-good/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2012/02/28 18:31:00 drochner Exp $
+$NetBSD: distinfo,v 1.38 2012/03/06 04:42:51 obache Exp $
 
 SHA1 (gst-plugins-good-0.10.31.tar.bz2) = b45fc01b133fc23617fa501dd9307a90f467b396
 RMD160 (gst-plugins-good-0.10.31.tar.bz2) = d9fed957ba26d055f7bccb9079bd43faae15b7e5
@@ -6,3 +6,4 @@ 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-sys_v4l2_gstv4l2object.c) = d0ca0f9f001e6719c64eda0a2eff40ed7da68b65
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
new file mode 100644
index 00000000000..14df5135b7e
--- /dev/null
+++ b/multimedia/gst-plugins0.10-good/patches/patch-sys_v4l2_gstv4l2object.c
@@ -0,0 +1,37 @@
+$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.1 2012/03/06 04:42:51 obache Exp $
+
+* take care some video standard macros added by V4L2 in Linux 2.6.17
+  (not in NetBSD)
+
+--- sys/v4l2/gstv4l2object.c.orig	2011-12-30 13:59:13.000000000 +0000
++++ sys/v4l2/gstv4l2object.c
+@@ -331,8 +331,12 @@ gst_v4l2_tv_norm_get_type (void)
+       {V4L2_STD_NTSC, "NTSC", "NTSC"},
+       {V4L2_STD_NTSC_M, "NTSC-M", "NTSC-M"},
+       {V4L2_STD_NTSC_M_JP, "NTSC-M-JP", "NTSC-M-JP"},
++#ifdef V4L2_STD_NTSC_M_KR
+       {V4L2_STD_NTSC_M_KR, "NTSC-M-KR", "NTSC-M-KR"},
++#endif
++#ifdef V4L2_STD_NTSC_443
+       {V4L2_STD_NTSC_443, "NTSC-443", "NTSC-443"},
++#endif
+ 
+       {V4L2_STD_PAL, "PAL", "PAL"},
+       {V4L2_STD_PAL_BG, "PAL-BG", "PAL-BG"},
+@@ -354,12 +358,16 @@ gst_v4l2_tv_norm_get_type (void)
+       {V4L2_STD_SECAM_B, "SECAM-B", "SECAM-B"},
+       {V4L2_STD_SECAM_G, "SECAM-G", "SECAM-G"},
+       {V4L2_STD_SECAM_H, "SECAM-H", "SECAM-H"},
++#ifdef V4L2_STD_SECAM_DK
+       {V4L2_STD_SECAM_DK, "SECAM-DK", "SECAM-DK"},
++#endif
+       {V4L2_STD_SECAM_D, "SECAM-D", "SECAM-D"},
+       {V4L2_STD_SECAM_K, "SECAM-K", "SECAM-K"},
+       {V4L2_STD_SECAM_K1, "SECAM-K1", "SECAM-K1"},
+       {V4L2_STD_SECAM_L, "SECAM-L", "SECAM-L"},
++#ifdef V4L2_STD_SECAM_LC
+       {V4L2_STD_SECAM_LC, "SECAM-Lc", "SECAM-Lc"},
++#endif
+ 
+       {0, NULL, NULL}
+     };