public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/files/, media-radio/fldigi/
@ 2017-02-03 15:20 Thomas Beierlein
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein @ 2017-02-03 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     5ea95c69866792175bb78ee5715e04fe1632069f
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 15:20:24 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 15:20:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ea95c69

Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-radio/fldigi/Manifest                   |  6 ----
 media-radio/fldigi/files/fldigi-3.23.12.patch | 34 --------------------
 media-radio/fldigi/fldigi-3.23.06.ebuild      | 40 -----------------------
 media-radio/fldigi/fldigi-3.23.12.ebuild      | 46 ---------------------------
 media-radio/fldigi/fldigi-3.23.15.ebuild      | 40 -----------------------
 media-radio/fldigi/fldigi-3.23.16.ebuild      | 40 -----------------------
 media-radio/fldigi/fldigi-3.23.17.ebuild      | 40 -----------------------
 media-radio/fldigi/fldigi-3.23.18.ebuild      | 40 -----------------------
 8 files changed, 286 deletions(-)

diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index b36cb5a..7ee02ce 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,8 +1,2 @@
-DIST fldigi-3.23.06.tar.gz 2970900 SHA256 4c21a92f8f7a4070a2fc3687ab7cf0895ff105dfdef7a84efe4a9b4519e6cc21 SHA512 18c07304eb424be4d72301630e748a14ce4efa2868293489f15fa9e36e2ac3ed1de16513b2cdf73f2733798632669008d85f621dee0facf5c1d4391dbe67df16 WHIRLPOOL ebc957d2d3303a681b9638061918875125ce99a5ca277e2717d8bbb1e9d009267554813fa3bf47c391c5e138446b46db50bff989be806270d1e394d76d02de65
-DIST fldigi-3.23.12.tar.gz 3078572 SHA256 59ba6ad8304849cb92b3ec2251bd389f4dfa7755de07a4d1638f71b17c0b3cce SHA512 3dc2c9545cb39cddf67a12e49a9ba4570b7055e073dc54a4f1a6b0e5811f780fea2109559aba0837ecfb62407eb8d2735f1d84ad70cc0b5335c6f88cb7dee0ad WHIRLPOOL 8cca738b8ffb2966746a9b9e918a68d123a430aa0e9ac66f0a8bcb202388ece9389fc00e9dae14e57118476cf0dd7b4fd41415656e70b033c7c1dfb8850a54d3
-DIST fldigi-3.23.15.tar.gz 3138313 SHA256 b55018b50f8ace203a633f23cab9b4b5a0c6e4bf6d0fcc1258de6497d274aadb SHA512 e5d96bc3c063374a7b12febee9d333a93f82213698718a3f4818247be65cf7be9893ce38c660482e8ee2128a148fa3a5fc74adb407f88668205158d09ab39ecc WHIRLPOOL 641f6e646259a95d1a65b51c64c64142037874b0728e0981ba49a3d061a32e0275821daf5b63d695383b63598f8ed0eb1b3e5e0195d02616227f44ff262da0bd
-DIST fldigi-3.23.16.tar.gz 3155189 SHA256 e9ad95191a1b2ec92936c589b181eac92fbbb5147f2a2569d5efc928949a0444 SHA512 5443d871cc0f42ab09cec3a4b207ecf7ebe6acb3a46adf76839494b81dca28047cc1ce041d342ec54ae91cc5efdcd8895cdd6c7463e9d8325005a93ed6e38e34 WHIRLPOOL 6bb8cdd3713c32547d61d02ac69e0840b2bb5db6abd666596d3c3f933daa76027dee44ddc16674e45258716a6deac6311d6cb4400737328a972e5746d45bec8e
-DIST fldigi-3.23.17.tar.gz 3204908 SHA256 ea10f993fbda5bba8d21283e301bc4b650d3093a3f35c1505a50d6479c386c5b SHA512 362e57e14fa1a05ea4fdd2415996117af47878c37beb4d63e2d4ab57ca7f20e0b47c49b69bf35fcd7a8e7558c1e6329785087c8bcfcf8b8958f197af3c8381bb WHIRLPOOL 14ae37cfa99a8968f9169972944edc57b731f6a110669472573e4181dab59ab40c8ab69f887aec38f00c13c07eb6856fad857ccc572384d15bc9f0a2b2f66130
-DIST fldigi-3.23.18.tar.gz 3211821 SHA256 39cd8459c3425326e998b740c96bc9b7351dea0a84f308e84d77cf050f0a7f30 SHA512 7dbe8d404c77c36724776afe3b1d7f5b96dfcddded746d8fe786c06ae67d50d897166534aa295a8d63487fbc00c0ebf89b780cdb4f0a526714c0a0b9c64544b2 WHIRLPOOL 4212bc07922c790b088d0d7d307281a06e9d5968c546c337ab3b84491732ba6e1030bfd544bbea750e2fdffa668ca0f2792b451cceae7a2e7e72f8fa519ff2f0
 DIST fldigi-3.23.19.tar.gz 3213970 SHA256 099d52eee57fbe5562ac0bc351a7bfc39668623c3e0e3573995f1e345dfb0ae9 SHA512 0761800347a12493e2025e653db9dc52ea60611118ac3904f50f060f0d27c3c9a35f189e69f2ee1c3eb133ab9cd41a67dae2f033e36641568ce5c19ce07f8ec0 WHIRLPOOL c1352b5e693609642645655884ad105980338d153a434a30c317da971c13bb403848fa5d105224a32eb7e4af6adea41d9c76e57aefdef8d6270b86e21e4cf346
 DIST fldigi-3.23.20.tar.gz 3215903 SHA256 97b5489c4e428ed707aaf6c05a7b46874339031a8e9b24e50f4818c15435fce9 SHA512 78c2d85eb8fb091f386c4680a8928635a8e81e97175755446dc30a7934a5caf96adacd8ab3722275bc7557913cb9372004c98e265dc46222ba3a54090187fc25 WHIRLPOOL d3e524a25c26f9b2856486d22ce4813fe70aee14a6cd9f7e2f27c882104367cc10d1668ebe5cb3cd511f3868e7840e2c1b7c594d5c20fb7b50985768b97d51da

diff --git a/media-radio/fldigi/files/fldigi-3.23.12.patch b/media-radio/fldigi/files/fldigi-3.23.12.patch
deleted file mode 100644
index b1cf3cd..00000000
--- a/media-radio/fldigi/files/fldigi-3.23.12.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- fldigi-3.23.12/src/main.cxx	2016-06-05 13:57:29.000000000 +0200
-+++ fldigi-3.23.15/src/main.cxx	2016-10-13 20:39:48.000000000 +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 = &input_frames[0];
-+	src.data_out = &output_frames[0];
- 
--	memset(src.data_in, 0, src.input_frames * sizeof(float));
-+	memset(input_frames, 0, sizeof(input_frames));
- 
- 	// warm up
- 	src_simple(&src, converter, 1);
-@@ -1547,9 +1586,6 @@
- 	clock_gettime(CLOCK_REALTIME, &t1);
- #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.06.ebuild b/media-radio/fldigi/fldigi-3.23.06.ebuild
deleted file mode 100644
index 7f1851f..00000000
--- a/media-radio/fldigi/fldigi-3.23.06.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	hamlib? ( media-libs/hamlib )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	econf $(use_with sndfile) \
-		$(use_with portaudio) \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--disable-silent-rules \
-		--without-asciidoc
-}

diff --git a/media-radio/fldigi/fldigi-3.23.12.ebuild b/media-radio/fldigi/fldigi-3.23.12.ebuild
deleted file mode 100644
index e4b598f..00000000
--- a/media-radio/fldigi/fldigi-3.23.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	hamlib? ( media-libs/hamlib )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-# backported from 3.23.15. Fixes bug #595220 and #599582
-src_prepare() {
-	epatch "$FILESDIR"/$P.patch
-}
-
-src_configure() {
-	econf $(use_with sndfile) \
-		$(use_with portaudio) \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--disable-silent-rules \
-		--without-asciidoc
-}

diff --git a/media-radio/fldigi/fldigi-3.23.15.ebuild b/media-radio/fldigi/fldigi-3.23.15.ebuild
deleted file mode 100644
index aba4d37..00000000
--- a/media-radio/fldigi/fldigi-3.23.15.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	hamlib? ( media-libs/hamlib )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	econf $(use_with sndfile) \
-		$(use_with portaudio) \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--disable-silent-rules \
-		--without-asciidoc
-}

diff --git a/media-radio/fldigi/fldigi-3.23.16.ebuild b/media-radio/fldigi/fldigi-3.23.16.ebuild
deleted file mode 100644
index aba4d37..00000000
--- a/media-radio/fldigi/fldigi-3.23.16.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	hamlib? ( media-libs/hamlib )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	econf $(use_with sndfile) \
-		$(use_with portaudio) \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--disable-silent-rules \
-		--without-asciidoc
-}

diff --git a/media-radio/fldigi/fldigi-3.23.17.ebuild b/media-radio/fldigi/fldigi-3.23.17.ebuild
deleted file mode 100644
index aba4d37..00000000
--- a/media-radio/fldigi/fldigi-3.23.17.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	hamlib? ( media-libs/hamlib )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	econf $(use_with sndfile) \
-		$(use_with portaudio) \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--disable-silent-rules \
-		--without-asciidoc
-}

diff --git a/media-radio/fldigi/fldigi-3.23.18.ebuild b/media-radio/fldigi/fldigi-3.23.18.ebuild
deleted file mode 100644
index aba4d37..00000000
--- a/media-radio/fldigi/fldigi-3.23.18.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	hamlib? ( media-libs/hamlib )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	econf $(use_with sndfile) \
-		$(use_with portaudio) \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--disable-silent-rules \
-		--without-asciidoc
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/files/, media-radio/fldigi/
@ 2022-02-07 18:44 Thomas Beierlein
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein @ 2022-02-07 18:44 UTC (permalink / raw
  To: gentoo-commits

commit:     a2fe58bfad5cdf534d6ae3e3e6de3d48843509ed
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 18:43:00 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 18:43:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fe58bf

media-radio/fldigi: Fixes musl build error

Closes: https://bugs.gentoo.org/832231
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 media-radio/fldigi/files/fldigi-4.1.20-musl.patch | 14 ++++++++++++++
 media-radio/fldigi/fldigi-4.1.20.ebuild           |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/media-radio/fldigi/files/fldigi-4.1.20-musl.patch b/media-radio/fldigi/files/fldigi-4.1.20-musl.patch
new file mode 100644
index 000000000000..5b96abf40337
--- /dev/null
+++ b/media-radio/fldigi/files/fldigi-4.1.20-musl.patch
@@ -0,0 +1,14 @@
+diff --git a/src/cmedia/cmedia.cxx b/src/cmedia/cmedia.cxx
+index b08e3d7..cc775e9 100644
+--- a/src/cmedia/cmedia.cxx
++++ b/src/cmedia/cmedia.cxx
+@@ -41,9 +41,6 @@
+ #ifndef __WIN32__
+ #include <termios.h>
+ #include <glob.h>
+-#  ifndef __APPLE__
+-#    include <error.h>
+-#  endif
+ #endif
+ 
+ #include "config.h"

diff --git a/media-radio/fldigi/fldigi-4.1.20.ebuild b/media-radio/fldigi/fldigi-4.1.20.ebuild
index 76084ffc4c43..792f85ce34c9 100644
--- a/media-radio/fldigi/fldigi-4.1.20.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,6 +35,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" )
+
+src_prepare() {
+	eapply ${PATCHES[@]}
+	eapply_user
+}
+
 src_configure() {
 	append-cxxflags $(test-flags-CXX -std=c++14)
 	local myconf=""


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/files/, media-radio/fldigi/
@ 2022-09-17 12:12 Thomas Beierlein
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein @ 2022-09-17 12:12 UTC (permalink / raw
  To: gentoo-commits

commit:     2d149b09fb7c013457a0c866a3a6a4f9e72c3ee3
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 12:11:20 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 12:11:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d149b09

media-radio/fldigi: Drop problematic definition of nullptr

Closes: https://bugs.gentoo.org/870082
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 .../files/fldigi-drop-nullptr-definition.patch     | 23 ++++++++++++++++++++++
 media-radio/fldigi/fldigi-4.1.22.ebuild            |  3 ++-
 media-radio/fldigi/fldigi-4.1.23.ebuild            |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch b/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch
new file mode 100644
index 000000000000..8e14c6e0ca39
--- /dev/null
+++ b/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch
@@ -0,0 +1,23 @@
+# dropped code leeds to circular definition for >=sys-libs/musl-1.2.3 and
+# is not needed as all our compilers support c++11
+diff --git a/src/logbook/table.cxx b/src/logbook/table.cxx
+index 6deee6d..8011d02 100644
+--- a/src/logbook/table.cxx
++++ b/src/logbook/table.cxx
+@@ -40,16 +40,6 @@
+ #define DAMAGE_HEADER  FL_DAMAGE_ALL
+ #define DAMAGE_ROWS  FL_DAMAGE_ALL
+ 
+-/* 
+- * nullptr is not available in gcc < 4.6
+- * Redefine to NULL for CentOS 6 and OSX Darwin
+- */
+-#ifndef __FreeBSD__
+- #ifndef nullptr
+- #define nullptr NULL
+- #endif
+-#endif
+-
+ 
+ /*
+  * ======================================

diff --git a/media-radio/fldigi/fldigi-4.1.22.ebuild b/media-radio/fldigi/fldigi-4.1.22.ebuild
index b6268dae8b30..13f0cf746f6b 100644
--- a/media-radio/fldigi/fldigi-4.1.22.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.22.ebuild
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch"
+		"${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
 
 src_prepare() {
 	eapply ${PATCHES[@]}

diff --git a/media-radio/fldigi/fldigi-4.1.23.ebuild b/media-radio/fldigi/fldigi-4.1.23.ebuild
index 78512dcf4f0c..56b0232ac656 100644
--- a/media-radio/fldigi/fldigi-4.1.23.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.23.ebuild
@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch"
+		"${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
 
 src_prepare() {
 	eapply ${PATCHES[@]}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/files/, media-radio/fldigi/
@ 2023-06-18 12:32 Thomas Beierlein
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Beierlein @ 2023-06-18 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     721a2294ddafa37cd2afe0101497ba1e7203c0dd
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 12:17:22 2023 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 12:32:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721a2294

media-radio/fldigi: drop 4.1.23, 4.1.24, 4.1.25

Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 media-radio/fldigi/Manifest                       |  3 --
 media-radio/fldigi/files/fldigi-4.1.20-musl.patch | 14 -----
 media-radio/fldigi/fldigi-4.1.23.ebuild           | 63 -----------------------
 media-radio/fldigi/fldigi-4.1.24.ebuild           | 63 -----------------------
 media-radio/fldigi/fldigi-4.1.25.ebuild           | 63 -----------------------
 5 files changed, 206 deletions(-)

diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index c5e26ee68284..4f4ac6648b8c 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,4 +1 @@
-DIST fldigi-4.1.23.tar.gz 4933875 BLAKE2B 73c9598d73e3f8f4a4299edebf687254830196d81470b4563bc530b0434e7b8beb6d9d0cbbd97029fba2da3491ec354f3fc723045e4691b60db7d03666624a07 SHA512 c01d579fb23325f097969cbb93bd488c8e0c61ef552097166c902a56ce119d7c20694df5cd76ae9b2cb485d68570720745d961b1f1dd9918c6f466f0441005fb
-DIST fldigi-4.1.24.tar.gz 4958881 BLAKE2B 9f138cee6ad16e5fc7e66aa8d985a838d5394417fa4f914c35ea737064433f8be9da4d798de65b2e72c321cf7ebf52242bec4e8c68bc7ad984c899c839146d71 SHA512 e5509e8904b2ee779e655483529b76aecc65ec927b358346b63b2ce1062194472713ea99ff6305acf7da68cb38c59c7a3bee31d867faea72bc51328c3050a4b7
-DIST fldigi-4.1.25.tar.gz 4959378 BLAKE2B 6d4ba6fa1c33fb7be29517a46fdf5c25fdf2d083700d41776e8365de99f6bd893be9af91c49a16e4b1192730781274551c45d7ae40138cd32cde4032d27f5329 SHA512 68b1327433b6f42e1daee5a1af912303ba876c9b2b65851e955807a5ae611dfdb572404d0336454c46ccf536c025ebf5efe58c33a3604a0e521f7c902b680c5b
 DIST fldigi-4.1.26.tar.gz 4964877 BLAKE2B 73048df0543b10602c7b49d8e5b426d20d4c563f3f2d3d5bd9cc5f91e071c429931e4f6307df8b256b3ab2be45c8023765cd0719a70310733c478b38d44fda0d SHA512 dee7cd8ce2a89ea6837a4515ef93c3e27d9674bbbb87f121b42c682bcd47e996de860796e45cd86ebfad5812569bbdc7c995a32953881987c84a6f8402b85faf

diff --git a/media-radio/fldigi/files/fldigi-4.1.20-musl.patch b/media-radio/fldigi/files/fldigi-4.1.20-musl.patch
deleted file mode 100644
index 5b96abf40337..000000000000
--- a/media-radio/fldigi/files/fldigi-4.1.20-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/cmedia/cmedia.cxx b/src/cmedia/cmedia.cxx
-index b08e3d7..cc775e9 100644
---- a/src/cmedia/cmedia.cxx
-+++ b/src/cmedia/cmedia.cxx
-@@ -41,9 +41,6 @@
- #ifndef __WIN32__
- #include <termios.h>
- #include <glob.h>
--#  ifndef __APPLE__
--#    include <error.h>
--#  endif
- #endif
- 
- #include "config.h"

diff --git a/media-radio/fldigi/fldigi-4.1.23.ebuild b/media-radio/fldigi/fldigi-4.1.23.ebuild
deleted file mode 100644
index 13f0cf746f6b..000000000000
--- a/media-radio/fldigi/fldigi-4.1.23.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch"
-		"${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	#fails to compile with -flto (bug #860405)
-	filter-lto
-
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}

diff --git a/media-radio/fldigi/fldigi-4.1.24.ebuild b/media-radio/fldigi/fldigi-4.1.24.ebuild
deleted file mode 100644
index 247868d8a399..000000000000
--- a/media-radio/fldigi/fldigi-4.1.24.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch"
-		"${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	#fails to compile with -flto (bug #860405)
-	filter-lto
-
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}

diff --git a/media-radio/fldigi/fldigi-4.1.25.ebuild b/media-radio/fldigi/fldigi-4.1.25.ebuild
deleted file mode 100644
index ebb133520866..000000000000
--- a/media-radio/fldigi/fldigi-4.1.25.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch"
-		"${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	#fails to compile with -flto (bug #860405)
-	filter-lto
-
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-18 12:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-07 18:44 [gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/files/, media-radio/fldigi/ Thomas Beierlein
  -- strict thread matches above, loose matches on Subject: below --
2023-06-18 12:32 Thomas Beierlein
2022-09-17 12:12 Thomas Beierlein
2017-02-03 15:20 Thomas Beierlein

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox