[gentoo-commits] repo/gentoo:master commit in: media-libs/hamlib/files/, media-libs/hamlib/
commit: f7eb6f486c17ac0a57e021a0b8ede3fd4c9ef6cc
Author: Brahmajit Das gmail com>
AuthorDate: Mon Jan 29 16:44:57 2024 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Tue Jan 30 11:43:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7eb6f48
media-libs/hamlib: Fix implicit declaration of function exit
Closes: https://bugs.gentoo.org/923108
Signed-off-by: Brahmajit Das gmail.com>
Closes: https://bugs.gentoo.org/923108
Closes: https://github.com/gentoo/gentoo/pull/35077
Signed-off-by: Thomas Beierlein gentoo.org>
.../hamlib/files/hamlib-4.5.5-gcc14-fix.patch | 12 +++
media-libs/hamlib/hamlib-4.5.5-r2.ebuild | 101 +
2 files changed, 113 insertions(+)
diff --git a/media-libs/hamlib/files/hamlib-4.5.5-gcc14-fix.patch
b/media-libs/hamlib/files/hamlib-4.5.5-gcc14-fix.patch
new file mode 100644
index ..35eade8f68e2
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-4.5.5-gcc14-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/memload.c b/tests/memload.c
+index 6157a08..4f189d0 100644
+--- a/tests/memload.c
b/tests/memload.c
+@@ -19,6 +19,7 @@
+ */
+
+
++#include
+ #include
+
+ #include
diff --git a/media-libs/hamlib/hamlib-4.5.5-r2.ebuild
b/media-libs/hamlib/hamlib-4.5.5-r2.ebuild
new file mode 100644
index ..7c6aabd3b754
--- /dev/null
+++ b/media-libs/hamlib/hamlib-4.5.5-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+MY_P=${P/_rc2/~rc2}
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="https://www.hamlib.github.io";
+SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/4.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+ =virtual/libusb-0*
+ dev-libs/libxml2
+ sys-libs/readline:0=
+ perl? ( dev-lang/perl )
+ python? ( ${PYTHON_DEPS} )
+ tcl? ( dev-lang/tcl:0= )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ dev-lang/swig
+ >=dev-build/libtool-2.2
+ doc? ( app-text/doxygen
+ dev-util/source-highlight )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.5.5-gcc14-fix.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # fix hardcoded libdir paths
+ sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+ -e "s#fix}/include#fix}/include/hamlib#" \
+ hamlib.pc.in || die "sed failed"
+
+ # Correct install target to whatever INSTALLDIRS says and use vendor
+ # installdirs everywhere (bug #611550)
+ sed -i -e "s#install_site#install#" \
+ -e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk"
INSTALLDIRS=vendor#' \
+ bindings/Makefile.am || die "sed failed patching for perl"
+
+ # make building of documentation compatible with autotools-utils
+ sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --libdir=/usr/$(get_libdir)/hamlib \
+ --disable-static \
+ --with-xml-support \
+ $(use_with perl perl-binding) \
+ $(use_with python python-binding) \
+ $(use_with tcl tcl-binding)
+}
+
+src_compile() {
+ emake
+ use doc && emake html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ use python && python_optimize
+
+ use doc && HTML_DOCS=( doc/html/ )
+ einstalldocs
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins hamlib.pc
+
+ echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+ doenvd "${T}"/73hamlib
+
+ find "${ED}" -name '*.la' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/hamlib/files/, media-libs/hamlib/
commit: 8d46f4f82f127c3fb83db4709380a675d10a1a9e
Author: Thomas Beierlein gentoo org>
AuthorDate: Thu Feb 16 16:08:10 2023 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Thu Feb 16 16:08:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d46f4f8
media-libs/hamlib: drop 4.4, 4.5.3
Signed-off-by: Thomas Beierlein gentoo.org>
media-libs/hamlib/Manifest | 2 -
.../files/hamlib-4.4-fix-clang-warnings.patch | 191 -
media-libs/hamlib/files/hamlib-4.4-slibtool.patch | 73
media-libs/hamlib/hamlib-4.4.ebuild| 102 ---
media-libs/hamlib/hamlib-4.5.3.ebuild | 97 ---
5 files changed, 465 deletions(-)
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 25ce0be5f8d6..425f7bb3083e 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,3 +1 @@
-DIST hamlib-4.4.tar.gz 2401399 BLAKE2B
4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7
SHA512
37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-DIST hamlib-4.5.3.tar.gz 2590200 BLAKE2B
7c06a20a1185a2e413fee56231f3e0f6aa77a7585b9853896b00abb773e2e23fc5e97a8a3fbb873528282756ee674b1ca5b2b14f0fe8e6b9b8e8f7e8ffa223f2
SHA512
be3b58c7276c1289d85b4dc9054016757200fde06d66116f7a1687442e53bf322f0a3ae974c9b784cbd0bff0c64b901b97fac74184f4b4a0fdf1f5079d0ea509
DIST hamlib-4.5.4.tar.gz 2598483 BLAKE2B
7f9654d6aa8c241e58dfdcd4d1967cb0d2415f9cd7a06de68f0ec0e837442db4fd373cfcd08406afca6d6c6c71435358bc5d31969fb0569dea5853b4f3d4f38e
SHA512
882fb517a3e5854cdaad506520e96c7736214fe27d1ac053f0510e3c5c08e1bf40217442f519d1c4be92e3d05135c7bd90bc0d60f334f52994e69b2ce9d3f442
diff --git a/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
b/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
deleted file mode 100644
index 832af50e0e6c..
--- a/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 1aebee2da9d29ff1d1a16e19f23bbff4e0f319a8 Mon Sep 17 00:00:00 2001
-From: Mike Black W9MDB
-Date: Mon, 14 Nov 2022 16:37:20 -0600
-Subject: [PATCH 1/2] Fix clang warning on callback functions
- https://github.com/Hamlib/Hamlib/issues/1149
-
- include/hamlib/rig.h | 4 +++-
- rigs/aor/aor.c | 4 ++--
- src/mem.c| 15 ---
- tests/testcaps.sh| 12
- 4 files changed, 25 insertions(+), 10 deletions(-)
- create mode 100755 tests/testcaps.sh
-
-diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
-index 574c21bd..5dbb5a7b 100644
a/include/hamlib/rig.h
-+++ b/include/hamlib/rig.h
-@@ -1675,7 +1675,7 @@ typedef struct cal_table_float cal_table_float_t;
- //! @cond Doxygen_Suppress
- #define EMPTY_FLOAT_CAL { 0, { { 0, 0f }, } }
-
--typedef int (* chan_cb_t)(RIG *, channel_t **, int, const chan_t *,
rig_ptr_t);
-+typedef int (* chan_cb_t)(RIG *, vfo_t vfo, channel_t **, int, const chan_t
*, rig_ptr_t);
- typedef int (* confval_cb_t)(RIG *,
- const struct confparams *,
- value_t *,
-@@ -2024,10 +2024,12 @@ struct rig_caps {
- int (*get_chan_all_cb)(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t);
-
- int (*set_mem_all_cb)(RIG *rig,
-+ vfo_t vfo,
- chan_cb_t chan_cb,
- confval_cb_t parm_cb,
- rig_ptr_t);
- int (*get_mem_all_cb)(RIG *rig,
-+ vfo_t vfo,
- chan_cb_t chan_cb,
- confval_cb_t parm_cb,
- rig_ptr_t);
-diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
-index ad4331d9..3f69d723 100644
a/rigs/aor/aor.c
-+++ b/rigs/aor/aor.c
-@@ -1364,7 +1364,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t
chan_cb, rig_ptr_t arg)
- * future data for channel channel_num
- */
- chan = NULL;
--retval = chan_cb(rig, &chan, chan_next, chan_list, arg);
-+retval = chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
-
- if (retval != RIG_OK)
- {
-@@ -1414,7 +1414,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t
chan_cb, rig_ptr_t arg)
- * provide application with channel data,
- * and ask for a new channel structure
- */
--chan_cb(rig, &chan, chan_next, chan_list, arg);
-+chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
-
- if (j >= LINES_PER_MA - 1)
- {
-diff --git a/src/mem.c b/src/mem.c
-index 8aa51e57..a6d72e59 100644
a/src/mem.c
-+++ b/src/mem.c
-@@ -954,7 +954,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t
chan_cb,
- * future data for channel channel_num
- */
- ch
[gentoo-commits] repo/gentoo:master commit in: media-libs/hamlib/files/, media-libs/hamlib/
commit: 573dae0ef553e180e7f5c85a333adce34237f59b
Author: Thomas Beierlein gentoo org>
AuthorDate: Thu Nov 17 07:06:09 2022 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Thu Nov 17 07:09:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=573dae0e
media-libs/hamlib: fix CLANG warnings
Backported from Hamlib repo i
(see https://github.com/Hamlib/Hamlib/issues/1149)
Closes: https://bugs.gentoo.org/880961
Signed-off-by: Thomas Beierlein gentoo.org>
.../files/hamlib-4.4-fix-clang-warnings.patch | 191 +
media-libs/hamlib/hamlib-4.4.ebuild| 1 +
2 files changed, 192 insertions(+)
diff --git a/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
b/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
new file mode 100644
index ..832af50e0e6c
--- /dev/null
+++ b/media-libs/hamlib/files/hamlib-4.4-fix-clang-warnings.patch
@@ -0,0 +1,191 @@
+From 1aebee2da9d29ff1d1a16e19f23bbff4e0f319a8 Mon Sep 17 00:00:00 2001
+From: Mike Black W9MDB
+Date: Mon, 14 Nov 2022 16:37:20 -0600
+Subject: [PATCH 1/2] Fix clang warning on callback functions
+ https://github.com/Hamlib/Hamlib/issues/1149
+
+---
+ include/hamlib/rig.h | 4 +++-
+ rigs/aor/aor.c | 4 ++--
+ src/mem.c| 15 ---
+ tests/testcaps.sh| 12
+ 4 files changed, 25 insertions(+), 10 deletions(-)
+ create mode 100755 tests/testcaps.sh
+
+diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
+index 574c21bd..5dbb5a7b 100644
+--- a/include/hamlib/rig.h
b/include/hamlib/rig.h
+@@ -1675,7 +1675,7 @@ typedef struct cal_table_float cal_table_float_t;
+ //! @cond Doxygen_Suppress
+ #define EMPTY_FLOAT_CAL { 0, { { 0, 0f }, } }
+
+-typedef int (* chan_cb_t)(RIG *, channel_t **, int, const chan_t *,
rig_ptr_t);
++typedef int (* chan_cb_t)(RIG *, vfo_t vfo, channel_t **, int, const chan_t
*, rig_ptr_t);
+ typedef int (* confval_cb_t)(RIG *,
+ const struct confparams *,
+ value_t *,
+@@ -2024,10 +2024,12 @@ struct rig_caps {
+ int (*get_chan_all_cb)(RIG *rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t);
+
+ int (*set_mem_all_cb)(RIG *rig,
++ vfo_t vfo,
+ chan_cb_t chan_cb,
+ confval_cb_t parm_cb,
+ rig_ptr_t);
+ int (*get_mem_all_cb)(RIG *rig,
++ vfo_t vfo,
+ chan_cb_t chan_cb,
+ confval_cb_t parm_cb,
+ rig_ptr_t);
+diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
+index ad4331d9..3f69d723 100644
+--- a/rigs/aor/aor.c
b/rigs/aor/aor.c
+@@ -1364,7 +1364,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t
chan_cb, rig_ptr_t arg)
+ * future data for channel channel_num
+ */
+ chan = NULL;
+-retval = chan_cb(rig, &chan, chan_next, chan_list, arg);
++retval = chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
+
+ if (retval != RIG_OK)
+ {
+@@ -1414,7 +1414,7 @@ int aor_get_chan_all_cb(RIG *rig, vfo_t vfo, chan_cb_t
chan_cb, rig_ptr_t arg)
+ * provide application with channel data,
+ * and ask for a new channel structure
+ */
+-chan_cb(rig, &chan, chan_next, chan_list, arg);
++chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
+
+ if (j >= LINES_PER_MA - 1)
+ {
+diff --git a/src/mem.c b/src/mem.c
+index 8aa51e57..a6d72e59 100644
+--- a/src/mem.c
b/src/mem.c
+@@ -954,7 +954,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t
chan_cb,
+ * future data for channel channel_num
+ */
+ chan = NULL;
+-retval = chan_cb(rig, &chan, chan_list[i].startc, chan_list, arg);
++retval = chan_cb(rig, vfo, &chan, chan_list[i].startc, chan_list,
arg);
+
+ if (retval != RIG_OK)
+ {
+@@ -995,7 +995,7 @@ int get_chan_all_cb_generic(RIG *rig, vfo_t vfo, chan_cb_t
chan_cb,
+
+ chan_next = j < chan_list[i].endc ? j + 1 : j;
+
+-chan_cb(rig, &chan, chan_next, chan_list, arg);
++chan_cb(rig, vfo, &chan, chan_next, chan_list, arg);
+ }
+ }
+
+@@ -1016,7 +1016,7 @@ int set_chan_all_cb_generic(RIG *rig, vfo_t vfo,
chan_cb_t chan_cb,
+ for (j = chan_list[i].startc; j <= chan_list[i].endc; j++)
+ {
+
+-chan_cb(rig, &chan, j, chan_list, arg);
++chan_cb(rig, vfo, &chan, j, chan_list, arg);
+ chan->vfo = RIG_VFO_MEM;
+
+ retval = rig_set_channel(rig, vfo, chan);
+@@ -1044,6 +1044,7 @@ struct map_all_s
+ * chan_cb_t to be used for non cb get/set_all
+ */
+ static int map_chan(RIG *rig,
++vfo_t vfo,
+ channel_t **chan,
+ int channel_num,
+ const chan_t *chan_list,
+@@
