From 3099e26d5fd9ac121c58834c98145b60ed932a6e Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 29 Dec 2024 14:14:41 +0300 Subject: [PATCH] Fix for SWIG 4.3.0 (rhbz#2319133) --- SOURCES/libftdi-1.5-swig-4.3.patch | 80 ++++++++++++++++++++++++++++++ SPECS/libftdi.spec | 11 +++- 2 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 SOURCES/libftdi-1.5-swig-4.3.patch diff --git a/SOURCES/libftdi-1.5-swig-4.3.patch b/SOURCES/libftdi-1.5-swig-4.3.patch new file mode 100644 index 0000000..a9b3e16 --- /dev/null +++ b/SOURCES/libftdi-1.5-swig-4.3.patch @@ -0,0 +1,80 @@ +From 5169cfca22381c2bf72f9bae43b72a72c8698990 Mon Sep 17 00:00:00 2001 +From: William S Fulton +Date: Fri, 18 Oct 2024 09:38:20 +0200 +Subject: [PATCH] python: update for SWIG 4.3 + +SWIG 4.3 comes with an API change to the SWIG_Python_AppendOutput() +function, so switch to the recommended SWIG_AppendOutput() instead. +Because the new function is a macro in fact also switch to the {..} +delimiters as the code needs to be preprocessed. The change is +compatible with the previous SWIG releases 4.2 and 4.1 at least. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2319133 +Related: https://github.com/swig/swig/pull/2907 +--- + python/ftdi1.i | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/python/ftdi1.i b/python/ftdi1.i +index 8b179f9..fac4d16 100644 +--- a/python/ftdi1.i ++++ b/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); + +-- +2.47.0 + diff --git a/SPECS/libftdi.spec b/SPECS/libftdi.spec index 9a920e7..48ea22b 100644 --- a/SPECS/libftdi.spec +++ b/SPECS/libftdi.spec @@ -1,6 +1,6 @@ Name: libftdi Version: 1.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Library to program and control the FTDI USB controller # Automatically converted from old format: LGPLv2 - review is highly recommended. @@ -14,6 +14,10 @@ Patch0: libftdi-1.5-fix_pkgconfig_path.patch Patch1: libftdi-1.5-no-distutils.patch # http://developer.intra2net.com/mailarchive/html/libftdi/2023/msg00005.html Patch2: libftdi-1.5-cmake-deps.patch +# Fix for SWIG 4.3.0 +# https://bugzilla.redhat.com/show_bug.cgi?id=2319133 +# http://developer.intra2net.com/mailarchive/html/libftdi/2024/msg00024.html +Patch3: libftdi-1.5-swig-4.3.patch BuildRequires: cmake BuildRequires: gcc @@ -124,9 +128,12 @@ rm -f %{buildroot}%{_datadir}/doc/libftdipp1/example.conf %changelog -* Thu Dec 26 2024 Dmitriy Samoylik - 1.5-15 +* Thu Dec 26 2024 Dmitriy Samoylik - 1.5-16 - Rebuilt for MSVSphere 10 +* Wed Oct 16 2024 Jitka Plesnikova - 1.5-16 +- Fix for SWIG 4.3.0 (rhbz#2319133) + * Mon Sep 02 2024 Miroslav Suchý - 1.5-15 - convert license to SPDX