gentoo resync : 11.05.2021

3 files changed, 72 insertions, 2 deletions

diff --git a/media-sound/jack_capture/Manifest b/media-sound/jack_capture/Manifest
index 52a274a981c8..85579c3b4c55 100644
--- a/media-sound/jack_capture/Manifest
+++ b/media-sound/jack_capture/Manifest
@@ -1,6 +1,7 @@
 AUX jack_capture-0.9.73-Makefile.patch 1046 BLAKE2B 5a87ea22918f46c625b23715b3bccabec6380e68374d877f6b1c3b9bb838fc3b5805c84c8a3acce3eb0cc2b7de6374a9a0124fad040c31ed8ac776972c43b7ec SHA512 8cfd1322299d314021ce58b7500ae538a43073fcc1df6514fd879d3b47db53069870846f450fb097a5a738f92dcac14e052821aa07ee1364cca648d94a47c754
+AUX jack_capture-0.9.73-avoid-custom-asprintf.patch 1800 BLAKE2B 78e1389865fd741cf6153a6a2f88996e9c9108c31a5239fda85de49a3217547117baf7d70cda213c7718e103d65f3f6ab9325b134634ac5ab1351d17727bfe43 SHA512 67c30d0d13070852af8fe0b1bc63f0e7061fb005c0c60331ac11c29162f0c256907b0e5404a2915e2a36474774cbacedc3336016ab61d7bf92b1c36ae03e5d29
 AUX jack_capture-0.9.73-r1-Makefile.patch 1193 BLAKE2B be2301633901dc63853292c014adf76e0999184bf331983036116a4591e83233f05a1ff6299691c2a3409bff7223acfacffe36aca643e26e2c689ffbb4b2ec67 SHA512 b7ac7d9c040358309c3652b9c620b805b303852d6c978042790200555013077455caaa63a0c877c863b968500396ec2d3cac08b6b7cb4d7694e0344926b6a9c5
 DIST jack_capture-0.9.73.tar.gz 63676 BLAKE2B 0ea944dc544f237501485c5d89299c2d1e202da2d1e3c4ef7922f4d2d49af7f0c871f077613da63ee3cb1a457a2a4edf4c1ab4b6b0625b4cb455db56d880e6f5 SHA512 eecab2e26d5e83b65adf386d6fb38f2d9169cf1574e462ec455367f7d98f4f4d5a9d0766b9c572cfdcb43c55ae914bb8a2222267842c9912e2afe13c1f7b0038
-EBUILD jack_capture-0.9.73-r1.ebuild 1105 BLAKE2B 5a1d6c2cf6240d779cfcf654e46a4e9c48665d97307fa0e28bc33738690cd0583206b688d8fc9c0cd3f89469ea6625ec2728136945ad1822058a337c2c3158d7 SHA512 1f9f09867157bb520dcb599b85e2312ff1af759b63c43977b4303c85726c759a44378aa8394d5e47acb4a0a3ac33ce523ec6b218d650b0252b8ee9235fb9fe64
+EBUILD jack_capture-0.9.73-r1.ebuild 1153 BLAKE2B 0502175c757bd2f82dc2534249247a8dbc26e0eea04f908e210a51d92bb3673cd03f1cb1a57e6e4390bf7889e06d0a114f1e7e2247cf35b764a06f784fea4557 SHA512 77c289a9f62a049f94a5d19eded20b78a21a317fda9f4f5ea608bb28232f6f89f4a67860f12682d0e4f26c985490d2fe0c7be15533fc2c7476fd6dd94bf1093d
 EBUILD jack_capture-9999.ebuild 1087 BLAKE2B ceb60e4476202319d11924b209c7858973e584590eade242d1508979335c9cd6723135f6d1a6da4cb70699c998cdf9429bcdee39aac7a390876e01fa5a4186e1 SHA512 39102ee68e3cff459954b469e4d38dce3382b39dd73d9b7eda0d152eaa2a46add6c28c22518f2ec8cd24540b4ffd52547e105a5fbd95fb0d25e6813d76d4b5b0
 MISC metadata.xml 361 BLAKE2B 87172f0c67cc6e071e287d233f2fcb91be1d7207fb7c321b002145cf0812a3b44cf317c0797aa281d199639d1a57670e5a1eb16d50160997882beece3e2539af SHA512 b410a8813b1a48dfc920e97401bd31f38349ef588e9fa770da53ed541b87a7da895465712d679bca09c4e27b2caf9ed84a553c330e48f6307fa91471de514513
diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch
new file mode 100644
index 000000000000..6c4d32985b6e
--- /dev/null
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch
@@ -0,0 +1,68 @@
+diff --git a/jack_capture.c b/jack_capture.c
+index b2d15a1..ccbfa5c 100644
+--- a/jack_capture.c
++++ b/jack_capture.c
+@@ -20,6 +20,8 @@
+ 
+ #include "das_config.h"
+ 
++#define _GNU_SOURCE 1
++
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -900,54 +902,6 @@ static void stop_helper_thread(void){
+ /////////////////////////////////////////////////////////////////////
+ 
+ 
+-#ifndef __USE_GNU
+-/* This code has been derived from an example in the glibc2 documentation.
+- * "asprintf() implementation for braindamaged operating systems"
+- * Copyright (C) 1991, 1994-1999, 2000, 2001 Free Software Foundation, Inc.
+- */
+-#ifdef _WIN32
+-#define vsnprintf _vsnprintf
+-#endif
+-#ifndef __APPLE__
+-int asprintf(char **buffer, char *fmt, ...) {
+-    /* Guess we need no more than 200 chars of space. */
+-    int size = 200;
+-    int nchars;
+-    va_list ap;
+-
+-    *buffer = (char*)malloc(size);
+-    if (*buffer == NULL) return -1;
+-
+-    /* Try to print in the allocated space. */
+-    va_start(ap, fmt);
+-    nchars = vsnprintf(*buffer, size, fmt, ap);
+-    va_end(ap);
+-
+-    if (nchars >= size)
+-    {
+-        char *tmpbuff;
+-        /* Reallocate buffer now that we know how much space is needed. */
+-        size = nchars+1;
+-        tmpbuff = (char*)realloc(*buffer, size);
+-
+-        if (tmpbuff == NULL) { /* we need to free it*/
+-            free(*buffer);
+-            return -1;
+-        }
+-
+-        *buffer=tmpbuff;
+-        /* Try again. */
+-        va_start(ap, fmt);
+-        nchars = vsnprintf(*buffer, size, fmt, ap);
+-        va_end(ap);
+-    }
+-
+-    if (nchars < 0) return nchars;
+-    return size;
+-}
+-#endif
+-#endif
+-
+ #define ARGS_ADD_ARGV(FMT,ARG) \
+   argv=(char**) realloc((void*)argv, (argc+2)*sizeof(char*)); \
+   asprintf(&argv[argc++], FMT, ARG); argv[argc] = 0;
diff --git a/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
index 17e85197eb3d..d8ddd678eb88 100644
--- a/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
+++ b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-avoid-custom-asprintf.patch"
 )
 
 DOCS=( README config )