commit: e014d41451b0d3fc3f9037d37703a20de1d197e3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 25 02:26:13 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 25 02:35:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e014d414
media-video/vlc: fix USE=srt with >=net-libs/srt-1.4.2 Thanks-to: Attila Tóth <atoth <AT> atoth.sote.hu> Closes: https://bugs.gentoo.org/758062 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch | 25 ++++++++++++++++++++++ ...3.0.11.1-r100.ebuild => vlc-3.0.11.1-r1.ebuild} | 18 ++++------------ ...0.11.1-r100.ebuild => vlc-3.0.11.1-r101.ebuild} | 3 ++- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch new file mode 100644 index 00000000000..d617a8357ff --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch @@ -0,0 +1,25 @@ +net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY. +https://github.com/Haivision/srt/pull/1364 +https://bugs.gentoo.org/758062 +--- b/modules/access/srt.c ++++ a/modules/access/srt.c +@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea + + /* Set latency */ + i_latency = var_InheritInteger( p_stream, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + psz_passphrase = var_InheritString( p_stream, "passphrase" ); +--- a/modules/access_output/srt.c ++++ b/modules/access_output/srt.c +@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_ + + /* Set latency */ + i_latency = var_InheritInteger( p_access, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r1.ebuild similarity index 97% copy from media-video/vlc/vlc-3.0.11.1-r100.ebuild copy to media-video/vlc/vlc-3.0.11.1-r1.ebuild index 1c18dbda43a..5191f531572 100644 --- a/media-video/vlc/vlc-3.0.11.1-r100.ebuild +++ b/media-video/vlc/vlc-3.0.11.1-r1.ebuild @@ -3,8 +3,6 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..2} ) - MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" MY_P="${PN}-${MY_PV}" @@ -23,7 +21,7 @@ else fi KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" fi -inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg +inherit autotools flag-o-matic toolchain-funcs virtualx xdg DESCRIPTION="Media player and framework with support for most multimedia files and streaming" HOMEPAGE="https://www.videolan.org/vlc/"; @@ -49,7 +47,6 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - lua? ( ${LUA_REQUIRED_USE} ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -58,7 +55,6 @@ REQUIRED_USE=" BDEPEND=" >=sys-devel/gettext-0.19.8 virtual/pkgconfig - lua? ( ${LUA_DEPS} ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) " @@ -137,7 +133,7 @@ RDEPEND=" linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) - lua? ( ${LUA_DEPS} ) + lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= @@ -184,7 +180,7 @@ RDEPEND=" >=media-libs/speex-1.2.0 media-libs/speexdsp ) - srt? ( net-libs/srt ) + srt? ( >=net-libs/srt-1.4.2 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 @@ -232,19 +228,13 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream - "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) S="${WORKDIR}/${MY_P}" -pkg_setup() { - if use lua; then - lua-single_pkg_setup - fi -} - src_prepare() { xdg_src_prepare # bug 608256 diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r101.ebuild similarity index 99% rename from media-video/vlc/vlc-3.0.11.1-r100.ebuild rename to media-video/vlc/vlc-3.0.11.1-r101.ebuild index 1c18dbda43a..f07316c9278 100644 --- a/media-video/vlc/vlc-3.0.11.1-r100.ebuild +++ b/media-video/vlc/vlc-3.0.11.1-r101.ebuild @@ -184,7 +184,7 @@ RDEPEND=" >=media-libs/speex-1.2.0 media-libs/speexdsp ) - srt? ( net-libs/srt ) + srt? ( >=net-libs/srt-1.4.2 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 @@ -233,6 +233,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
