git: 841aab24c396 - main - devel/libsigrok: Runtime fix

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Mon, 27 Feb 2023 15:46:54 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=841aab24c396cb242b66b764950a2c848ffae2e1

commit 841aab24c396cb242b66b764950a2c848ffae2e1
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-02-27 13:38:02 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-02-27 15:45:48 +0000

    devel/libsigrok: Runtime fix
    
    C/C++ Comments handling are broken in swig 4 which is a pending issue
    for more than 2 years. Use this hack for now to skip parsing comments.
    
    - Pet portclippy
---
 devel/libsigrok/Makefile                           | 18 ++--
 devel/libsigrok/files/patch-Makefile.in            | 98 ++++++++++++++++++++++
 .../patch-src_hardware_lascar-el-usb_protocol.c    |  4 +-
 3 files changed, 110 insertions(+), 10 deletions(-)

diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile
index fc9cafd2aa8f..d635d2134e31 100644
--- a/devel/libsigrok/Makefile
+++ b/devel/libsigrok/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libsigrok
 PORTVERSION=	0.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://sigrok.org/download/source/libsigrok/
 
@@ -12,21 +12,23 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	doxygen:devel/doxygen
-LIB_DEPENDS=	libhidapi.so:comms/hidapi \
-		libcheck.so:devel/check \
+LIB_DEPENDS=	libcheck.so:devel/check \
 		libftdi1.so:devel/libftdi1 \
+		libhidapi.so:comms/hidapi \
 		libserialport.so:devel/libserialport \
 		libvisa.so:devel/librevisa \
 		libzip.so:archivers/libzip
 
-USES=		compiler:c11 gnome pathfix libtool pkgconfig \
-		python:-3.9,build shared-mime-info
+USES=		compiler:c11 gnome libtool pathfix pkgconfig python:-3.9,build \
+		shared-mime-info
+USE_GNOME=	glibmm
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+
 MAKE_JOBS_UNSAFE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	glibmm
+
+INSTALL_TARGET=	install-strip
 
 post-patch:
 # libusb can be disabled via src.conf(5), so detect via pkg-config
diff --git a/devel/libsigrok/files/patch-Makefile.in b/devel/libsigrok/files/patch-Makefile.in
new file mode 100644
index 000000000000..acb879d7942b
--- /dev/null
+++ b/devel/libsigrok/files/patch-Makefile.in
@@ -0,0 +1,98 @@
+--- Makefile.in.orig	2023-02-26 13:49:58 UTC
++++ Makefile.in
+@@ -579,7 +579,7 @@ am__v_lt_0 = --silent
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+-am__v_lt_1 = 
++am__v_lt_1 =
+ bindings_cxx_libsigrokcxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS) \
+@@ -1095,12 +1095,12 @@ am__v_GEN_0 = @echo "  GEN     " $@;
+ AM_V_GEN = $(am__v_GEN_@AM_V@)
+ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo "  GEN     " $@;
+-am__v_GEN_1 = 
++am__v_GEN_1 =
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+-am__v_at_1 = 
+-DEFAULT_INCLUDES = 
++am__v_at_1 =
++DEFAULT_INCLUDES =
+ depcomp = $(SHELL) $(top_srcdir)/autostuff/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = bindings/cxx/$(DEPDIR)/classes.Plo \
+@@ -1327,7 +1327,7 @@ am__v_CC_0 = @echo "  CC      " $@;
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo "  CC      " $@;
+-am__v_CC_1 = 
++am__v_CC_1 =
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -1335,7 +1335,7 @@ am__v_CCLD_0 = @echo "  CCLD    " $@;
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+-am__v_CCLD_1 = 
++am__v_CCLD_1 =
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+@@ -1345,7 +1345,7 @@ am__v_CXX_0 = @echo "  CXX     " $@;
+ AM_V_CXX = $(am__v_CXX_@AM_V@)
+ am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+ am__v_CXX_0 = @echo "  CXX     " $@;
+-am__v_CXX_1 = 
++am__v_CXX_1 =
+ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+@@ -1353,7 +1353,7 @@ am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+ am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+-am__v_CXXLD_1 = 
++am__v_CXXLD_1 =
+ SOURCES = $(bindings_cxx_libsigrokcxx_la_SOURCES) \
+ 	$(libsigrok_la_SOURCES) $(src_libdrivers_la_SOURCES) \
+ 	$(src_libdrivers_head_la_SOURCES) \
+@@ -1780,7 +1780,7 @@ local_includes = -Iinclude -I$(srcdir)/include -I$(src
+ 	$(am__append_1)
+ @WIN32_FALSE@global_defs = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+ # Do not hard-code the firmware location on Windows.
+-@WIN32_TRUE@global_defs = 
++@WIN32_TRUE@global_defs =
+ # Ensure that local include directories are always searched first.
+ AM_CPPFLAGS = $(local_includes) $(global_defs)
+ 
+@@ -2020,7 +2020,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in:  $(am__configure_deps)
+ 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ 	rm -f stamp-h1
+ 	touch $@
+@@ -2319,7 +2319,7 @@ src/scale/kern.lo: src/scale/$(am__dirstamp) \
+ src/scale/kern.lo: src/scale/$(am__dirstamp) \
+ 	src/scale/$(DEPDIR)/$(am__dirstamp)
+ 
+-libsigrok.la: $(libsigrok_la_OBJECTS) $(libsigrok_la_DEPENDENCIES) $(EXTRA_libsigrok_la_DEPENDENCIES) 
++libsigrok.la: $(libsigrok_la_OBJECTS) $(libsigrok_la_DEPENDENCIES) $(EXTRA_libsigrok_la_DEPENDENCIES)
+ 	$(AM_V_CCLD)$(libsigrok_la_LINK) -rpath $(libdir) $(libsigrok_la_OBJECTS) $(libsigrok_la_LIBADD) $(LIBS)
+ src/drivers.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+ src/hardware/agilent-dmm/$(am__dirstamp):
+@@ -5262,6 +5262,7 @@ $(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsig
+ @BINDINGS_RUBY_TRUE@$(RDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
+ @BINDINGS_RUBY_TRUE@	$(AM_V_at)test -d $(RDIR) || $(MKDIR_P) $(RDIR)
+ @BINDINGS_RUBY_TRUE@	$(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/swig/doc.py ruby $(CPPXMLDOC) > $@
++@BINDINGS_RUBY_TRUE@	/bin/cp /dev/null  $@
+ 
+ @BINDINGS_RUBY_TRUE@$(RWRAP): $(srcdir)/$(RDIR)/classes.i $(RDOC) \
+ @BINDINGS_RUBY_TRUE@		bindings/swig/classes.i bindings/swig/templates.i \
diff --git a/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c b/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c
index ad70f2a7aaa2..22476a4d932c 100644
--- a/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c
+++ b/devel/libsigrok/files/patch-src_hardware_lascar-el-usb_protocol.c
@@ -1,6 +1,6 @@
---- src/hardware/lascar-el-usb/protocol.c.orig	2017-06-12 01:07:28 UTC
+--- src/hardware/lascar-el-usb/protocol.c.orig	2019-12-25 20:29:19 UTC
 +++ src/hardware/lascar-el-usb/protocol.c
-@@ -508,8 +508,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int re
+@@ -513,8 +513,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int re
  	}
  
  	memset(&tv, 0, sizeof(struct timeval));