From 1c148fead66de545c671857100ab9d083a63267e Mon Sep 17 00:00:00 2001 From: Florian Tham Date: Mon, 26 Jun 2017 20:33:31 +0200 Subject: [PATCH] dump1090: fix html path --- net-wireless/dump1090/Manifest | 3 ++- net-wireless/dump1090/dump1090-9999.ebuild | 6 +++++- net-wireless/dump1090/files/htmlpath.patch | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 net-wireless/dump1090/files/htmlpath.patch diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index 6fe1f0d..49e0db3 100644 --- a/net-wireless/dump1090/Manifest +++ b/net-wireless/dump1090/Manifest @@ -1,2 +1,3 @@ -EBUILD dump1090-9999.ebuild 977 SHA256 789b85e5f7b50c085c0b5433eda27aa77f6395b017d8e9c2ab5669a34ed6dae9 SHA512 66f1dea6eaa6fd3e22108e960d669f750e9655e60a79916aa52803d8b47be1c2c4f3fa4fc4552d31e760870b6a8b9c27ccaf483dafb874828e4c86944c2677da WHIRLPOOL 75e55b90b5c9bb506299310da691814a2d41928f5a802bd4b1c2addc0bec5aaff0461d9730eb5f658b0a527b53646b9aa53f0382018df067766d64cf25b76ed0 +AUX htmlpath.patch 378 SHA256 c4c9c754535417f67c8dcef846e45f343825be32f507e575fe8f2587f5ac87c4 SHA512 9ccc3b004b02816d73d6cd20a856d812dde48994a98d4c5ec35ad33f4aa230ef158aededc5d078cac050986a3410633e2ad2ed3be7c0cd843c6f788936055e64 WHIRLPOOL 67c2935607b74668bcc1d6ecac74a25f5c8f55263ae48c480a915997fe0e9cbc783f58ea8d44dde06d4a79767fb0634cbd4d1530e197bb8466a8c83eec7fc23c +EBUILD dump1090-9999.ebuild 988 SHA256 c5fd74c5d0af195b50967ee10cbc51cac9ab54c1b2ce04f613256662c9837375 SHA512 4867bbeca306ea54242bf585206692e2a988a49bad9abfbf820c10e3facba6033c6253202b65013432dc7f698336938723da47b9e79e0410c5ec208cb1298140 WHIRLPOOL 53a86a2268f360bfc7da062c37225911d088eaabe37d57d4606793a2a9903bb3d6430ce0b0534265ede4bdfc5ada1a3b880ed7cabd59e5dfdcc553aca56b9072 MISC metadata.xml 423 SHA256 bafcdb269e9ffedfea0c42637d31c7c17e6177035d563727298bd2c360f055cf SHA512 6fcab3c262761efdb8742d485789fac8284494e5b2c21fa8ecaa671429ae11dfa22a9c0ce3f66eaf78d0001f01d4d117a7967521d478457af4765f9bdec84ba9 WHIRLPOOL ca4cdadc81d3da056f06f6391b7fdb7b59c209c763067e48385efc4496166f20d6c328b5f0317387c3eed2079f3cd64098cd7a6801c78f658a01de3c658cec1e diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild index 7a98af0..c44798b 100644 --- a/net-wireless/dump1090/dump1090-9999.ebuild +++ b/net-wireless/dump1090/dump1090-9999.ebuild @@ -22,11 +22,15 @@ RDEPEND="net-wireless/rtl-sdr virtual/libusb:1" DEPEND="${RDEPEND}" +src_prepare() { + eapply ${FILESDIR}/htmlpath.patch + eapply_user +} + src_compile() { emake CC="$(tc-getCC)" \ UNAME="Linux" CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \ - EXTRACFLAGS="-DHTMLPATH='/usr/share/dump1090/html'" \ LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread" } diff --git a/net-wireless/dump1090/files/htmlpath.patch b/net-wireless/dump1090/files/htmlpath.patch new file mode 100644 index 0000000..815ce66 --- /dev/null +++ b/net-wireless/dump1090/files/htmlpath.patch @@ -0,0 +1,15 @@ +--- a/Makefile 2017-06-26 20:28:16.120774095 +0200 ++++ b/Makefile 2017-06-26 20:29:24.869615176 +0200 +@@ -5,11 +5,7 @@ + PROGNAME=dump1090 + SDRPLAY=1 + +-ifdef PREFIX +-BINDIR=$(PREFIX)/bin +-SHAREDIR=$(PREFIX)/share/$(PROGNAME) +-EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\" +-endif ++EXTRACFLAGS=-DHTMLPATH=\"/usr/share/$(PROGNAME)/html/\" + + ifdef SDRPLAY + SDRPLAY_LIBS = -lmirsdrapi-rsp