commit: 78abc588b5811a3b597cc476a58f9881efc6adb9 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Mar 24 15:36:31 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Mar 24 15:36:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78abc588
media-tv/tvheadend: Bump to 20240322 snapshot for ffmpeg 5+, fix Python deps Bug: https://bugs.gentoo.org/834399 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-tv/tvheadend/Manifest | 1 + ...-9999.ebuild => tvheadend-4.3_p20240322.ebuild} | 25 +++++++++++++++------- media-tv/tvheadend/tvheadend-9999.ebuild | 21 +++++++++++------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest index a4b0579a1fa6..66b6b6e2df8e 100644 --- a/media-tv/tvheadend/Manifest +++ b/media-tv/tvheadend/Manifest @@ -1 +1,2 @@ DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f +DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0 SHA512 068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild similarity index 89% copy from media-tv/tvheadend/tvheadend-9999.ebuild copy to media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild index 570fce9e982d..d151d6b97eea 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild @@ -3,19 +3,25 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +COMMIT="c63115464d8f6556fb4cac93ce8740afea1b00d5" +PYTHON_COMPAT=( python3_{10..12} ) -inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs +inherit linux-info python-single-r1 systemd toolchain-funcs DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" HOMEPAGE="https://tvheadend.org/"; -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; +SRC_URI="https://github.com/tvheadend/tvheadend/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" - +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ddci? ( dvb ) +" + BDEPEND=" ${PYTHON_DEPS} sys-devel/gettext @@ -23,6 +29,7 @@ BDEPEND=" " RDEPEND=" + ${PYTHON_DEPS} acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) @@ -50,13 +57,14 @@ DEPEND=" " RDEPEND+=" + $(python_gen_cond_dep ' + dev-python/requests[${PYTHON_USEDEP}] + ') dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv ) " -REQUIRED_USE=" - ddci? ( dvb ) -" +S="${WORKDIR}/${PN}-${COMMIT}" # Some patches from: # https://github.com/rpmfusion/tvheadend @@ -71,7 +79,7 @@ PATCHES=( DOCS=( README.md ) pkg_setup() { - python-any-r1_pkg_setup + python-single-r1_pkg_setup use inotify && CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup @@ -130,6 +138,7 @@ src_compile() { src_install() { default + python_fix_shebang "${ED}"/usr/bin/ newinitd "${FILESDIR}"/tvheadend.initd tvheadend newconfd "${FILESDIR}"/tvheadend.confd tvheadend diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 570fce9e982d..21d9095d7d84 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit git-r3 linux-info python-any-r1 systemd toolchain-funcs +inherit git-r3 linux-info python-single-r1 systemd toolchain-funcs DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder" HOMEPAGE="https://tvheadend.org/"; @@ -13,9 +13,13 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; LICENSE="GPL-3" SLOT="0" - IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ddci? ( dvb ) +" + BDEPEND=" ${PYTHON_DEPS} sys-devel/gettext @@ -23,6 +27,7 @@ BDEPEND=" " RDEPEND=" + ${PYTHON_DEPS} acct-user/tvheadend virtual/libiconv dbus? ( sys-apps/dbus ) @@ -50,14 +55,13 @@ DEPEND=" " RDEPEND+=" + $(python_gen_cond_dep ' + dev-python/requests[${PYTHON_USEDEP}] + ') dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv ) " -REQUIRED_USE=" - ddci? ( dvb ) -" - # Some patches from: # https://github.com/rpmfusion/tvheadend @@ -71,7 +75,7 @@ PATCHES=( DOCS=( README.md ) pkg_setup() { - python-any-r1_pkg_setup + python-single-r1_pkg_setup use inotify && CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup @@ -130,6 +134,7 @@ src_compile() { src_install() { default + python_fix_shebang "${ED}"/usr/bin/ newinitd "${FILESDIR}"/tvheadend.initd tvheadend newconfd "${FILESDIR}"/tvheadend.confd tvheadend
