From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-wireless/osmo-fl2k/Manifest | 4 +- net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild | 54 ++++++++++++++++++++++++ net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild | 52 ----------------------- net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild | 20 +++++---- 4 files changed, 67 insertions(+), 63 deletions(-) create mode 100644 net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild delete mode 100644 net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild (limited to 'net-wireless/osmo-fl2k') diff --git a/net-wireless/osmo-fl2k/Manifest b/net-wireless/osmo-fl2k/Manifest index c7f8bdebfa0d..bc50801923bc 100644 --- a/net-wireless/osmo-fl2k/Manifest +++ b/net-wireless/osmo-fl2k/Manifest @@ -1,4 +1,4 @@ DIST osmo-fl2k-0.1.1.tar.gz 68811 BLAKE2B 6c1b602b47d5e0816d93750e0470ed4530e587341f28e2e93c3aef634d7108b981cc4a96b758d72796316f15e4401ef746b91a983f374e63103ac76d8b7168c1 SHA512 55b384e18cfa5a1ab660860874cc6f6256b812ee867c863b6cd12c67cfc3517632469fc1ed6b83a35c956aa5371e1198634a52b292b109da828bee60c23f5140 -EBUILD osmo-fl2k-0.1.1.ebuild 1264 BLAKE2B ff9ee662871853ab86ec47263ba125e57652f00dd87c53b323e184f92a41bed72a8231429eeac148f4311936e3323b97059f564e3f0d94e7db80d4dba5f3a056 SHA512 c167f2335a11fbca68e8e2a195edc55d645119906cad7d640f52814436c5480c1e32d262842ff7e100f62ee4031b6ee253398bac5857f874ae76fc8fc3ae6d00 -EBUILD osmo-fl2k-9999.ebuild 1261 BLAKE2B 1c65126580c67e48dc5d40c6c1467df0a523a21c74c482f765c7ed627075e5d35c74cc399827e42d2b3b39a51500ae789f9cd139675118a8a44c1ba0f4550fa4 SHA512 59e5969e91dfa795e82049a2a4a5d8792236d549e9774189596d4a5a4411f4ebb8ee20f699fff6db4c12310ed01ef1b61dc5d39dd1f87e2fa2e3d76c883a499b +EBUILD osmo-fl2k-0.1.1-r1.ebuild 1347 BLAKE2B 91a2a878fc9a3fcfa0e78f2745899b2c1e8000d9b6bf9945befde75a99b053b857b14b02030a637e567df96d872e6ee07dce4f225091baa1f60fb411b6b6a3f8 SHA512 b52c864f8285af2f645338c172c4bb90511d17ffa44ebcb35e57c2dbe0224461445e6660cf4bdace39a972fa544d90da32f71e83726f70650937b459f88718ec +EBUILD osmo-fl2k-9999.ebuild 1347 BLAKE2B 91a2a878fc9a3fcfa0e78f2745899b2c1e8000d9b6bf9945befde75a99b053b857b14b02030a637e567df96d872e6ee07dce4f225091baa1f60fb411b6b6a3f8 SHA512 b52c864f8285af2f645338c172c4bb90511d17ffa44ebcb35e57c2dbe0224461445e6660cf4bdace39a972fa544d90da32f71e83726f70650937b459f88718ec MISC metadata.xml 239 BLAKE2B 8a5d257499b7178bea8d035ab855e235ebbc400424ef2b15910592d72c39ccbd31f0aa62d966799ef867c5478da8a172d4f02ebdeb483333de2561af62a11705 SHA512 1b66fb2d49901d2a3c6a23d60e9f6f4d861870d49441ac076f0f150b8f918da2bf6c4bb2fa1d57a56e4067c65718ce2688496d8b4e06edbd2f65bd267495697a diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild new file mode 100644 index 000000000000..f8ab9250ade2 --- /dev/null +++ b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic linux-info udev + +DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs" +HOMEPAGE="https://osmocom.org/projects/osmo-fl2k/wiki" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.osmocom.org/osmo-fl2k" +else + KEYWORDS="~amd64" + SRC_URI="https://git.osmocom.org/osmo-fl2k/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/v${PV}" +fi + +LICENSE="GPL-2+" +SLOT="0" + +IUSE="udev" + +DEPEND="virtual/libusb:1" +RDEPEND="${DEPEND} + media-sound/sox + sys-apps/pv" + +# continguous memory allocator can optionally be used for zero-copy transfer +# TODO: tell users to set CONFIG_CMA_SIZE_MBYTES or boot with cma=... parameter +CONFIG_CHECK="~CMA ~DMA_CMA" + +src_configure() { + # udev rules use wrong filename and would go to wrong directory anyway + local mycmakeargs=( + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DINSTALL_UDEV_RULES=OFF + ) + #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653 + replace-flags -O0 -O2 + replace-flags -Os -O2 + cmake_src_configure +} + +src_install() { + if use udev; then + udev_newrules ${PN}.rules 99-${PN}.rules + fi + cmake_src_install + # https://bugs.gentoo.org/727984 + # No obvious way to prevent build + find "${ED}" -name libosmo-fl2k.a -delete +} diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild deleted file mode 100644 index 0df5cfc8b4b9..000000000000 --- a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic linux-info udev - -DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs" - -HOMEPAGE="https://osmocom.org/projects/osmo-fl2k/wiki" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.osmocom.org/osmo-fl2k" -else - KEYWORDS="~amd64" - SRC_URI="https://git.osmocom.org/osmo-fl2k/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/v${PV}" -fi - -LICENSE="GPL-2+" -SLOT="0" - -IUSE="udev" - -DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" -PDEPEND="media-sound/sox - sys-apps/pv" - -# continguous memory allocator can optionally be used for zero-copy transfer -# TODO: tell users to set CONFIG_CMA_SIZE_MBYTES or boot with cma=... parameter -CONFIG_CHECK="~CMA ~DMA_CMA" - -src_configure() { - # udev rules use wrong filename and would go to wrong directory anyway - local mycmakeargs=( - -DLIB_INSTALL_DIR="/usr/$(get_libdir)" - -DINSTALL_UDEV_RULES=OFF - ) - #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653 - replace-flags -O0 -O2 - replace-flags -Os -O2 - cmake-utils_src_configure -} - -src_install() { - if use udev; then - udev_newrules ${PN}.rules 99-${PN}.rules - fi - cmake-utils_src_install -} diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild index 148e9614dedc..f8ab9250ade2 100644 --- a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild +++ b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils flag-o-matic linux-info udev +inherit cmake flag-o-matic linux-info udev DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs" - HOMEPAGE="https://osmocom.org/projects/osmo-fl2k/wiki" if [[ ${PV} == "9999" ]]; then @@ -24,9 +23,9 @@ SLOT="0" IUSE="udev" DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" -PDEPEND="media-sound/sox - sys-apps/pv" +RDEPEND="${DEPEND} + media-sound/sox + sys-apps/pv" # continguous memory allocator can optionally be used for zero-copy transfer # TODO: tell users to set CONFIG_CMA_SIZE_MBYTES or boot with cma=... parameter @@ -41,12 +40,15 @@ src_configure() { #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653 replace-flags -O0 -O2 replace-flags -Os -O2 - cmake-utils_src_configure + cmake_src_configure } src_install() { if use udev; then udev_newrules ${PN}.rules 99-${PN}.rules fi - cmake-utils_src_install + cmake_src_install + # https://bugs.gentoo.org/727984 + # No obvious way to prevent build + find "${ED}" -name libosmo-fl2k.a -delete } -- cgit v1.2.3