diff options
| author |   Michael Weber <xmw@gentoo.org> | 2015-08-11 01:05:44 +0200 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2015-08-11 01:05:57 +0200 |
| commit | 6bb3d1e8458fc0872b4d01349fcb8e74e02f3566 (patch) | |
| tree | 61ad9259e9105e54ba4388df0d17b2f5d54008dc /media-gfx/zbar | |
| parent | Linux patch 3.10.86 (diff) | |
| download | gentoo-6bb3d1e8458fc0872b4d01349fcb8e74e02f3566.tar.gz gentoo-6bb3d1e8458fc0872b4d01349fcb8e74e02f3566.tar.bz2 gentoo-6bb3d1e8458fc0872b4d01349fcb8e74e02f3566.zip | |
media-gfx/zbar: fix UVC webcam compatibility (bug 548034, thanks Scott Alfter).
Package-Manager: portage-2.2.20
Diffstat (limited to 'media-gfx/zbar')
| -rw-r--r-- | media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch | 49 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10-r5.ebuild | 7 | ||||
| -rw-r--r-- | media-gfx/zbar/zbar-0.10_p20121015.ebuild | 6 |
3 files changed, 56 insertions, 6 deletions
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch new file mode 100644 index 000000000000..4fde95e2b563 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch @@ -0,0 +1,49 @@ +--- zbar-0.10/zbar/video/v4l2.c 2009-10-23 18:16:44.000000000 +0000 ++++ zbar-0.10/zbar/video/v4l2.c 2015-03-07 05:46:36.000000000 +0000 +@@ -241,6 +241,21 @@ + return(0); + } + ++static int v4l2_request_buffers (zbar_video_t *vdo) ++{ ++ struct v4l2_requestbuffers rb; ++ memset(&rb, 0, sizeof(rb)); ++ rb.count = vdo->num_images; ++ rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ++ rb.memory = V4L2_MEMORY_USERPTR; ++ if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) ++ return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__, ++ "requesting video frame buffers (VIDIOC_REQBUFS)")); ++ if(rb.count) ++ vdo->num_images = rb.count; ++ return(0); ++} ++ + static int v4l2_set_format (zbar_video_t *vdo, + uint32_t fmt) + { +@@ -308,6 +323,8 @@ + return(-1); + if(vdo->iomode == VIDEO_MMAP) + return(v4l2_mmap_buffers(vdo)); ++ if(vdo->iomode == VIDEO_USERPTR) ++ return(v4l2_request_buffers(vdo)); + return(0); + } + +@@ -337,8 +354,13 @@ + else { + if(!vdo->iomode) + vdo->iomode = VIDEO_USERPTR; +- if(rb.count) +- vdo->num_images = rb.count; ++ /* releasing buffers ++ * lest the driver may later refuse to change format ++ */ ++ rb.count = 0; ++ if (ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0) ++ zprintf(0, "WARNING: releasing video buffers failed: error %d\n", ++ errno); + } + return(0); + } diff --git a/media-gfx/zbar/zbar-0.10-r5.ebuild b/media-gfx/zbar/zbar-0.10-r5.ebuild index 96d5787182e2..c9873c23c833 100644 --- a/media-gfx/zbar/zbar-0.10-r5.ebuild +++ b/media-gfx/zbar/zbar-0.10-r5.ebuild @@ -38,9 +38,10 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-no-v4l1-check.patch - epatch "${FILESDIR}"/${P}-errors.patch - epatch "${FILESDIR}"/${P}-python-crash.patch + epatch "${FILESDIR}"/${P}-no-v4l1-check.patch \ + "${FILESDIR}"/${P}-errors.patch \ + "${FILESDIR}"/${P}-python-crash.patch \ + "${FILESDIR}"/${P}-v4l2-uvcvideo.patch use python && python_fix_shebang examples/upcrpc.py test/*.py diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild b/media-gfx/zbar/zbar-0.10_p20121015.ebuild index 7beedc913b7a..c6f6de1177dd 100644 --- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild +++ b/media-gfx/zbar/zbar-0.10_p20121015.ebuild @@ -44,9 +44,9 @@ src_unpack() { } src_prepare() { - #epatch "${FILESDIR}"/${P}-no-v4l1-check.patch - epatch "${FILESDIR}"/${PN}-0.10-errors.patch - epatch "${FILESDIR}"/${PN}-0.10-python-crash.patch + epatch "${FILESDIR}"/${PN}-0.10-errors.patch \ + "${FILESDIR}"/${PN}-0.10-python-crash.patch \ + "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch use python && python_fix_shebang examples/upcrpc.py test/*.py |