Sat Aug 3 08:29:22 2013 UTC ()
Fix build of gst-plugins1-v4l2.


(ryoon)
diff -r1.6 -r1.7 pkgsrc/multimedia/gst-plugins1-good/Makefile.common
diff -r1.5 -r1.6 pkgsrc/multimedia/gst-plugins1-good/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/gst-plugins1-good/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/gst-plugins1-good/Makefile.common 2013/07/22 14:29:43 1.6
+++ pkgsrc/multimedia/gst-plugins1-good/Makefile.common 2013/08/03 08:29:22 1.7
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile.common,v 1.6 2013/07/22 14:29:43 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.7 2013/08/03 08:29:22 ryoon Exp $
2# 2#
3# used by audio/gst-plugins1-flac/Makefile 3# used by audio/gst-plugins1-flac/Makefile
4## used by multimedia/gst-plugins1-v4l2/Makefile (broken) 4# used by multimedia/gst-plugins1-v4l2/Makefile
5# used by audio/gst-plugins1-jack/Makefile 5# used by audio/gst-plugins1-jack/Makefile
 6# used by graphics/gst-plugins1-cairo/Makefile
6# used by graphics/gst-plugins1-jpeg/Makefile 7# used by graphics/gst-plugins1-jpeg/Makefile
7# used by graphics/gst-plugins1-png/Makefile 8# used by graphics/gst-plugins1-png/Makefile
8# used by audio/gst-plugins1-oss/Makefile 9# used by audio/gst-plugins1-oss/Makefile
9# used by audio/gst-plugins1-pulse/Makefile 10# used by audio/gst-plugins1-pulse/Makefile
10# used by audio/gst-plugins1-speex/Makefile 11# used by audio/gst-plugins1-speex/Makefile
11# used by multimedia/gst-plugins1-vpx/Makefile 12# used by multimedia/gst-plugins1-vpx/Makefile
12# used by x11/gst-plugins1-x11/Makefile 13# used by x11/gst-plugins1-x11/Makefile
13# used by audio/gst-plugins1-wavpack/Makefile 14# used by audio/gst-plugins1-wavpack/Makefile
14# 15#
15 16
16GST_PLUGINS1_TYPE= good 17GST_PLUGINS1_TYPE= good
17GST_PLUGINS1_VER= 1.0.8 18GST_PLUGINS1_VER= 1.0.8
18 19
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/gst-plugins1-good/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gst-plugins1-good/distinfo 2013/07/22 14:29:43 1.5
+++ pkgsrc/multimedia/gst-plugins1-good/distinfo 2013/08/03 08:29:22 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2013/07/22 14:29:43 drochner Exp $ 1$NetBSD: distinfo,v 1.6 2013/08/03 08:29:22 ryoon Exp $
2 2
3SHA1 (gst-plugins-good-1.0.8.tar.xz) = 786a7481ba8dbee3fe780778d00196fe1727c4b1 3SHA1 (gst-plugins-good-1.0.8.tar.xz) = 786a7481ba8dbee3fe780778d00196fe1727c4b1
4RMD160 (gst-plugins-good-1.0.8.tar.xz) = 004e35ab20c0f996c7c5cd7cf00558810d45d01d 4RMD160 (gst-plugins-good-1.0.8.tar.xz) = 004e35ab20c0f996c7c5cd7cf00558810d45d01d
5Size (gst-plugins-good-1.0.8.tar.xz) = 2729744 bytes 5Size (gst-plugins-good-1.0.8.tar.xz) = 2729744 bytes
6SHA1 (patch-ab) = 69fbd1268ee0c448341bfbd2590769785cd27604 6SHA1 (patch-ab) = 69fbd1268ee0c448341bfbd2590769785cd27604
7SHA1 (patch-ba) = b9a4b1f6ef0df2c1c286218edcf8b592a9839b24 7SHA1 (patch-ba) = b9a4b1f6ef0df2c1c286218edcf8b592a9839b24
8SHA1 (patch-bb) = 2b448778acd9ce6c4cd6a22a894bcee457cd0360 8SHA1 (patch-bb) = 2b448778acd9ce6c4cd6a22a894bcee457cd0360
9SHA1 (patch-sys_v4l2_gstv4l2object.c) = b19a02ff26c49f8ced260f738d7e8973b2201b10 9SHA1 (patch-sys_v4l2_gstv4l2object.c) = 9ea3ce3b49c13af27aeded8358ec34d244c646b6
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/gst-plugins1-good/patches/Attic/patch-sys_v4l2_gstv4l2object.c (expand / switch to unified diff)

--- pkgsrc/multimedia/gst-plugins1-good/patches/Attic/patch-sys_v4l2_gstv4l2object.c 2012/11/29 08:24:42 1.1
+++ pkgsrc/multimedia/gst-plugins1-good/patches/Attic/patch-sys_v4l2_gstv4l2object.c 2013/08/03 08:29:22 1.2
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.1 2012/11/29 08:24:42 ryoon Exp $ 1$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.2 2013/08/03 08:29:22 ryoon Exp $
2 2
3* take care some video standard macros added by V4L2 in Linux 2.6.17 3* take care some video standard macros added by V4L2
4 (not in NetBSD) 
5 4
6--- sys/v4l2/gstv4l2object.c.orig 2012-10-25 10:55:59.000000000 +0000 5--- sys/v4l2/gstv4l2object.c.orig 2013-04-26 09:30:32.000000000 +0000
7+++ sys/v4l2/gstv4l2object.c 6+++ sys/v4l2/gstv4l2object.c
8@@ -338,8 +338,12 @@ gst_v4l2_tv_norm_get_type (void) 7@@ -338,8 +338,12 @@ gst_v4l2_tv_norm_get_type (void)
9 {V4L2_STD_NTSC, "NTSC", "NTSC"}, 8 {V4L2_STD_NTSC, "NTSC", "NTSC"},
10 {V4L2_STD_NTSC_M, "NTSC-M", "NTSC-M"}, 9 {V4L2_STD_NTSC_M, "NTSC-M", "NTSC-M"},
11 {V4L2_STD_NTSC_M_JP, "NTSC-M-JP", "NTSC-M-JP"}, 10 {V4L2_STD_NTSC_M_JP, "NTSC-M-JP", "NTSC-M-JP"},
12+#ifdef V4L2_STD_NTSC_M_KR 11+#ifdef V4L2_STD_NTSC_M_KR
13 {V4L2_STD_NTSC_M_KR, "NTSC-M-KR", "NTSC-M-KR"}, 12 {V4L2_STD_NTSC_M_KR, "NTSC-M-KR", "NTSC-M-KR"},
14+#endif 13+#endif
15+#ifdef V4L2_STD_NTSC_443 14+#ifdef V4L2_STD_NTSC_443
16 {V4L2_STD_NTSC_443, "NTSC-443", "NTSC-443"}, 15 {V4L2_STD_NTSC_443, "NTSC-443", "NTSC-443"},
17+#endif 16+#endif
18  17
19 {V4L2_STD_PAL, "PAL", "PAL"}, 18 {V4L2_STD_PAL, "PAL", "PAL"},
@@ -25,13 +24,23 @@ $NetBSD: patch-sys_v4l2_gstv4l2object.c, @@ -25,13 +24,23 @@ $NetBSD: patch-sys_v4l2_gstv4l2object.c,
25+#ifdef V4L2_STD_SECAM_DK 24+#ifdef V4L2_STD_SECAM_DK
26 {V4L2_STD_SECAM_DK, "SECAM-DK", "SECAM-DK"}, 25 {V4L2_STD_SECAM_DK, "SECAM-DK", "SECAM-DK"},
27+#endif 26+#endif
28 {V4L2_STD_SECAM_D, "SECAM-D", "SECAM-D"}, 27 {V4L2_STD_SECAM_D, "SECAM-D", "SECAM-D"},
29 {V4L2_STD_SECAM_K, "SECAM-K", "SECAM-K"}, 28 {V4L2_STD_SECAM_K, "SECAM-K", "SECAM-K"},
30 {V4L2_STD_SECAM_K1, "SECAM-K1", "SECAM-K1"}, 29 {V4L2_STD_SECAM_K1, "SECAM-K1", "SECAM-K1"},
31 {V4L2_STD_SECAM_L, "SECAM-L", "SECAM-L"}, 30 {V4L2_STD_SECAM_L, "SECAM-L", "SECAM-L"},
32+#ifdef V4L2_STD_SECAM_LC 31+#ifdef V4L2_STD_SECAM_LC
33 {V4L2_STD_SECAM_LC, "SECAM-Lc", "SECAM-Lc"}, 32 {V4L2_STD_SECAM_LC, "SECAM-Lc", "SECAM-Lc"},
34+#endif 33+#endif
35  34
36 {0, NULL, NULL} 35 {0, NULL, NULL}
37 }; 36 };
 37@@ -1500,8 +1508,8 @@ gst_v4l2_object_get_caps_info (GstV4l2Ob
 38 #ifdef V4L2_PIX_FMT_PWC2
 39 } else if (g_str_equal (mimetype, "video/x-pwc2")) {
 40 fourcc = V4L2_PIX_FMT_PWC2;
 41- }
 42 #endif
 43+ }
 44
 45 if (dimensions) {
 46 const gchar *interlace_mode;