From 48b38f65df12e80000a0040a19e4473b5618c012 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Tue, 16 Jul 2024 21:00:24 -0400 Subject: [PATCH] fldigi: temporary fork for bugfix that I need --- media-radio/fldigi/Manifest | 1 + .../fldigi-drop-nullptr-definition.patch | 23 +++++++ media-radio/fldigi/fldigi-4.2.05.ebuild | 64 +++++++++++++++++++ media-radio/fldigi/metadata.xml | 13 ++++ 4 files changed, 101 insertions(+) create mode 100644 media-radio/fldigi/Manifest create mode 100644 media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch create mode 100644 media-radio/fldigi/fldigi-4.2.05.ebuild create mode 100644 media-radio/fldigi/metadata.xml diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest new file mode 100644 index 000000000..28a8f7f52 --- /dev/null +++ b/media-radio/fldigi/Manifest @@ -0,0 +1 @@ +DIST fldigi-4.2.05.tar.gz 5127250 BLAKE2B 54a144e34da47c5379256c4ece67447815c29500331e29ccce884885daa96650d6ec098839eb97d13a641d8d0078a9656c9d443016a2acc98fbe7b78c98ca6f9 SHA512 46281e65dad24c57ea344182ed053ddea70281b1682d2fe6b40aa1f111c529328c7e1e4de86828ac265ed4523882d086f5213706159fc43b61f15989fdd9d407 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 000000000..8e14c6e0c --- /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.2.05.ebuild b/media-radio/fldigi/fldigi-4.2.05.ebuild new file mode 100644 index 000000000..b86ef3c81 --- /dev/null +++ b/media-radio/fldigi/fldigi-4.2.05.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 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="https://downloads.sourceforge.net/${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= + sys-apps/systemd-utils + x11-libs/libX11 + 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-libs/libpulse ) + >=media-libs/libsndfile-1.0.10" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +PATCHES=( "${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/metadata.xml b/media-radio/fldigi/metadata.xml new file mode 100644 index 000000000..202c67699 --- /dev/null +++ b/media-radio/fldigi/metadata.xml @@ -0,0 +1,13 @@ + + + + + Enables support by the Hamlib amateur radio + rig control library to get/set frequency and mode of the + ham radio in use + + + fldigi + w1hkj/fldigi + +