From d52f456408a9318f26e2b2479f0cb24b1da2eafe Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 26 Nov 2025 22:41:04 +0100 Subject: [PATCH] media-video/vlc: drop 3.0.21_p20250217-r4 Signed-off-by: Andreas Sturmlechner --- media-video/vlc/Manifest | 1 - .../vlc/files/vlc-3.0.21-freerdp-2.patch | 230 -------- media-video/vlc/metadata.xml | 1 - .../vlc/vlc-3.0.21_p20250217-r4.ebuild | 504 ------------------ 4 files changed, 736 deletions(-) delete mode 100644 media-video/vlc/files/vlc-3.0.21-freerdp-2.patch delete mode 100644 media-video/vlc/vlc-3.0.21_p20250217-r4.ebuild diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index bb1394b286836..5062c366ae9f2 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-rc2.tar.xz 26426204 BLAKE2B a75ec346e047e951494b3a2df21493117ac4533f55e54629759c9a666dcb1a319b21482af2583b65fd2fe0006d044c1127bc08076620373c841670d32410da32 SHA512 52cd274ddab0d8f7eb247a32c26cc311ae86d53c205fbee30f0958788e8340bed79a5dce15d121b47fd5638b5999802a9c9d314e7bf91d79aa33141cef801927 DIST vlc-3.0.22_rc1-5bd37679.tar.gz 32590898 BLAKE2B a7d4eeb24e26f3e4e891f4d0fb50c4720521a6294c082d9bcacf550779a7a99608d01084bb517879f4b363e51ce0675e4de4aa5ef73be45adb7291df743beee1 SHA512 6e9abf40d2e53a51acb3be51834bcfcb214e1fc243bdfa5123704f7e0acc9267048b7a1809b396c3c0b7b94fcb5f47ab36825d9f4fbdc89d2a68326e3fa2935f diff --git a/media-video/vlc/files/vlc-3.0.21-freerdp-2.patch b/media-video/vlc/files/vlc-3.0.21-freerdp-2.patch deleted file mode 100644 index 2c2311d352c41..0000000000000 --- a/media-video/vlc/files/vlc-3.0.21-freerdp-2.patch +++ /dev/null @@ -1,230 +0,0 @@ -https://bugs.gentoo.org/590164 -https://bugs.gentoo.org/919296 -https://code.videolan.org/videolan/vlc/-/commit/95e7bba6105bd8c2b8ea9cabc02c8dfe7411cab2 - -diff --git a/configure.ac b/configure.ac -index 4870d9f718..ce656be9ae 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2159,7 +2159,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [libvncclient >= 0.9.9], (VNC/rfb client su - - dnl RDP/Remote Desktop access module - dnl --PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) -+PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 2.0.0], (RDP/Remote Desktop client support) ) - - dnl - dnl AVFoundation -diff --git a/modules/access/rdp.c b/modules/access/rdp.c -index 51b63ae942..87a55310cb 100644 ---- a/modules/access/rdp.c -+++ b/modules/access/rdp.c -@@ -45,18 +45,6 @@ - # include - #endif - --#if !defined(FREERDP_VERSION_MAJOR) || \ -- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) --# define SoftwareGdi sw_gdi --# define Fullscreen fullscreen --# define ServerHostname hostname --# define Username username --# define Password password --# define ServerPort port --# define EncryptionMethods encryption --# define ContextSize context_size --#endif -- - #include - #ifdef HAVE_POLL_H - # include -@@ -75,6 +63,8 @@ - - #define CFG_PREFIX "rdp-" - -+#define FREERDP_PIXEL_BPP(_format) (_format >> 24) -+ - /***************************************************************************** - * Module descriptor - *****************************************************************************/ -@@ -136,11 +126,12 @@ typedef struct vlcrdp_context_t vlcrdp_context_t; - - /* updates handlers */ - --static void desktopResizeHandler( rdpContext *p_context ) -+static BOOL desktopResizeHandler( rdpContext *p_context ) - { - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context; - demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; - rdpGdi *p_gdi = p_context->gdi; -+ int i_colordepth = FREERDP_PIXEL_BPP( p_gdi->dstFormat ); - - if ( p_sys->es ) - { -@@ -148,11 +139,13 @@ static void desktopResizeHandler( rdpContext *p_context ) - p_sys->es = NULL; - } - -- /* Now init and fill es format */ - vlc_fourcc_t i_chroma; -- switch( p_gdi->bytesPerPixel ) -+ /* Now init and fill es format */ -+ switch ( i_colordepth ) - { - default: -+ msg_Dbg( p_vlccontext->p_demux, "invalid color depth %d", i_colordepth); -+ /* fallthrough */ - case 16: - i_chroma = VLC_CODEC_RGB16; - break; -@@ -160,7 +153,7 @@ static void desktopResizeHandler( rdpContext *p_context ) - i_chroma = VLC_CODEC_RGB24; - break; - case 32: -- i_chroma = VLC_CODEC_RGB32; -+ i_chroma = VLC_CODEC_ARGB; - break; - } - es_format_t fmt; -@@ -173,7 +166,7 @@ static void desktopResizeHandler( rdpContext *p_context ) - fmt.video.i_height = p_gdi->height; - fmt.video.i_frame_rate_base = 1000; - fmt.video.i_frame_rate = 1000 * p_sys->f_fps; -- p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel; -+ p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * (i_colordepth >> 3); - - if ( p_sys->p_block ) - p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize ); -@@ -181,20 +174,21 @@ static void desktopResizeHandler( rdpContext *p_context ) - p_sys->p_block = block_Alloc( p_sys->i_framebuffersize ); - - p_sys->es = es_out_Add( p_vlccontext->p_demux->out, &fmt ); -+ return TRUE; - } - --static void beginPaintHandler( rdpContext *p_context ) -+static BOOL beginPaintHandler( rdpContext *p_context ) - { - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context; - demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; - rdpGdi *p_gdi = p_context->gdi; -- p_gdi->primary->hdc->hwnd->invalid->null = 1; -- p_gdi->primary->hdc->hwnd->ninvalid = 0; -+ p_gdi->primary->hdc->hwnd->invalid->null = TRUE; - if ( ! p_sys->p_block && p_sys->i_framebuffersize ) - p_sys->p_block = block_Alloc( p_sys->i_framebuffersize ); -+ return TRUE; - } - --static void endPaintHandler( rdpContext *p_context ) -+static BOOL endPaintHandler( rdpContext *p_context ) - { - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context; - demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; -@@ -205,11 +199,12 @@ static void endPaintHandler( rdpContext *p_context ) - p_sys->p_block->i_buffer = p_sys->i_framebuffersize; - memcpy( p_sys->p_block->p_buffer, p_gdi->primary_buffer, p_sys->p_block->i_buffer ); - } -+ return TRUE; - } - - /* instance handlers */ - --static bool preConnectHandler( freerdp *p_instance ) -+static BOOL preConnectHandler( freerdp *p_instance ) - { - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; - demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; -@@ -226,49 +221,54 @@ static bool preConnectHandler( freerdp *p_instance ) - p_instance->settings->EncryptionMethods = - var_InheritBool( p_vlccontext->p_demux, CFG_PREFIX "encrypt" ); - -- return true; -+ return TRUE; - } - --static bool postConnectHandler( freerdp *p_instance ) -+static BOOL postConnectHandler( freerdp *p_instance ) - { - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; - - msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", --#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)) - p_instance->settings->DesktopWidth, - p_instance->settings->DesktopHeight, - p_instance->settings->ColorDepth --#else -- p_instance->settings->width, -- p_instance->settings->height, -- p_instance->settings->color_depth --#endif - ); - - p_instance->update->DesktopResize = desktopResizeHandler; - p_instance->update->BeginPaint = beginPaintHandler; - p_instance->update->EndPaint = endPaintHandler; -+ UINT32 format; -+ switch ( p_instance->settings->ColorDepth ) -+ { -+ default: -+ msg_Dbg( p_vlccontext->p_demux, "no valid pixel format found for color depth %d bpp", p_instance->settings->ColorDepth); -+ /* fallthrough */ -+ case 16: -+ format = PIXEL_FORMAT_RGB16; -+ break; -+ case 24: -+ format = PIXEL_FORMAT_RGB24; -+ break; -+ case 32: -+ format = PIXEL_FORMAT_ARGB32; -+ break; -+ } - - gdi_init( p_instance, -- CLRBUF_16BPP | --#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ -- !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) -- CLRBUF_24BPP | --#endif -- CLRBUF_32BPP, NULL ); -+ format ); - - desktopResizeHandler( p_instance->context ); -- return true; -+ return TRUE; - } - --static bool authenticateHandler( freerdp *p_instance, char** ppsz_username, -+static BOOL authenticateHandler( freerdp *p_instance, char** ppsz_username, - char** ppsz_password, char** ppsz_domain ) - { - VLC_UNUSED(ppsz_domain); - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; - *ppsz_username = var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "user" ); - *ppsz_password = var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "password" ); -- return true; -+ return TRUE; - } - - /***************************************************************************** -@@ -431,10 +431,6 @@ static int Open( vlc_object_t *p_this ) - if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; - p_sys->i_frame_interval = CLOCK_FREQ / p_sys->f_fps; - --#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 -- freerdp_channels_global_init(); --#endif -- - p_sys->p_instance = freerdp_new(); - if ( !p_sys->p_instance ) - { -@@ -507,9 +503,6 @@ static void Close( vlc_object_t *p_this ) - - freerdp_disconnect( p_sys->p_instance ); - freerdp_free( p_sys->p_instance ); --#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 -- freerdp_channels_global_uninit(); --#endif - - if ( p_sys->p_block ) - block_Release( p_sys->p_block ); diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index 370630f1402c6..68dc0294c9a79 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -26,7 +26,6 @@ Adds support for Ogg Kate subtitles via libkate Enable kernel mode setting video output plugin via x11-libs/libdrm Enable support for GPU accelerated video rendering with media-libs/libplacebo - Uses libtar instead of the built-in tar reader for reading custom skins Enable Ogg Kate subtitles rendering using libtiger Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards Enable live555 streaming media support (client support for rtsp) diff --git a/media-video/vlc/vlc-3.0.21_p20250217-r4.ebuild b/media-video/vlc/vlc-3.0.21_p20250217-r4.ebuild deleted file mode 100644 index ed54fede792b6..0000000000000 --- a/media-video/vlc/vlc-3.0.21_p20250217-r4.ebuild +++ /dev/null @@ -1,504 +0,0 @@ -# Copyright 2000-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -COMMIT=ac807d2c8574c292a34c51e000c1554f372aa618 -LUA_COMPAT=( lua5-{1..2} ) -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://code.videolan.org/videolan/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" -S="${WORKDIR}/${PN}-${COMMIT}" - -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 - fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate - libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua - macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg - omxil optimisememory opus png projectm pulseaudio rdp 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 ) - libtar? ( skins ) - libtiger? ( kate ) - lua? ( ${LUA_REQUIRED_USE} ) - skins? ( archive gui truetype X xml ) - ssl? ( gcrypt ) - vaapi? ( ffmpeg X ) - vdpau? ( ffmpeg X ) -" -# 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 ) -" -# =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 -}