Attachment #230902 for bug #261105

View | Details | Raw Unified | Return to bug 261105
Collapse All | Expand All

Lines 1-8 Link Here

(-)./Makefile (-8 / +6 lines)
1	# Created by: Sebastian Yepes <esn@x123.info>	1	# Created by: Sebastian Yepes <esn@x123.info>
2		2
3	PORTNAME= hamlib	3	PORTNAME= hamlib
4	PORTVERSION= 4.3.1	4	PORTVERSION= 4.4
5	PORTREVISION= 1
6	CATEGORIES= comms hamradio	5	CATEGORIES= comms hamradio
7	MASTER_SITES= SF	6	MASTER_SITES= SF
8		7
Lines 16-29 LIB_DEPENDS= libltdl.so:devel/libltdl Link Here
16		15
17	USES= autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \	16	USES= autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \
18	readline shebangfix tcl	17	readline shebangfix tcl
19	USE_PYTHON= py3kplist
20	USE_PERL5= build run
21	USE_GNOME= libxml2	18	USE_GNOME= libxml2
22	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
		20	USE_PERL5= build run
		21	USE_PYTHON= py3kplist
23		22
24	# $TCL_INCLUDE_SPEC	23	# $TCL_INCLUDE_SPEC
25	CPPFLAGS+= -I${LOCALBASE}/include
26	LIBS+= -L${LOCALBASE}/lib
27	SHEBANG_FILES= bindings/perltest.pl	24	SHEBANG_FILES= bindings/perltest.pl
28	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
29	CONFIGURE_ARGS= --with-perl-binding \	26	CONFIGURE_ARGS= --with-perl-binding \
Lines 31-39 CONFIGURE_ARGS= --with-perl-binding \ Link Here
31	--with-libusb \	28	--with-libusb \
32	--with-python-binding	29	--with-python-binding
33	CONFIGURE_ENV= LIBUSB_LIBS="-lusb"	30	CONFIGURE_ENV= LIBUSB_LIBS="-lusb"
34	PLIST_SUB= VER=${PORTVERSION} TCL_VER=${TCL_VER}
35	INSTALL_TARGET= install-strip	31	INSTALL_TARGET= install-strip
36		32	CPPFLAGS+= -I${LOCALBASE}/include
		33	LIBS+= -L${LOCALBASE}/lib
		34	PLIST_SUB= VER=${PORTVERSION} TCL_VER=${TCL_VER}
37	OPTIONS_DEFINE= DOCS	35	OPTIONS_DEFINE= DOCS
38		36
39	post-patch:	37	post-patch:

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1636328018	1	TIMESTAMP = 1641893139
2	SHA256 (hamlib-4.3.1.tar.gz) = 3437386dfdd2314f108cf35f1527b20d784256b76633d216a50de94f4045a730	2	SHA256 (hamlib-4.4.tar.gz) = 8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
3	SIZE (hamlib-4.3.1.tar.gz) = 2356944	3	SIZE (hamlib-4.4.tar.gz) = 2401399

Lines 1-11 Link Here

(-)./files/patch-configure.ac (-11 lines)
1	--- configure.ac.orig 2016-12-31 20:01:25 UTC
2	+++ configure.ac
3	@@ -87,7 +87,7 @@ AC_PROG_INSTALL
4	AC_PROG_LN_S
5
6	# TODO: check whether CXX is functional
7	-AC_CHECK_PROG([cf_with_cxx], ["${CXX}"], [yes], [no])
8	+AC_PATH_PROG([cf_with_cxx], ["${CXX}"], [yes], [no])
9
10	AM_CONDITIONAL([ENABLE_CXX], [test x"${cf_with_cxx}" = "xyes"])
11

Lines 1-4 Link Here

(-)./files/patch-hamlib.pc.in (-1 / +1 lines)
1	--- hamlib.pc.in.orig 2016-12-31 20:01:25 UTC	1	--- hamlib.pc.in.orig 2021-12-03 00:09:30 UTC
2	+++ hamlib.pc.in	2	+++ hamlib.pc.in
3	@@ -7,7 +7,6 @@ Name: @PACKAGE_NAME@	3	@@ -7,7 +7,6 @@ Name: @PACKAGE_NAME@
4	Description: Library to control radio and rotator equipment.	4	Description: Library to control radio and rotator equipment.




--- include/hamlib/rig.h.orig	2021-12-03 00:09:30 UTC
+++ include/hamlib/rig.h
@@ -1124,8 +1124,8 @@ typedef uint64_t setting_t;
 #define RIG_FUNC_TRANSCEIVE CONSTANT_64BIT_FLAG (42)   /*!< \c TRANSCEIVE -- Send radio state changes automatically ON/OFF */
 #define RIG_FUNC_SPECTRUM   CONSTANT_64BIT_FLAG (43)   /*!< \c SPECTRUM -- Spectrum scope data output ON/OFF */
 #define RIG_FUNC_SPECTRUM_HOLD CONSTANT_64BIT_FLAG (44)   /*!< \c SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF */
-#define RIG_FUNC_BIT45      CONSTANT_64BIT_FLAG (45)   /*!< \c available for future RIG_FUNC items */
-#define RIG_FUNC_BIT46      CONSTANT_64BIT_FLAG (46)   /*!< \c available for future RIG_FUNC items */
+#define RIG_FUNC_SEND_MORSE CONSTANT_64BIT_FLAG (45)   /*!< \c SEND_MORSE -- Send specified characters using CW */
+#define RIG_FUNC_SEND_VOICE_MEM CONSTANT_64BIT_FLAG (46)   /*!< \c SEND_VOICE_MEM -- Transmit in SSB message stored in memory */
 #define RIG_FUNC_BIT47      CONSTANT_64BIT_FLAG (47)   /*!< \c available for future RIG_FUNC items */
 #define RIG_FUNC_BIT48      CONSTANT_64BIT_FLAG (48)   /*!< \c available for future RIG_FUNC items */
 #define RIG_FUNC_BIT49      CONSTANT_64BIT_FLAG (49)   /*!< \c available for future RIG_FUNC items */
@@ -2063,6 +2063,7 @@ enum rig_function_e {
     RIG_FUNCTION_SEND_MORSE,
     RIG_FUNCTION_STOP_MORSE,
     RIG_FUNCTION_WAIT_MORSE,
+    RIG_FUNCTION_SEND_VOICE_MEM,
     RIG_FUNCTION_SET_BANK,
     RIG_FUNCTION_SET_MEM,
     RIG_FUNCTION_GET_MEM,




--- src/misc.c.orig	2021-12-03 00:09:30 UTC
+++ src/misc.c
@@ -884,6 +884,8 @@ static const struct
     { RIG_LEVEL_SPECTRUM_AVG, "SPECTRUM_AVG" },
     { RIG_LEVEL_SPECTRUM_ATT, "SPECTRUM_ATT" },
     { RIG_LEVEL_TEMP_METER, "TEMP_METER" },
+    { RIG_FUNC_SEND_MORSE, "SEND_MORSE" },
+    { RIG_FUNC_SEND_VOICE_MEM, "SEND_VOICE_MEM" },
     { RIG_LEVEL_NONE, "" },
 };
 
@@ -2254,6 +2256,9 @@ void *HAMLIB_API rig_get_function_ptr(rig_model_t rig_
 
     case RIG_FUNCTION_WAIT_MORSE:
         return caps->wait_morse;
+
+    case RIG_FUNCTION_SEND_VOICE_MEM:
+        return caps->send_voice_mem;
 
     case RIG_FUNCTION_SET_BANK:
         return caps->set_bank;




--- tests/testlibusb.c	2021-11-30 22:59:53.050103000 -0500
+++ tests/testlibusb.c	2021-11-30 23:03:26.187330000 -0500
@@ -113,7 +113,9 @@
     printf("      wSpeedSupported:       %u\n", ss_usb_cap->wSpeedSupported);
     printf("      bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);
     printf("      bU1devExitLat:         %u\n", ss_usb_cap->bU1DevExitLat);
+#if !defined(__FreeBSD__)
     printf("      bU2devExitLat:         %u\n", ss_usb_cap->bU2DevExitLat);
+#endif
 }
 
 static void print_bos(libusb_device_handle *handle)
@@ -131,6 +133,7 @@
 
     printf("  Binary Object Store (BOS):\n");
     printf("    wTotalLength:            %u\n", bos->wTotalLength);
+#if !defined(__FreeBSD__)
     printf("    bNumDeviceCaps:          %u\n", bos->bNumDeviceCaps);
 
     for (i = 0; i < bos->bNumDeviceCaps; i++)
@@ -168,7 +171,7 @@
             libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap);
         }
     }
-
+#endif
     libusb_free_bos_descriptor(bos);
 }
 




lib/libhamlib++.la
lib/libhamlib++.so
lib/libhamlib++.so.4
lib/libhamlib++.so.4.0.4
lib/libhamlib.a
lib/libhamlib.la
lib/libhamlib.so
lib/libhamlib.so.4
lib/libhamlib.so.4.0.4
%%SITE_ARCH%%/Hamlib.pm
%%SITE_ARCH%%/auto/Hamlib/Hamlib.so
%%SITE_ARCH%%/perltest.pl

%%PYTHON_SITELIBDIR%%/_Hamlib.a
%%PYTHON_SITELIBDIR%%/_Hamlib.la
%%PYTHON_SITELIBDIR%%/_Hamlib.so
%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.pyc
lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-%%VER%%.so
lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a
lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la
lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so

Return to bug 261105

Line 0 Link Here

(-)./files/patch-include_hamlib_rig.h (+21 lines)
	1	--- include/hamlib/rig.h.orig 2021-12-03 00:09:30 UTC
	2	+++ include/hamlib/rig.h
	3	@@ -1124,8 +1124,8 @@ typedef uint64_t setting_t;
	4	#define RIG_FUNC_TRANSCEIVE CONSTANT_64BIT_FLAG (42) /!< \c TRANSCEIVE -- Send radio state changes automatically ON/OFF /
	5	#define RIG_FUNC_SPECTRUM CONSTANT_64BIT_FLAG (43) /!< \c SPECTRUM -- Spectrum scope data output ON/OFF /
	6	#define RIG_FUNC_SPECTRUM_HOLD CONSTANT_64BIT_FLAG (44) /!< \c SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF /
	7	-#define RIG_FUNC_BIT45 CONSTANT_64BIT_FLAG (45) /!< \c available for future RIG_FUNC items /
	8	-#define RIG_FUNC_BIT46 CONSTANT_64BIT_FLAG (46) /!< \c available for future RIG_FUNC items /
	9	+#define RIG_FUNC_SEND_MORSE CONSTANT_64BIT_FLAG (45) /!< \c SEND_MORSE -- Send specified characters using CW /
	10	+#define RIG_FUNC_SEND_VOICE_MEM CONSTANT_64BIT_FLAG (46) /!< \c SEND_VOICE_MEM -- Transmit in SSB message stored in memory /
	11	#define RIG_FUNC_BIT47 CONSTANT_64BIT_FLAG (47) /!< \c available for future RIG_FUNC items /
	12	#define RIG_FUNC_BIT48 CONSTANT_64BIT_FLAG (48) /!< \c available for future RIG_FUNC items /
	13	#define RIG_FUNC_BIT49 CONSTANT_64BIT_FLAG (49) /!< \c available for future RIG_FUNC items /
	14	@@ -2063,6 +2063,7 @@ enum rig_function_e {
	15	RIG_FUNCTION_SEND_MORSE,
	16	RIG_FUNCTION_STOP_MORSE,
	17	RIG_FUNCTION_WAIT_MORSE,
	18	+ RIG_FUNCTION_SEND_VOICE_MEM,
	19	RIG_FUNCTION_SET_BANK,
	20	RIG_FUNCTION_SET_MEM,
	21	RIG_FUNCTION_GET_MEM,

Line 0 Link Here

(-)./files/patch-src_misc.c (+21 lines)
	1	--- src/misc.c.orig 2021-12-03 00:09:30 UTC
	2	+++ src/misc.c
	3	@@ -884,6 +884,8 @@ static const struct
	4	{ RIG_LEVEL_SPECTRUM_AVG, "SPECTRUM_AVG" },
	5	{ RIG_LEVEL_SPECTRUM_ATT, "SPECTRUM_ATT" },
	6	{ RIG_LEVEL_TEMP_METER, "TEMP_METER" },
	7	+ { RIG_FUNC_SEND_MORSE, "SEND_MORSE" },
	8	+ { RIG_FUNC_SEND_VOICE_MEM, "SEND_VOICE_MEM" },
	9	{ RIG_LEVEL_NONE, "" },
	10	};
	11
	12	@@ -2254,6 +2256,9 @@ void *HAMLIB_API rig_get_function_ptr(rig_model_t rig_
	13
	14	case RIG_FUNCTION_WAIT_MORSE:
	15	return caps->wait_morse;
	16	+
	17	+ case RIG_FUNCTION_SEND_VOICE_MEM:
	18	+ return caps->send_voice_mem;
	19
	20	case RIG_FUNCTION_SET_BANK:
	21	return caps->set_bank;

Lines 1-29 Link Here

(-)./files/patch-tests_testlibusb.c (-29 lines)
1	--- tests/testlibusb.c 2021-11-30 22:59:53.050103000 -0500
2	+++ tests/testlibusb.c 2021-11-30 23:03:26.187330000 -0500
3	@@ -113,7 +113,9 @@
4	printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported);
5	printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport);
6	printf(" bU1devExitLat: %u\n", ss_usb_cap->bU1DevExitLat);
7	+#if !defined(__FreeBSD__)
8	printf(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat);
9	+#endif
10	}
11
12	static void print_bos(libusb_device_handle *handle)
13	@@ -131,6 +133,7 @@
14
15	printf(" Binary Object Store (BOS):\n");
16	printf(" wTotalLength: %u\n", bos->wTotalLength);
17	+#if !defined(__FreeBSD__)
18	printf(" bNumDeviceCaps: %u\n", bos->bNumDeviceCaps);
19
20	for (i = 0; i < bos->bNumDeviceCaps; i++)
21	@@ -168,7 +171,7 @@
22	libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap);
23	}
24	}
25	-
26	+#endif
27	libusb_free_bos_descriptor(bos);
28	}
29

Lines 22-33 lib/libhamlib++.a Link Here

(-)./pkg-plist (-3 / +5 lines)
22	lib/libhamlib++.la	22	lib/libhamlib++.la
23	lib/libhamlib++.so	23	lib/libhamlib++.so
24	lib/libhamlib++.so.4	24	lib/libhamlib++.so.4
25	lib/libhamlib++.so.4.0.3	25	lib/libhamlib++.so.4.0.4
26	lib/libhamlib.a	26	lib/libhamlib.a
27	lib/libhamlib.la	27	lib/libhamlib.la
28	lib/libhamlib.so	28	lib/libhamlib.so
29	lib/libhamlib.so.4	29	lib/libhamlib.so.4
30	lib/libhamlib.so.4.0.3	30	lib/libhamlib.so.4.0.4
31	%%SITE_ARCH%%/Hamlib.pm	31	%%SITE_ARCH%%/Hamlib.pm
32	%%SITE_ARCH%%/auto/Hamlib/Hamlib.so	32	%%SITE_ARCH%%/auto/Hamlib/Hamlib.so
33	%%SITE_ARCH%%/perltest.pl	33	%%SITE_ARCH%%/perltest.pl
Lines 35-41 lib/libhamlib.so.4.0.3 Link Here
35	%%PYTHON_SITELIBDIR%%/_Hamlib.a	35	%%PYTHON_SITELIBDIR%%/_Hamlib.a
36	%%PYTHON_SITELIBDIR%%/_Hamlib.la	36	%%PYTHON_SITELIBDIR%%/_Hamlib.la
37	%%PYTHON_SITELIBDIR%%/_Hamlib.so	37	%%PYTHON_SITELIBDIR%%/_Hamlib.so
38	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.3.so	38	%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
		39	%%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.pyc
		40	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-%%VER%%.so
39	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a	41	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a
40	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la	42	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la
41	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so	43	lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so