summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2019-01-11 18:59:09 +0100
committerAaron Bauman <bman@gentoo.org>2019-02-09 15:12:30 -0500
commit216425aa738a3aa0c4eace62446cc98605bf6f4b (patch)
tree4846515ad54075dab3c8f91275ec90d9ebc593b9 /media-gfx/zbar/files
parentapp-mobilephone/kannel: remove unused patch (diff)
downloadgentoo-216425aa738a3aa0c4eace62446cc98605bf6f4b.tar.gz
gentoo-216425aa738a3aa0c4eace62446cc98605bf6f4b.tar.bz2
gentoo-216425aa738a3aa0c4eace62446cc98605bf6f4b.zip
media-gfx/zbar: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'media-gfx/zbar/files')
-rw-r--r--media-gfx/zbar/files/zbar-0.10-python-crash.patch19
-rw-r--r--media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch49
2 files changed, 0 insertions, 68 deletions
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
deleted file mode 100644
index a6f7a96e34db..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://sourceforge.net/p/zbar/patches/37/
-
-fix from Debian for crashes when importing the python module.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
-
-this doesn't happen on some arches as the data naturally ends up with zero
-data after the structure, but on some (like arm), it isn't so we crash when
-python walks the list.
-
---- a/python/imagescanner.c
-+++ b/python/imagescanner.c
-@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
-
- static PyGetSetDef imagescanner_getset[] = {
- { "results", (getter)imagescanner_get_results, },
-+ { NULL },
- };
-
- static PyObject*
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
deleted file mode 100644
index 4fde95e2b563..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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);
- }