gentoo resync : 10.02.2019

3 files changed, 0 insertions, 70 deletions

diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 6fd205fa64d8..ad74f040f13b 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,6 +1,4 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
-AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c86b9ddc116f34f15668459d8ac86d77dabe388cd61af9182c02be37475363ff832d7c8c705d29bf1829f7ccb167b3 SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba
-AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a
 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
 EBUILD zbar-0.20.1-r1.ebuild 3725 BLAKE2B afedede5b3120e473e3d72d15f386a4931d318c096d338f070b65d7dbf9f722d6d292b5759b5a7d9f13e040ff7f54ff444e9c1d3603f0aa23333b770ab18fdd1 SHA512 182b93701cc615df4db4aa83e8ff8fe38ecafb2aa376ae69d3ee89f9fd86e0036e6f2bc8ce20c2ef9c52808bf815831b4e7ae3a7b8608c093fe92ce61dd4b4e4
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);
- }