* [gentoo-commits] repo/gentoo:master commit in: media-radio/direwolf/, media-radio/direwolf/files/
@ 2021-04-19 19:12 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-04-19 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 1da1e6bc9c2a5f124b5f908044736e02e06caf0c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 17:43:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 19:12:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da1e6bc
media-radio/direwolf: drop 1.4 (epatch)
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-radio/direwolf/Manifest | 1 -
media-radio/direwolf/direwolf-1.4.ebuild | 39 ------------
media-radio/direwolf/files/1.4-makefile.patch | 89 ---------------------------
3 files changed, 129 deletions(-)
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 04bed6f619c..20566d786ae 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -1,2 +1 @@
-DIST direwolf-1.4.tar.gz 17554878 BLAKE2B a8eea6777df93d66d67c993c23eba86f37ff1e23d95df842b17be1a9a0b83c4bb0b7b14b97f43a1756512d060e50136712d1d9d499b2567eabbe1092a2f5edf0 SHA512 597b0652e910642d5a3c538297e4306f9317c29b3629e7fd96cc33b92b2f09d743cea8b8a0cc6451347dc0877fcf1f3933a420ae58e33ad7be7d899f80036eb3
DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
diff --git a/media-radio/direwolf/direwolf-1.4.ebuild b/media-radio/direwolf/direwolf-1.4.ebuild
deleted file mode 100644
index abc8b2f7df5..00000000000
--- a/media-radio/direwolf/direwolf-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit epatch systemd
-
-DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
-HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
-SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib:="
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md README.md doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf doc/APRS-Telemetry-Toolkit.pdf doc/APRStt-Implementation-Notes.pdf doc/APRStt-interface-for-SARTrack.pdf doc/APRStt-Listening-Example.pdf doc/Going-beyond-9600-baud.pdf doc/Raspberry-Pi-APRS.pdf doc/Raspberry-Pi-APRS-Tracker.pdf doc/Raspberry-Pi-SDR-IGate.pdf doc/README.md doc/Successful-APRS-IGate-Operation.pdf doc/User-Guide.pdf doc/WA8LMF-TNC-Test-CD-Results.pdf direwolf.conf dw-start.sh sdr.conf telemetry-toolkit/telem-m0xer-3.txt telemetry-toolkit/telem-balloon.conf telemetry-toolkit/telem-volts.conf )
-
-INSTALLDIR="${D}"
-
-src_prepare() {
- eapply_user
- epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-src_install() {
- dodir /usr
- dodir /usr/bin
- dodir /var/log/direwolf
- emake DESTDIR="${D}" install
- insinto /etc/direwolf/
- doins direwolf.conf
- einstalldocs
- systemd_dounit "${FILESDIR}"/direwolf.service
- systemd_dounit "${FILESDIR}"/direwolf-kiss.service
-}
diff --git a/media-radio/direwolf/files/1.4-makefile.patch b/media-radio/direwolf/files/1.4-makefile.patch
deleted file mode 100644
index 6424d8a72cc..00000000000
--- a/media-radio/direwolf/files/1.4-makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- direwolf-1.4-orig/Makefile.linux
-+++ direwolf-1.4/Makefile.linux
-@@ -484,11 +484,12 @@ direwolf.conf : generic.conf
- # This is a step in the right direction but not sufficient to use /usr instead.
- # Eventually I'd like to have targets here to build the .DEB and .RPM packages.
-
--INSTALLDIR := /usr/local
-+DESTDIR ?= /usr/local
-+INSTALLDIR ?= $(DESTDIR)usr/
-
- # Command to "install" to system directories. Use "ginstall" for Mac.
-
--INSTALL=install
-+INSTALL=install
-
- # direwolf.desktop was previously handcrafted for the Raspberry Pi.
- # It was hardcoded with lxterminal, /home/pi, and so on.
-@@ -554,56 +555,37 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
- #
- # Misc. data such as "tocall" to system mapping.
- #
-- $(INSTALL) -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
-- $(INSTALL) -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
-- $(INSTALL) -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
-- $(INSTALL) -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
-- $(INSTALL) -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
-+ $(INSTALL) -D --mode=644 tocalls.txt $(INSTALLDIR)/share/direwolf/tocalls.txt
-+ $(INSTALL) -D --mode=644 symbols-new.txt $(INSTALLDIR)/share/direwolf/symbols-new.txt
-+ $(INSTALL) -D --mode=644 symbolsX.txt $(INSTALLDIR)/share/direwolf/symbolsX.txt
-+ $(INSTALL) -D --mode=644 dw-icon.png $(INSTALLDIR)/share/direwolf/dw-icon.png
-+ $(INSTALL) -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop
- #
- # Documentation. Various plain text files and PDF.
- #
-- $(INSTALL) -D --mode=644 CHANGES.md $(INSTALLDIR)/share/doc/direwolf/CHANGES.md
-- $(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
-- $(INSTALL) -D --mode=644 LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-other.txt
- #
- # ./README.md is an overview for the project main page.
- # doc/README.md contains an overview of the PDF file contents and is more useful here.
- #
-- $(INSTALL) -D --mode=644 doc/README.md $(INSTALLDIR)/share/doc/direwolf/README.md
-- $(INSTALL) -D --mode=644 doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
-- $(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-- $(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
-- $(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
-- $(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-- $(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
-- $(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
-- $(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
-- $(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
- #
- # Various sample config and other files go into examples under the doc directory.
- # When building from source, these can be put in home directory with "make install-conf".
- # When installed from .DEB or .RPM package, the user will need to copy these to
- # the home directory or other desired location.
- #
-- $(INSTALL) -D --mode=644 direwolf.conf $(INSTALLDIR)/share/doc/direwolf/examples/direwolf.conf
-- $(INSTALL) -D --mode=755 dw-start.sh $(INSTALLDIR)/share/doc/direwolf/examples/dw-start.sh
-- $(INSTALL) -D --mode=644 sdr.conf $(INSTALLDIR)/share/doc/direwolf/examples/sdr.conf
-- $(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
-- $(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-balloon.conf
-- $(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-volts.conf
- #
- # "man" pages
- #
-- $(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/man/man1/aclients.1
-- $(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/man/man1/atest.1
-- $(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/man/man1/decode_aprs.1
-- $(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/man/man1/direwolf.1
-- $(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/man/man1/gen_packets.1
-- $(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/man/man1/ll2utm.1
-- $(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/man/man1/log2gpx.1
-- $(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/man/man1/text2tt.1
-- $(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/man/man1/tt2text.1
-- $(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/man/man1/utm2ll.1
-+ $(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/share/man/man1/aclients.1
-+ $(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/share/man/man1/atest.1
-+ $(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/share/man/man1/decode_aprs.1
-+ $(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/share/man/man1/direwolf.1
-+ $(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/share/man/man1/gen_packets.1
-+ $(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/share/man/man1/ll2utm.1
-+ $(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/share/man/man1/log2gpx.1
-+ $(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/share/man/man1/text2tt.1
-+ $(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/share/man/man1/tt2text.1
-+ $(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/share/man/man1/utm2ll.1
- #
- @echo " "
- @echo "If this is your first install, not an upgrade, type this to put a copy"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/direwolf/, media-radio/direwolf/files/
@ 2021-11-26 5:11 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-11-26 5:11 UTC (permalink / raw
To: gentoo-commits
commit: f2451003826e4c1a4807484544e513883ad61810
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 05:05:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 05:11:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2451003
media-radio/direwolf: add 1.6
Upstream now uses CMake.
Bug: https://bugs.gentoo.org/716708
Closes: https://bugs.gentoo.org/807664
Closes: https://bugs.gentoo.org/808513
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-radio/direwolf/Manifest | 1 +
media-radio/direwolf/direwolf-1.6.ebuild | 67 ++++++++++++++++++++++
.../files/direwolf-1.6-use-standard-doc-dir.patch | 50 ++++++++++++++++
3 files changed, 118 insertions(+)
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 20566d786ae1..2fd9f36b0d21 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -1 +1,2 @@
DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
+DIST direwolf-1.6.tar.gz 22298168 BLAKE2B d0bffe78ecfdd7b41e4e2d458416e30e9151870d6890c3e4f65e44472699f0c1e1016fcbab5c30209978594ccaf567a8d53ae62194649e9df5cca4d4ea4689af SHA512 f29805dfea01ed5a81b133ac0a98455c2edfb6d18e0764db23c398475b11cc0e57c1c7c35c44cdaa5cf73129e8c18b836ad17dd3e9811e84277db0ef7b10bcd5
diff --git a/media-radio/direwolf/direwolf-1.6.ebuild b/media-radio/direwolf/direwolf-1.6.ebuild
new file mode 100644
index 000000000000..7058a03085ab
--- /dev/null
+++ b/media-radio/direwolf/direwolf-1.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd udev toolchain-funcs
+
+DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
+HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
+SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa gps hamlib test udev"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ alsa? ( media-libs/alsa-lib )
+ gps? ( sci-geosciences/gpsd )
+ hamlib? ( media-libs/hamlib:= )
+ udev? ( virtual/libudev:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6-use-standard-doc-dir.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_ALSA=$(usex !alsa)
+ -DCMAKE_DISABLE_FIND_PACKAGE_GPSD=$(usex !gps)
+ -DCMAKE_DISABLE_FIND_PACKAGE_hamlib=$(usex !hamlib)
+ -DCMAKE_DISABLE_FIND_PACKAGE_udev=$(usex !udev)
+ -DUNITTEST=$(usex test)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # Fix udev rule installation path
+ udev_dorules "${ED}"/etc/udev/rules.d/99-direwolf-cmedia.rules
+ rm "${ED}"/etc/udev/rules.d/99-direwolf-cmedia.rules || die
+
+ keepdir /var/log/direwolf
+
+ # Pre-CMake, we installed a default config to /etc/direwolf.
+ # Should we do that now?
+ #insinto /etc/direwolf/
+ #doins direwolf.conf
+
+ systemd_dounit "${FILESDIR}"/direwolf.service
+ systemd_dounit "${FILESDIR}"/direwolf-kiss.service
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo "The default configuration files are at:"
+ einfo " - ${EROOT}/usr/share/doc/${PF}/conf/direwolf.conf"
+ einfo " - ${EROOT}/usr/share/doc/${PF}/conf/sdr.conf"
+ einfo "Copy these to the /etc/direwolf/ directory to modify them."
+ fi
+}
diff --git a/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch b/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch
new file mode 100644
index 000000000000..1377ba0b4fab
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch
@@ -0,0 +1,50 @@
+From bfb62c085b0841818a5aaa0d2096c0d26f409553 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 26 Nov 2021 04:57:44 +0000
+Subject: [PATCH] Use standard doc directory (a la GNUInstallDirs)
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 139cb4d..e5da77c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,16 +233,12 @@ if (WIN32 OR CYGWIN)
+ set(INSTALL_MAN_DIR "man")
+ set(INSTALL_DATA_DIR "data")
+ else()
+- set(INSTALL_BIN_DIR "bin")
+- set(INSTALL_DOC_DIR "share/doc/${CMAKE_PROJECT_NAME}")
++ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}")
++ set(INSTALL_DOC_DIR "${CMAKE_INSTALL_DOCDIR}")
+ set(INSTALL_CONF_DIR "${INSTALL_DOC_DIR}/conf")
+ set(INSTALL_SCRIPTS_DIR "${INSTALL_DOC_DIR}/scripts")
+- if(FREEBSD)
+- set(INSTALL_MAN_DIR "man/man1")
+- else()
+- set(INSTALL_MAN_DIR "share/man/man1")
+- endif()
+- set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
++ set(INSTALL_MAN_DIR "${CMAKE_INSTALL_MANDIR}/man1")
++ set(INSTALL_DATA_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}")
+ endif(WIN32 OR CYGWIN)
+
+ # requirements
+--
+2.34.1
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5da77c..ae7ea25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,6 +225,7 @@ elseif (C_GCC)
+ endif()
+
+ # set installation directories
++include(GNUInstallDirs)
+ if (WIN32 OR CYGWIN)
+ set(INSTALL_BIN_DIR ".")
+ set(INSTALL_DOC_DIR "doc")
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-26 5:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-19 19:12 [gentoo-commits] repo/gentoo:master commit in: media-radio/direwolf/, media-radio/direwolf/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-11-26 5:11 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox