commit: 8b38662222f2b8b469461cf299c2612841a40504 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 17 18:09:42 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 17 18:35:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b386622
media-video/vlc: Revbump 3.0.22_rc1 to retagged commit Unfortunately, upstream are retagging rc1 again and again. The next best thing we can do to deal with this situation is to pin a revbump to current 3.0.22_rc1 commit hash. Closes: https://bugs.gentoo.org/962833 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/vlc/Manifest | 1 + ...lc-3.0.9999.ebuild => vlc-3.0.22_rc1-r2.ebuild} | 24 +++++++++++++-------- media-video/vlc/vlc-3.0.9999.ebuild | 22 ++++++++++++------- media-video/vlc/vlc-9999.ebuild | 25 +++++++++++++--------- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 4538899a6323..5391afcaff27 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,2 +1,3 @@ DIST vlc-3.0.21_p20250217.tar.bz2 24645521 BLAKE2B 473cc2bc5f385635ba7c36bca2ddb0ca6cb479491e7a5baa51583edce3fa1e4b0a7afd883d595332cafe8d1b22e743e0f306aebfe2c7c13d3317d0ea5502bb38 SHA512 95d23c8ecf013d072530fe7cd6e78b5efc0a7132407e8d09d02014b4a7cf9f508cea4c18c0f39edced634338fce06613a207b5f0b556344c7481a1ed5af2dc5f DIST vlc-3.0.22-rc1.tar.bz2 24674367 BLAKE2B df8252146441c16c510247a8aa731e5f54f4a95efcea2a3be3c2047f61ba310f68c2f0d1f7ad622b548d2f2abd41494013c91247b4650ca459653f2d52c29937 SHA512 1ef222e2c8110ce40876fee6fea1d8c1c057629c78d80f39ce8a53a6ac78627616e761b47ed633a82df26dac7a56fa0bfe0a28c863605678387ab1259c76f93f +DIST vlc-3.0.22_rc1-5bd37679.tar.gz 32590898 BLAKE2B a7d4eeb24e26f3e4e891f4d0fb50c4720521a6294c082d9bcacf550779a7a99608d01084bb517879f4b363e51ce0675e4de4aa5ef73be45adb7291df743beee1 SHA512 6e9abf40d2e53a51acb3be51834bcfcb214e1fc243bdfa5123704f7e0acc9267048b7a1809b396c3c0b7b94fcb5f47ab36825d9f4fbdc89d2a68326e3fa2935f diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.22_rc1-r2.ebuild similarity index 95% copy from media-video/vlc/vlc-3.0.9999.ebuild copy to media-video/vlc/vlc-3.0.22_rc1-r2.ebuild index 0d22fc0c5257..d03cb2fae17d 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.22_rc1-r2.ebuild @@ -8,19 +8,25 @@ 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* ]] ; then if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_BRANCH="3.0.x" + EGIT_BRANCH="${PV%.9999}.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"; + COMMIT=5bd37679406d364c39c3385867794cce814aa664 + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://code.videolan.org/videolan/vlc/-/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"; + 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}" 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 @@ -227,6 +233,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + PATCHES=( "${FILESDIR}"/${PN}-3.0.22-gettext-version.patch # bug 766549 "${FILESDIR}"/${PN}-3.0.22-no-vlc-cache-gen.patch # bugs 564842, 608256 @@ -236,8 +244,6 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch ) -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - pkg_setup() { if use lua; then lua-single_pkg_setup @@ -256,7 +262,7 @@ src_prepare() { fi # Make it build with libtool 1.5 - rm m4/lt* m4/libtool.m4 || die + # rm m4/lt* m4/libtool.m4 || die # We are not in a real git checkout due to the absence of a .git directory. touch src/revision.txt || die diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 0d22fc0c5257..2ff9f31ba1ea 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -8,19 +8,25 @@ 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* ]] ; then if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_BRANCH="3.0.x" + EGIT_BRANCH="${PV%.9999}.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"; + COMMIT= + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://code.videolan.org/videolan/vlc/-/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"; + 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}" 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 @@ -227,6 +233,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + PATCHES=( "${FILESDIR}"/${PN}-3.0.22-gettext-version.patch # bug 766549 "${FILESDIR}"/${PN}-3.0.22-no-vlc-cache-gen.patch # bugs 564842, 608256 @@ -236,8 +244,6 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch ) -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - pkg_setup() { if use lua; then lua-single_pkg_setup diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index ca5765dd31a5..a0be3860d866 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -8,26 +8,31 @@ 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* ]] ; then if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_BRANCH="3.0.x" + EGIT_BRANCH="${PV%.9999}.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"; + COMMIT= + if [[ -n ${COMMIT} ]] ; then + SRC_URI="https://code.videolan.org/videolan/vlc/-/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"; + 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}" fi - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86" + 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/"; -S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2.1 GPL-2" SLOT="0/12-9" # vlc - vlccore @@ -231,6 +236,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " +DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt ) + PATCHES=( "${FILESDIR}"/${PN}-9999-gettext-version.patch # bug 766549 "${FILESDIR}"/${PN}-9999-no-vlc-cache-gen.patch # bugs 564842, 608256 @@ -238,8 +245,6 @@ PATCHES=( "${FILESDIR}"/${PN}-9999-configure-lua-version.patch ) -DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt ) - pkg_setup() { if use lua; then lua-single_pkg_setup
