From c3343e4903020ce8f47cb833e882fe7ab03d1dd9 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 1 Dec 2014 08:08:57 +0000 Subject: Use upstream patch for v4l2. http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?h=1.4&id=b3e132d2d7a759215cc3b183102b7d0e6f678699 --- multimedia/gst-plugins1-good/distinfo | 5 ++- multimedia/gst-plugins1-good/patches/patch-bb | 11 +++---- .../patches/patch-sys_v4l2_gstv4l2object.c | 37 ---------------------- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c (limited to 'multimedia') diff --git a/multimedia/gst-plugins1-good/distinfo b/multimedia/gst-plugins1-good/distinfo index 1c8b28fd1ab..5818a9ad2ef 100644 --- a/multimedia/gst-plugins1-good/distinfo +++ b/multimedia/gst-plugins1-good/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.15 2014/11/29 23:07:19 wiz Exp $ +$NetBSD: distinfo,v 1.16 2014/12/01 08:08:57 wiz Exp $ SHA1 (gst-plugins-good-1.4.4.tar.xz) = b2c1691bd13d4567788dcb3af49a99401f057112 RMD160 (gst-plugins-good-1.4.4.tar.xz) = 8fa0090102e7079e0aa281a66a393ab910d40d86 Size (gst-plugins-good-1.4.4.tar.xz) = 3025496 bytes -SHA1 (patch-bb) = 871a784c4e020f4cb5d555d221aa2bfcfe7db388 -SHA1 (patch-sys_v4l2_gstv4l2object.c) = 01128ba565143aae7a9ffacfe4ba4799d7c29f50 +SHA1 (patch-bb) = d98dbca14a692809bcd25b374720b12e2be42eee diff --git a/multimedia/gst-plugins1-good/patches/patch-bb b/multimedia/gst-plugins1-good/patches/patch-bb index 768bebc2fff..da55986c8bb 100644 --- a/multimedia/gst-plugins1-good/patches/patch-bb +++ b/multimedia/gst-plugins1-good/patches/patch-bb @@ -1,19 +1,16 @@ -$NetBSD: patch-bb,v 1.5 2014/11/29 23:07:19 wiz Exp $ +$NetBSD: patch-bb,v 1.6 2014/12/01 08:08:57 wiz Exp $ NetBSD compatibility for v4l2. -https://bugzilla.gnome.org/show_bug.cgi?id=740905 +http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?h=1.4&id=b3e132d2d7a759215cc3b183102b7d0e6f678699 --- sys/v4l2/v4l2_calls.h.orig 2014-10-19 11:41:09.000000000 +0000 +++ sys/v4l2/v4l2_calls.h -@@ -29,7 +29,11 @@ +@@ -29,7 +29,7 @@ #ifdef HAVE_LIBV4L2 # include #else -+#ifdef __NetBSD__ +-# include +# include "ext/videodev2.h" -+#else - # include -+#endif # include # include # include diff --git a/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c b/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c deleted file mode 100644 index a5f05281349..00000000000 --- a/multimedia/gst-plugins1-good/patches/patch-sys_v4l2_gstv4l2object.c +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-sys_v4l2_gstv4l2object.c,v 1.4 2014/11/29 23:07:19 wiz Exp $ - -* take care some video standard macros added by V4L2 -https://bugzilla.gnome.org/show_bug.cgi?id=740905 - ---- 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"}, - {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"}, -@@ -361,12 +365,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} - }; -- cgit v1.2.3