Here is an update to VLC 3.0.8.
Please test.
Also needs build testing with ports-gcc.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.231
diff -u -p -u -p -r1.231 Makefile
--- Makefile 18 Nov 2019 19:57:45 -0000 1.231
+++ Makefile 25 Nov 2019 01:03:52 -0000
@@ -3,18 +3,18 @@
COMMENT-main= VideoLAN client; multimedia player
COMMENT-jack= JACK audio output module for VLC
-V= 2.2.8
+V= 3.0.8
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
CATEGORIES= x11
MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
-REVISION-main= 10
-REVISION-jack= 10
-SHARED_LIBS= vlc 3.0 \
- vlccore 3.0
+SHARED_LIBS= https_plugin 0.0 \
+ vlc 4.0 \
+ vlc_xcb_events 0.0 \
+ vlccore 4.0
HOMEPAGE= https://www.videolan.org/vlc/
@@ -24,38 +24,44 @@ MAINTAINER= Brad Smith <[email protected]
PERMIT_PACKAGE= Yes
WANTLIB-common= dbus-1 iconv idn intl m pthread
-WANTLIB-main= EGL GL ICE lib/qt4/QtGui QtCore SM SDL SDL_image X11 \
- Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xpm \
- Xrender Xrandr ass atk-1.0 avcodec avformat avutil bluray \
- c cairo cddb dvbpsi dvdnav dvdread ebml expat \
- ffi fontconfig freetype fribidi gcrypt gdk-x11-2.0 \
- gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls \
- gobject-2.0 gpg-error graphite2 gthread-2.0 gtk-x11-2.0 \
- harfbuzz hogweed idn2 jpeg lzma matroska nettle notify opus \
- ogg p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 \
- pixman-1 png postproc rsvg-2 samplerate sndio \
- speex speexdsp swscale tag tar tasn1 tiff unistring usbhid \
- vorbis vorbisenc webp x264 x265 xcb-composite xcb-keysyms \
- xcb-randr xcb-render xcb-shm xcb-xfixes xcb-xv xcb xml2 z \
- X11-xcb Xxf86vm drm gbm glapi xcb-dri2 xcb-glx \
- cairo-gobject xcb-dri3 xcb-present xcb-sync xshmfence \
- ${WANTLIB-common}
+WANTLIB-main= EGL GL ICE Qt5Core Qt5Gui Qt5Svg Qt5Widgets Qt5X11Extras \
+ SDL SDL_image SM X11 X11-xcb Xau Xcomposite Xcursor \
+ Xdamage Xdmcp Xext Xfixes Xi Xinerama Xpm Xrandr Xrender \
+ Xxf86vm aom archive ass atk-1.0 atk-bridge-2.0 avcodec \
+ avformat avutil b2 bluray bz2 c cairo cairo-gobject cddb \
+ charset crypto dav1d double-conversion drm dsm dvbpsi dvdnav \
+ dvdread ebml epoxy execinfo expat 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 icuuc idn2 jpeg 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 png postproc rsvg-2 \
+ samplerate sndio 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}
# v4l2 is dlopen'd
-WANTLIB-main += v4l2
+WANTLIB-main+= v4l2
WANTLIB-jack= db jack vlccore ${WANTLIB-common}
AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.15
-AUTORECONF = ./bootstrap
+AUTOMAKE_VERSION= 1.16
+AUTORECONF= ./bootstrap
-MODULES= x11/qt4
+MODULES= x11/qt5
-COMPILER = base-clang ports-gcc
+COMPILER= base-clang ports-gcc
WANTLIB-main += ${COMPILER_LIBCXX}
-LIB_DEPENDS-main= ${MODQT4_LIB_DEPENDS} \
+LIB_DEPENDS-main= ${MODQT5_LIB_DEPENDS} \
+ x11/qt5/qtsvg,-main \
+ x11/qt5/qtx11extras \
+ archivers/libarchive \
archivers/libtar \
audio/libcddb \
audio/libsamplerate \
@@ -65,8 +71,11 @@ LIB_DEPENDS-main= ${MODQT4_LIB_DEPENDS}
audio/taglib \
devel/fribidi \
devel/gettext,-runtime \
+ devel/harfbuzz \
devel/libdvdread \
devel/libidn \
+ devel/libdsm \
+ devel/libnfs \
devel/libnotify \
devel/sdl \
devel/sdl-image \
@@ -85,11 +94,12 @@ LIB_DEPENDS-main= ${MODQT4_LIB_DEPENDS}
textproc/libebml \
textproc/libxml \
x11/dbus \
- x11/gtk+2
+ x11/gtk+3
LIB_DEPENDS-jack= ${BUILD_PKGPATH} \
audio/jack
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
+ archivers/gtar \
devel/bison \
devel/gettext,-tools \
devel/libtool
@@ -98,51 +108,62 @@ RUN_DEPENDS-main= devel/desktop-file-uti
RUN_DEPENDS-jack= ${BUILD_PKGPATH}
USE_GMAKE= Yes
-# Fails to link _pic libs properly resulting in undefined symbols in the
live555 plugin
-USE_LIBTOOL= gnu
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= autoreconf
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autotools
CONFIGURE_ARGS+=--disable-a52 \
--disable-alsa \
--disable-altivec \
- --disable-bonjour \
+ --disable-aom \
+ --disable-aribb25 \
+ --disable-aribsub \
+ --disable-asdcp \
+ --disable-avahi \
--disable-caca \
--disable-chromaprint \
+ --disable-chromecast \
--disable-crystalhd \
+ --disable-dav1d \
--disable-dc1394 \
--disable-dca \
--disable-decklink \
--disable-dv1394 \
--disable-faad \
--disable-flac \
+ --disable-fluidlite \
--disable-fluidsynth \
--disable-freerdp \
--disable-gme \
- --disable-gnomevfs \
--disable-goom \
--disable-gst-decode \
--disable-kate \
+ --disable-kwallet \
--disable-libmpeg2 \
+ --disable-libplacebo \
--disable-libva \
--disable-linsys \
--disable-lua \
--disable-mad \
--disable-mfx \
- --disable-mmal-codec \
+ --disable-microdns \
+ --disable-mmal \
--disable-mod \
--disable-mpc \
--disable-mtp \
- --disable-neon \
+ --disable-oggspots \
--disable-opencv \
--disable-projectm \
--disable-pulse \
--disable-schroedinger \
+ --disable-secret \
--disable-sftp \
--disable-shine \
--disable-shout \
--disable-sid \
--disable-smbclient \
+ --disable-soxr \
+ --disable-spatialaudio \
+ --disable-srt \
--disable-svg \
--disable-theora \
--disable-tiger \
@@ -161,10 +182,12 @@ CONFIGURE_ARGS+=--disable-a52 \
# too old for now
CONFIGURE_ARGS+= --disable-live555
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+CONFIGURE_ENV+= BUILDCC="${CC}" \
+ CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
LIVE555_PREFIX="${LOCALBASE}/live" \
- PKG_CONFIG_PATH="${LOCALBASE}/lib/qt4/pkgconfig" \
+ PKG_CONFIG_PATH="${LOCALBASE}/lib/qt5/pkgconfig" \
+ RCC="${LOCALBASE}/bin/rcc-qt5" \
ac_cv_header_execinfo_h=no
PSEUDO_FLAVORS= no_jack
@@ -198,7 +221,3 @@ post-install:
@find ${PREFIX}/lib/vlc -name '*.la' -delete
.include <bsd.port.mk>
-
-.if ${CHOSEN_COMPILER} == "base-clang"
-CXXFLAGS+= -DXXX_CLANG_WORKAROUND=1
-.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/vlc/distinfo,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 distinfo
--- distinfo 27 Nov 2017 08:08:20 -0000 1.38
+++ distinfo 25 Nov 2019 01:03:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (vlc-2.2.8.tar.xz) = m/BGhI+1bZNRiIGzkJm4KI7gBdW6Dd9wW29mQ7jVYuw=
-SIZE (vlc-2.2.8.tar.xz) = 22137276
+SHA256 (vlc-3.0.8.tar.xz) = 4BSe9KIKGbns2HMJwtJ3h+4/R9/UfGY5ZEvB9v2VvfY=
+SIZE (vlc-3.0.8.tar.xz) = 26041520
Index: patches/patch-compat_Makefile_am
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-compat_Makefile_am,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-compat_Makefile_am
--- patches/patch-compat_Makefile_am 16 Nov 2019 18:28:19 -0000 1.2
+++ patches/patch-compat_Makefile_am 25 Nov 2019 01:03:52 -0000
@@ -10,7 +10,7 @@ Index: compat/Makefile.am
-pkglib_LTLIBRARIES = libcompat.la
+noinst_LTLIBRARIES = libcompat.la
libcompat_la_SOURCES = dummy.c
- libcompat_la_LIBADD = $(LTLIBOBJS)
+ libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT) $(LIBM)
-libcompat_la_LDFLAGS = -no-undefined -static
+libcompat_la_LDFLAGS = -no-undefined
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 patch-configure_ac
--- patches/patch-configure_ac 21 Feb 2019 22:38:48 -0000 1.34
+++ patches/patch-configure_ac 25 Nov 2019 01:03:52 -0000
@@ -1,168 +1,38 @@
$OpenBSD: patch-configure_ac,v 1.34 2019/02/21 22:38:48 jca Exp $
-Update for newer FFmpeg API.
-
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -134,8 +134,6 @@ case "${host_os}" in
+@@ -127,8 +127,7 @@ case "${host_os}" in
;;
openbsd*)
SYS=openbsd
- CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/usr/X11R6/include"
- LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib/"
++ ac_cv_ld_z_defs=no
;;
netbsd*)
SYS=netbsd
-@@ -952,35 +950,6 @@ AC_ARG_ENABLE(optimizations,
+@@ -1069,22 +1068,6 @@ AC_ARG_ENABLE(optimizations,
+
dnl Check for various optimization flags
AS_IF([test "${enable_optimizations}" != "no"], [
-
-- dnl -O4 and -O3 only in production builds
+-
+- dnl -O3 only in production builds
- AS_IF([test "${enable_debug}" = "no"], [
- VLC_SAVE_FLAGS
-- CFLAGS="${CFLAGS} -O4"
-- CXXFLAGS="${CXXFLAGS} -O4"
-- OBJCFLAGS="${OBJCFLAGS} -O4"
-- AC_CACHE_CHECK([if $CC accepts -O4], [ac_cv_c_o4], [
+- CFLAGS="${CFLAGS} -O3"
+- CXXFLAGS="${CXXFLAGS} -O3"
+- OBJCFLAGS="${OBJCFLAGS} -O3"
+- AC_CACHE_CHECK([if $CC accepts -O3], [ac_cv_c_o3], [
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
-- ac_cv_c_o4=yes
+- ac_cv_c_o3=yes
- ], [
-- ac_cv_c_o4=no
+- ac_cv_c_o3=no
- ])
- ])
-- AS_IF([test "${ac_cv_c_o4}" = "no"], [
-- VLC_RESTORE_FLAGS
-- CFLAGS="${CFLAGS} -O3"
-- CXXFLAGS="${CXXFLAGS} -O3"
-- OBJCFLAGS="${OBJCFLAGS} -O3"
-- AC_CACHE_CHECK([if $CC accepts -O3], [ac_cv_c_o3], [
-- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
-- ac_cv_c_o3=yes
-- ], [
-- ac_cv_c_o3=no
-- ])
-- ])
-- AS_IF([test "${ac_cv_c_o3}" = "no"], [VLC_RESTORE_FLAGS])
-- ])
+- AS_IF([test "${ac_cv_c_o3}" = "no"], [VLC_RESTORE_FLAGS])
- ])
--
+
dnl Check for fast maths
- RDC_PROG_CC_FFLAGS([no-math-errno unsafe-math-optimizations
no-rounding-math no-signaling-nans cx-limited-range])
- AC_LANG_PUSH(C++)
-@@ -1605,7 +1574,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"
- ], [
- AS_IF([test "${SYS}" != "os2"], [
- LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"}
-- CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia
-I${LIVE555_PREFIX}/include/groupsock
-I${LIVE555_PREFIX}/include/BasicUsageEnvironment
-I${LIVE555_PREFIX}/include/UsageEnvironment"
-+ CPPFLAGS_live555="-I${LIVE555_PREFIX}/live/liveMedia/include
-I${LIVE555_PREFIX}/live/groupsock/include
-I${LIVE555_PREFIX}/live/BasicUsageEnvironment/include
-I${LIVE555_PREFIX}/live/UsageEnvironment/include"
- ], [
- LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"}
- CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include
-I${LIVE555_PREFIX}/groupsock/include
-I${LIVE555_PREFIX}/BasicUsageEnvironment/include
-I${LIVE555_PREFIX}/UsageEnvironment/include"
-@@ -2316,10 +2285,10 @@ dnl
- AC_ARG_ENABLE(avcodec,
- [ --enable-avcodec libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
-- PKG_CHECK_EXISTS([libavutil < 55],, [
-- AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
-- ])
-+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 55.0.0 libavutil >= 51.22.0], [
-+ dnl PKG_CHECK_EXISTS([libavcodec < 56],, [
-+ dnl AC_MSG_ERROR([libavcodec versions 56 and later are not supported
yet.])
-+ dnl ])
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
- CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
-@@ -2377,7 +2346,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12
or libav.])
-+ ])
- ])
- ;;
- esac
-@@ -2411,7 +2382,9 @@ AS_IF([test "${enable_dxva2}" != "no"], [
- case "${avfork}" in
- ffmpeg)
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12
or libav.])
-+ ])
- ])
- ;;
- esac
-@@ -3175,7 +3148,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec
- libav) av_vdpau_ver="55.26.0" ;;
- ffmpeg) av_vdpau_ver="55.42.100"
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
-- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12
or libav.])
-+ ])
- ])
- ;;
- esac
-@@ -3730,47 +3705,18 @@ AC_ARG_ENABLE(qt, [
- ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
-- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
-- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
-- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-- PKG_CHECK_MODULES([XI], [xi], [
-- VLC_ADD_LIBS([qt4], [${XI_LIBS}])
-- VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI])
-- ], [
-- PKG_CHECK_EXISTS([Qt5Gui >= 5.5], [
-- AC_MSG_ERROR([${XI_PKG_ERRORS}.])
-- ], [
-- AC_MSG_WARN([${XI_PKG_ERRORS}.])
-- ])
-- ])
-- ],[
-- AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
-- ])
--
-- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
-- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to
backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
-- ])
--
-- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
-- QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
-- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}"
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-- AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}"
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-- AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}"
"${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-- ], [
-- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-- AS_IF([test -n "${enable_qt}"],[
-- AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-- ],[
-- AC_MSG_WARN([${QT_PKG_ERRORS}.])
-- ])
-- enable_qt="no"
-- ])
-- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin"
"${CONTRIB_DIR}/bin"])
-- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin"
"${CONTRIB_DIR}/bin"])
-+ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-+ AS_IF([test -n "${enable_qt}"],[
-+ AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-+ ],[
-+ AC_MSG_WARN([${QT_PKG_ERRORS}.])
- ])
-+ enable_qt="no"
-+ ])
-+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin"
"${CONTRIB_DIR}/bin"])
-+ AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin"
"${CONTRIB_DIR}/bin"])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
- VLC_ADD_PLUGIN([qt4])
+ AX_APPEND_COMPILE_FLAGS([-fno-math-errno -funsafe-math-optimizations
-fno-rounding-math -fno-signaling-nans -fcx-limited-range], [CFLAGS])
Index: patches/patch-include_vlc_atomic_h
===================================================================
RCS file: patches/patch-include_vlc_atomic_h
diff -N patches/patch-include_vlc_atomic_h
--- patches/patch-include_vlc_atomic_h 11 Nov 2019 19:10:46 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-include_vlc_atomic_h,v 1.3 2019/11/11 19:10:46 ajacoutot Exp $
-
-Use std::atomic, libc++ will bring them in anyway.
-
-Index: include/vlc_atomic.h
---- include/vlc_atomic.h.orig
-+++ include/vlc_atomic.h
-@@ -26,7 +26,15 @@
- * Atomic operations do not require locking, but they are not very powerful.
- */
-
--# if !defined (__cplusplus) && (__STDC_VERSION__ >= 201112L) \
-+# if defined(__cplusplus) && __cplusplus >= 201103L
-+# include <atomic>
-+using std::atomic_uint_least32_t;
-+using std::atomic_init;
-+using std::atomic_load;
-+using std::atomic_store;
-+using std::atomic_uint;
-+
-+# elif !defined (__cplusplus) && (__STDC_VERSION__ >= 201112L) \
- && !defined (__STDC_NO_ATOMICS__)
-
- /*** Native C11 atomics ***/
Index: patches/patch-include_vlc_fixups_h
===================================================================
RCS file: patches/patch-include_vlc_fixups_h
diff -N patches/patch-include_vlc_fixups_h
--- patches/patch-include_vlc_fixups_h 22 May 2017 10:22:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-include_vlc_fixups_h,v 1.2 2017/05/22 10:22:25 espie Exp $
-
-Adjust fixes for clang's libc++
-
-From 51ce6cdaf598754e617900994c1943c6cba6d604 Mon Sep 17 00:00:00 2001
-From: Thomas Guillem <[email protected]>
-Date: Thu, 30 Apr 2015 15:29:50 +0200
-Subject: [PATCH] Fix build when using C99 and C++11
-
-From 6faf9066670db6e0d241ead6a3926b2d9cc6a041 Mon Sep 17 00:00:00 2001
-From: Thomas Guillem <[email protected]>
-Date: Mon, 14 Dec 2015 10:08:25 +0100
-Subject: [PATCH] compat: fix static_assert
-
-Index: include/vlc_fixups.h
---- include/vlc_fixups.h.orig
-+++ include/vlc_fixups.h
-@@ -218,6 +218,8 @@ int posix_memalign (void **, size_t, size_t);
-
- /* locale.h */
- #ifndef HAVE_USELOCALE
-+/// XXX we have this in C++ on clang
-+#if !(defined(__cplusplus) && defined(XXX_CLANG_WORKAROUND))
- #define LC_ALL_MASK 0
- #define LC_NUMERIC_MASK 0
- #define LC_MESSAGES_MASK 0
-@@ -238,9 +240,12 @@ static inline locale_t newlocale(int mask, const char
- return NULL;
- }
- #endif
-+#endif
-
--#if !defined (HAVE_STATIC_ASSERT)
--# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
-+#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) &&
!defined(static_assert)
-+# define STATIC_ASSERT_CONCAT_(a, b) a##b
-+# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b)
-+# define _Static_assert(x, s) extern char
STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x);
})]
- # define static_assert _Static_assert
- #endif
-
Index: patches/patch-include_vlc_playlist_h
===================================================================
RCS file: patches/patch-include_vlc_playlist_h
diff -N patches/patch-include_vlc_playlist_h
--- patches/patch-include_vlc_playlist_h 16 Nov 2019 18:28:19 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-include_vlc_playlist_h,v 1.2 2019/11/16 18:28:19 ajacoutot Exp
$
-
-Keep them outside of extern C, vlc_atomic.h will use std::atomic.
-
-Index: include/vlc_playlist.h
---- include/vlc_playlist.h.orig
-+++ include/vlc_playlist.h
-@@ -24,12 +24,12 @@
- #ifndef VLC_PLAYLIST_H_
- #define VLC_PLAYLIST_H_
-
-+#include <vlc_input.h>
-+#include <vlc_events.h>
-+
- # ifdef __cplusplus
- extern "C" {
- # endif
--
--#include <vlc_input.h>
--#include <vlc_events.h>
-
- TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t)
-
Index: patches/patch-modules_access_http_Makefile_am
===================================================================
RCS file: patches/patch-modules_access_http_Makefile_am
diff -N patches/patch-modules_access_http_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_access_http_Makefile_am 25 Nov 2019 01:03:52
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Workaround for duplicate symbols from libcompat being linked twice.
+
+Index: modules/access/http/Makefile.am
+--- modules/access/http/Makefile.am.orig
++++ modules/access/http/Makefile.am
+@@ -1,5 +1,6 @@
+ libhttps_plugin_la_SOURCES = access/http/access.c
+ libhttps_plugin_la_LIBADD = libvlc_http.la
++libhttps_plugin_la_LDFLAGS = -Wl,--allow-multiple-definition
+ access_LTLIBRARIES += libhttps_plugin.la
+
+ libvlc_http_la_SOURCES = \
Index: patches/patch-modules_access_v4l2_lib_c
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-modules_access_v4l2_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_access_v4l2_lib_c
--- patches/patch-modules_access_v4l2_lib_c 23 Jan 2016 08:09:50 -0000
1.1
+++ patches/patch-modules_access_v4l2_lib_c 25 Nov 2019 01:03:52 -0000
@@ -3,9 +3,10 @@ $OpenBSD: patch-modules_access_v4l2_lib_
Linux driver doesn't exist on OpenBSD and adjust dlopen() use
for OpenBSD.
---- modules/access/v4l2/lib.c.orig Sat Jan 9 21:59:47 2016
-+++ modules/access/v4l2/lib.c Sat Jan 9 22:00:24 2016
-@@ -50,9 +50,7 @@ static void v4l2_lib_load (void)
+Index: modules/access/v4l2/lib.c
+--- modules/access/v4l2/lib.c.orig
++++ modules/access/v4l2/lib.c
+@@ -54,9 +54,7 @@ static void v4l2_lib_load (void)
{
void *h;
@@ -14,5 +15,5 @@ for OpenBSD.
- h = dlopen ("libv4l2.so.0", RTLD_LAZY | RTLD_LOCAL);
+ h = dlopen ("libv4l2.so", RTLD_LAZY | RTLD_LOCAL);
if (h == NULL)
- goto fallback;
+ return;
Index: patches/patch-modules_access_v4l2_v4l2_h
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-modules_access_v4l2_v4l2_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_access_v4l2_v4l2_h
--- patches/patch-modules_access_v4l2_v4l2_h 23 Jan 2016 08:09:50 -0000
1.1
+++ patches/patch-modules_access_v4l2_v4l2_h 25 Nov 2019 01:03:52 -0000
@@ -2,8 +2,9 @@ $OpenBSD: patch-modules_access_v4l2_v4l2
Use OpenBSD's videoio.h header.
---- modules/access/v4l2/v4l2.h.orig Sat Jan 9 21:39:10 2016
-+++ modules/access/v4l2/v4l2.h Sat Jan 9 21:51:49 2016
+Index: modules/access/v4l2/v4l2.h
+--- modules/access/v4l2/v4l2.h.orig
++++ modules/access/v4l2/v4l2.h
@@ -18,7 +18,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
@@ -16,4 +17,4 @@ Use OpenBSD's videoio.h header.
+#endif
/* libv4l2 functions */
- extern int v4l2_fd_open (int, int);
+ extern int (*v4l2_fd_open) (int, int);
Index: patches/patch-modules_codec_avcodec_audio_c
===================================================================
RCS file: patches/patch-modules_codec_avcodec_audio_c
diff -N patches/patch-modules_codec_avcodec_audio_c
--- patches/patch-modules_codec_avcodec_audio_c 21 Feb 2019 22:38:48 -0000
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-modules_codec_avcodec_audio_c,v 1.8 2019/02/21 22:38:48 jca
Exp $
-
-Update for newer FFmpeg API.
-
-Index: modules/codec/avcodec/audio.c
---- modules/codec/avcodec/audio.c.orig
-+++ modules/codec/avcodec/audio.c
-@@ -39,7 +39,7 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
-
--#include <libavutil/audioconvert.h>
-+#include <libavutil/channel_layout.h>
-
- #include "avcodec.h"
-
-@@ -96,7 +96,7 @@ static void InitDecoderConfig( decoder_t *p_dec, AVCod
- if( i_size > 0 )
- {
- p_context->extradata =
-- av_malloc( i_size + FF_INPUT_BUFFER_PADDING_SIZE );
-+ av_malloc( i_size + AV_INPUT_BUFFER_PADDING_SIZE );
- if( p_context->extradata )
- {
- uint8_t *p_dst = p_context->extradata;
-@@ -104,7 +104,7 @@ static void InitDecoderConfig( decoder_t *p_dec, AVCod
- p_context->extradata_size = i_size;
-
- memcpy( &p_dst[0], &p_src[i_offset], i_size );
-- memset( &p_dst[i_size], 0, FF_INPUT_BUFFER_PADDING_SIZE );
-+ memset( &p_dst[i_size], 0, AV_INPUT_BUFFER_PADDING_SIZE );
- }
- }
- }
-@@ -302,12 +302,12 @@ block_t * DecodeAudio ( decoder_t *p_dec, block_t **pp
-
- if( (p_block->i_flags & BLOCK_FLAG_PRIVATE_REALLOCATED) == 0 )
- {
-- p_block = block_Realloc( p_block, 0, p_block->i_buffer +
FF_INPUT_BUFFER_PADDING_SIZE );
-+ p_block = block_Realloc( p_block, 0, p_block->i_buffer +
AV_INPUT_BUFFER_PADDING_SIZE );
- if( !p_block )
- return NULL;
- *pp_block = p_block;
-- p_block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
-- memset( &p_block->p_buffer[p_block->i_buffer], 0,
FF_INPUT_BUFFER_PADDING_SIZE );
-+ p_block->i_buffer -= AV_INPUT_BUFFER_PADDING_SIZE;
-+ memset( &p_block->p_buffer[p_block->i_buffer], 0,
AV_INPUT_BUFFER_PADDING_SIZE );
-
- p_block->i_flags |= BLOCK_FLAG_PRIVATE_REALLOCATED;
- }
Index: patches/patch-modules_codec_avcodec_avcommon_compat_h
===================================================================
RCS file: patches/patch-modules_codec_avcodec_avcommon_compat_h
diff -N patches/patch-modules_codec_avcodec_avcommon_compat_h
--- patches/patch-modules_codec_avcodec_avcommon_compat_h 21 Feb 2019
22:38:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-modules_codec_avcodec_avcommon_compat_h,v 1.1 2019/02/21
22:38:48 jca Exp $
-
-Update for newer FFmpeg API.
-
-Index: modules/codec/avcodec/avcommon_compat.h
---- modules/codec/avcodec/avcommon_compat.h.orig
-+++ modules/codec/avcodec/avcommon_compat.h
-@@ -36,6 +36,11 @@
- ( (LIBAVCODEC_VERSION_MICRO < 100 && LIBAVCODEC_VERSION_INT >=
AV_VERSION_INT( a, b, c ) ) || \
- (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >=
AV_VERSION_INT( a, d, e ) ) )
-
-+#ifndef FF_MAX_B_FRAMES
-+# define FF_MAX_B_FRAMES 16 // FIXME: remove this
-+#endif
-+
-+
- #if LIBAVCODEC_VERSION_MAJOR < 54
- # define AV_PICTURE_TYPE_B FF_B_TYPE
- # define AV_PICTURE_TYPE_I FF_I_TYPE
Index: patches/patch-modules_codec_avcodec_encoder_c
===================================================================
RCS file: patches/patch-modules_codec_avcodec_encoder_c
diff -N patches/patch-modules_codec_avcodec_encoder_c
--- patches/patch-modules_codec_avcodec_encoder_c 21 Feb 2019 22:38:48
-0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,262 +0,0 @@
-$OpenBSD: patch-modules_codec_avcodec_encoder_c,v 1.7 2019/02/21 22:38:48 jca
Exp $
-
-Update for newer FFmpeg API.
-
-Index: modules/codec/avcodec/encoder.c
---- modules/codec/avcodec/encoder.c.orig
-+++ modules/codec/avcodec/encoder.c
-@@ -41,7 +41,7 @@
- #include <vlc_cpu.h>
-
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
-+#include <libavutil/channel_layout.h>
-
- #include "avcodec.h"
- #include "avcommon.h"
-@@ -285,6 +285,24 @@ static void probe_video_frame_rate( encoder_t *p_enc,
- msg_Dbg( p_enc, "Time base set to %d/%d", p_context->time_base.num,
p_context->time_base.den );
- }
-
-+static void add_av_option_int( encoder_t *p_enc, AVDictionary** pp_dict,
const char* psz_name, int i_value )
-+{
-+ char buff[32];
-+ if ( snprintf( buff, sizeof(buff), "%d", i_value ) < 0 )
-+ return;
-+ if( av_dict_set( pp_dict, psz_name, buff, 0 ) < 0 )
-+ msg_Warn( p_enc, "Failed to set encoder option %s", psz_name );
-+}
-+
-+static void add_av_option_float( encoder_t *p_enc, AVDictionary** pp_dict,
const char* psz_name, float f_value )
-+{
-+ char buff[128];
-+ if ( snprintf( buff, sizeof(buff), "%f", f_value ) < 0 )
-+ return;
-+ if( av_dict_set( pp_dict, psz_name, buff, 0 ) < 0 )
-+ msg_Warn( p_enc, "Failed to set encoder option %s", psz_name );
-+}
-+
- int OpenEncoder( vlc_object_t *p_this )
- {
- encoder_t *p_enc = (encoder_t *)p_this;
-@@ -311,7 +329,7 @@ int OpenEncoder( vlc_object_t *p_this )
- else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
- &psz_namecodec ) )
- {
-- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
-+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
- return VLC_EGENERIC; /* handed chroma output */
-
- i_cat = VIDEO_ES;
-@@ -493,6 +511,7 @@ int OpenEncoder( vlc_object_t *p_this )
- }
- }
- free( psz_val );
-+ AVDictionary *options = NULL;
-
- if( p_enc->fmt_in.i_cat == VIDEO_ES )
- {
-@@ -522,7 +541,7 @@ int OpenEncoder( vlc_object_t *p_this )
- p_context->lumi_masking = p_sys->f_lumi_masking;
- p_context->dark_masking = p_sys->f_dark_masking;
- p_context->p_masking = p_sys->f_p_masking;
-- p_context->border_masking = p_sys->f_border_masking;
-+ add_av_option_float( p_enc, &options, "border_mask",
p_sys->f_border_masking );
- #if (LIBAVCODEC_VERSION_MAJOR < 55)
- p_context->luma_elim_threshold = p_sys->i_luma_elim;
- p_context->chroma_elim_threshold = p_sys->i_chroma_elim;
-@@ -536,7 +555,7 @@ int OpenEncoder( vlc_object_t *p_this )
- if( !p_context->max_b_frames &&
- ( p_enc->fmt_out.i_codec == VLC_CODEC_MPGV ||
- p_enc->fmt_out.i_codec == VLC_CODEC_MP2V ) )
-- p_context->flags |= CODEC_FLAG_LOW_DELAY;
-+ p_context->flags |= AV_CODEC_FLAG_LOW_DELAY;
-
- av_reduce( &p_context->sample_aspect_ratio.num,
- &p_context->sample_aspect_ratio.den,
-@@ -555,7 +574,7 @@ int OpenEncoder( vlc_object_t *p_this )
-
- if( p_codec->pix_fmts )
- {
-- const enum PixelFormat *p = p_codec->pix_fmts;
-+ const enum AVPixelFormat *p = p_codec->pix_fmts;
- for( ; *p != -1; p++ )
- {
- if( *p == p_context->pix_fmt ) break;
-@@ -594,16 +613,16 @@ int OpenEncoder( vlc_object_t *p_this )
- }
- else
- {
-- p_context->flags |= CODEC_FLAG_INTERLACED_DCT;
-+ p_context->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
- if ( p_sys->b_interlace_me )
-- p_context->flags |= CODEC_FLAG_INTERLACED_ME;
-+ p_context->flags |= AV_CODEC_FLAG_INTERLACED_ME;
- }
- }
-
- p_context->trellis = p_sys->b_trellis;
-
- if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
-- p_context->flags |= CODEC_FLAG_QSCALE;
-+ p_context->flags |= AV_CODEC_FLAG_QSCALE;
- /* These codecs cause libavcodec to exit if thread_count is > 1.
- See libavcodec/mpegvideo_enc.c:MPV_encode_init and
- libavcodec/svq3.c , WMV2 calls MPV_encode_init also.
-@@ -639,12 +658,14 @@ int OpenEncoder( vlc_object_t *p_this )
- if( p_sys->i_qmin > 0 )
- {
- p_context->qmin = p_sys->i_qmin;
-- p_context->mb_lmin = p_context->lmin = p_sys->i_qmin *
FF_QP2LAMBDA;
-+ p_context->mb_lmin = p_sys->i_qmin * FF_QP2LAMBDA;
-+ add_av_option_int( p_enc, &options, "lmin", p_context->mb_lmin);
- }
- if( p_sys->i_qmax > 0 )
- {
- p_context->qmax = p_sys->i_qmax;
-- p_context->mb_lmax = p_context->lmax = p_sys->i_qmax *
FF_QP2LAMBDA;
-+ p_context->mb_lmax = p_sys->i_qmax * FF_QP2LAMBDA;
-+ add_av_option_int( p_enc, &options, "lmax", p_context->mb_lmax);
- }
- p_context->max_qdiff = 3;
-
-@@ -652,12 +673,12 @@ int OpenEncoder( vlc_object_t *p_this )
-
- if( p_sys->i_quality && !p_enc->fmt_out.i_bitrate )
- {
-- p_context->flags |= CODEC_FLAG_QSCALE;
-+ p_context->flags |= AV_CODEC_FLAG_QSCALE;
- p_context->global_quality = p_sys->i_quality;
- }
- else
- {
-- p_context->rc_qsquish = 1.0;
-+ av_dict_set(&options, "qsquish", "1.0", 0);
- /* Default to 1/2 second buffer for given bitrate unless defined
otherwise*/
- if( !p_sys->i_rc_buffer_size )
- {
-@@ -671,7 +692,7 @@ int OpenEncoder( vlc_object_t *p_this )
- /* This is from ffmpeg's ffmpeg.c : */
- p_context->rc_initial_buffer_occupancy
- = p_sys->i_rc_buffer_size * 3/4;
-- p_context->rc_buffer_aggressivity =
p_sys->f_rc_buffer_aggressivity;
-+ add_av_option_float( p_enc, &options, "rc_buffer_aggressivity",
p_sys->f_rc_buffer_aggressivity );
- }
- }
- else if( p_enc->fmt_in.i_cat == AUDIO_ES )
-@@ -808,20 +829,23 @@ int OpenEncoder( vlc_object_t *p_this )
- if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
- {
- p_context->qmin = 10;
-- p_context->mb_lmin = p_context->lmin = 10 * FF_QP2LAMBDA;
-+ p_context->mb_lmin = 10 * FF_QP2LAMBDA;
-+ add_av_option_int( p_enc, &options, "lmin",
p_context->mb_lmin );
- }
-
- if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmax" ) )
- {
- p_context->qmax = 42;
-- p_context->mb_lmax = p_context->lmax = 42 * FF_QP2LAMBDA;
-+ p_context->mb_lmax = 42 * FF_QP2LAMBDA;
-+ add_av_option_int( p_enc, &options, "lmax",
p_context->mb_lmax );
- }
-
- } else {
- if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
- {
- p_context->qmin = 1;
-- p_context->mb_lmin = p_context->lmin = FF_QP2LAMBDA;
-+ p_context->mb_lmin = FF_QP2LAMBDA;
-+ add_av_option_int( p_enc, &options, "lmin",
p_context->mb_lmin );
- }
- }
-
-@@ -846,7 +870,7 @@ int OpenEncoder( vlc_object_t *p_this )
- /* Make sure we get extradata filled by the encoder */
- p_context->extradata_size = 0;
- p_context->extradata = NULL;
-- p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ p_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- if( p_enc->i_threads >= 1)
- p_context->thread_count = p_enc->i_threads;
-@@ -855,7 +879,6 @@ int OpenEncoder( vlc_object_t *p_this )
-
- int ret;
- char *psz_opts = var_InheritString(p_enc, ENC_CFG_PREFIX "options");
-- AVDictionary *options = NULL;
- if (psz_opts && *psz_opts)
- options = vlc_av_get_options(psz_opts);
- free(psz_opts);
-@@ -983,7 +1006,7 @@ errmsg:
- }
- }
-
-- p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
-+ p_context->flags &= ~AV_CODEC_FLAG_GLOBAL_HEADER;
-
- if( p_enc->fmt_in.i_cat == AUDIO_ES )
- {
-@@ -993,7 +1016,7 @@ errmsg:
- p_sys->i_sample_bytes = (p_enc->fmt_in.audio.i_bitspersample / 8);
- p_sys->i_frame_size = p_context->frame_size > 1 ?
- p_context->frame_size :
-- FF_MIN_BUFFER_SIZE;
-+ AV_INPUT_BUFFER_MIN_SIZE;
- p_sys->i_buffer_out = av_samples_get_buffer_size(NULL,
- p_sys->p_context->channels, p_sys->i_frame_size,
- p_sys->p_context->sample_fmt, DEFAULT_ALIGN);
-@@ -1017,7 +1040,7 @@ errmsg:
- }
- }
-
-- p_sys->frame = avcodec_alloc_frame();
-+ p_sys->frame = av_frame_alloc();
- if( !p_sys->frame )
- {
- goto error;
-@@ -1088,7 +1111,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture
- AVFrame *frame = NULL;
- if( likely(p_pict) ) {
- frame = p_sys->frame;
-- avcodec_get_frame_defaults( frame );
-+ av_frame_unref( frame );
- for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
- {
- p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
-@@ -1202,7 +1225,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture
- p_sys->p_context->bits_per_coded_sample ?
- p_sys->p_context->bits_per_coded_sample :
- 24;
-- unsigned blocksize = __MAX( FF_MIN_BUFFER_SIZE, ( bitsPerPixel *
p_sys->p_context->height * p_sys->p_context->width ) / 8 + 200 );
-+ unsigned blocksize = __MAX( AV_INPUT_BUFFER_MIN_SIZE, ( bitsPerPixel *
p_sys->p_context->height * p_sys->p_context->width ) / 8 + 200 );
- if( p_enc->fmt_out.i_codec == VLC_CODEC_TIFF )
- {
- blocksize = 2 * blocksize +
-@@ -1329,7 +1352,7 @@ static block_t *handle_delay_buffer( encoder_t *p_enc,
- //How much we need to copy from new packet
- const int leftover = leftover_samples * p_sys->p_context->channels *
p_sys->i_sample_bytes;
-
-- avcodec_get_frame_defaults( p_sys->frame );
-+ av_frame_unref( p_sys->frame );
- p_sys->frame->format = p_sys->p_context->sample_fmt;
- p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
-
-@@ -1359,7 +1382,7 @@ static block_t *handle_delay_buffer( encoder_t *p_enc,
- }
-
- if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&
-- !(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME
)))
-+ !(p_sys->p_codec->capabilities &
AV_CODEC_CAP_SMALL_LAST_FRAME )))
- {
- msg_Dbg( p_enc, "No small last frame support, padding");
- size_t padding_size = p_sys->i_buffer_out - (leftover+buffer_delay);
-@@ -1451,7 +1474,7 @@ static block_t *EncodeAudio( encoder_t *p_enc, block_t
- while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
- ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
- {
-- avcodec_get_frame_defaults( p_sys->frame );
-+ av_frame_unref( p_sys->frame );
- if( p_sys->b_variable )
- p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
- else
Index: patches/patch-modules_codec_avcodec_subtitle_c
===================================================================
RCS file: patches/patch-modules_codec_avcodec_subtitle_c
diff -N patches/patch-modules_codec_avcodec_subtitle_c
--- patches/patch-modules_codec_avcodec_subtitle_c 21 Feb 2019 22:38:48
-0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-modules_codec_avcodec_subtitle_c,v 1.4 2019/02/21 22:38:48 jca
Exp $
-
-Update for newer FFmpeg API.
-
-Index: modules/codec/avcodec/subtitle.c
---- modules/codec/avcodec/subtitle.c.orig
-+++ modules/codec/avcodec/subtitle.c
-@@ -144,11 +144,11 @@ subpicture_t *DecodeSubtitle(decoder_t *dec, block_t *
- *block_ptr =
- block = block_Realloc(block,
- 0,
-- block->i_buffer +
FF_INPUT_BUFFER_PADDING_SIZE);
-+ block->i_buffer +
AV_INPUT_BUFFER_PADDING_SIZE);
- if (!block)
- return NULL;
-- block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
-- memset(&block->p_buffer[block->i_buffer], 0,
FF_INPUT_BUFFER_PADDING_SIZE);
-+ block->i_buffer -= AV_INPUT_BUFFER_PADDING_SIZE;
-+ memset(&block->p_buffer[block->i_buffer], 0,
AV_INPUT_BUFFER_PADDING_SIZE);
-
- /* */
- AVSubtitle subtitle;
Index: patches/patch-modules_codec_avcodec_video_c
===================================================================
RCS file: patches/patch-modules_codec_avcodec_video_c
diff -N patches/patch-modules_codec_avcodec_video_c
--- patches/patch-modules_codec_avcodec_video_c 21 Feb 2019 22:38:48 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,156 +0,0 @@
-$OpenBSD: patch-modules_codec_avcodec_video_c,v 1.4 2019/02/21 22:38:48 jca
Exp $
-
-Update for newer FFmpeg API.
-
-Index: modules/codec/avcodec/video.c
---- modules/codec/avcodec/video.c.orig
-+++ modules/codec/avcodec/video.c
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecContext *, AVFr
- static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
- #endif
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
-- const enum PixelFormat * );
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
-+ const enum AVPixelFormat * );
-
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
- {
-@@ -236,7 +236,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_
- p_sys->p_codec = p_codec;
- p_sys->i_codec_id = i_codec_id;
- p_sys->psz_namecodec = psz_namecodec;
-- p_sys->p_ff_pic = avcodec_alloc_frame();
-+ p_sys->p_ff_pic = av_frame_alloc();
- p_sys->b_delayed_open = true;
- p_sys->p_va = NULL;
- vlc_sem_init( &p_sys->sem_mt, 0 );
-@@ -251,11 +251,11 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_
- var_InheritInteger( p_dec, "avcodec-error-resilience" );
-
- if( var_CreateGetBool( p_dec, "grayscale" ) )
-- p_sys->p_context->flags |= CODEC_FLAG_GRAY;
-+ p_sys->p_context->flags |= AV_CODEC_FLAG_GRAY;
-
- /* ***** Output always the frames ***** */
- #if LIBAVCODEC_VERSION_CHECK(55, 23, 1, 40, 101)
-- p_sys->p_context->flags |= CODEC_FLAG_OUTPUT_CORRUPT;
-+ p_sys->p_context->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT;
- #endif
-
- i_val = var_CreateGetInteger( p_dec, "avcodec-vismv" );
-@@ -268,7 +268,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_
- else if( i_val == 1 ) p_sys->p_context->skip_loop_filter =
AVDISCARD_NONREF;
-
- if( var_CreateGetBool( p_dec, "avcodec-fast" ) )
-- p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
-+ p_sys->p_context->flags2 |= AV_CODEC_FLAG2_FAST;
-
- /* ***** libavcodec frame skipping ***** */
- p_sys->b_hurry_up = var_CreateGetBool( p_dec, "avcodec-hurry-up" );
-@@ -295,7 +295,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_
- p_sys->b_direct_rendering = false;
- p_sys->i_direct_rendering_used = -1;
- if( var_CreateGetBool( p_dec, "avcodec-dr" ) &&
-- (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
-+ (p_sys->p_codec->capabilities & AV_CODEC_CAP_DR1) &&
- /* No idea why ... but this fixes flickering on some TSCC streams */
- p_sys->i_codec_id != AV_CODEC_ID_TSCC && p_sys->i_codec_id !=
AV_CODEC_ID_CSCD &&
- p_sys->i_codec_id != AV_CODEC_ID_CINEPAK &&
-@@ -311,7 +311,6 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_
- if( p_sys->b_direct_rendering )
- {
- msg_Dbg( p_dec, "trying to use direct rendering" );
-- p_sys->p_context->flags |= CODEC_FLAG_EMU_EDGE;
- }
- else
- {
-@@ -448,7 +447,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_
- if( ffmpeg_OpenCodec( p_dec ) < 0 )
- {
- msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
-- avcodec_free_frame( &p_sys->p_ff_pic );
-+ av_frame_free( &p_sys->p_ff_pic );
- vlc_sem_destroy( &p_sys->sem_mt );
- free( p_sys );
- return VLC_EGENERIC;
-@@ -484,7 +483,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp
- }
-
- p_block = *pp_block;
-- if(!p_block && !(p_sys->p_codec->capabilities & CODEC_CAP_DELAY) )
-+ if(!p_block && !(p_sys->p_codec->capabilities & AV_CODEC_CAP_DELAY) )
- return NULL;
-
- if( p_sys->b_delayed_open )
-@@ -594,13 +593,13 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp
- p_sys->b_flush = ( p_block->i_flags & BLOCK_FLAG_END_OF_SEQUENCE ) !=
0;
-
- p_block = block_Realloc( p_block, 0,
-- p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE
);
-+ p_block->i_buffer + AV_INPUT_BUFFER_PADDING_SIZE
);
- if( !p_block )
- return NULL;
-- p_block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
-+ p_block->i_buffer -= AV_INPUT_BUFFER_PADDING_SIZE;
- *pp_block = p_block;
- memset( p_block->p_buffer + p_block->i_buffer, 0,
-- FF_INPUT_BUFFER_PADDING_SIZE );
-+ AV_INPUT_BUFFER_PADDING_SIZE );
- }
-
- while( !p_block || p_block->i_buffer > 0 || p_sys->b_flush )
-@@ -621,7 +620,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp
- }
- else
- {
-- /* Return delayed frames if codec has CODEC_CAP_DELAY */
-+ /* Return delayed frames if codec has AV_CODEC_CAP_DELAY */
- pkt.data = NULL;
- pkt.size = 0;
- }
-@@ -849,7 +848,7 @@ void EndVideoDec( decoder_t *p_dec )
- wait_mt( p_sys );
-
- if( p_sys->p_ff_pic )
-- avcodec_free_frame( &p_sys->p_ff_pic );
-+ av_frame_free( &p_sys->p_ff_pic );
-
- if( p_sys->p_va )
- vlc_va_Delete( p_sys->p_va );
-@@ -874,7 +873,7 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
- p_sys->p_context->extradata_size = i_size + 12;
- p = p_sys->p_context->extradata =
- av_malloc( p_sys->p_context->extradata_size +
-- FF_INPUT_BUFFER_PADDING_SIZE );
-+ AV_INPUT_BUFFER_PADDING_SIZE );
- if( !p )
- return;
-
-@@ -911,13 +910,13 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
- {
- p_sys->p_context->extradata_size = i_size;
- p_sys->p_context->extradata =
-- av_malloc( i_size + FF_INPUT_BUFFER_PADDING_SIZE );
-+ av_malloc( i_size + AV_INPUT_BUFFER_PADDING_SIZE );
- if( p_sys->p_context->extradata )
- {
- memcpy( p_sys->p_context->extradata,
- p_dec->fmt_in.p_extra, i_size );
- memset( p_sys->p_context->extradata + i_size,
-- 0, FF_INPUT_BUFFER_PADDING_SIZE );
-+ 0, AV_INPUT_BUFFER_PADDING_SIZE );
- }
- }
- }
-@@ -1336,8 +1335,8 @@ static void ffmpeg_ReleaseFrameBuf( struct AVCodecCont
- }
- #endif
-
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-- const enum PixelFormat *pi_fmt )
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-+ const enum AVPixelFormat *pi_fmt )
- {
- decoder_t *p_dec = p_context->opaque;
- decoder_sys_t *p_sys = p_dec->p_sys;
Index: patches/patch-modules_codec_x264_c
===================================================================
RCS file: patches/patch-modules_codec_x264_c
diff -N patches/patch-modules_codec_x264_c
--- patches/patch-modules_codec_x264_c 16 Nov 2019 18:28:19 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,195 +0,0 @@
-$OpenBSD: patch-modules_codec_x264_c,v 1.5 2019/11/16 18:28:19 ajacoutot Exp $
-
-x264: drop <148 build support and fix 10bit support.
-
-Index: modules/codec/x264.c
---- modules/codec/x264.c.orig
-+++ modules/codec/x264.c
-@@ -83,13 +83,7 @@ static void x264_log( void *, int i_level, const char
- "I-frames, but do not start a new GOP." )
-
- #define OPENGOP_TEXT N_("Use recovery points to close GOPs")
--#if X264_BUILD < 115
--#define OPENGOP_LONGTEXT N_("none: use closed GOPs only\n"\
-- "normal: use standard open GOPs\n" \
-- "bluray: use Blu-ray compatible open GOPs" )
--#else
- #define OPENGOP_LONGTEXT N_("use open GOP, for bluray compatibility use also
bluray-compat option")
--#endif
-
- #define BLURAY_TEXT N_("Enable compatibility hacks for Blu-ray support")
- #define BLURAY_LONGTEXT N_("Enable hacks for Blu-ray support, this doesn't
enforce every aspect of Blu-ray compatibility\n" \
-@@ -471,16 +465,10 @@ vlc_module_begin ()
- add_integer( SOUT_CFG_PREFIX "min-keyint", 25, MIN_KEYINT_TEXT,
- MIN_KEYINT_LONGTEXT, true )
-
--#if X264_BUILD >= 102 && X264_BUILD <= 114
-- add_string( SOUT_CFG_PREFIX "opengop", "none", OPENGOP_TEXT,
-- OPENGOP_LONGTEXT, true )
-- change_string_list( x264_open_gop_names, x264_open_gop_names )
--#elif X264_BUILD > 114
- add_bool( SOUT_CFG_PREFIX "opengop", false, OPENGOP_TEXT,
- OPENGOP_LONGTEXT, true )
- add_bool( SOUT_CFG_PREFIX "bluray-compat", false, BLURAY_TEXT,
- BLURAY_LONGTEXT, true )
--#endif
-
- add_integer( SOUT_CFG_PREFIX "scenecut", 40, SCENE_TEXT,
- SCENE_LONGTEXT, true )
-@@ -500,13 +488,8 @@ vlc_module_begin ()
- B_BIAS_LONGTEXT, true )
- change_integer_range( -100, 100 )
-
--#if X264_BUILD >= 87
- add_string( SOUT_CFG_PREFIX "bpyramid", "normal", BPYRAMID_TEXT,
- BPYRAMID_LONGTEXT, true )
--#else
-- add_string( SOUT_CFG_PREFIX "bpyramid", "none", BPYRAMID_TEXT,
-- BPYRAMID_LONGTEXT, true )
--#endif
- change_string_list( bpyramid_list, bpyramid_list )
-
- add_bool( SOUT_CFG_PREFIX "cabac", true, CABAC_TEXT, CABAC_LONGTEXT,
-@@ -543,22 +526,18 @@ vlc_module_begin ()
- add_bool( SOUT_CFG_PREFIX "interlaced", false, INTERLACED_TEXT,
INTERLACED_LONGTEXT,
- true )
-
--#if X264_BUILD >= 111
- add_integer( SOUT_CFG_PREFIX "frame-packing", -1, FRAMEPACKING_TEXT,
FRAMEPACKING_LONGTEXT, true )
- change_integer_list( framepacking_list, framepacking_list_text )
- change_integer_range( -1, 5)
--#endif
-
- add_integer( SOUT_CFG_PREFIX "slices", 0, SLICE_COUNT,
SLICE_COUNT_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "slice-max-size", 0, SLICE_MAX_SIZE,
SLICE_MAX_SIZE_LONGTEXT, true )
- add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, SLICE_MAX_MBS,
SLICE_MAX_MBS_LONGTEXT, true )
-
--#if X264_BUILD >= 89
- add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_TEXT, true )
- vlc_config_set (VLC_CONFIG_LIST,
- (sizeof(x264_nal_hrd_names) / sizeof (char*)) - 1,
- x264_nal_hrd_names, x264_nal_hrd_names);
--#endif
-
-
- /* Ratecontrol */
-@@ -843,21 +822,15 @@ static int Open ( vlc_object_t *p_this )
- fullrange = var_GetBool( p_enc, SOUT_CFG_PREFIX "fullrange" );
- p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
- p_sys->i_colorspace = X264_CSP_I420;
--#if X264_BUILD >= 118
- char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
-+# ifdef MODULE_NAME_IS_x26410b
-+ const int mask = X264_CSP_HIGH_DEPTH;
-+# else
-+ const int mask = 0;
-+# endif
- if( psz_profile )
- {
-- const int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
-
--
--# ifdef MODULE_NAME_IS_x26410b
-- if( mask == 0)
-- {
-- msg_Err( p_enc, "Only high bith depth encoding supported, bit
depth:%d", x264_bit_depth);
-- return VLC_EGENERIC;
-- }
--# endif
--
- if( !strcmp( psz_profile, "high10" ) )
- {
- p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I420_10L : fullrange ?
VLC_CODEC_J420 : VLC_CODEC_I420;
-@@ -879,7 +852,6 @@ static int Open ( vlc_object_t *p_this )
- msg_Err( p_enc, "Only high-profiles and 10-bit are supported");
- return VLC_EGENERIC;
- }
--
- # endif
- }
- # ifdef MODULE_NAME_IS_x26410b
-@@ -890,7 +862,6 @@ static int Open ( vlc_object_t *p_this )
- }
- # endif
- free( psz_profile );
--#endif //X264_BUILD
-
- p_enc->pf_encode_video = Encode;
- p_enc->pf_encode_audio = NULL;
-@@ -913,6 +884,10 @@ static int Open ( vlc_object_t *p_this )
- #else
- x264_param_default( &p_sys->param );
- x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
-+# if X264_BUILD > 152
-+ if( mask )
-+ p_sys->param.i_bitdepth = 10;
-+# endif
- #endif
- free( psz_preset );
- free( psz_tune );
-@@ -1045,10 +1020,8 @@ static int Open ( vlc_object_t *p_this )
- if( fabs( var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" ) - 1.0) >
0.005 )
- p_sys->param.rc.f_aq_strength = var_GetFloat( p_enc, SOUT_CFG_PREFIX
"aq-strength" );
-
--#if X264_BUILD >= 111
- if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "frame-packing" ) > -1 )
- p_sys->param.i_frame_packing = var_GetInteger( p_enc, SOUT_CFG_PREFIX
"frame-packing" );
--#endif
-
- if( var_GetBool( p_enc, SOUT_CFG_PREFIX "verbose" ) )
- p_sys->param.i_log_level = X264_LOG_DEBUG;
-@@ -1064,26 +1037,14 @@ static int Open ( vlc_object_t *p_this )
-
- i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "keyint" );
- if( i_val > 0 && i_val != 250 ) p_sys->param.i_keyint_max = i_val;
--#if X264_BUILD >= 102
- if( i_val == -1 ) p_sys->param.i_keyint_max = X264_KEYINT_MAX_INFINITE;
--#endif
-
- i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" );
- if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val;
-
--#if X264_BUILD >= 102 && X264_BUILD <= 114
-- psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "opengop" );
-- if( !strcmp( psz_val, "none" ) )
-- p_sys->param.i_open_gop = X264_OPEN_GOP_NONE;
-- else if( !strcmp( psz_val, "normal" ) )
-- p_sys->param.i_open_gop = X264_OPEN_GOP_NORMAL;
-- else if( !strcmp( psz_val, "bluray" ) )
-- p_sys->param.i_open_gop = X264_OPEN_GOP_BLURAY;
-- free( psz_val );
--#elif X264_BUILD >= 115
- p_sys->param.b_open_gop = var_GetBool( p_enc, SOUT_CFG_PREFIX "opengop" );
- p_sys->param.b_bluray_compat = var_GetBool( p_enc, SOUT_CFG_PREFIX
"bluray-compat" );
--#endif
-+
- i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "bframes" );
- if( i_val >= 0 && i_val <= 16 && i_val != 3 )
- p_sys->param.i_bframe = i_val;
-@@ -1121,14 +1082,12 @@ static int Open ( vlc_object_t *p_this )
- if( i_val >= 1 && i_val != 7 )
- p_sys->param.analyse.i_subpel_refine = i_val;
-
--#if X264_BUILD >= 89
- psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "hrd");
- if( !strcmp( psz_val, "vbr" ) )
- p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR;
- else if( !strcmp( psz_val, "cbr" ) )
- p_sys->param.i_nal_hrd = X264_NAL_HRD_CBR;
- free( psz_val );
--#endif
-
- //TODO: psz_val == NULL ?
- psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "me" );
-@@ -1486,11 +1445,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p
- int i_nal=0, i_out=0, i=0;
-
- /* init pic */
--#if X264_BUILD >= 98
- x264_picture_init( &pic );
--#else
-- memset( &pic, 0, sizeof( x264_picture_t ) );
--#endif
- if( likely(p_pict) ) {
- pic.i_pts = p_pict->date;
- pic.img.i_csp = p_sys->i_colorspace;
Index: patches/patch-modules_demux_mp4_libmp4_h
===================================================================
RCS file: patches/patch-modules_demux_mp4_libmp4_h
diff -N patches/patch-modules_demux_mp4_libmp4_h
--- patches/patch-modules_demux_mp4_libmp4_h 16 Nov 2019 18:28:19 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-modules_demux_mp4_libmp4_h,v 1.2 2019/11/16 18:28:19 ajacoutot
Exp $
-
-C++11 rules.
-
-Index: modules/demux/mp4/libmp4.h
---- modules/demux/mp4/libmp4.h.orig
-+++ modules/demux/mp4/libmp4.h
-@@ -1360,7 +1360,7 @@ static inline size_t mp4_box_headersize( MP4_Box_t *p_
- if( i_actually_read < 0 || (int64_t)i_actually_read < i_read )\
- { \
- msg_Warn( p_stream, "MP4_READBOX_ENTER: I got %i bytes, "\
-- "but I requested %"PRId64"", i_actually_read, i_read );\
-+ "but I requested %" PRId64 "", i_actually_read, i_read );\
- free( p_buff ); \
- return( 0 ); \
- } \
Index: patches/patch-modules_gui_qt4_dialogs_messages_cpp
===================================================================
RCS file: patches/patch-modules_gui_qt4_dialogs_messages_cpp
diff -N patches/patch-modules_gui_qt4_dialogs_messages_cpp
--- patches/patch-modules_gui_qt4_dialogs_messages_cpp 16 Nov 2019 18:28:19
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-modules_gui_qt4_dialogs_messages_cpp,v 1.3 2019/11/16 18:28:19
ajacoutot Exp $
-
-Use Qt4 atomics there, they're portable (taken from FreeBSD).
-
-Index: modules/gui/qt4/dialogs/messages.cpp
---- modules/gui/qt4/dialogs/messages.cpp.orig
-+++ modules/gui/qt4/dialogs/messages.cpp
-@@ -145,7 +145,7 @@ MessagesDialog::~MessagesDialog()
-
- void MessagesDialog::changeVerbosity( int i_verbosity )
- {
-- atomic_store( &this->verbosity, i_verbosity );
-+ verbosity = i_verbosity;
- }
-
- void MessagesDialog::updateConfig()
-@@ -339,7 +339,7 @@ void MessagesDialog::MsgCallback( void *self, int type
- {
- MessagesDialog *dialog = (MessagesDialog *)self;
- char *str;
-- int verbosity = atomic_load( &dialog->verbosity );
-+ int verbosity = dialog->verbosity;
-
- if( verbosity < 0 || verbosity < (type - VLC_MSG_ERR)
- || unlikely(vasprintf( &str, format, ap ) == -1) )
Index: patches/patch-modules_gui_qt4_dialogs_messages_hpp
===================================================================
RCS file: patches/patch-modules_gui_qt4_dialogs_messages_hpp
diff -N patches/patch-modules_gui_qt4_dialogs_messages_hpp
--- patches/patch-modules_gui_qt4_dialogs_messages_hpp 16 Nov 2019 18:28:19
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-modules_gui_qt4_dialogs_messages_hpp,v 1.2 2019/11/16 18:28:19
ajacoutot Exp $
-
-Use Qt4 atomics there, they're portable (taken from FreeBSD).
-
-Index: modules/gui/qt4/dialogs/messages.hpp
---- modules/gui/qt4/dialogs/messages.hpp.orig
-+++ modules/gui/qt4/dialogs/messages.hpp
-@@ -30,6 +30,7 @@
- #include <stdarg.h>
- #include <vlc_atomic.h>
- #include <QMutex>
-+#include <QAtomicInt>
-
- class QTabWidget;
- class QPushButton;
-@@ -55,7 +56,7 @@ class MessagesDialog : public QVLCFrame, public Single
- void sinkMessage( const MsgEvent * );
- bool matchFilter( const QString& );
-
-- atomic_uint verbosity;
-+ QAtomicInt verbosity;
- static void MsgCallback( void *, int, const vlc_log_t *, const char *,
- va_list );
-
Index: patches/patch-modules_gui_skins2_src_dialogs_cpp
===================================================================
RCS file: patches/patch-modules_gui_skins2_src_dialogs_cpp
diff -N patches/patch-modules_gui_skins2_src_dialogs_cpp
--- patches/patch-modules_gui_skins2_src_dialogs_cpp 16 Nov 2019 18:28:19
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-modules_gui_skins2_src_dialogs_cpp,v 1.2 2019/11/16 18:28:19
ajacoutot Exp $
-
-C++11 rules.
-
-Index: modules/gui/skins2/src/dialogs.cpp
---- modules/gui/skins2/src/dialogs.cpp.orig
-+++ modules/gui/skins2/src/dialogs.cpp
-@@ -212,7 +212,7 @@ void Dialogs::showChangeSkin()
- void Dialogs::showPlaylistLoad()
- {
- showFileGeneric( _("Open playlist"),
-- _("Playlist Files|"EXTENSIONS_PLAYLIST"|"
-+ _("Playlist Files|" EXTENSIONS_PLAYLIST "|"
- "All Files|*"),
- showPlaylistLoadCB, kOPEN );
- }
Index: patches/patch-share_Makefile_am
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-share_Makefile_am,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-share_Makefile_am
--- patches/patch-share_Makefile_am 16 Nov 2019 18:28:19 -0000 1.5
+++ patches/patch-share_Makefile_am 25 Nov 2019 01:03:52 -0000
@@ -3,24 +3,12 @@ $OpenBSD: patch-share_Makefile_am,v 1.5
Index: share/Makefile.am
--- share/Makefile.am.orig
+++ share/Makefile.am
-@@ -46,7 +46,6 @@ EXTRA_DIST += \
-
- nobase_vlcdata_DATA =
- if BUILD_SKINS
--nobase_vlcdata_DATA += skins2/default.vlt
- nobase_vlcdata_DATA += $(DIST_skins2)
- endif
- if KDE_SOLID
-@@ -77,12 +76,6 @@ skins2_default_vlt_FILES = \
-
- skins2/default.vlt: $(skins2_default_vlt_FILES)
+@@ -93,7 +93,7 @@ skins2/default.vlt: $(skins2_default_vlt_FILES)
$(AM_V_at)mkdir -p skins2
-- $(AM_V_at)rm -f -- skins2/default.vlt.tmp
-- $(AM_V_GEN)GZIP=--no-name \
+ $(AM_V_at)rm -f -- skins2/default.vlt.tmp
+ $(AM_V_GEN)GZIP=--no-name \
- tar cvvzf skins2/default.vlt.tmp \
-- --owner=root --group=root --directory="$(srcdir)/skins2" \
-- default/
-- $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
-
- #
- # LUA
++ gtar cvvzf skins2/default.vlt.tmp \
+ --owner=root --group=root --directory="$(srcdir)/skins2" \
+ default/
+ $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
Index: patches/patch-src_misc_mtime_c
===================================================================
RCS file: patches/patch-src_misc_mtime_c
diff -N patches/patch-src_misc_mtime_c
--- patches/patch-src_misc_mtime_c 16 Nov 2019 18:28:19 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_misc_mtime_c,v 1.3 2019/11/16 18:28:19 ajacoutot Exp $
-
-Make use of clock_gettime() on OpenBSD. Until we have per-process
-timers and can enable _POSIX_TIMERS in unistd.h.
-
-Index: src/misc/mtime.c
---- src/misc/mtime.c.orig
-+++ src/misc/mtime.c
-@@ -40,7 +40,7 @@
- #if !defined (_POSIX_TIMERS) || defined (_WIN32)
- # define _POSIX_TIMERS (-1)
- #endif
--#if (_POSIX_TIMERS > 0)
-+#if (_POSIX_TIMERS > 0) || defined(__OpenBSD__)
- # include <time.h> /* clock_gettime() */
- #else
- # include <sys/time.h>
-@@ -232,7 +232,7 @@ mtime_t date_Decrement( date_t *p_date, uint32_t i_nb_
- */
- uint64_t NTPtime64 (void)
- {
--#if (_POSIX_TIMERS > 0)
-+#if (_POSIX_TIMERS > 0) || defined(__OpenBSD__)
- struct timespec ts;
-
- clock_gettime (CLOCK_REALTIME, &ts);
Index: patches/patch-src_posix_thread_c
===================================================================
RCS file: /cvs/ports/x11/vlc/patches/patch-src_posix_thread_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_posix_thread_c
--- patches/patch-src_posix_thread_c 16 Nov 2019 18:28:19 -0000 1.3
+++ patches/patch-src_posix_thread_c 25 Nov 2019 01:03:52 -0000
@@ -6,7 +6,7 @@ timers and can enable _POSIX_TIMERS in u
Index: src/posix/thread.c
--- src/posix/thread.c.orig
+++ src/posix/thread.c
-@@ -65,7 +65,7 @@
+@@ -62,7 +62,7 @@
# define _POSIX_MONOTONIC_CLOCK (-1)
#endif
@@ -15,8 +15,8 @@ Index: src/posix/thread.c
static unsigned vlc_clock_prec;
# if (_POSIX_MONOTONIC_CLOCK > 0) && (_POSIX_CLOCK_SELECTION > 0)
-@@ -848,7 +848,7 @@ void vlc_control_cancel (int cmd, ...)
- */
+@@ -625,7 +625,7 @@ void vlc_control_cancel (int cmd, ...)
+
mtime_t mdate (void)
{
-#if (_POSIX_TIMERS > 0)
Index: pkg/PFRAG.amd64-main
===================================================================
RCS file: /cvs/ports/x11/vlc/pkg/PFRAG.amd64-main,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PFRAG.amd64-main
--- pkg/PFRAG.amd64-main 24 May 2015 07:16:31 -0000 1.7
+++ pkg/PFRAG.amd64-main 25 Nov 2019 01:03:52 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PFRAG.amd64-main,v 1.7 2015/05/24 07:16:31 ajacoutot Exp $
-lib/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so
-lib/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so
-lib/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so
-lib/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so
-lib/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so
-lib/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so
+@so lib/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so
+@so lib/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so
Index: pkg/PFRAG.i386-main
===================================================================
RCS file: /cvs/ports/x11/vlc/pkg/PFRAG.i386-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PFRAG.i386-main
--- pkg/PFRAG.i386-main 24 May 2015 07:16:31 -0000 1.6
+++ pkg/PFRAG.i386-main 25 Nov 2019 01:03:52 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PFRAG.i386-main,v 1.6 2015/05/24 07:16:31 ajacoutot Exp $
-lib/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so
-lib/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so
-lib/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so
-lib/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so
-lib/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so
-lib/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so
+@so lib/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so
+@so lib/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so
Index: pkg/PLIST-jack
===================================================================
RCS file: /cvs/ports/x11/vlc/pkg/PLIST-jack,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-jack
--- pkg/PLIST-jack 16 Nov 2011 13:33:16 -0000 1.7
+++ pkg/PLIST-jack 25 Nov 2019 01:03:52 -0000
@@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-jack,v 1.7 2011/11/16 13:33:16 phessler Exp $
@pkgpath x11/vlc,-jack,altivec
-lib/vlc/plugins/access/libaccess_jack_plugin.so
-lib/vlc/plugins/audio_output/libjack_plugin.so
+@so lib/vlc/plugins/access/libaccess_jack_plugin.so
+@so lib/vlc/plugins/audio_output/libjack_plugin.so
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/vlc/pkg/PLIST-main,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 PLIST-main
--- pkg/PLIST-main 29 Jun 2018 22:16:35 -0000 1.43
+++ pkg/PLIST-main 25 Nov 2019 01:03:52 -0000
@@ -11,6 +11,7 @@ bin/svlc
include/vlc/
include/vlc/deprecated.h
include/vlc/libvlc.h
+include/vlc/libvlc_dialog.h
include/vlc/libvlc_events.h
include/vlc/libvlc_media.h
include/vlc/libvlc_media_discoverer.h
@@ -18,12 +19,13 @@ include/vlc/libvlc_media_library.h
include/vlc/libvlc_media_list.h
include/vlc/libvlc_media_list_player.h
include/vlc/libvlc_media_player.h
-include/vlc/libvlc_structures.h
+include/vlc/libvlc_renderer_discoverer.h
include/vlc/libvlc_version.h
include/vlc/libvlc_vlm.h
include/vlc/plugins/
include/vlc/plugins/vlc_about.h
include/vlc/plugins/vlc_access.h
+include/vlc/plugins/vlc_actions.h
include/vlc/plugins/vlc_addons.h
include/vlc/plugins/vlc_aout.h
include/vlc/plugins/vlc_aout_volume.h
@@ -33,6 +35,7 @@ include/vlc/plugins/vlc_avcodec.h
include/vlc/plugins/vlc_bits.h
include/vlc/plugins/vlc_block.h
include/vlc/plugins/vlc_block_helper.h
+include/vlc/plugins/vlc_boxes.h
include/vlc/plugins/vlc_charset.h
include/vlc/plugins/vlc_codec.h
include/vlc/plugins/vlc_common.h
@@ -57,10 +60,13 @@ include/vlc/plugins/vlc_image.h
include/vlc/plugins/vlc_inhibit.h
include/vlc/plugins/vlc_input.h
include/vlc/plugins/vlc_input_item.h
-include/vlc/plugins/vlc_keys.h
+include/vlc/plugins/vlc_interface.h
+include/vlc/plugins/vlc_interrupt.h
+include/vlc/plugins/vlc_keystore.h
include/vlc/plugins/vlc_main.h
include/vlc/plugins/vlc_md5.h
include/vlc/plugins/vlc_media_library.h
+include/vlc/plugins/vlc_memstream.h
include/vlc/plugins/vlc_messages.h
include/vlc/plugins/vlc_meta.h
include/vlc/plugins/vlc_meta_fetcher.h
@@ -78,18 +84,22 @@ include/vlc/plugins/vlc_playlist.h
include/vlc/plugins/vlc_plugin.h
include/vlc/plugins/vlc_probe.h
include/vlc/plugins/vlc_rand.h
+include/vlc/plugins/vlc_renderer_discovery.h
include/vlc/plugins/vlc_services_discovery.h
include/vlc/plugins/vlc_sout.h
include/vlc/plugins/vlc_spu.h
include/vlc/plugins/vlc_stream.h
+include/vlc/plugins/vlc_stream_extractor.h
include/vlc/plugins/vlc_strings.h
include/vlc/plugins/vlc_subpicture.h
include/vlc/plugins/vlc_text_style.h
include/vlc/plugins/vlc_threads.h
+include/vlc/plugins/vlc_timestamp_helper.h
include/vlc/plugins/vlc_tls.h
include/vlc/plugins/vlc_url.h
include/vlc/plugins/vlc_variables.h
include/vlc/plugins/vlc_video_splitter.h
+include/vlc/plugins/vlc_viewpoint.h
include/vlc/plugins/vlc_vlm.h
include/vlc/plugins/vlc_vout.h
include/vlc/plugins/vlc_vout_display.h
@@ -105,318 +115,348 @@ lib/libvlccore.la
lib/pkgconfig/libvlc.pc
lib/pkgconfig/vlc-plugin.pc
lib/vlc/
+@lib lib/vlc/libvlc_xcb_events.so.${LIBvlc_xcb_events_VERSION}
lib/vlc/plugins/
lib/vlc/plugins/access/
-lib/vlc/plugins/access/libaccess_bd_plugin.so
-lib/vlc/plugins/access/libaccess_mms_plugin.so
-lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
-lib/vlc/plugins/access/libattachment_plugin.so
-lib/vlc/plugins/access/libavio_plugin.so
-lib/vlc/plugins/access/libcdda_plugin.so
-lib/vlc/plugins/access/libdvdnav_plugin.so
-lib/vlc/plugins/access/libdvdread_plugin.so
-lib/vlc/plugins/access/libfilesystem_plugin.so
-lib/vlc/plugins/access/libftp_plugin.so
-lib/vlc/plugins/access/libhttp_plugin.so
-lib/vlc/plugins/access/libidummy_plugin.so
-lib/vlc/plugins/access/libimem_plugin.so
-lib/vlc/plugins/access/liblibbluray_plugin.so
-lib/vlc/plugins/access/librar_plugin.so
-lib/vlc/plugins/access/librtp_plugin.so
-lib/vlc/plugins/access/libsdp_plugin.so
-lib/vlc/plugins/access/libshm_plugin.so
-lib/vlc/plugins/access/libtcp_plugin.so
-lib/vlc/plugins/access/libtimecode_plugin.so
-lib/vlc/plugins/access/libudp_plugin.so
-lib/vlc/plugins/access/libv4l2_plugin.so
-lib/vlc/plugins/access/libvcd_plugin.so
-lib/vlc/plugins/access/libvdr_plugin.so
-lib/vlc/plugins/access/libxcb_screen_plugin.so
-lib/vlc/plugins/access/libzip_plugin.so
+@so lib/vlc/plugins/access/libaccess_concat_plugin.so
+@so lib/vlc/plugins/access/libaccess_imem_plugin.so
+@so lib/vlc/plugins/access/libaccess_mms_plugin.so
+@so lib/vlc/plugins/access/libaccess_realrtsp_plugin.so
+@so lib/vlc/plugins/access/libattachment_plugin.so
+@so lib/vlc/plugins/access/libavio_plugin.so
+@so lib/vlc/plugins/access/libcdda_plugin.so
+@so lib/vlc/plugins/access/libdsm_plugin.so
+@so lib/vlc/plugins/access/libdvdnav_plugin.so
+@so lib/vlc/plugins/access/libdvdread_plugin.so
+@so lib/vlc/plugins/access/libfilesystem_plugin.so
+@so lib/vlc/plugins/access/libftp_plugin.so
+@so lib/vlc/plugins/access/libhttp_plugin.so
+@lib lib/vlc/plugins/access/libhttps_plugin.so.${LIBhttps_plugin_VERSION}
+@so lib/vlc/plugins/access/libidummy_plugin.so
+@so lib/vlc/plugins/access/libimem_plugin.so
+@so lib/vlc/plugins/access/liblibbluray_plugin.so
+@so lib/vlc/plugins/access/libnfs_plugin.so
+@so lib/vlc/plugins/access/librtp_plugin.so
+@so lib/vlc/plugins/access/libsatip_plugin.so
+@so lib/vlc/plugins/access/libsdp_plugin.so
+@so lib/vlc/plugins/access/libshm_plugin.so
+@so lib/vlc/plugins/access/libtcp_plugin.so
+@so lib/vlc/plugins/access/libtimecode_plugin.so
+@so lib/vlc/plugins/access/libudp_plugin.so
+@so lib/vlc/plugins/access/libv4l2_plugin.so
+@so lib/vlc/plugins/access/libvcd_plugin.so
+@so lib/vlc/plugins/access/libvdr_plugin.so
+@so lib/vlc/plugins/access/libxcb_screen_plugin.so
lib/vlc/plugins/access_output/
-lib/vlc/plugins/access_output/libaccess_output_dummy_plugin.so
-lib/vlc/plugins/access_output/libaccess_output_file_plugin.so
-lib/vlc/plugins/access_output/libaccess_output_http_plugin.so
-lib/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so
-lib/vlc/plugins/access_output/libaccess_output_udp_plugin.so
+@so lib/vlc/plugins/access_output/libaccess_output_dummy_plugin.so
+@so lib/vlc/plugins/access_output/libaccess_output_file_plugin.so
+@so lib/vlc/plugins/access_output/libaccess_output_http_plugin.so
+@so lib/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so
+@so lib/vlc/plugins/access_output/libaccess_output_udp_plugin.so
lib/vlc/plugins/audio_filter/
-lib/vlc/plugins/audio_filter/liba52tospdif_plugin.so
-lib/vlc/plugins/audio_filter/libaudio_format_plugin.so
-lib/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so
-lib/vlc/plugins/audio_filter/libchorus_flanger_plugin.so
-lib/vlc/plugins/audio_filter/libcompressor_plugin.so
-lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so
-lib/vlc/plugins/audio_filter/libdtstospdif_plugin.so
-lib/vlc/plugins/audio_filter/libequalizer_plugin.so
-lib/vlc/plugins/audio_filter/libgain_plugin.so
-lib/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so
-lib/vlc/plugins/audio_filter/libkaraoke_plugin.so
-lib/vlc/plugins/audio_filter/libmono_plugin.so
-lib/vlc/plugins/audio_filter/libnormvol_plugin.so
-lib/vlc/plugins/audio_filter/libparam_eq_plugin.so
-lib/vlc/plugins/audio_filter/libremap_plugin.so
-lib/vlc/plugins/audio_filter/libsamplerate_plugin.so
-lib/vlc/plugins/audio_filter/libscaletempo_plugin.so
-lib/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
-lib/vlc/plugins/audio_filter/libspatializer_plugin.so
-lib/vlc/plugins/audio_filter/libspeex_resampler_plugin.so
-lib/vlc/plugins/audio_filter/libstereo_widen_plugin.so
-lib/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so
-lib/vlc/plugins/audio_filter/libugly_resampler_plugin.so
+@so lib/vlc/plugins/audio_filter/libaudio_format_plugin.so
+@so lib/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so
+@so lib/vlc/plugins/audio_filter/libchorus_flanger_plugin.so
+@so lib/vlc/plugins/audio_filter/libcompressor_plugin.so
+@so lib/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so
+@so lib/vlc/plugins/audio_filter/libequalizer_plugin.so
+@so lib/vlc/plugins/audio_filter/libgain_plugin.so
+@so lib/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so
+@so lib/vlc/plugins/audio_filter/libkaraoke_plugin.so
+@so lib/vlc/plugins/audio_filter/libmono_plugin.so
+@so lib/vlc/plugins/audio_filter/libnormvol_plugin.so
+@so lib/vlc/plugins/audio_filter/libparam_eq_plugin.so
+@so lib/vlc/plugins/audio_filter/libremap_plugin.so
+@so lib/vlc/plugins/audio_filter/libsamplerate_plugin.so
+@so lib/vlc/plugins/audio_filter/libscaletempo_pitch_plugin.so
+@so lib/vlc/plugins/audio_filter/libscaletempo_plugin.so
+@so lib/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
+@so lib/vlc/plugins/audio_filter/libspatializer_plugin.so
+@so lib/vlc/plugins/audio_filter/libspeex_resampler_plugin.so
+@so lib/vlc/plugins/audio_filter/libstereo_widen_plugin.so
+@so lib/vlc/plugins/audio_filter/libtospdif_plugin.so
+@so lib/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so
+@so lib/vlc/plugins/audio_filter/libugly_resampler_plugin.so
lib/vlc/plugins/audio_mixer/
-lib/vlc/plugins/audio_mixer/libfloat_mixer_plugin.so
-lib/vlc/plugins/audio_mixer/libinteger_mixer_plugin.so
+@so lib/vlc/plugins/audio_mixer/libfloat_mixer_plugin.so
+@so lib/vlc/plugins/audio_mixer/libinteger_mixer_plugin.so
lib/vlc/plugins/audio_output/
-lib/vlc/plugins/audio_output/libadummy_plugin.so
-lib/vlc/plugins/audio_output/libafile_plugin.so
-lib/vlc/plugins/audio_output/libamem_plugin.so
-lib/vlc/plugins/audio_output/libsndio_plugin.so
+@so lib/vlc/plugins/audio_output/libadummy_plugin.so
+@so lib/vlc/plugins/audio_output/libafile_plugin.so
+@so lib/vlc/plugins/audio_output/libamem_plugin.so
+@so lib/vlc/plugins/audio_output/libsndio_plugin.so
lib/vlc/plugins/codec/
-lib/vlc/plugins/codec/liba52_plugin.so
-lib/vlc/plugins/codec/libadpcm_plugin.so
-lib/vlc/plugins/codec/libaes3_plugin.so
-lib/vlc/plugins/codec/libaraw_plugin.so
-lib/vlc/plugins/codec/libavcodec_plugin.so
-lib/vlc/plugins/codec/libcc_plugin.so
-lib/vlc/plugins/codec/libcdg_plugin.so
-lib/vlc/plugins/codec/libcvdsub_plugin.so
-lib/vlc/plugins/codec/libddummy_plugin.so
-lib/vlc/plugins/codec/libdts_plugin.so
-lib/vlc/plugins/codec/libdvbsub_plugin.so
-lib/vlc/plugins/codec/libedummy_plugin.so
-lib/vlc/plugins/codec/libg711_plugin.so
-lib/vlc/plugins/codec/libjpeg_plugin.so
-lib/vlc/plugins/codec/liblibass_plugin.so
-lib/vlc/plugins/codec/liblpcm_plugin.so
-lib/vlc/plugins/codec/libmpeg_audio_plugin.so
-lib/vlc/plugins/codec/libopus_plugin.so
-lib/vlc/plugins/codec/libpng_plugin.so
-lib/vlc/plugins/codec/librawvideo_plugin.so
-lib/vlc/plugins/codec/libscte27_plugin.so
-lib/vlc/plugins/codec/libsdl_image_plugin.so
-lib/vlc/plugins/codec/libspeex_plugin.so
-lib/vlc/plugins/codec/libspudec_plugin.so
-lib/vlc/plugins/codec/libstl_plugin.so
-lib/vlc/plugins/codec/libsubsdec_plugin.so
-lib/vlc/plugins/codec/libsubstx3g_plugin.so
-lib/vlc/plugins/codec/libsubsusf_plugin.so
-lib/vlc/plugins/codec/libsvcdsub_plugin.so
-lib/vlc/plugins/codec/libsvgdec_plugin.so
-lib/vlc/plugins/codec/libt140_plugin.so
-lib/vlc/plugins/codec/libtelx_plugin.so
-lib/vlc/plugins/codec/libuleaddvaudio_plugin.so
-lib/vlc/plugins/codec/libvorbis_plugin.so
-lib/vlc/plugins/codec/libx264_plugin.so
-lib/vlc/plugins/codec/libx265_plugin.so
-lib/vlc/plugins/codec/libxwd_plugin.so
+@so lib/vlc/plugins/codec/libadpcm_plugin.so
+@so lib/vlc/plugins/codec/libaes3_plugin.so
+@so lib/vlc/plugins/codec/libaraw_plugin.so
+@so lib/vlc/plugins/codec/libavcodec_plugin.so
+@so lib/vlc/plugins/codec/libcc_plugin.so
+@so lib/vlc/plugins/codec/libcdg_plugin.so
+@so lib/vlc/plugins/codec/libcvdsub_plugin.so
+@so lib/vlc/plugins/codec/libddummy_plugin.so
+@so lib/vlc/plugins/codec/libdvbsub_plugin.so
+@so lib/vlc/plugins/codec/libedummy_plugin.so
+@so lib/vlc/plugins/codec/libg711_plugin.so
+@so lib/vlc/plugins/codec/libjpeg_plugin.so
+@so lib/vlc/plugins/codec/liblibass_plugin.so
+@so lib/vlc/plugins/codec/liblpcm_plugin.so
+@so lib/vlc/plugins/codec/libopus_plugin.so
+@so lib/vlc/plugins/codec/libpng_plugin.so
+@so lib/vlc/plugins/codec/librawvideo_plugin.so
+@so lib/vlc/plugins/codec/librtpvideo_plugin.so
+@so lib/vlc/plugins/codec/libscte18_plugin.so
+@so lib/vlc/plugins/codec/libscte27_plugin.so
+@so lib/vlc/plugins/codec/libsdl_image_plugin.so
+@so lib/vlc/plugins/codec/libspdif_plugin.so
+@so lib/vlc/plugins/codec/libspeex_plugin.so
+@so lib/vlc/plugins/codec/libspudec_plugin.so
+@so lib/vlc/plugins/codec/libstl_plugin.so
+@so lib/vlc/plugins/codec/libsubsdec_plugin.so
+@so lib/vlc/plugins/codec/libsubstx3g_plugin.so
+@so lib/vlc/plugins/codec/libsubsusf_plugin.so
+@so lib/vlc/plugins/codec/libsvcdsub_plugin.so
+@so lib/vlc/plugins/codec/libsvgdec_plugin.so
+@so lib/vlc/plugins/codec/libt140_plugin.so
+@so lib/vlc/plugins/codec/libtelx_plugin.so
+@so lib/vlc/plugins/codec/libtextst_plugin.so
+@so lib/vlc/plugins/codec/libttml_plugin.so
+@so lib/vlc/plugins/codec/libuleaddvaudio_plugin.so
+@so lib/vlc/plugins/codec/libvorbis_plugin.so
+@so lib/vlc/plugins/codec/libwebvtt_plugin.so
+@so lib/vlc/plugins/codec/libx26410b_plugin.so
+@so lib/vlc/plugins/codec/libx264_plugin.so
+@so lib/vlc/plugins/codec/libx265_plugin.so
+@so lib/vlc/plugins/codec/libxwd_plugin.so
lib/vlc/plugins/control/
-lib/vlc/plugins/control/libdbus_plugin.so
-lib/vlc/plugins/control/libdummy_plugin.so
-lib/vlc/plugins/control/libgestures_plugin.so
-lib/vlc/plugins/control/libhotkeys_plugin.so
-lib/vlc/plugins/control/libmotion_plugin.so
-lib/vlc/plugins/control/libnetsync_plugin.so
-lib/vlc/plugins/control/liboldrc_plugin.so
-lib/vlc/plugins/control/libxcb_hotkeys_plugin.so
+@so lib/vlc/plugins/control/libdbus_plugin.so
+@so lib/vlc/plugins/control/libdummy_plugin.so
+@so lib/vlc/plugins/control/libgestures_plugin.so
+@so lib/vlc/plugins/control/libhotkeys_plugin.so
+@so lib/vlc/plugins/control/libmotion_plugin.so
+@so lib/vlc/plugins/control/libnetsync_plugin.so
+@so lib/vlc/plugins/control/liboldrc_plugin.so
+@so lib/vlc/plugins/control/libxcb_hotkeys_plugin.so
lib/vlc/plugins/demux/
-lib/vlc/plugins/demux/libaiff_plugin.so
-lib/vlc/plugins/demux/libasf_plugin.so
-lib/vlc/plugins/demux/libau_plugin.so
-lib/vlc/plugins/demux/libavformat_plugin.so
-lib/vlc/plugins/demux/libavi_plugin.so
-lib/vlc/plugins/demux/libcaf_plugin.so
-lib/vlc/plugins/demux/libdemux_cdg_plugin.so
-lib/vlc/plugins/demux/libdemux_stl_plugin.so
-lib/vlc/plugins/demux/libdemuxdump_plugin.so
-lib/vlc/plugins/demux/libdiracsys_plugin.so
-lib/vlc/plugins/demux/libes_plugin.so
-lib/vlc/plugins/demux/libflacsys_plugin.so
-lib/vlc/plugins/demux/libh264_plugin.so
-lib/vlc/plugins/demux/libhevc_plugin.so
-lib/vlc/plugins/demux/libimage_plugin.so
-lib/vlc/plugins/demux/libmjpeg_plugin.so
-lib/vlc/plugins/demux/libmkv_plugin.so
-lib/vlc/plugins/demux/libmp4_plugin.so
-lib/vlc/plugins/demux/libmpgv_plugin.so
-lib/vlc/plugins/demux/libnsc_plugin.so
-lib/vlc/plugins/demux/libnsv_plugin.so
-lib/vlc/plugins/demux/libnuv_plugin.so
-lib/vlc/plugins/demux/libogg_plugin.so
-lib/vlc/plugins/demux/libplaylist_plugin.so
-lib/vlc/plugins/demux/libps_plugin.so
-lib/vlc/plugins/demux/libpva_plugin.so
-lib/vlc/plugins/demux/librawaud_plugin.so
-lib/vlc/plugins/demux/librawdv_plugin.so
-lib/vlc/plugins/demux/librawvid_plugin.so
-lib/vlc/plugins/demux/libreal_plugin.so
-lib/vlc/plugins/demux/libsmf_plugin.so
-lib/vlc/plugins/demux/libsubtitle_plugin.so
-lib/vlc/plugins/demux/libts_plugin.so
-lib/vlc/plugins/demux/libtta_plugin.so
-lib/vlc/plugins/demux/libty_plugin.so
-lib/vlc/plugins/demux/libvc1_plugin.so
-lib/vlc/plugins/demux/libvobsub_plugin.so
-lib/vlc/plugins/demux/libvoc_plugin.so
-lib/vlc/plugins/demux/libwav_plugin.so
-lib/vlc/plugins/demux/libxa_plugin.so
+@so lib/vlc/plugins/demux/libadaptive_plugin.so
+@so lib/vlc/plugins/demux/libaiff_plugin.so
+@so lib/vlc/plugins/demux/libasf_plugin.so
+@so lib/vlc/plugins/demux/libau_plugin.so
+@so lib/vlc/plugins/demux/libavformat_plugin.so
+@so lib/vlc/plugins/demux/libavi_plugin.so
+@so lib/vlc/plugins/demux/libcaf_plugin.so
+@so lib/vlc/plugins/demux/libdemux_cdg_plugin.so
+@so lib/vlc/plugins/demux/libdemux_stl_plugin.so
+@so lib/vlc/plugins/demux/libdemuxdump_plugin.so
+@so lib/vlc/plugins/demux/libdiracsys_plugin.so
+@so lib/vlc/plugins/demux/libdirectory_demux_plugin.so
+@so lib/vlc/plugins/demux/libes_plugin.so
+@so lib/vlc/plugins/demux/libflacsys_plugin.so
+@so lib/vlc/plugins/demux/libh26x_plugin.so
+@so lib/vlc/plugins/demux/libimage_plugin.so
+@so lib/vlc/plugins/demux/libmjpeg_plugin.so
+@so lib/vlc/plugins/demux/libmkv_plugin.so
+@so lib/vlc/plugins/demux/libmp4_plugin.so
+@so lib/vlc/plugins/demux/libmpgv_plugin.so
+@so lib/vlc/plugins/demux/libnoseek_plugin.so
+@so lib/vlc/plugins/demux/libnsc_plugin.so
+@so lib/vlc/plugins/demux/libnsv_plugin.so
+@so lib/vlc/plugins/demux/libnuv_plugin.so
+@so lib/vlc/plugins/demux/libogg_plugin.so
+@so lib/vlc/plugins/demux/libplaylist_plugin.so
+@so lib/vlc/plugins/demux/libps_plugin.so
+@so lib/vlc/plugins/demux/libpva_plugin.so
+@so lib/vlc/plugins/demux/librawaud_plugin.so
+@so lib/vlc/plugins/demux/librawdv_plugin.so
+@so lib/vlc/plugins/demux/librawvid_plugin.so
+@so lib/vlc/plugins/demux/libreal_plugin.so
+@so lib/vlc/plugins/demux/libsmf_plugin.so
+@so lib/vlc/plugins/demux/libsubtitle_plugin.so
+@so lib/vlc/plugins/demux/libts_plugin.so
+@so lib/vlc/plugins/demux/libtta_plugin.so
+@so lib/vlc/plugins/demux/libty_plugin.so
+@so lib/vlc/plugins/demux/libvc1_plugin.so
+@so lib/vlc/plugins/demux/libvobsub_plugin.so
+@so lib/vlc/plugins/demux/libvoc_plugin.so
+@so lib/vlc/plugins/demux/libwav_plugin.so
+@so lib/vlc/plugins/demux/libxa_plugin.so
lib/vlc/plugins/gui/
-lib/vlc/plugins/gui/libqt4_plugin.so
-lib/vlc/plugins/gui/libskins2_plugin.so
+@so lib/vlc/plugins/gui/libqt_plugin.so
+@so lib/vlc/plugins/gui/libskins2_plugin.so
+lib/vlc/plugins/keystore/
+@so lib/vlc/plugins/keystore/libfile_keystore_plugin.so
+@so lib/vlc/plugins/keystore/libmemory_keystore_plugin.so
+lib/vlc/plugins/logger/
+@so lib/vlc/plugins/logger/libconsole_logger_plugin.so
+@so lib/vlc/plugins/logger/libfile_logger_plugin.so
+@so lib/vlc/plugins/logger/libsyslog_plugin.so
lib/vlc/plugins/meta_engine/
-lib/vlc/plugins/meta_engine/libfolder_plugin.so
-lib/vlc/plugins/meta_engine/libtaglib_plugin.so
+@so lib/vlc/plugins/meta_engine/libfolder_plugin.so
+@so lib/vlc/plugins/meta_engine/libtaglib_plugin.so
lib/vlc/plugins/misc/
-lib/vlc/plugins/misc/libaddonsfsstorage_plugin.so
-lib/vlc/plugins/misc/libaddonsvorepository_plugin.so
-lib/vlc/plugins/misc/libaudioscrobbler_plugin.so
-lib/vlc/plugins/misc/libdbus_screensaver_plugin.so
-lib/vlc/plugins/misc/libexport_plugin.so
-lib/vlc/plugins/misc/libfingerprinter_plugin.so
-lib/vlc/plugins/misc/libgnutls_plugin.so
-lib/vlc/plugins/misc/liblogger_plugin.so
-lib/vlc/plugins/misc/libstats_plugin.so
-lib/vlc/plugins/misc/libvod_rtsp_plugin.so
-lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
-lib/vlc/plugins/misc/libxml_plugin.so
+@so lib/vlc/plugins/misc/libaddonsfsstorage_plugin.so
+@so lib/vlc/plugins/misc/libaddonsvorepository_plugin.so
+@so lib/vlc/plugins/misc/libaudioscrobbler_plugin.so
+@so lib/vlc/plugins/misc/libdbus_screensaver_plugin.so
+@so lib/vlc/plugins/misc/libexport_plugin.so
+@so lib/vlc/plugins/misc/libfingerprinter_plugin.so
+@so lib/vlc/plugins/misc/libgnutls_plugin.so
+@so lib/vlc/plugins/misc/liblogger_plugin.so
+@so lib/vlc/plugins/misc/libstats_plugin.so
+@so lib/vlc/plugins/misc/libvod_rtsp_plugin.so
+@so lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
+@so lib/vlc/plugins/misc/libxml_plugin.so
lib/vlc/plugins/mux/
-lib/vlc/plugins/mux/libmux_asf_plugin.so
-lib/vlc/plugins/mux/libmux_avi_plugin.so
-lib/vlc/plugins/mux/libmux_dummy_plugin.so
-lib/vlc/plugins/mux/libmux_mp4_plugin.so
-lib/vlc/plugins/mux/libmux_mpjpeg_plugin.so
-lib/vlc/plugins/mux/libmux_ogg_plugin.so
-lib/vlc/plugins/mux/libmux_ps_plugin.so
-lib/vlc/plugins/mux/libmux_ts_plugin.so
-lib/vlc/plugins/mux/libmux_wav_plugin.so
+@so lib/vlc/plugins/mux/libmux_asf_plugin.so
+@so lib/vlc/plugins/mux/libmux_avi_plugin.so
+@so lib/vlc/plugins/mux/libmux_dummy_plugin.so
+@so lib/vlc/plugins/mux/libmux_mp4_plugin.so
+@so lib/vlc/plugins/mux/libmux_mpjpeg_plugin.so
+@so lib/vlc/plugins/mux/libmux_ogg_plugin.so
+@so lib/vlc/plugins/mux/libmux_ps_plugin.so
+@so lib/vlc/plugins/mux/libmux_ts_plugin.so
+@so lib/vlc/plugins/mux/libmux_wav_plugin.so
lib/vlc/plugins/notify/
-lib/vlc/plugins/notify/libnotify_plugin.so
+@so lib/vlc/plugins/notify/libnotify_plugin.so
lib/vlc/plugins/packetizer/
-lib/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_flac_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_h264_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_mlp_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so
-lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_a52_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_av1_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_dts_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_flac_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_h264_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_mlp_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_mpegaudio_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so
+@so lib/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
@comment no checksum
lib/vlc/plugins/plugins.dat
lib/vlc/plugins/services_discovery/
-lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
-lib/vlc/plugins/services_discovery/libpodcast_plugin.so
-lib/vlc/plugins/services_discovery/libsap_plugin.so
-lib/vlc/plugins/services_discovery/libxcb_apps_plugin.so
+@so lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
+@so lib/vlc/plugins/services_discovery/libpodcast_plugin.so
+@so lib/vlc/plugins/services_discovery/libsap_plugin.so
+@so lib/vlc/plugins/services_discovery/libxcb_apps_plugin.so
+lib/vlc/plugins/spu/
+@so lib/vlc/plugins/spu/libaudiobargraph_v_plugin.so
+@so lib/vlc/plugins/spu/libdynamicoverlay_plugin.so
+@so lib/vlc/plugins/spu/liblogo_plugin.so
+@so lib/vlc/plugins/spu/libmarq_plugin.so
+@so lib/vlc/plugins/spu/libmosaic_plugin.so
+@so lib/vlc/plugins/spu/libremoteosd_plugin.so
+@so lib/vlc/plugins/spu/librss_plugin.so
+@so lib/vlc/plugins/spu/libsubsdelay_plugin.so
+lib/vlc/plugins/stream_extractor/
+@so lib/vlc/plugins/stream_extractor/libarchive_plugin.so
lib/vlc/plugins/stream_filter/
-lib/vlc/plugins/stream_filter/libdash_plugin.so
-lib/vlc/plugins/stream_filter/libdecomp_plugin.so
-lib/vlc/plugins/stream_filter/libhttplive_plugin.so
-lib/vlc/plugins/stream_filter/librecord_plugin.so
-lib/vlc/plugins/stream_filter/libsmooth_plugin.so
+@so lib/vlc/plugins/stream_filter/libadf_plugin.so
+@so lib/vlc/plugins/stream_filter/libcache_block_plugin.so
+@so lib/vlc/plugins/stream_filter/libcache_read_plugin.so
+@so lib/vlc/plugins/stream_filter/libdecomp_plugin.so
+@so lib/vlc/plugins/stream_filter/libhds_plugin.so
+@so lib/vlc/plugins/stream_filter/libinflate_plugin.so
+@so lib/vlc/plugins/stream_filter/libprefetch_plugin.so
+@so lib/vlc/plugins/stream_filter/librecord_plugin.so
+@so lib/vlc/plugins/stream_filter/libskiptags_plugin.so
lib/vlc/plugins/stream_out/
-lib/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_delay_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_description_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_display_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_dummy_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_duplicate_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_es_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_gather_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_langfromtelx_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_raop_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_record_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_setid_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_smem_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_standard_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_stats_plugin.so
-lib/vlc/plugins/stream_out/libstream_out_transcode_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_cycle_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_delay_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_description_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_display_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_dummy_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_duplicate_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_es_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_gather_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_record_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_setid_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_smem_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_standard_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_stats_plugin.so
+@so lib/vlc/plugins/stream_out/libstream_out_transcode_plugin.so
lib/vlc/plugins/text_renderer/
-lib/vlc/plugins/text_renderer/libfreetype_plugin.so
-lib/vlc/plugins/text_renderer/libtdummy_plugin.so
+@so lib/vlc/plugins/text_renderer/libfreetype_plugin.so
+@so lib/vlc/plugins/text_renderer/libtdummy_plugin.so
lib/vlc/plugins/video_chroma/
-lib/vlc/plugins/video_chroma/libchain_plugin.so
-lib/vlc/plugins/video_chroma/libgrey_yuv_plugin.so
-lib/vlc/plugins/video_chroma/libi420_rgb_plugin.so
-lib/vlc/plugins/video_chroma/libi420_yuy2_plugin.so
-lib/vlc/plugins/video_chroma/libi422_i420_plugin.so
-lib/vlc/plugins/video_chroma/libi422_yuy2_plugin.so
-lib/vlc/plugins/video_chroma/librv32_plugin.so
-lib/vlc/plugins/video_chroma/libswscale_plugin.so
-lib/vlc/plugins/video_chroma/libyuy2_i420_plugin.so
-lib/vlc/plugins/video_chroma/libyuy2_i422_plugin.so
+@so lib/vlc/plugins/video_chroma/libchain_plugin.so
+@so lib/vlc/plugins/video_chroma/libgrey_yuv_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_10_p010_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_nv12_plugin.so
+@so lib/vlc/plugins/video_chroma/libi420_rgb_plugin.so
+@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
+@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
+@so lib/vlc/plugins/video_chroma/libyuy2_i420_plugin.so
+@so lib/vlc/plugins/video_chroma/libyuy2_i422_plugin.so
lib/vlc/plugins/video_filter/
-lib/vlc/plugins/video_filter/libadjust_plugin.so
-lib/vlc/plugins/video_filter/libalphamask_plugin.so
-lib/vlc/plugins/video_filter/libanaglyph_plugin.so
-lib/vlc/plugins/video_filter/libantiflicker_plugin.so
-lib/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
-lib/vlc/plugins/video_filter/libball_plugin.so
-lib/vlc/plugins/video_filter/libblend_plugin.so
-lib/vlc/plugins/video_filter/libblendbench_plugin.so
-lib/vlc/plugins/video_filter/libbluescreen_plugin.so
-lib/vlc/plugins/video_filter/libcanvas_plugin.so
-lib/vlc/plugins/video_filter/libcolorthres_plugin.so
-lib/vlc/plugins/video_filter/libcroppadd_plugin.so
-lib/vlc/plugins/video_filter/libdeinterlace_plugin.so
-lib/vlc/plugins/video_filter/libdynamicoverlay_plugin.so
-lib/vlc/plugins/video_filter/liberase_plugin.so
-lib/vlc/plugins/video_filter/libextract_plugin.so
-lib/vlc/plugins/video_filter/libfreeze_plugin.so
-lib/vlc/plugins/video_filter/libgaussianblur_plugin.so
-lib/vlc/plugins/video_filter/libgradfun_plugin.so
-lib/vlc/plugins/video_filter/libgradient_plugin.so
-lib/vlc/plugins/video_filter/libgrain_plugin.so
-lib/vlc/plugins/video_filter/libhqdn3d_plugin.so
-lib/vlc/plugins/video_filter/libinvert_plugin.so
-lib/vlc/plugins/video_filter/liblogo_plugin.so
-lib/vlc/plugins/video_filter/libmagnify_plugin.so
-lib/vlc/plugins/video_filter/libmarq_plugin.so
-lib/vlc/plugins/video_filter/libmirror_plugin.so
-lib/vlc/plugins/video_filter/libmosaic_plugin.so
-lib/vlc/plugins/video_filter/libmotionblur_plugin.so
-lib/vlc/plugins/video_filter/libmotiondetect_plugin.so
-lib/vlc/plugins/video_filter/liboldmovie_plugin.so
-lib/vlc/plugins/video_filter/libposterize_plugin.so
-lib/vlc/plugins/video_filter/libpostproc_plugin.so
-lib/vlc/plugins/video_filter/libpsychedelic_plugin.so
-lib/vlc/plugins/video_filter/libpuzzle_plugin.so
-lib/vlc/plugins/video_filter/libremoteosd_plugin.so
-lib/vlc/plugins/video_filter/libripple_plugin.so
-lib/vlc/plugins/video_filter/librotate_plugin.so
-lib/vlc/plugins/video_filter/librss_plugin.so
-lib/vlc/plugins/video_filter/libscale_plugin.so
-lib/vlc/plugins/video_filter/libscene_plugin.so
-lib/vlc/plugins/video_filter/libsepia_plugin.so
-lib/vlc/plugins/video_filter/libsharpen_plugin.so
-lib/vlc/plugins/video_filter/libsubsdelay_plugin.so
-lib/vlc/plugins/video_filter/libtransform_plugin.so
-lib/vlc/plugins/video_filter/libvhs_plugin.so
-lib/vlc/plugins/video_filter/libwave_plugin.so
-lib/vlc/plugins/video_filter/libyuvp_plugin.so
+@so lib/vlc/plugins/video_filter/libadjust_plugin.so
+@so lib/vlc/plugins/video_filter/libalphamask_plugin.so
+@so lib/vlc/plugins/video_filter/libanaglyph_plugin.so
+@so lib/vlc/plugins/video_filter/libantiflicker_plugin.so
+@so lib/vlc/plugins/video_filter/libball_plugin.so
+@so lib/vlc/plugins/video_filter/libblend_plugin.so
+@so lib/vlc/plugins/video_filter/libblendbench_plugin.so
+@so lib/vlc/plugins/video_filter/libbluescreen_plugin.so
+@so lib/vlc/plugins/video_filter/libcanvas_plugin.so
+@so lib/vlc/plugins/video_filter/libcolorthres_plugin.so
+@so lib/vlc/plugins/video_filter/libcroppadd_plugin.so
+@so lib/vlc/plugins/video_filter/libdeinterlace_plugin.so
+@so lib/vlc/plugins/video_filter/libedgedetection_plugin.so
+@so lib/vlc/plugins/video_filter/liberase_plugin.so
+@so lib/vlc/plugins/video_filter/libextract_plugin.so
+@so lib/vlc/plugins/video_filter/libfps_plugin.so
+@so lib/vlc/plugins/video_filter/libfreeze_plugin.so
+@so lib/vlc/plugins/video_filter/libgaussianblur_plugin.so
+@so lib/vlc/plugins/video_filter/libgradfun_plugin.so
+@so lib/vlc/plugins/video_filter/libgradient_plugin.so
+@so lib/vlc/plugins/video_filter/libgrain_plugin.so
+@so lib/vlc/plugins/video_filter/libhqdn3d_plugin.so
+@so lib/vlc/plugins/video_filter/libinvert_plugin.so
+@so lib/vlc/plugins/video_filter/libmagnify_plugin.so
+@so lib/vlc/plugins/video_filter/libmirror_plugin.so
+@so lib/vlc/plugins/video_filter/libmotionblur_plugin.so
+@so lib/vlc/plugins/video_filter/libmotiondetect_plugin.so
+@so lib/vlc/plugins/video_filter/liboldmovie_plugin.so
+@so lib/vlc/plugins/video_filter/libposterize_plugin.so
+@so lib/vlc/plugins/video_filter/libpostproc_plugin.so
+@so lib/vlc/plugins/video_filter/libpsychedelic_plugin.so
+@so lib/vlc/plugins/video_filter/libpuzzle_plugin.so
+@so lib/vlc/plugins/video_filter/libripple_plugin.so
+@so lib/vlc/plugins/video_filter/librotate_plugin.so
+@so lib/vlc/plugins/video_filter/libscale_plugin.so
+@so lib/vlc/plugins/video_filter/libscene_plugin.so
+@so lib/vlc/plugins/video_filter/libsepia_plugin.so
+@so lib/vlc/plugins/video_filter/libsharpen_plugin.so
+@so lib/vlc/plugins/video_filter/libtransform_plugin.so
+@so lib/vlc/plugins/video_filter/libvhs_plugin.so
+@so lib/vlc/plugins/video_filter/libwave_plugin.so
lib/vlc/plugins/video_output/
-lib/vlc/plugins/video_output/libegl_x11_plugin.so
-lib/vlc/plugins/video_output/libgl_plugin.so
-lib/vlc/plugins/video_output/libglx_plugin.so
-lib/vlc/plugins/video_output/libvdummy_plugin.so
-lib/vlc/plugins/video_output/libvmem_plugin.so
-lib/vlc/plugins/video_output/libvout_sdl_plugin.so
-lib/vlc/plugins/video_output/libxcb_glx_plugin.so
-lib/vlc/plugins/video_output/libxcb_window_plugin.so
-lib/vlc/plugins/video_output/libxcb_x11_plugin.so
-lib/vlc/plugins/video_output/libxcb_xv_plugin.so
-lib/vlc/plugins/video_output/libyuv_plugin.so
+@so lib/vlc/plugins/video_output/libegl_x11_plugin.so
+@so lib/vlc/plugins/video_output/libflaschen_plugin.so
+@so lib/vlc/plugins/video_output/libgl_plugin.so
+@so lib/vlc/plugins/video_output/libglx_plugin.so
+@so lib/vlc/plugins/video_output/libvdummy_plugin.so
+@so lib/vlc/plugins/video_output/libvmem_plugin.so
+@so lib/vlc/plugins/video_output/libxcb_window_plugin.so
+@so lib/vlc/plugins/video_output/libxcb_x11_plugin.so
+@so lib/vlc/plugins/video_output/libxcb_xv_plugin.so
+@so lib/vlc/plugins/video_output/libyuv_plugin.so
lib/vlc/plugins/video_splitter/
-lib/vlc/plugins/video_splitter/libclone_plugin.so
-lib/vlc/plugins/video_splitter/libpanoramix_plugin.so
-lib/vlc/plugins/video_splitter/libwall_plugin.so
+@so lib/vlc/plugins/video_splitter/libclone_plugin.so
+@so lib/vlc/plugins/video_splitter/libpanoramix_plugin.so
+@so lib/vlc/plugins/video_splitter/libwall_plugin.so
lib/vlc/plugins/visualization/
-lib/vlc/plugins/visualization/libglspectrum_plugin.so
-lib/vlc/plugins/visualization/libvisual_plugin.so
+@so lib/vlc/plugins/visualization/libglspectrum_plugin.so
+@so lib/vlc/plugins/visualization/libvisual_plugin.so
@bin lib/vlc/vlc-cache-gen
@man man/man1/vlc-wrapper.1
@man man/man1/vlc.1
@@ -429,9 +469,7 @@ share/apps/solid/actions/vlc-opencda.des
share/apps/solid/actions/vlc-opendvd.desktop
share/apps/solid/actions/vlc-openvcd.desktop
share/doc/vlc/
-share/doc/vlc/bugreport-howto.txt
share/doc/vlc/fortunes.txt
-share/doc/vlc/intf-vcd.txt
share/doc/vlc/libvlc/
share/doc/vlc/libvlc/QtPlayer/
share/doc/vlc/libvlc/QtPlayer/LICENSE
@@ -443,6 +481,7 @@ share/doc/vlc/libvlc/gtk_player.c
share/doc/vlc/libvlc/libvlc_DVD_ripper.c
share/doc/vlc/libvlc/vlc-thumb.c
share/doc/vlc/libvlc/wx_player.cpp
+share/icons/hicolor/128x128/apps/vlc-kb.png
share/icons/hicolor/128x128/apps/vlc-xmas.png
share/icons/hicolor/128x128/apps/vlc.png
share/icons/hicolor/16x16/apps/vlc.png
@@ -456,23 +495,29 @@ share/icons/hicolor/48x48/apps/vlc.png
share/locale/ach/LC_MESSAGES/vlc.mo
share/locale/af/LC_MESSAGES/vlc.mo
share/locale/am/LC_MESSAGES/vlc.mo
+share/locale/am_ET/
+share/locale/am_ET/LC_MESSAGES/
+share/locale/am_ET/LC_MESSAGES/vlc.mo
share/locale/an/LC_MESSAGES/vlc.mo
share/locale/ar/LC_MESSAGES/vlc.mo
+share/locale/as_IN/
+share/locale/as_IN/LC_MESSAGES/
+share/locale/as_IN/LC_MESSAGES/vlc.mo
share/locale/ast/LC_MESSAGES/vlc.mo
-share/locale/az/LC_MESSAGES/vlc.mo
share/locale/be/LC_MESSAGES/vlc.mo
share/locale/bg/LC_MESSAGES/vlc.mo
share/locale/bn/LC_MESSAGES/vlc.mo
share/locale/bn_IN/LC_MESSAGES/vlc.mo
share/locale/br/LC_MESSAGES/vlc.mo
+share/locale/brx/
+share/locale/brx/LC_MESSAGES/
+share/locale/brx/LC_MESSAGES/vlc.mo
share/locale/bs/LC_MESSAGES/vlc.mo
share/locale/ca/LC_MESSAGES/vlc.mo
+share/locale/ca@valencia/LC_MESSAGES/vlc.mo
share/locale/cgg/
share/locale/cgg/LC_MESSAGES/
share/locale/cgg/LC_MESSAGES/vlc.mo
-share/locale/ckb/
-share/locale/ckb/LC_MESSAGES/
-share/locale/ckb/LC_MESSAGES/vlc.mo
share/locale/co/
share/locale/co/LC_MESSAGES/
share/locale/co/LC_MESSAGES/vlc.mo
@@ -495,6 +540,9 @@ share/locale/ff/LC_MESSAGES/vlc.mo
share/locale/fi/LC_MESSAGES/vlc.mo
share/locale/fr/LC_MESSAGES/vlc.mo
share/locale/fur/LC_MESSAGES/vlc.mo
+share/locale/fy/
+share/locale/fy/LC_MESSAGES/
+share/locale/fy/LC_MESSAGES/vlc.mo
share/locale/ga/LC_MESSAGES/vlc.mo
share/locale/gd/LC_MESSAGES/vlc.mo
share/locale/gl/LC_MESSAGES/vlc.mo
@@ -504,12 +552,14 @@ share/locale/hi/LC_MESSAGES/vlc.mo
share/locale/hr/LC_MESSAGES/vlc.mo
share/locale/hu/LC_MESSAGES/vlc.mo
share/locale/hy/LC_MESSAGES/vlc.mo
-share/locale/ia/LC_MESSAGES/vlc.mo
share/locale/id/LC_MESSAGES/vlc.mo
share/locale/is/LC_MESSAGES/vlc.mo
share/locale/it/LC_MESSAGES/vlc.mo
share/locale/ja/LC_MESSAGES/vlc.mo
share/locale/ka/LC_MESSAGES/vlc.mo
+share/locale/kab/
+share/locale/kab/LC_MESSAGES/
+share/locale/kab/LC_MESSAGES/vlc.mo
share/locale/kk/LC_MESSAGES/vlc.mo
share/locale/km/LC_MESSAGES/vlc.mo
share/locale/kn/LC_MESSAGES/vlc.mo
@@ -517,23 +567,23 @@ share/locale/ko/LC_MESSAGES/vlc.mo
share/locale/ks_IN/
share/locale/ks_IN/LC_MESSAGES/
share/locale/ks_IN/LC_MESSAGES/vlc.mo
+share/locale/ku_IQ/
+share/locale/ku_IQ/LC_MESSAGES/
+share/locale/ku_IQ/LC_MESSAGES/vlc.mo
share/locale/ky/LC_MESSAGES/vlc.mo
share/locale/lg/LC_MESSAGES/vlc.mo
share/locale/lt/LC_MESSAGES/vlc.mo
share/locale/lv/LC_MESSAGES/vlc.mo
share/locale/mai/LC_MESSAGES/vlc.mo
-share/locale/mk/LC_MESSAGES/vlc.mo
share/locale/ml/LC_MESSAGES/vlc.mo
share/locale/mn/LC_MESSAGES/vlc.mo
share/locale/mr/LC_MESSAGES/vlc.mo
share/locale/ms/LC_MESSAGES/vlc.mo
-share/locale/my/LC_MESSAGES/vlc.mo
share/locale/nb/LC_MESSAGES/vlc.mo
share/locale/ne/LC_MESSAGES/vlc.mo
share/locale/nl/LC_MESSAGES/vlc.mo
share/locale/nn/LC_MESSAGES/vlc.mo
share/locale/oc/LC_MESSAGES/vlc.mo
-share/locale/or/LC_MESSAGES/vlc.mo
share/locale/pa/LC_MESSAGES/vlc.mo
share/locale/pl/LC_MESSAGES/vlc.mo
share/locale/ps/LC_MESSAGES/vlc.mo
@@ -551,12 +601,10 @@ share/locale/sr/LC_MESSAGES/vlc.mo
share/locale/sv/LC_MESSAGES/vlc.mo
share/locale/ta/LC_MESSAGES/vlc.mo
share/locale/te/LC_MESSAGES/vlc.mo
-share/locale/tet/
-share/locale/tet/LC_MESSAGES/
-share/locale/tet/LC_MESSAGES/vlc.mo
share/locale/th/LC_MESSAGES/vlc.mo
-share/locale/tl/LC_MESSAGES/vlc.mo
share/locale/tr/LC_MESSAGES/vlc.mo
+share/locale/tt/LC_MESSAGES/vlc.mo
+share/locale/ug/LC_MESSAGES/vlc.mo
share/locale/uk/LC_MESSAGES/vlc.mo
share/locale/uz/LC_MESSAGES/vlc.mo
share/locale/vi/LC_MESSAGES/vlc.mo
@@ -564,8 +612,11 @@ share/locale/wa/LC_MESSAGES/vlc.mo
share/locale/zh_CN/LC_MESSAGES/vlc.mo
share/locale/zh_TW/LC_MESSAGES/vlc.mo
share/locale/zu/LC_MESSAGES/vlc.mo
+share/metainfo/
+share/metainfo/vlc.appdata.xml
share/vlc/
share/vlc/skins2/
+share/vlc/skins2/default.vlt
share/vlc/skins2/fonts/
share/vlc/skins2/fonts/FreeSans.ttf
share/vlc/skins2/fonts/FreeSansBold.ttf
