commit: 6d65a04d75b67e8123e4b8f74be48016eaff74b1 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Mon Apr 21 22:51:50 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Apr 21 22:52:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d65a04d
net-wireless/dump1090: drop 9.0 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-wireless/dump1090/Manifest | 1 - net-wireless/dump1090/dump1090-9.0.ebuild | 117 --------------------- .../dump1090/files/dump1090-9.0-gcc14.patch | 24 ----- 3 files changed, 142 deletions(-) diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index 64f78c8675a9..a05ab7e4a29d 100644 --- a/net-wireless/dump1090/Manifest +++ b/net-wireless/dump1090/Manifest @@ -1,2 +1 @@ DIST dump1090-10.0.1.tar.gz 5744154 BLAKE2B 7a1c3baedf9e425d34540542bebb514e0cada874ea347b214b6bcb64c7e3064d65fb21964119b0949a9f0f3b454982854d5ace6bb8b8bfe8e10ca08baf366664 SHA512 dec93f29b2f2e262b230e13e8e18cb2902b4204de005b0f70aa4909c000b0a24cee3c1020dca27e09eb23182d8e74e007ae724afc7484f8aab158e19502a59bb -DIST dump1090-9.0.tar.gz 5743616 BLAKE2B 3276075d441f7d410b63fc08b702102637b3c95b0ec5ed3dbd1ea93ecd6af1e322929842db398a23e9e2bca690e601e8bb1916b9998fce1cc80194ca83484dbf SHA512 07408c5680e626eccd3f74d35a6e8a7538dfffd31675f036580003dbba2a78f2487e1980d72d3ec7e44d3f94880e3f231ab1c97bd99ba1ca6cdcfa0ebf198aff diff --git a/net-wireless/dump1090/dump1090-9.0.ebuild b/net-wireless/dump1090/dump1090-9.0.ebuild deleted file mode 100644 index 44138a48f6f9..000000000000 --- a/net-wireless/dump1090/dump1090-9.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit tmpfiles toolchain-funcs - -DESCRIPTION="Simple Mode S decoder for RTLSDR devices" -HOMEPAGE="https://github.com/flightaware/dump1090"; - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"; -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD GPL-2+" -SLOT="0" -IUSE="bladerf hackrf minimal +rtlsdr" - -DEPEND=" - sys-libs/ncurses:=[tinfo] - bladerf? ( - net-wireless/bladerf:= - virtual/libusb:1 - ) - hackrf? ( - net-libs/libhackrf:= - virtual/libusb:1 - ) - rtlsdr? ( - net-wireless/rtl-sdr:= - virtual/libusb:1 - ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1-libdir.patch - "${FILESDIR}"/${PN}-9.0-gcc14.patch -) - -src_prepare() { - default - - sed \ - -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' \ - -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" \ - -i Makefile || die -} - -src_compile() { - myemakeargs=( - BLADERF="$(usex bladerf)" - CC="$(tc-getCC)" - CPUFEATURES="yes" - HACKRF="$(usex hackrf)" - LIMESDR="no" - RTLSDR="$(usex rtlsdr)" - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - dobin dump1090 view1090 - - # DSP config files for bladeRF - if use bladerf; then - insinto usr/share/dump1090/bladerf - doins bladerf/* - fi - - newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf dump1090.conf - newconfd "${FILESDIR}"/dump1090-5.0.confd dump1090 - newinitd "${FILESDIR}"/dump1090-5.0.initd dump1090 - - einstalldocs - - if use !minimal; then - # Install tools - insinto /usr/share/dump1090 - doins -r tools - - # Install lighthttps example files - insinto /usr/share/dump1090/lighttpd - doins debian/lighttpd/{88-dump1090-fa-statcache.conf,89-skyaware.conf} - - # Some tooling expects the -fa variant directory to contain the files - dosym ../../usr/share/dump1090 /usr/share/dump1090-fa - - # Install html docs - docinto html - doins -r public_html/* - - # See README.md for how to use custom wisdom files - exeinto /usr/share/dump1090/wisdom - doexe debian/generate-wisdom - insinto /usr/share/dump1090/wisdom - doins wisdom.* - doins wisdom/wisdom.* - - # For /etc/dump1090-fa/wisdom.local - keepdir /etc/dump1090-fa/ - - # Tooling to generate custom wisdom: - exeinto /usr/libexec/dump1090 - doexe starch-benchmark - fi -} - -pkg_postinst() { - tmpfiles_process dump1090.conf -} diff --git a/net-wireless/dump1090/files/dump1090-9.0-gcc14.patch b/net-wireless/dump1090/files/dump1090-9.0-gcc14.patch deleted file mode 100644 index 25e5ea8e4ce0..000000000000 --- a/net-wireless/dump1090/files/dump1090-9.0-gcc14.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix -Werror=calloc-transposed-args error with gcc 14. - ---- dump1090-9.0-origin/adaptive.c -+++ dump1090-9.0/adaptive.c -@@ -195,7 +195,7 @@ - adaptive_burst_window_remaining = adaptive_samples_per_window; - adaptive_burst_window_counter = 0; - -- adaptive_range_radix = calloc(sizeof(unsigned), 65536); -+ adaptive_range_radix = calloc(65536, sizeof(unsigned)); - adaptive_range_state = RANGE_RESCAN_UP; - - // select and enforce gain limits ---- dump1090-9.0-origin/net_io.c -+++ dump1090-9.0/net_io.c -@@ -104,7 +104,7 @@ - { - struct net_service *service; - -- if (!(service = calloc(sizeof(*service), 1))) { -+ if (!(service = calloc(1, sizeof(*service)))) { - fprintf(stderr, "Out of memory allocating service %s\n", descr); - exit(1); - }
