Hello everyone!
Here is a small update revision for x11/vlc.
In this case the revision is intended to enable the construction of
x11/vlc without libplacebo support, since VLC3 does not support
(and it seems that it will not support) libplacebo(>=6).
Building VLC with libplacebo support simply doesn't work with this new
libplacebo library. However, we need libplacebo(>=6) to be able to
update mpv (0.37.0).
In VLC upstream, the only solution they give to this problem at the
moment is to wait for the future release of VLC4 (without a defined
release date).
To solve this, I propose to compile x11/vlc without libplacebo support,
and replace its functionality with graphics/lcms2. So, we can compile a
working x11/vlc, update when necessary and build the new versions of
libplacebo and mpv.
I also take the opportunity to add libraries that "make
port-lib-depends-check" has indicated are missing (wayland stuff).
I attach the diff for the changes in x11/vlc and link [1] to upstream
VLC discussion.
[1] https://code.videolan.org/videolan/vlc/-/merge_requests/3950
--
*********************************************************
Dios en su cielo, todo bien en la Tierra
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.268
diff -u -p -r1.268 Makefile
--- Makefile 2 Feb 2024 20:09:08 -0000 1.268
+++ Makefile 14 Feb 2024 01:30:31 -0000
@@ -5,7 +5,7 @@ V= 3.0.18
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
-REVISION-main= 5
+REVISION-main= 6
CATEGORIES= x11
SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
@@ -53,20 +53,20 @@ WANTLIB-main += absl_throw_delegate absl
WANTLIB-main += ass atk-1.0 atk-bridge-2.0 atspi avahi-client avahi-common
WANTLIB-main += avcodec avformat avutil b2 bluray brotlidec brotlienc
WANTLIB-main += bz2 c cairo cairo-gobject cddb crypto dav1d double-conversion
-WANTLIB-main += drm dvbpsi dvdnav dvdread ebml epoxy execinfo expat
+WANTLIB-main += drm dvbpsi dvdnav dvdread ebml epoll-shim epoxy execinfo expat
WANTLIB-main += ffi fontconfig freetype fribidi gbm gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB-main += gio-2.0 glapi glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0
WANTLIB-main += gpg-error graphite2 gsm gthread-2.0 gtk-3 harfbuzz
WANTLIB-main += hogweed icudata icui18n icuuc idn2 jpeg lcms2 lz4 lzma
WANTLIB-main += matroska mp3lame nettle nfs notify ogg opus p11-kit
WANTLIB-main += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-16 pcre2-8
-WANTLIB-main += pixman-1 placebo png postproc protobuf-lite rsvg-2
+WANTLIB-main += pixman-1 png postproc protobuf-lite rsvg-2
WANTLIB-main += sharpyuv smb2 sndio soxr speex speexdsp ssl swresample
WANTLIB-main += swscale tag tar tasn1 theoradec theoraenc tiff udfread
WANTLIB-main += unibreak unistring usbhid utf8_range utf8_validity
-WANTLIB-main += vorbis vorbisenc vpx webp x264 x265 xcb xcb-composite
-WANTLIB-main += xcb-dri2 xcb-dri3 xcb-glx xcb-keysyms xcb-present xcb-randr
-WANTLIB-main += xcb-render xcb-shm xcb-sync xcb-xfixes xcb-xv xml2
+WANTLIB-main += vorbis vorbisenc vpx wayland-client wayland-cursor wayland-egl
+WANTLIB-main += webp x264 x265 xcb xcb-composite xcb-dri2 xcb-dri3 xcb-glx xcb-keysyms
+WANTLIB-main += xcb-present xcb-randr xcb-render xcb-shm xcb-sync xcb-xfixes xcb-xv xkbcommon xml2
WANTLIB-main += xshmfence xvidcore z zstd ${WANTLIB-common} ${MODLUA_WANTLIB}
# v4l2 is dlopen'd
WANTLIB-main+= v4l2
@@ -113,8 +113,8 @@ LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS}
devel/sdl \
devel/sdl-image \
graphics/ffmpeg \
+ graphics/lcms2 \
graphics/libdvbpsi \
- graphics/libplacebo \
graphics/png \
multimedia/libass \
multimedia/libbluray \
@@ -173,6 +173,7 @@ CONFIGURE_ARGS+=--disable-a52 \
--disable-kate \
--disable-kwallet \
--disable-libmpeg2 \
+ --disable-libplacebo \
--disable-libva \
--disable-linsys \
--disable-live555 \
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/vlc/pkg/PLIST-main,v
retrieving revision 1.52
diff -u -p -r1.52 PLIST-main
--- pkg/PLIST-main 14 May 2023 09:20:41 -0000 1.52
+++ pkg/PLIST-main 14 Feb 2024 01:30:31 -0000
@@ -1,6 +1,5 @@
@pkgpath x11/vlc
%%amd64%%
-%%i386%%
bin/cvlc
bin/qvlc
bin/rvlc
@@ -444,6 +443,7 @@ lib/vlc/plugins/video_chroma/
@so lib/vlc/plugins/video_chroma/libi420_yuy2_plugin.so
@so lib/vlc/plugins/video_chroma/libi422_i420_plugin.so
@so lib/vlc/plugins/video_chroma/libi422_yuy2_plugin.so
+%%i386%%
@so lib/vlc/plugins/video_chroma/librv32_plugin.so
@so lib/vlc/plugins/video_chroma/libswscale_plugin.so
@so lib/vlc/plugins/video_chroma/libyuvp_plugin.so
