commit: 2f345159df2e2f90a53de975b46158090913b479 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 17 18:12:01 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 17 18:35:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f345159
media-video/vlc: drop 3.0.22_rc1-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/vlc/Manifest | 1 - .../files/vlc-3.0.22-live555-fix-w-20241128.patch | 47 -- media-video/vlc/vlc-3.0.22_rc1-r1.ebuild | 505 --------------------- 3 files changed, 553 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 5391afcaff27..3a83010e2c36 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,3 +1,2 @@ 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/files/vlc-3.0.22-live555-fix-w-20241128.patch b/media-video/vlc/files/vlc-3.0.22-live555-fix-w-20241128.patch deleted file mode 100644 index 3b61982a6e67..000000000000 --- a/media-video/vlc/files/vlc-3.0.22-live555-fix-w-20241128.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://code.videolan.org/videolan/vlc/-/merge_requests/7709 - -From 2ae84a65385394637f243e37a89026a20828c657 Mon Sep 17 00:00:00 2001 -From: Florian Albrechtskirchinger <[email protected]> -Date: Sun, 2 Mar 2025 08:30:43 +0100 -Subject: [PATCH] live555: fix build with versions >= 2024.11.28 - -In the 2024.11.28 release (version 1732752000), live555 introduced -`EventLoopWatchVariable` as a typedef for `std::atomic<char>`, replacing -direct use of `char` in earlier versions. Add a conditional typedef to -define it as `char` for older versions, and update `event_rtsp` and -`event_data` to use `EventLoopWatchVariable`. - -(cherry picked from commit 8befcbfa834b809602db24c9ba7456d8cfc25cdb) ---- - modules/access/live555.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp -index e90382eeb3..a495187763 100644 ---- a/modules/access/live555.cpp -+++ b/modules/access/live555.cpp -@@ -198,6 +198,10 @@ class RTSPClientVlc; - #define CAP_SUBSESSION_PAUSE (1 << 3) - #define CAPS_DEFAULT CAP_RATE_CONTROL - -+#if LIVEMEDIA_LIBRARY_VERSION_INT < 1732752000 // 2024.11.28 -+typedef char EventLoopWatchVariable; -+#endif -+ - struct demux_sys_t - { - char *p_sdp; /* XXX mallocated */ -@@ -236,8 +240,8 @@ struct demux_sys_t - bool b_no_data; /* if we never received any data */ - int i_no_data_ti; /* consecutive number of TaskInterrupt */ - -- char event_rtsp; -- char event_data; -+ EventLoopWatchVariable event_rtsp; -+ EventLoopWatchVariable event_data; - - bool b_get_param; /* Does the server support GET_PARAMETER */ - bool b_paused; /* Are we paused? */ --- -2.51.0 - diff --git a/media-video/vlc/vlc-3.0.22_rc1-r1.ebuild b/media-video/vlc/vlc-3.0.22_rc1-r1.ebuild deleted file mode 100644 index f258c996a79f..000000000000 --- a/media-video/vlc/vlc-3.0.22_rc1-r1.ebuild +++ /dev/null @@ -1,505 +0,0 @@ -# Copyright 2000-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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"; - SRC_URI="https://code.videolan.org/videolan/vlc/-/archive/${MY_PV}/${MY_P}.tar.bz2"; - 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/"; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-9" # vlc - vlccore - -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 - fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate - libass libcaca libnotify +libsamplerate libtiger linsys lirc live lua - macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg - omxil optimisememory opus png projectm pulseaudio run-as-root samba sdl-image - sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame - udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi - cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse -" -REQUIRED_USE=" - chromecast? ( encode ) - directx? ( ffmpeg ) - fontconfig? ( truetype ) - libcaca? ( X ) - libtiger? ( kate ) - lua? ( ${LUA_REQUIRED_USE} ) - skins? ( archive gui truetype X xml ) - ssl? ( gcrypt ) - vaapi? ( ffmpeg X ) - vdpau? ( ffmpeg X ) -" -# live+snapshots need bison+flex -BDEPEND=" - sys-devel/bison - sys-devel/flex - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - lua? ( ${LUA_DEPS} ) - amd64? ( dev-lang/yasm ) - wayland? ( dev-util/wayland-scanner ) - x86? ( dev-lang/yasm ) -" -RDEPEND=" - media-libs/libvorbis - net-dns/libidn:= - sys-libs/zlib - virtual/libintl - virtual/opengl - a52? ( media-libs/a52dec ) - alsa? ( media-libs/alsa-lib ) - aom? ( media-libs/libaom:= ) - archive? ( app-arch/libarchive:= ) - aribsub? ( media-libs/aribb24 ) - bidi? ( - dev-libs/fribidi - media-libs/freetype:2[harfbuzz] - media-libs/harfbuzz:= - virtual/ttf-fonts - ) - bluray? ( >=media-libs/libbluray-1.3.0:= ) - cddb? ( media-libs/libcddb ) - chromaprint? ( media-libs/chromaprint:= ) - chromecast? ( - >=dev-libs/protobuf-2.5.0:= - >=net-libs/libmicrodns-0.1.2:= - ) - dav1d? ( media-libs/dav1d:= ) - dbus? ( sys-apps/dbus ) - dc1394? ( - media-libs/libdc1394:2 - sys-libs/libraw1394 - ) - dts? ( media-libs/libdca ) - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) - dvd? ( - >=media-libs/libdvdnav-6.1.1:= - >=media-libs/libdvdread-6.1.2:= - ) - faad? ( media-libs/faad2 ) - fdk? ( media-libs/fdk-aac:= ) - ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[vaapi?,vdpau?] ) - flac? ( - media-libs/flac:= - media-libs/libogg - ) - fluidsynth? ( media-sound/fluidsynth:= ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( - dev-libs/libgcrypt:= - dev-libs/libgpg-error - ) - gme? ( media-libs/game-music-emu ) - keyring? ( app-crypt/libsecret ) - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) - ieee1394? ( - sys-libs/libavc1394 - sys-libs/libraw1394 - ) - jack? ( virtual/jack ) - jpeg? ( media-libs/libjpeg-turbo:0 ) - kate? ( media-libs/libkate ) - libass? ( - media-libs/fontconfig:1.0 - media-libs/libass:= - ) - libcaca? ( media-libs/libcaca ) - libnotify? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libnotify - ) - libsamplerate? ( media-libs/libsamplerate ) - libtiger? ( media-libs/libtiger ) - linsys? ( media-libs/zvbi ) - lirc? ( app-misc/lirc ) - live? ( media-plugins/live:= ) - lua? ( ${LUA_DEPS} ) - mad? ( media-libs/libmad ) - matroska? ( - >=dev-libs/libebml-1.4.2:= - media-libs/libmatroska:= - ) - modplug? ( >=media-libs/libmodplug-0.8.9.0 ) - mp3? ( media-sound/mpg123-base ) - mpeg? ( media-libs/libmpeg2 ) - mtp? ( media-libs/libmtp:= ) - musepack? ( media-sound/musepack-tools ) - ncurses? ( sys-libs/ncurses:=[unicode(+)] ) - nfs? ( >=net-fs/libnfs-0.10.0:= ) - ogg? ( media-libs/libogg ) - opus? ( >=media-libs/opus-1.0.3 ) - png? ( media-libs/libpng:0= ) - projectm? ( - media-fonts/dejavu - >=media-libs/libprojectm-3.1.12:0= - ) - pulseaudio? ( media-libs/libpulse ) - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - sdl-image? ( media-libs/sdl-image ) - sftp? ( net-libs/libssh2 ) - shout? ( media-libs/libshout ) - sid? ( media-libs/libsidplay:2 ) - skins? ( - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXpm - ) - soxr? ( >=media-libs/soxr-0.1.2 ) - speex? ( - >=media-libs/speex-1.2.0 - media-libs/speexdsp - ) - srt? ( >=net-libs/srt-1.4.2:= ) - ssl? ( net-libs/gnutls:= ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - ) - taglib? ( media-libs/taglib:= ) - theora? ( media-libs/libtheora:= ) - tremor? ( media-libs/tremor ) - truetype? ( - media-libs/freetype:2 - virtual/ttf-fonts - !fontconfig? ( media-fonts/dejavu ) - ) - twolame? ( media-sound/twolame ) - udev? ( virtual/udev ) - upnp? ( net-libs/libupnp:=[ipv6(+)] ) - v4l? ( media-libs/libv4l:= ) - vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) - vnc? ( net-libs/libvncserver ) - vpx? ( media-libs/libvpx:= ) - wayland? ( - >=dev-libs/wayland-1.15 - dev-libs/wayland-protocols - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-keysyms - ) - x264? ( >=media-libs/x264-0.0.20190214:= ) - x265? ( media-libs/x265:= ) - xml? ( dev-libs/libxml2:2= ) - zeroconf? ( net-dns/avahi[dbus] ) - zvbi? ( media-libs/zvbi ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.22-gettext-version.patch # bug 766549 - "${FILESDIR}"/${PN}-3.0.22-no-vlc-cache-gen.patch # bugs 564842, 608256 - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system - "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 - "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch - "${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch - "${FILESDIR}"/${PN}-3.0.22-live555-fix-w-20241128.patch # git master -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - -pkg_setup() { - if use lua; then - lua-single_pkg_setup - fi -} - -src_prepare() { - default - - # bug 608256 - xdg_environment_reset - - # Bootstrap when we are on a git checkout. - if [[ ${PV} == *9999* || ${PV} == *_p[0-9]* ]] ; then - ./bootstrap - fi - - # Make it build with libtool 1.5 - # 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 - - # Don't use --started-from-file when not using dbus. - if ! use dbus ; then - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die - fi - - eautoreconf -} - -src_configure() { - # live+snapshots need bison+flex - unset LEX YACC - - local -x BUILDCC="$(tc-getBUILD_CC)" - - local myeconfargs=( - --disable-aa - --disable-amf-frc # DirectX specific - --disable-freerdp # bug 921096 - --disable-optimizations - --disable-postproc # bug 961436 - --disable-rpath - --disable-update-check - --enable-fast-install - --enable-screen - --enable-vcd - --enable-vlc - --enable-vorbis - $(use_enable a52) # not officially supported anymore (avcodec takes priority) - $(use_enable alsa) - $(use_enable aom) - $(use_enable archive) - $(use_enable aribsub) - $(use_enable bidi fribidi) - $(use_enable bidi harfbuzz) - $(use_enable bluray) - $(use_enable cddb libcddb) - $(use_enable chromaprint) - $(use_enable chromecast) - $(use_enable chromecast microdns) - $(use_enable cpu_flags_arm_neon neon) - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable dav1d) - $(use_enable dbus) - $(use_enable dbus kwallet) - $(use_enable dc1394) - $(use_enable debug) - $(use_enable directx) - $(use_enable directx d3d11va) - $(use_enable directx dxva2) - $(use_enable dts dca) # not officially supported anymore (avcodec takes priority) - $(use_enable dvbpsi) - $(use_enable dvd dvdnav) - $(use_enable dvd dvdread) - $(use_enable encode sout) - $(use_enable encode vlm) - $(use_enable faad) - $(use_enable fdk fdkaac) - $(use_enable ffmpeg avcodec) - $(use_enable ffmpeg avformat) - $(use_enable ffmpeg swscale) - $(use_enable flac) - $(use_enable fluidsynth) - $(use_enable fontconfig) - $(use_enable gcrypt libgcrypt) - $(use_enable gme) - $(use_enable keyring secret) - $(use_enable gstreamer gst-decode) - $(use_enable gui qt) - $(use_enable ieee1394 dv1394) - $(use_enable jack) - $(use_enable jpeg) - $(use_enable kate) - $(use_enable libass) - $(use_enable libcaca caca) - $(use_enable libnotify notify) - $(use_enable libsamplerate samplerate) - $(use_enable libtiger tiger) - $(use_enable linsys) - $(use_enable lirc) - $(use_enable live live555) - $(use_enable lua) - $(use_enable macosx-notifications osx-notifications) - $(use_enable mad) - $(use_enable matroska) - $(use_enable modplug mod) - $(use_enable mp3 mpg123) - $(use_enable mpeg libmpeg2) # not officially supported anymore (avcodec takes priority) - $(use_enable mtp) - $(use_enable musepack mpc) - $(use_enable ncurses) - $(use_enable nfs) - $(use_enable ogg) - $(use_enable omxil) - $(use_enable omxil omxil-vout) - $(use_enable optimisememory optimize-memory) - $(use_enable opus) - $(use_enable png) - $(use_enable projectm) - $(use_enable pulseaudio pulse) - $(use_enable run-as-root) - $(use_enable samba smbclient) - $(use_enable sdl-image) - $(use_enable sftp) - $(use_enable shout) - $(use_enable sid) - $(use_enable skins skins2) - $(use_enable soxr) - $(use_enable speex) - $(use_enable srt) - $(use_enable ssl gnutls) - $(use_enable svg) - $(use_enable svg svgdec) - $(use_enable taglib) - $(use_enable theora) - $(use_enable tremor) - $(use_enable twolame) - $(use_enable udev) - $(use_enable upnp) - $(use_enable v4l v4l2) - $(use_enable vaapi libva) - $(use_enable vdpau) - $(use_enable vnc) - $(use_enable vpx) - $(use_enable wayland) - $(use_with X x) - $(use_enable X xcb) - $(use_enable X xvideo) - $(use_enable x264) - $(use_enable x264 x26410b) - $(use_enable x265) - $(use_enable xml libxml2) - $(use_enable zeroconf avahi) - $(use_enable zvbi) - $(use_enable !zvbi telx) - --with-kde-solid="${EPREFIX}"/usr/share/solid/actions - --disable-asdcp - --disable-coverage - --disable-cprof - --disable-crystalhd - --disable-decklink - --disable-gles2 - --disable-goom - --disable-kai - --disable-kva - --disable-libplacebo - --disable-maintainer-mode - --disable-merge-ffmpeg - --disable-mfx - --disable-mmal - --disable-opencv - --disable-opensles - --disable-oss - --disable-rpi-omxil - --disable-schroedinger - --disable-shine - --disable-sndio - --disable-spatialaudio - --disable-vsxu - --disable-wasapi - --disable-wma-fixed - ) - # ^ We don't have these disabled libraries in the Portage tree yet. - - # https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143) - append-flags -fno-strict-aliasing - filter-lto - - # Compatibility fix for Samba 4. - use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0" - - if use x86; then - # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 - append-cflags $(test-flags-CC -fno-stack-check) - # Bug 569774 - replace-flags -Os -O2 - fi - - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... - append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/" - - if use riscv; then - # bug #803473 - append-libs -latomic - fi - - if use truetype || use bidi; then - myeconfargs+=( --enable-freetype ) - else - myeconfargs+=( --disable-freetype ) - fi - - if use truetype || use projectm; then - local dejavu="${EPREFIX}/usr/share/fonts/dejavu/" - myeconfargs+=( - --with-default-font=${dejavu}/DejaVuSans.ttf - --with-default-font-family=Sans - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace - ) - fi - - econf "${myeconfargs[@]}" - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values may break the build (bug 523144), so definition should not be removed. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h - sed -i '1i#undef _FORTIFY_SOURCE' config.h || die -} - -src_test() { - virtx emake check-TESTS -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" - "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/" - else - ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" - ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually" - ewarn "If you do not do it, vlc will take a long time to load." - fi - - xdg_pkg_postinst -} - -pkg_postrm() { - if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" - fi - - xdg_pkg_postrm -}
