commit: cfce8ecb33464f7f27152cc36526bb40ae934df4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Dec 29 19:24:40 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Dec 29 21:34:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfce8ecb
media-video/vlc: fix build with >=media-libs/taglib-2 Add media-libs/taglib:= slot op Closes: https://bugs.gentoo.org/938946 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/vlc/Manifest | 1 + .../{vlc-3.0.9999.ebuild => vlc-3.0.21-r2.ebuild} | 27 +++++----------------- media-video/vlc/vlc-3.0.9999.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 6d8c4a110fc2..b42ea0c78ca5 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1 +1,2 @@ +DIST vlc-3.0.21-taglib2.tar.xz 12620 BLAKE2B e0211789acc6c0381307bd154775ab32c0c403c9e245a965774667f9a83e801436b8609574f3152cde714e416d1826eb2b197349a54dfdf8eb86fc6ee3dd6f4e SHA512 f5b6691c36993b7f8002ff5c244f8e73b8fa8aeb09ef83f38f51ff9fda67c8204551cb2d762e16364229fdca6d7284a47c4d44d0a98b1d3c7759923500d04ffa DIST vlc-3.0.21.tar.xz 25649288 BLAKE2B 0ad05282d624611ba8a2b6ca062c68aabeac8f37410dd427cc9b8c0d107af48ed203b73978e2fe83e8171ea6b78caa51394f3497061b561447dbb41058e1af9f SHA512 cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.21-r2.ebuild similarity index 95% copy from media-video/vlc/vlc-3.0.9999.ebuild copy to media-video/vlc/vlc-3.0.21-r2.ebuild index 863da84818a5..c675966604da 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.21-r2.ebuild @@ -4,32 +4,16 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-beta/-test}" -MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *9999 ]] ; then - if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_BRANCH="3.0.x" - fi - EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"; - inherit git-r3 -else - if [[ ${MY_P} = ${P} ]] ; then - SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"; - else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"; - fi - S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86" -fi inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg DESCRIPTION="Media player and framework with support for most multimedia files and streaming" HOMEPAGE="https://www.videolan.org/vlc/"; +SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${P}-taglib2.tar.xz"; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86" IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth @@ -191,7 +175,7 @@ RDEPEND=" gnome-base/librsvg:2 x11-libs/cairo ) - taglib? ( <media-libs/taglib-2 ) + taglib? ( media-libs/taglib:= ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( @@ -233,7 +217,8 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch "${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164 - "${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmepg4.patch # bug 864721, thx Fedora + "${WORKDIR}"/${P}-taglib2 # bug 938946, in 3.0.x branch + "${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmpeg4.patch # bug 864721, thx Fedora ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 863da84818a5..73417535b63d 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -191,7 +191,7 @@ RDEPEND=" gnome-base/librsvg:2 x11-libs/cairo ) - taglib? ( <media-libs/taglib-2 ) + taglib? ( media-libs/taglib:= ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( @@ -233,7 +233,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch "${FILESDIR}"/${PN}-3.0.21-freerdp-2.patch # bug 919296, 590164 - "${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmepg4.patch # bug 864721, thx Fedora + "${FILESDIR}"/${PN}-3.0.21-vaapi-without-ffmpeg4.patch # bug 864721, thx Fedora ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
