Here is an update to VLC 3.0.13.
Changes between 3.0.12.1 and 3.0.13:
----------------------------------
Demux:
* Adaptive: fix artefacts in HLS streams with wrong profiles/levels
* Fix regression on some MP4 files for the audio track
* Fix MPGA and ADTS probing in TS files
* Fix Flac inside AVI files
* Fix VP9/Webm artefacts when seeking
Codec:
* Support SSA text scaling
* Fix rotation on Android rotation
* Fix WebVTT subtitles that start at 00:00
Access:
* Update libnfs to support NFSv4
* Improve SMB2 integration
* Fix Blu-ray files using Unicode names on Windows
* Disable mcast lookups on Android for RTSP playback
Video Output:
* Rework the D3D11 rendering wait, to fix choppiness on display
Interfaces:
* Fix VLC getting stuck on close on X11 (#21875)
* Improve RTL on preferences on macOS
* Add mousewheel horizontal axis control
* Fix crash on exit on macOS
* Fix sizing of the fullscreen controls on macOS
Windows:
* Fix subtitles/OSD under Windows XP
Misc:
* Update translations
* Improve MIDI fonts search on Linux
* Update Soundcloud, Youtube, liveleak
* Fix compilation with GCC11
* Fix input-slave option for subtitles
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.248
diff -u -p -u -p -r1.248 Makefile
--- Makefile 3 Apr 2021 11:15:46 -0000 1.248
+++ Makefile 30 Apr 2021 18:33:22 -0000
@@ -3,11 +3,10 @@
COMMENT-main= VideoLAN client; multimedia player
COMMENT-jack= JACK audio output module for VLC
-V= 3.0.12
+V= 3.0.13
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
-REVISION-main= 0
CATEGORIES= x11
MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
@@ -34,13 +33,13 @@ WANTLIB-main= EGL GL ICE Qt5Core Qt5Gui
ffi fontconfig freetype fribidi gbm gcrypt gdk-3 gdk_pixbuf-2.0
\
gio-2.0 glapi glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 \
gpg-error graphite2 gsm gthread-2.0 gtk-3 harfbuzz \
- hogweed icudata icui18n icuio icuuc idn2 jpeg lcms2 \
- lz4 lzma matroska mp3lame nettle nfs notify ogg opus \
- p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
- pcre2-16 pixman-1 placebo png postproc protobuf-lite \
- rsvg-2 smb2 sndio soxr speex speexdsp ssl swresample \
- swscale tag tar tasn1 theoradec theoraenc tiff unistring \
- usbhid vorbis vorbisenc vpx webp x264 x265 xcb xcb-composite \
+ hogweed icudata icui18n icuuc idn2 jpeg lcms2 lz4 lzma \
+ matroska mp3lame nettle nfs notify ogg opus p11-kit \
+ pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pcre2-16 \
+ pixman-1 placebo png postproc protobuf-lite rsvg-2 \
+ smb2 sndio soxr speex speexdsp ssl swresample swscale \
+ tag tar tasn1 theoradec theoraenc tiff unistring usbhid \
+ vorbis vorbisenc vpx webp x264 x265 xcb xcb-composite \
xcb-dri2 xcb-dri3 xcb-glx xcb-keysyms xcb-present xcb-randr \
xcb-render xcb-shm xcb-sync xcb-xfixes xcb-xv xml2 \
xshmfence xvidcore z zstd ${WANTLIB-common}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/vlc/distinfo,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 distinfo
--- distinfo 23 Jan 2021 09:50:09 -0000 1.44
+++ distinfo 29 Apr 2021 15:35:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (vlc-3.0.12.tar.xz) = 7/RY84qSEmCU9E8iY8K/LHze8nG0gZLQ/nsXJjiM+Hk=
-SIZE (vlc-3.0.12.tar.xz) = 25997468
+SHA256 (vlc-3.0.13.tar.xz) = 1bQ6o1Tb5A8oCZmV4De894iWqptghisXxbehlBm+HOU=
+SIZE (vlc-3.0.13.tar.xz) = 26254428
Index: patches/patch-modules_access_smb2_c
===================================================================
RCS file: patches/patch-modules_access_smb2_c
diff -N patches/patch-modules_access_smb2_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_access_smb2_c 30 Apr 2021 18:29:47 -0000
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+smb2: fix build with libsmb2 3.0.0
+
+https://code.videolan.org/videolan/vlc/-/issues/25680
+
+Index: modules/access/smb2.c
+--- modules/access/smb2.c.orig
++++ modules/access/smb2.c
+@@ -133,6 +133,34 @@ smb2_set_error(stream_t *access, const char *psz_func,
+
+ #define VLC_SMB2_STATUS_DENIED(x) (x == -ECONNREFUSED || x == -EACCES)
+
++#if defined (__ELF__) || defined (__MACH__) /* weak support */
++/* There is no way to know if libsmb2 has these new symbols and we don't want
++ * to increase the version requirement on VLC 3.0, therefore implement a weak
++ * compat version. */
++const t_socket *
++smb2_get_fds(struct smb2_context *smb2, size_t *fd_count, int *timeout);
++int
++smb2_service_fd(struct smb2_context *smb2, int fd, int revents);
++
++__attribute__((weak)) const t_socket *
++smb2_get_fds(struct smb2_context *smb2, size_t *fd_count, int *timeout)
++{
++ (void) timeout;
++ static thread_local t_socket fd;
++
++ *fd_count = 1;
++ fd = smb2_get_fd(smb2);
++ return &fd;
++}
++
++__attribute__((weak)) int
++smb2_service_fd(struct smb2_context *smb2, int fd, int revents)
++{
++ (void) fd;
++ return smb2_service(smb2, revents);
++}
++#endif
++
+ static int
+ vlc_smb2_mainloop(stream_t *access, bool teardown)
+ {
Index: patches/patch-src_posix_thread_c
===================================================================
RCS file: /home/cvs/ports/x11/vlc/patches/patch-src_posix_thread_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_posix_thread_c
--- patches/patch-src_posix_thread_c 3 Apr 2021 11:15:46 -0000 1.5
+++ patches/patch-src_posix_thread_c 29 Apr 2021 15:38:01 -0000
@@ -1,8 +1,7 @@
$OpenBSD: patch-src_posix_thread_c,v 1.5 2021/04/03 11:15:46 sthen Exp $
-- Make use of clock_gettime() on OpenBSD. Until we have per-process
- timers and can enable _POSIX_TIMERS in unistd.h.
-- Make use of _SC_NPROCESSORS_ONLN.
+Make use of clock_gettime() on OpenBSD. Until we have per-process
+timers and can enable _POSIX_TIMERS in unistd.h.
Index: src/posix/thread.c
--- src/posix/thread.c.orig
@@ -25,12 +24,3 @@ Index: src/posix/thread.c
struct timespec ts;
vlc_clock_setup ();
-@@ -712,6 +712,8 @@ unsigned vlc_GetCPUCount(void)
- count = sysconf (_SC_NPROCESSORS_ONLN);
- free (cpulist);
- return count ? count : 1;
-+#elif defined(_SC_NPROCESSORS_ONLN)
-+ return sysconf(_SC_NPROCESSORS_ONLN);
- #elif defined(_SC_NPROCESSORS_CONF)
- return sysconf(_SC_NPROCESSORS_CONF);
- #else
