Attachment 230902 Details for Bug 261105 – hamlib-4.4.patch

[patch] hamlib-4.4.patch

hamlib-4.4.patch (text/plain), 7.74 KB, created by takefu on 2022-01-11 13:05:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2022-01-11 13:05:54 UTC

Size: 7.74 KB

patch

obsolete

>diff -udprN /usr/ports/comms/hamlib/Makefile ./Makefile
>--- /usr/ports/comms/hamlib/Makefile	2021-12-03 01:38:28.000000000 +0000
>+++ ./Makefile	2022-01-11 09:28:22.208113000 +0000
>@@ -1,8 +1,7 @@
> # Created by: Sebastian Yepes <esn@x123.info>
> 
> PORTNAME=	hamlib
>-PORTVERSION=	4.3.1
>-PORTREVISION=	1
>+PORTVERSION=	4.4
> CATEGORIES=	comms hamradio
> MASTER_SITES=	SF
> 
>@@ -16,14 +15,12 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl
> 
> USES=		autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \
> 		readline shebangfix tcl
>-USE_PYTHON=	py3kplist
>-USE_PERL5=	build run
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
>+USE_PERL5=	build run
>+USE_PYTHON=	py3kplist
> 
> # $TCL_INCLUDE_SPEC
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
> SHEBANG_FILES=	bindings/perltest.pl
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-perl-binding \
>@@ -31,9 +28,10 @@ CONFIGURE_ARGS=	--with-perl-binding \
> 		--with-libusb \
> 		--with-python-binding
> CONFIGURE_ENV=	LIBUSB_LIBS="-lusb"
>-PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
> INSTALL_TARGET=	install-strip
>-
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
>+PLIST_SUB=	VER=${PORTVERSION} TCL_VER=${TCL_VER}
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>diff -udprN /usr/ports/comms/hamlib/distinfo ./distinfo
>--- /usr/ports/comms/hamlib/distinfo	2021-12-03 00:53:00.000000000 +0000
>+++ ./distinfo	2022-01-11 09:25:39.712775000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1636328018
>-SHA256 (hamlib-4.3.1.tar.gz) = 3437386dfdd2314f108cf35f1527b20d784256b76633d216a50de94f4045a730
>-SIZE (hamlib-4.3.1.tar.gz) = 2356944
>+TIMESTAMP = 1641893139
>+SHA256 (hamlib-4.4.tar.gz) = 8bf0107b071f52f08587f38e2dee8a7848de1343435b326f8f66d95e1f8a2487
>+SIZE (hamlib-4.4.tar.gz) = 2401399
>diff -udprN /usr/ports/comms/hamlib/files/patch-configure.ac ./files/patch-configure.ac
>--- /usr/ports/comms/hamlib/files/patch-configure.ac	2017-03-25 13:21:49.000000000 +0000
>+++ ./files/patch-configure.ac	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- configure.ac.orig	2016-12-31 20:01:25 UTC
>-+++ configure.ac
>-@@ -87,7 +87,7 @@ AC_PROG_INSTALL
>- AC_PROG_LN_S
>- 
>- # TODO: check whether CXX is functional
>--AC_CHECK_PROG([cf_with_cxx], ["${CXX}"], [yes], [no])
>-+AC_PATH_PROG([cf_with_cxx], ["${CXX}"], [yes], [no])
>- 
>- AM_CONDITIONAL([ENABLE_CXX], [test x"${cf_with_cxx}" = "xyes"])
>- 
>diff -udprN /usr/ports/comms/hamlib/files/patch-hamlib.pc.in ./files/patch-hamlib.pc.in
>--- /usr/ports/comms/hamlib/files/patch-hamlib.pc.in	2017-01-01 03:27:32.000000000 +0000
>+++ ./files/patch-hamlib.pc.in	2022-01-11 10:04:51.471818000 +0000
>@@ -1,4 +1,4 @@
>---- hamlib.pc.in.orig	2016-12-31 20:01:25 UTC
>+--- hamlib.pc.in.orig	2021-12-03 00:09:30 UTC
> +++ hamlib.pc.in
> @@ -7,7 +7,6 @@ Name: @PACKAGE_NAME@
>  Description: Library to control radio and rotator equipment.
>diff -udprN /usr/ports/comms/hamlib/files/patch-include_hamlib_rig.h ./files/patch-include_hamlib_rig.h
>--- /usr/ports/comms/hamlib/files/patch-include_hamlib_rig.h	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-include_hamlib_rig.h	2022-01-11 12:46:27.752313000 +0000
>@@ -0,0 +1,21 @@
>+--- 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,
>diff -udprN /usr/ports/comms/hamlib/files/patch-src_misc.c ./files/patch-src_misc.c
>--- /usr/ports/comms/hamlib/files/patch-src_misc.c	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-src_misc.c	2022-01-11 12:46:40.899923000 +0000
>@@ -0,0 +1,21 @@
>+--- 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;
>diff -udprN /usr/ports/comms/hamlib/files/patch-tests_testlibusb.c ./files/patch-tests_testlibusb.c
>--- /usr/ports/comms/hamlib/files/patch-tests_testlibusb.c	2021-12-03 00:53:00.000000000 +0000
>+++ ./files/patch-tests_testlibusb.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,29 +0,0 @@
>---- 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);
>- }
>- 
>diff -udprN /usr/ports/comms/hamlib/pkg-plist ./pkg-plist
>--- /usr/ports/comms/hamlib/pkg-plist	2021-12-03 01:38:28.000000000 +0000
>+++ ./pkg-plist	2022-01-11 12:16:00.703340000 +0000
>@@ -22,12 +22,12 @@ lib/libhamlib++.a
> lib/libhamlib++.la
> lib/libhamlib++.so
> lib/libhamlib++.so.4
>-lib/libhamlib++.so.4.0.3
>+lib/libhamlib++.so.4.0.4
> lib/libhamlib.a
> lib/libhamlib.la
> lib/libhamlib.so
> lib/libhamlib.so.4
>-lib/libhamlib.so.4.0.3
>+lib/libhamlib.so.4.0.4
> %%SITE_ARCH%%/Hamlib.pm
> %%SITE_ARCH%%/auto/Hamlib/Hamlib.so
> %%SITE_ARCH%%/perltest.pl
>@@ -35,7 +35,9 @@ lib/libhamlib.so.4.0.3
> %%PYTHON_SITELIBDIR%%/_Hamlib.a
> %%PYTHON_SITELIBDIR%%/_Hamlib.la
> %%PYTHON_SITELIBDIR%%/_Hamlib.so
>-lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.3.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

Actions: View | Diff

Attachments on bug 261105: 230902