From nobody Wed Oct 30 13:43:42 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XdpHg2jqyz5bP5n; Wed, 30 Oct 2024 13:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdpHg1tFBz4mZ2; Wed, 30 Oct 2024 13:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730295823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvaJJMPft/ZRuO/8/YFUQLNNQGrSCfaZKgTsZ7vmrKg=; b=Yq/AB7xgFO+KY7AMhMqwPeZGpaUKk32gfTkhDtb0RWXThUOr5tmMSiYoiyaURCj5JQ0fYw uxSl7jATj/rM4vipZHJnN1hWRsCR7JcI8TOxmhCPMGqsJOb6g5hNUDntvhaLMx6mqp25MD DQ1/Gs6xe6dNdjdm22QOyBEGIFXHIrfxJWVRaKye48Tz5jhVKzzLtZvuQW5aLnZ6/d5I7i LHSNesgWR4qflhcWq+4qh1p8zmVsHdTmSD7IFm8OAWK/vOVtN+it1Dymb0XNXeHcGDG9m2 4IPP178D/NdPcBcUduWRY+h5LkpHSD0Oen8fg6vsXb4bcLdCXSzGM2LpYfa9cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730295823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OvaJJMPft/ZRuO/8/YFUQLNNQGrSCfaZKgTsZ7vmrKg=; b=DmOM+n2ZaLN9jz0KWq2S2rhaLEdmHELFgHHgrYOGFGsDBfmfdvVixthOdvQOEBzr7P5LS2 yBVfEIJMuO78HtV67x98H986rwMSsK8gwPk65blgqSTZKpvGJhRuzAV/2VsW+fVhdIFgDj kTWdCvSSVJni812w/wCrSPXTmIm+qHUs5BjABUV+u7m5gpPaJ5jGeWBaOgN/H4pYKtwxwp mUL+NxTBM8NdsBwXwP+gdTnkpU+4Uo2vudkCrpMFBETIEaF8KXC4Lnk8kw2RDG4DAIKVd0 BKmyP4rHY6SuaZc+CL941TTFYjcxz3GTSQCF3fZDSttjTO5CTTDkyWlDFpaqSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730295823; a=rsa-sha256; cv=none; b=psvRC4P8RY4fUkqPWVkm0yhgxO4wn5tt/K6pblEgHp9yGUhVV64nltuHLqwOEQFLAvmRZM C7Y1TTVhuDycOp/tq34sBd587B6045TgWirk3GP5IUQSQlp9CaUCn5fzBs0lgp+yMYePnI refEr10aB15v7oQ+BQZ09Go9/m+J7cBmatDPzPTfZReFTmwrq6vz6bDwtpYGLS84/55cZX UAKKijPK+27dTMUmpmYCthz8ZgGnGTc2ZoWof2MOLeeHsl6I3R0Ml5WPQg2ilF2OnKOzIK Mt3GhKSG9cf+Lf/GlBDqZZ+3WvZA2F4FQoxZngYkkL2ZgOKT/+VBP1KLjWongQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XdpHg0QL9z18rP; Wed, 30 Oct 2024 13:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49UDhgQ3031941; Wed, 30 Oct 2024 13:43:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UDhgmA031938; Wed, 30 Oct 2024 13:43:42 GMT (envelope-from git) Date: Wed, 30 Oct 2024 13:43:42 GMT Message-Id: <202410301343.49UDhgmA031938@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c2864dcf045d - main - devel/libftdi1: Fix build with swig 4.3.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2864dcf045d047a110930b8c8bc312791317c4e Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2864dcf045d047a110930b8c8bc312791317c4e commit c2864dcf045d047a110930b8c8bc312791317c4e Author: Po-Chuan Hsieh AuthorDate: 2024-10-30 13:43:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-10-30 13:43:17 +0000 devel/libftdi1: Fix build with swig 4.3.0+ Obtained from: https://src.fedoraproject.org/rpms/libftdi/pull-request/4 Approved by: portmgr (blanket) --- devel/libftdi1/files/patch-swig | 60 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/devel/libftdi1/files/patch-swig b/devel/libftdi1/files/patch-swig new file mode 100644 index 000000000000..8bed21f41773 --- /dev/null +++ b/devel/libftdi1/files/patch-swig @@ -0,0 +1,60 @@ +Obtained from: https://src.fedoraproject.org/rpms/libftdi/pull-request/4 + +--- python/ftdi1.i.orig 2020-07-07 19:32:55 UTC ++++ python/ftdi1.i +@@ -52,7 +52,7 @@ char * str2charp_size(PyObject* pyObj, int * size) + %enddef + %feature("autodoc", ftdi_usb_find_all_docstring) ftdi_usb_find_all; + %typemap(in,numinputs=0) SWIGTYPE** OUTPUT ($*ltype temp) %{ $1 = &temp; %} +-%typemap(argout) SWIGTYPE** OUTPUT %{ $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj((void*)*$1,$*descriptor,0)); %} ++%typemap(argout,noblock=1) SWIGTYPE** OUTPUT { $result = SWIG_AppendOutput($result, SWIG_NewPointerObj((void*)*$1,$*descriptor,0)); } + %apply SWIGTYPE** OUTPUT { struct ftdi_device_list **devlist }; + int ftdi_usb_find_all(struct ftdi_context *ftdi, struct ftdi_device_list **devlist, + int vendor, int product); +@@ -92,12 +92,12 @@ char * str2charp_size(PyObject* pyObj, int * size) + %enddef + %feature("autodoc", ftdi_read_data_docstring) ftdi_read_data; + %typemap(in,numinputs=1) (unsigned char *buf, int size) %{ $2 = PyInt_AsLong($input);$1 = (unsigned char*)malloc($2*sizeof(char)); %} +-%typemap(argout) (unsigned char *buf, int size) %{ ++%typemap(argout,noblock=1) (unsigned char *buf, int size) { + if(result<0) + $2=0; +- $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, $2)); ++ $result = SWIG_AppendOutput($result, charp2str((char*)$1, $2)); + free($1); +-%} ++} + int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size); + %clear (unsigned char *buf, int size); + +@@ -119,12 +119,12 @@ char * str2charp_size(PyObject* pyObj, int * size) + %enddef + %feature("autodoc", ftdi_read_pins_docstring) ftdi_read_pins; + %typemap(in,numinputs=0) unsigned char *pins ($*ltype temp) %{ $1 = &temp; %} +-%typemap(argout) (unsigned char *pins) %{ $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, 1)); %} ++%typemap(argout,noblock=1) (unsigned char *pins) { $result = SWIG_AppendOutput($result, charp2str((char*)$1, 1)); } + int ftdi_read_pins(struct ftdi_context *ftdi, unsigned char *pins); + %clear unsigned char *pins; + + %typemap(in,numinputs=0) unsigned char *latency ($*ltype temp) %{ $1 = &temp; %} +-%typemap(argout) (unsigned char *latency) %{ $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, 1)); %} ++%typemap(argout,noblock=1) (unsigned char *latency) { $result = SWIG_AppendOutput($result, charp2str((char*)$1, 1)); } + int ftdi_get_latency_timer(struct ftdi_context *ftdi, unsigned char *latency); + %clear unsigned char *latency; + +@@ -137,12 +137,12 @@ char * str2charp_size(PyObject* pyObj, int * size) + %clear int* value; + + %typemap(in,numinputs=1) (unsigned char *buf, int size) %{ $2 = PyInt_AsLong($input);$1 = (unsigned char*)malloc($2*sizeof(char)); %} +-%typemap(argout) (unsigned char *buf, int size) %{ ++%typemap(argout,noblock=1) (unsigned char *buf, int size) { + if(result<0) + $2=0; +- $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, $2)); ++ $result = SWIG_AppendOutput($result, charp2str((char*)$1, $2)); + free($1); +-%} ++} + int ftdi_get_eeprom_buf(struct ftdi_context *ftdi, unsigned char * buf, int size); + %clear (unsigned char *buf, int size); +