op25: upstream fixes, python3, works with gnuradio 3.8

This commit is contained in:
blshkv 2020-05-24 17:20:18 +08:00
parent f9e32c2120
commit e018e85878
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
2 changed files with 8 additions and 71 deletions

View file

@ -3,9 +3,9 @@
EAPI=7
PYTHON_COMPAT=( python2_7 )
PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
inherit cmake python-single-r1 flag-o-matic
inherit cmake python-single-r1
DESCRIPTION="software-defined analyzer for APCO P25 signals"
HOMEPAGE="http://osmocom.org/projects/op25/wiki"
@ -24,7 +24,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="${PYTHON_DEPS}
>=net-wireless/gnuradio-3.7:=
>=net-wireless/gnuradio-3.7:=[vocoder]
sci-libs/itpp
dev-libs/boost
dev-util/cppunit
@ -37,25 +37,23 @@ pkg_setup() {
}
src_prepare() {
#workaround: compile with gcc 6
# append-cxxflags -Wno-narrowing
append-flags -funsigned-char
#https://github.com/boatbod/op25/issues/48
sed '/set(CMAKE_CXX_FLAGS/d' -i CMakeLists.txt
cmake_src_prepare
}
src_configure() {
python_export PYTHON_SITEDIR
local mycmakeargs=(
-Wno-dev
-DPYTHON_EXECUTABLE="${PYTHON}"
-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
#https://github.com/boatbod/op25/issues/47
-DBUILD_SHARED_LIBS=NO
)
cmake_src_configure
}
src_install() {
cmake_src_install
python_optimize "${ED}/$(python_get_sitedir)"
#this isn't right, but cmake is broken somehow
dodir /usr/share/${PN}

View file

@ -1,61 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
inherit cmake python-single-r1 flag-o-matic
DESCRIPTION="software-defined analyzer for APCO P25 signals"
HOMEPAGE="http://osmocom.org/projects/op25/wiki"
inherit git-r3
#EGIT_REPO_URI="https://github.com/balint256/op25.git"
#EGIT_REPO_URI="https://git.osmocom.org/op25"
EGIT_BRANCH="python3"
EGIT_REPO_URI="https://github.com/boatbod/op25.git"
LICENSE="GPL-3"
SLOT="0"
#KEYWORDS=""
#https://github.com/osmocom/op25/blob/master/gr3.8.patch
DEPEND="${PYTHON_DEPS}
>=net-wireless/gnuradio-3.7:=
sci-libs/itpp
dev-libs/boost
dev-util/cppunit
net-libs/libpcap
${PYTHON_DEPS}"
RDEPEND="${DEPEND}"
pkg_setup() {
python-single-r1_pkg_setup
}
src_prepare() {
#workaround: compile with gcc 6
# append-cxxflags -Wno-narrowing
append-flags -funsigned-char
cmake_src_prepare
}
src_configure() {
python_export PYTHON_SITEDIR
local mycmakeargs=(
-Wno-dev
-DPYTHON_EXECUTABLE="${PYTHON}"
-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
)
cmake_src_configure
}
src_install() {
cmake_src_install
#this isn't right, but cmake is broken somehow
dodir /usr/share/${PN}
cp -r "${S}/op25/gr-op25_repeater/apps" "${ED}/usr/share/${PN}"
rm "${ED}/usr/share/${PN}/CMakeLists.txt"
}