| 1 |
commit: b4ac49a0b7d666360214d4f27ba05a32e70b8199 |
| 2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 3 05:21:47 2019 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 3 05:22:02 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ac49a0 |
| 7 |
|
| 8 |
net-wireless/dump1090: wip update to fa fork |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.16 |
| 11 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 12 |
|
| 13 |
net-wireless/dump1090/dump1090-9999.ebuild | 37 ++++++++++++++++++------------ |
| 14 |
net-wireless/dump1090/metadata.xml | 6 ++++- |
| 15 |
2 files changed, 27 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild |
| 18 |
index 556e4a14a69..e4ab4ba0cfe 100644 |
| 19 |
--- a/net-wireless/dump1090/dump1090-9999.ebuild |
| 20 |
+++ b/net-wireless/dump1090/dump1090-9999.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2018 Gentoo Foundation |
| 23 |
+# Copyright 1999-2019 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -9,34 +9,42 @@ DESCRIPTION="simple Mode S decoder for RTLSDR devices" |
| 28 |
#Original repo |
| 29 |
#HOMEPAGE="https://github.com/antirez/dump1090" |
| 30 |
#Repo that has actually been touched recenly |
| 31 |
-HOMEPAGE="https://github.com/mutability/dump1090" |
| 32 |
+#HOMEPAGE="https://github.com/mutability/dump1090" |
| 33 |
+#And now we move to the next one in line |
| 34 |
+HOMEPAGE="https://github.com/flightaware/dump1090" |
| 35 |
|
| 36 |
if [[ ${PV} == "9999" ]] ; then |
| 37 |
inherit git-r3 |
| 38 |
- EGIT_REPO_URI="https://github.com/mutability/${PN}.git" |
| 39 |
+ EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" |
| 40 |
KEYWORDS="" |
| 41 |
else |
| 42 |
KEYWORDS="~amd64 ~x86" |
| 43 |
- COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9" |
| 44 |
- SRC_URI="https://github.com/mutability/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
| 45 |
- S="${WORKDIR}/${PN}-${COMMIT}" |
| 46 |
+ #COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9" |
| 47 |
+ #SRC_URI="https://github.com/flightaware/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
| 48 |
+ #S="${WORKDIR}/${PN}-${COMMIT}" |
| 49 |
+ SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 50 |
fi |
| 51 |
|
| 52 |
LICENSE="BSD" |
| 53 |
SLOT="0" |
| 54 |
-IUSE="" |
| 55 |
+IUSE="bladerf +rtlsdr" |
| 56 |
|
| 57 |
-RDEPEND="net-wireless/rtl-sdr |
| 58 |
+RDEPEND="bladerf? ( net-wireless/bladerf:= ) |
| 59 |
+ rtlsdr? ( net-wireless/rtl-sdr:= ) |
| 60 |
+ sys-libs/ncurses:= |
| 61 |
virtual/libusb:1" |
| 62 |
DEPEND="${RDEPEND}" |
| 63 |
|
| 64 |
+src_prepare() { |
| 65 |
+ default |
| 66 |
+ sed -i 's#-O2 -g -Wall -Werror -W##' Makefile |
| 67 |
+ sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile |
| 68 |
+} |
| 69 |
+ |
| 70 |
src_compile() { |
| 71 |
emake CC="$(tc-getCC)" \ |
| 72 |
- UNAME="Linux" \ |
| 73 |
- DUMP1090_VERSION=${PV} \ |
| 74 |
- CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \ |
| 75 |
- EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \ |
| 76 |
- LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread" |
| 77 |
+ BLADERF=$(usex bladerf) \ |
| 78 |
+ RTLSDR=$(usex rtlsdr) |
| 79 |
} |
| 80 |
|
| 81 |
src_install() { |
| 82 |
@@ -50,6 +58,5 @@ src_install() { |
| 83 |
insinto /usr/share/${PN}/tools |
| 84 |
doins -r tools/* |
| 85 |
|
| 86 |
- newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf |
| 87 |
- newdoc debian/nginx/dump1090-mutability nginx.conf |
| 88 |
+ newdoc debian/lighttpd/89-dump1090-fa.conf lighttpd.conf |
| 89 |
} |
| 90 |
|
| 91 |
diff --git a/net-wireless/dump1090/metadata.xml b/net-wireless/dump1090/metadata.xml |
| 92 |
index 88faf189fed..da238ebeece 100644 |
| 93 |
--- a/net-wireless/dump1090/metadata.xml |
| 94 |
+++ b/net-wireless/dump1090/metadata.xml |
| 95 |
@@ -5,7 +5,11 @@ |
| 96 |
<email>radio@g.o</email> |
| 97 |
<name>Radio</name> |
| 98 |
</maintainer> |
| 99 |
+ <use> |
| 100 |
+ <flag name="bladerf">Build with Nuand BladeRF support</flag> |
| 101 |
+ <flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag> |
| 102 |
+ </use> |
| 103 |
<upstream> |
| 104 |
- <remote-id type="github">antirez/dump1090</remote-id> |
| 105 |
+ <remote-id type="github">flightaware/dump1090</remote-id> |
| 106 |
</upstream> |
| 107 |
</pkgmetadata> |
Archives