[gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/, media-radio/fldigi/files/
commit: 9b2d57478d976e76b25b9dd71effd0cb1f0b6f77
Author: Thomas Beierlein gentoo org>
AuthorDate: Thu Jul 1 05:40:14 2021 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Thu Jul 1 05:40:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2d5747
media-radio/fldigi: Fix GCC-11 compilation problems (use C++14)
Closes: https://bugs.gentoo.org/789627
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Beierlein gentoo.org>
media-radio/fldigi/files/fldigi-c++11.patch | 41 -
media-radio/fldigi/fldigi-4.1.18.ebuild | 5 ++--
media-radio/fldigi/fldigi-4.1.19.ebuild | 5 ++--
3 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/media-radio/fldigi/files/fldigi-c++11.patch
b/media-radio/fldigi/files/fldigi-c++11.patch
deleted file mode 100644
index 0ca08c484a5..000
--- a/media-radio/fldigi/files/fldigi-c++11.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-#fix -Werror=terminate
/src/soundcard/sound.cxx.orig 2017-06-28 12:58:41.682698479 +
-+++ /src/soundcard/sound.cxx 2017-06-28 13:02:44.862055549 +
-@@ -143,7 +143,7 @@
- #endif
- }
-
--SoundBase::~SoundBase()
-+SoundBase::~SoundBase() throw (SndException)
- {
- delete [] wrt_buffer;
-
-@@ -1091,7 +1091,7 @@
- memset(fbuf, 0, 2 * SND_BUF_LEN * sizeof(*fbuf));
- }
-
--SoundPort::~SoundPort()
-+SoundPort::~SoundPort() throw (SndException)
- {
- Close();
-
/src/include/sound.h.orig 2017-06-28 12:59:04.670899172 +
-+++ /src/include/sound.h 2017-06-28 13:00:41.253335034 +
-@@ -119,7 +119,7 @@
-
- public:
- SoundBase();
-- virtual ~SoundBase();
-+ virtual ~SoundBase() throw (SndException);
- virtual int Open(int mode, int freq = 8000) = 0;
- virtual voidClose(unsigned dir = UINT_MAX) = 0;
- virtual voidAbort(unsigned dir = UINT_MAX) = 0;
-@@ -213,7 +213,7 @@
-
- public:
- SoundPort(const char *in_dev, const char *out_dev);
--~SoundPort();
-+~SoundPort() throw (SndException);
- int Open(int mode, int freq = 8000);
- voidClose(unsigned dir = UINT_MAX);
- voidAbort(unsigned dir = UINT_MAX);
diff --git a/media-radio/fldigi/fldigi-4.1.18.ebuild
b/media-radio/fldigi/fldigi-4.1.18.ebuild
index 816703cc962..904b1023173 100644
--- a/media-radio/fldigi/fldigi-4.1.18.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.18.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit flag-o-matic
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -33,9 +35,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=( "${FILESDIR}"/${PN}-c++11.patch )
-
src_configure() {
+ append-cxxflags $(test-flags-CXX -std=c++14)
local myconf=""
use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
diff --git a/media-radio/fldigi/fldigi-4.1.19.ebuild
b/media-radio/fldigi/fldigi-4.1.19.ebuild
index 179a9c3176a..d58de298fbf 100644
--- a/media-radio/fldigi/fldigi-4.1.19.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.19.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit flag-o-matic
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -33,9 +35,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=( "${FILESDIR}"/${PN}-c++11.patch )
-
src_configure() {
+ append-cxxflags $(test-flags-CXX -std=c++14)
local myconf=""
use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
[gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/, media-radio/fldigi/files/
commit: ee50e145da2f9a2cb21019c15bc012d58a1cbc62
Author: Thomas Beierlein gentoo org>
AuthorDate: Wed Jun 28 13:40:15 2017 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Wed Jun 28 13:40:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee50e145
media-radio/fldigi: Fix -Werror=terminate problem (bug #622686) Tnx Toralf.
Furthermore fix homepage
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-radio/fldigi/files/fldigi-c++11.patch| 41 ++
...{fldigi-4.0.5.ebuild => fldigi-4.0.4-r1.ebuild} | 16 ++---
media-radio/fldigi/fldigi-4.0.5.ebuild | 6
3 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/media-radio/fldigi/files/fldigi-c++11.patch
b/media-radio/fldigi/files/fldigi-c++11.patch
new file mode 100644
index 000..0ca08c484a5
--- /dev/null
+++ b/media-radio/fldigi/files/fldigi-c++11.patch
@@ -0,0 +1,41 @@
+#fix -Werror=terminate
+--- /src/soundcard/sound.cxx.orig 2017-06-28 12:58:41.682698479 +
/src/soundcard/sound.cxx 2017-06-28 13:02:44.862055549 +
+@@ -143,7 +143,7 @@
+ #endif
+ }
+
+-SoundBase::~SoundBase()
++SoundBase::~SoundBase() throw (SndException)
+ {
+ delete [] wrt_buffer;
+
+@@ -1091,7 +1091,7 @@
+ memset(fbuf, 0, 2 * SND_BUF_LEN * sizeof(*fbuf));
+ }
+
+-SoundPort::~SoundPort()
++SoundPort::~SoundPort() throw (SndException)
+ {
+ Close();
+
+--- /src/include/sound.h.orig 2017-06-28 12:59:04.670899172 +
/src/include/sound.h 2017-06-28 13:00:41.253335034 +
+@@ -119,7 +119,7 @@
+
+ public:
+ SoundBase();
+- virtual ~SoundBase();
++ virtual ~SoundBase() throw (SndException);
+ virtual int Open(int mode, int freq = 8000) = 0;
+ virtual voidClose(unsigned dir = UINT_MAX) = 0;
+ virtual voidAbort(unsigned dir = UINT_MAX) = 0;
+@@ -213,7 +213,7 @@
+
+ public:
+ SoundPort(const char *in_dev, const char *out_dev);
+-~SoundPort();
++~SoundPort() throw (SndException);
+ int Open(int mode, int freq = 8000);
+ voidClose(unsigned dir = UINT_MAX);
+ voidAbort(unsigned dir = UINT_MAX);
diff --git a/media-radio/fldigi/fldigi-4.0.5.ebuild
b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild
similarity index 73%
copy from media-radio/fldigi/fldigi-4.0.5.ebuild
copy to media-radio/fldigi/fldigi-4.0.4-r1.ebuild
index 7821860fabf..46fd4cc3670 100644
--- a/media-radio/fldigi/fldigi-4.0.5.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild
@@ -3,6 +3,8 @@
EAPI=5
+inherit eutils
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -10,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls pulseaudio"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
RDEPEND="x11-libs/fltk:1[threads,xft]
media-libs/libsamplerate
@@ -18,19 +20,23 @@ RDEPEND="x11-libs/fltk:1[threads,xft]
x11-misc/xdg-utils
dev-perl/RPC-XML
dev-perl/Term-ReadLine-Perl
- >=media-libs/portaudio-19_pre20071207
hamlib? ( media-libs/hamlib )
+ portaudio? ( >=media-libs/portaudio-19_pre20071207 )
pulseaudio? ( media-sound/pulseaudio )
- >=media-libs/libsndfile-1.0.10"
+ sndfile? ( >=media-libs/libsndfile-1.0.10 )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig"
DOCS=( AUTHORS ChangeLog NEWS README )
+src_prepare() {
+ epatch "$FILESDIR"/$PN-c++11.patch
+}
+
src_configure() {
- econf --with-sndfile \
- --with-portaudio \
+ econf $(use_with sndfile) \
+ $(use_with portaudio) \
$(use_with hamlib) \
$(use_enable nls) \
$(use_with pulseaudio) \
diff --git a/media-radio/fldigi/fldigi-4.0.5.ebuild
b/media-radio/fldigi/fldigi-4.0.5.ebuild
index 7821860fabf..1610c05c209 100644
--- a/media-radio/fldigi/fldigi-4.0.5.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.5.ebuild
@@ -3,6 +3,8 @@
EAPI=5
+inherit eutils
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -28,6 +30,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
+src_prepare() {
+ epatch "$FILESDIR"/$PN-c++11.patch
+}
+
src_configure() {
econf --with-sndfile \
--with-portaudio \
[gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/, media-radio/fldigi/files/
commit: d77ac515c2a9a6e2ef39483aca4bc4c60a3b42bd
Author: Thomas Beierlein gentoo org>
AuthorDate: Tue Nov 15 07:52:19 2016 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Tue Nov 15 07:52:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77ac515
media-radio/fldigi: Fix bug #599582. Thanks for reporting.
Package-Manager: portage-2.3.2
media-radio/fldigi/files/fldigi-3.23.12.patch | 34 +++
media-radio/fldigi/fldigi-3.23.12.ebuild | 5 ++--
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/media-radio/fldigi/files/fldigi-3.23.12.patch
b/media-radio/fldigi/files/fldigi-3.23.12.patch
new file mode 100644
index ..b1cf3cd
--- /dev/null
+++ b/media-radio/fldigi/files/fldigi-3.23.12.patch
@@ -0,0 +1,34 @@
+--- fldigi-3.23.12/src/main.cxx2016-06-05 13:57:29.0 +0200
fldigi-3.23.15/src/main.cxx2016-10-13 20:39:48.0 +0200
+@@ -1521,14 +1556,18 @@
+ #define OUT_RATE 8000
+ double speed_test(int converter, unsigned repeat)
+ {
++ float input_frames[IN_RATE];
++ float output_frames[OUT_RATE];
++
+ SRC_DATA src;
++
+ src.src_ratio = (double)OUT_RATE / IN_RATE;
+ src.input_frames = IN_RATE;
+ src.output_frames = OUT_RATE;
+- src.data_in = new float[src.input_frames];
+- src.data_out = new float[src.output_frames];
++ src.data_in = _frames[0];
++ src.data_out = _frames[0];
+
+- memset(src.data_in, 0, src.input_frames * sizeof(float));
++ memset(input_frames, 0, sizeof(input_frames));
+
+ // warm up
+ src_simple(, converter, 1);
+@@ -1547,9 +1586,6 @@
+ clock_gettime(CLOCK_REALTIME, );
+ #endif
+
+- delete [] src.data_in;
+- delete [] src.data_out;
+-
+ t0 = t1 - t0;
+ return repeat / (t0.tv_sec + t0.tv_nsec/1e9);
+ }
diff --git a/media-radio/fldigi/fldigi-3.23.12.ebuild
b/media-radio/fldigi/fldigi-3.23.12.ebuild
index bd16b41..59a1b4f 100644
--- a/media-radio/fldigi/fldigi-3.23.12.ebuild
+++ b/media-radio/fldigi/fldigi-3.23.12.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+inherit eutils
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com/Fldigi.html;
@@ -29,9 +30,9 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
-# backported from coming 3.23.15 alpha. Fixes bug #595220
+# backported from 3.23.15. Fixes bug #595220 and #599582
src_prepare() {
- sed -i -e "s/memset(src/memset(\/" src/main.cxx
+ epatch "$FILESDIR"/$P.patch
}
src_configure() {
