From: Ted Hess <redacted>
Date: Wed, 18 Nov 2015 17:29:33 +0000 (-0500)
Subject: mjpg-streamer: Fix SIGTRAP in v4l2uvc
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a17fa8c058d33dca8265e8e9f5ae2d6c61fc77c1;p=openwrt-packages.git

mjpg-streamer: Fix SIGTRAP in v4l2uvc

Signed-off-by: Ted Hess <redacted>
---

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index cae661aaf..69e05f499 100644
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mjpg-streamer
 PKG_REV:=182
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
diff --git a/multimedia/mjpg-streamer/patches/060-fix-sigtrap-in-v4l2uvc.patch b/multimedia/mjpg-streamer/patches/060-fix-sigtrap-in-v4l2uvc.patch
new file mode 100644
index 000000000..e0b583796
--- /dev/null
+++ b/multimedia/mjpg-streamer/patches/060-fix-sigtrap-in-v4l2uvc.patch
@@ -0,0 +1,11 @@
+--- a/plugins/input_uvc/v4l2uvc.c
++++ b/plugins/input_uvc/v4l2uvc.c
+@@ -130,7 +130,7 @@ int init_videoIn(struct vdIn *vd, char *
+             return -1;
+         }
+ 
+-        memcpy(&pglobal->in[id].in_formats[pglobal->in[id].formatCount], &fmtdesc, sizeof(input_format));
++        memcpy(&pglobal->in[id].in_formats[pglobal->in[id].formatCount], &fmtdesc, sizeof(struct v4l2_fmtdesc));
+ 
+         if(fmtdesc.pixelformat == format)
+             pglobal->in[id].currentFormat = pglobal->in[id].formatCount;