commit: fe77ebfb2d4ce018a281ae00284986c76ca374dd Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Fri Mar 28 20:36:27 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Mar 28 20:48:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe77ebfb
net-wireless/dump1090: drop 4.0, 5.0, 6.1 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-wireless/dump1090/Manifest | 3 - net-wireless/dump1090/dump1090-4.0.ebuild | 56 ----------- net-wireless/dump1090/dump1090-5.0.ebuild | 104 --------------------- net-wireless/dump1090/dump1090-6.1.ebuild | 103 -------------------- .../dump1090/files/dump1090-5.0-32bit-fix.patch | 21 ----- .../files/dump1090-5.0-further-32bit-fix.patch | 52 ----------- 6 files changed, 339 deletions(-) diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index 859cfa1ff573..64c96181e0d0 100644 --- a/net-wireless/dump1090/Manifest +++ b/net-wireless/dump1090/Manifest @@ -1,5 +1,2 @@ DIST dump1090-10.0.tar.gz 5744121 BLAKE2B 58c366bca12e2f2ab44d6f970ce2e5113bb4daea5c2138f00a3431aa3b37371ac8724b44c9e24d8faff2725282d61dc90b6be0226d617dec7c90f6013e63806c SHA512 516f4491070e5011d21a7f39d57c1dd94fb6b2152dbffa2b2034b72d58c18098ef3aa524d5db899ab68b2d81b2571c5c1390767873196003e19cf682d2d08b5a -DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95 -DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142 -DIST dump1090-6.1.tar.gz 9879362 BLAKE2B 716c1abe6df7958fb5ec94c35ed6af75fdb6180a56cdfba72443a7b34d1614cede6ec29aaac22a1e15f31d05bf1d1971eebccdff21cf9442ae69617e7c535ae6 SHA512 5f20d52f1fda754e33774faab852252d802ae5da8694e768cbf92df56f7693cd2da788df9e0a422f1801603e62498fb0af0143f5ea3292e9d607296cd5983dc2 DIST dump1090-9.0.tar.gz 5743616 BLAKE2B 3276075d441f7d410b63fc08b702102637b3c95b0ec5ed3dbd1ea93ecd6af1e322929842db398a23e9e2bca690e601e8bb1916b9998fce1cc80194ca83484dbf SHA512 07408c5680e626eccd3f74d35a6e8a7538dfffd31675f036580003dbba2a78f2487e1980d72d3ec7e44d3f94880e3f231ab1c97bd99ba1ca6cdcfa0ebf198aff diff --git a/net-wireless/dump1090/dump1090-4.0.ebuild b/net-wireless/dump1090/dump1090-4.0.ebuild deleted file mode 100644 index c49bf27909f2..000000000000 --- a/net-wireless/dump1090/dump1090-4.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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" -SLOT="0" -IUSE="bladerf +rtlsdr" - -DEPEND=" - sys-libs/ncurses:=[tinfo] - virtual/libusb:1 - bladerf? ( net-wireless/bladerf:= ) - rtlsdr? ( net-wireless/rtl-sdr:= )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die - sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" \ - BLADERF=$(usex bladerf) \ - RTLSDR=$(usex rtlsdr) -} - -src_install() { - dobin ${PN} - dobin view1090 - dodoc README.md - - insinto /usr/share/${PN}/html - doins -r public_html/* - - insinto /usr/share/${PN} - doins -r tools - - insinto /usr/share/${PN} - newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf -} diff --git a/net-wireless/dump1090/dump1090-5.0.ebuild b/net-wireless/dump1090/dump1090-5.0.ebuild deleted file mode 100644 index 00364313d593..000000000000 --- a/net-wireless/dump1090/dump1090-5.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -SLOT="0" -IUSE="bladerf hackrf +rtlsdr minimal" - -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}/${P}-32bit-fix.patch" - "${FILESDIR}/${P}-further-32bit-fix.patch" -) - -src_prepare() { - default - sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die - sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" \ - BLADERF=$(usex bladerf) \ - RTLSDR=$(usex rtlsdr) \ - HACKRF=$(usex hackrf) \ - CPUFEATURES=yes \ - LIMESDR=no -} - -src_install() { - dobin ${PN} - dobin view1090 - dodoc README.md README-json.md - # DSP config for bladerf - if use bladerf; then - insinto usr/share/${PN}/bladerf - doins bladerf/* - fi - - newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf ${PN}.conf - newconfd "${FILESDIR}"/dump1090-5.0.confd ${PN} - newinitd "${FILESDIR}"/dump1090-5.0.initd ${PN} - - if use !minimal; then - insinto /usr/share/${PN} - doins -r tools - - # Some tooling expects the -fa variant directory to contain the files - dosym ../../usr/share/${PN} /usr/share/dump1090-fa - - # Older HTML - insinto /usr/share/${PN}/html - doins -r public_html/* - # Newer HTML - insinto /usr/share/skyaware/html - doins -r public_html_merged/* - - # One of these this should be included into other lighttpd configs - insinto /usr/share/${PN}/lighttpd - # Old style: - doins debian/lighttpd/89-dump1090-fa.conf - doins debian/lighttpd/88-dump1090-fa-statcache.conf - # New style: - doins debian/lighttpd/89-skyaware.conf - - # See README.md for how to use custom wisdom files - exeinto /usr/share/${PN}/wisdom - doexe debian/generate-wisdom - insinto /usr/share/${PN}/wisdom - doins wisdom.* - doins wisdom/wisdom.* - # For /etc/dump1090-fa/wisdom.local - keepdir /etc/dump1090-fa/ - - # Tooling to generate custom wisdom: - exeinto /usr/libexec/${PN} - doexe starch-benchmark - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild deleted file mode 100644 index 199f64604457..000000000000 --- a/net-wireless/dump1090/dump1090-6.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -SLOT="0" -IUSE="bladerf hackrf +rtlsdr minimal" - -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 -) - -src_prepare() { - default - sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die - sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" \ - BLADERF=$(usex bladerf) \ - RTLSDR=$(usex rtlsdr) \ - HACKRF=$(usex hackrf) \ - CPUFEATURES=yes \ - LIMESDR=no -} - -src_install() { - dobin ${PN} - dobin view1090 - dodoc README.md README-json.md - # DSP config for bladerf - if use bladerf; then - insinto usr/share/${PN}/bladerf - doins bladerf/* - fi - - newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf ${PN}.conf - newconfd "${FILESDIR}"/dump1090-5.0.confd ${PN} - newinitd "${FILESDIR}"/dump1090-5.0.initd ${PN} - - if use !minimal; then - insinto /usr/share/${PN} - doins -r tools - - # Some tooling expects the -fa variant directory to contain the files - dosym ../../usr/share/${PN} /usr/share/dump1090-fa - - # Older HTML - insinto /usr/share/${PN}/html - doins -r public_html/* - # Newer HTML - insinto /usr/share/skyaware/html - doins -r public_html_merged/* - - # One of these this should be included into other lighttpd configs - insinto /usr/share/${PN}/lighttpd - # Old style: - doins debian/lighttpd/89-dump1090-fa.conf - doins debian/lighttpd/88-dump1090-fa-statcache.conf - # New style: - doins debian/lighttpd/89-skyaware.conf - - # See README.md for how to use custom wisdom files - exeinto /usr/share/${PN}/wisdom - doexe debian/generate-wisdom - insinto /usr/share/${PN}/wisdom - doins wisdom.* - doins wisdom/wisdom.* - # For /etc/dump1090-fa/wisdom.local - keepdir /etc/dump1090-fa/ - - # Tooling to generate custom wisdom: - exeinto /usr/libexec/${PN} - doexe starch-benchmark - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-wireless/dump1090/files/dump1090-5.0-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-32bit-fix.patch deleted file mode 100644 index 8425f3d9da06..000000000000 --- a/net-wireless/dump1090/files/dump1090-5.0-32bit-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -From c97b83d3eded3e2232a9f938fee52771ebe09c9c Mon Sep 17 00:00:00 2001 -From: Oliver Jowett <[email protected]> -Date: Sat, 13 Mar 2021 20:24:01 +0800 -Subject: [PATCH] Maybe fix alignment warnings in arm neon code with recent gcc - ---- - dsp-types.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dsp-types.h b/dsp-types.h -index a3ef98dab..962b608be 100644 ---- a/dsp-types.h -+++ b/dsp-types.h -@@ -16,6 +16,6 @@ typedef union { - typedef struct { - int16_t I; - int16_t Q; --} __attribute__((__packed__)) sc16_t; -+} __attribute__((__packed__, __aligned__(2))) sc16_t; - - #endif diff --git a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch deleted file mode 100644 index bfcea2e4f88f..000000000000 --- a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://github.com/flightaware/dump1090/commit/462dee56f3a339bc4d83fea264fe89a1ced5bd22.patch -https://github.com/flightaware/dump1090/commit/455896e86db84d10a197f5a3f88d13c0539ad470.patch -https://bugs.gentoo.org/818130 - -From 462dee56f3a339bc4d83fea264fe89a1ced5bd22 Mon Sep 17 00:00:00 2001 -From: Oliver Jowett <[email protected]> -Date: Sat, 13 Mar 2021 12:49:40 +0800 -Subject: [PATCH] Fix builds on 32-bit x86 - ---- - Makefile.cpufeatures | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures -index 099714e08..12377ad81 100644 ---- a/Makefile.cpufeatures -+++ b/Makefile.cpufeatures -@@ -17,7 +17,11 @@ ifeq ($(CPUFEATURES_UNAME),Darwin) - CPUFEATURES_CFLAGS += -DHAVE_SYSCTLBYNAME - endif - --ifeq ($(CPUFEATURES_ARCH), x86_64) -+ifeq ($(CPUFEATURES_ARCH),x86_64) -+ CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o -+endif -+ -+ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) - CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o - endif - -From 455896e86db84d10a197f5a3f88d13c0539ad470 Mon Sep 17 00:00:00 2001 -From: Oliver Jowett <[email protected]> -Date: Wed, 17 Mar 2021 02:21:18 +0800 -Subject: [PATCH] Fix broken 32-bit x86 test that broke builds on non-x86 - ---- - Makefile.cpufeatures | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures -index 12377ad81..8c3b8418d 100644 ---- a/Makefile.cpufeatures -+++ b/Makefile.cpufeatures -@@ -21,7 +21,7 @@ ifeq ($(CPUFEATURES_ARCH),x86_64) - CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o - endif - --ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) -+ifneq (,$(filter i%86,$(CPUFEATURES_ARCH))) - CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o - endif -
