From: Brad Smith Subject: Re: [UPDATE] x11/vlc - revision for libplacebo support To: Jose Maldonado , Thomas Frohwein Cc: ports@openbsd.org Date: Mon, 19 Feb 2024 02:47:46 -0500 On 2024-02-15 7:36 p.m., Jose Maldonado wrote: > El Thu, 15 Feb 2024 15:46:38 -0500 > Thomas Frohwein escribió: >> On Tue, Feb 13, 2024 at 09:31:32PM -0400, Jose Maldonado wrote: >> >> [...] >> >>> --- 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 >> I'm nitpicking, but please keep the same tab spacing here. > No problem, you are reviewing what I send, if I do let me know, my > point here is to improve and avoid making mistakes, after all I am a > newbie :) > >>> 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 >> You are adding wayland dependency/WANTLIB here. > Fixed and delete this dependencies. > >>> +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 >> ^ These lines are very long now; I would usually reflow them to stay >> <= 80 chars wide. > Fixed too. > >>> 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 >> Not sure if that's a change generated by update-plist, but probably >> not the right time to adjust the order of PLIST unless this is >> related to the libplacebo change or another compelling reason... >> > This is something that the maintainer can clarify better for us, but > based on the file names, this would also be related to libplacebo. The PLIST-main part should be removed. The order is intentional. >> I don't use vlc myself, but before moving forward with the libplacebo >> update and this change to vlc, would need to hear from maintainer or >> some others if the change for vlc is justifiable here. > It will be the last word of the maintainer. But the truth is that as > things are with libplacebo and VLC, due to the latter we will not be > able to update mpv either, since 0.37.0 has a strong dependency on > libplacebo(v>=6) and with this VLC using libplacebo will not compile > until VLC4 arrives. > > I don't use VLC either, but as upstream indicates, not using libplacebo > should not remove any functionality from VLC, only that color > management and mapping would be done with graphics/lcms2. > > In any case, I sent you the new diff along with an image [1] showing > how well VLC works with the changes. > > [1] https://imgur.com/a/ZIGLB3I I am fine with the diff disabling placebo. VLC with version 3 only uses it for tone mapping if I'm not mistaken, so it is not critical if it is disabled.