commit: 03cd3275857a0d452d03b93c6db9700166b487a7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jun 14 12:53:26 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 14 12:54:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03cd3275
net-wireless/rtl-sdr: fix libdir in .pc Bug: https://bugs.gentoo.org/831403 Signed-off-by: Sam James <sam <AT> gentoo.org> ...rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch | 13 +++++++++++++ ...-9999.ebuild => rtl-sdr-0.6.0_p2020802-r1.ebuild} | 20 ++++++++------------ net-wireless/rtl-sdr/rtl-sdr-9999.ebuild | 18 +++++++----------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch new file mode 100644 index 000000000000..b71454b87828 --- /dev/null +++ b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc39bc3..4833602 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -160,7 +160,7 @@ ENDIF(CMAKE_CROSSCOMPILING) + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix \${prefix}) + set(includedir \${prefix}/include) +-set(libdir \${exec_prefix}/lib) ++set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) + + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/librtlsdr.pc.in diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild similarity index 82% copy from net-wireless/rtl-sdr/rtl-sdr-9999.ebuild copy to net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild index 4f87f3a82cdd..e6d44a620d49 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake multilib +inherit cmake -DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver" +DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver" HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"; if [[ ${PV} == 9999* ]]; then @@ -21,7 +21,7 @@ else COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5" SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" fi LICENSE="GPL-2" @@ -31,13 +31,9 @@ IUSE="+zerocopy" DEPEND="virtual/libusb:1" RDEPEND="${DEPEND}" -src_unpack() { - if [[ ${PV} == 9999* ]]; then - git-r3_src_unpack - else - default - fi -} +PATCHES=( + "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch +) src_prepare() { sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild index 4f87f3a82cdd..b00901863baa 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake multilib +inherit cmake -DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver" +DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver" HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"; if [[ ${PV} == 9999* ]]; then @@ -31,13 +31,9 @@ IUSE="+zerocopy" DEPEND="virtual/libusb:1" RDEPEND="${DEPEND}" -src_unpack() { - if [[ ${PV} == 9999* ]]; then - git-r3_src_unpack - else - default - fi -} +PATCHES=( + "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch +) src_prepare() { sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
