diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 7df9383f8afd..78bdd6aa224d 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,406 +1,405 @@ PORTNAME= vlc -DISTVERSION= 3.0.17.4 -PORTREVISION= 5 +DISTVERSION= 3.0.18 PORTEPOCH= 4 CATEGORIES= multimedia audio net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Qt based multimedia player and streaming server WWW= https://www.videolan.org LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libdvbpsi.so:multimedia/libdvbpsi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libidn.so:dns/libidn \ libmatroska.so:multimedia/libmatroska \ libgpg-error.so:security/libgpg-error \ libebml.so:textproc/libebml BUILD_DEPENDS= gsed:textproc/gsed \ ffmpeg>=3.4.1,1:multimedia/ffmpeg \ yasm:devel/yasm RUN_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg USES= compiler:c++17-lang cpe desktop-file-utils gettext-tools gmake gnome \ iconv:wchar_t libtool localbase pathfix pkgconfig tar:xz CPE_VENDOR= videolan # VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag # to the compiler. Until the port is updated, we explicitly pass -std=c++11 to # the compiler because Qt 5.7+ requires C++11 support, and FreeBSD 10's clang # does not default to C++11 mode. # USE_CXXSTD= c++11 USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip GNU_CONFIGURE= yes BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ --enable-fontconfig --enable-freetype --enable-libgcrypt \ --enable-libxml2 --enable-oss --enable-postproc \ --enable-swscale --enable-vlc \ --disable-alsa --disable-archive --disable-chromaprint --disable-crystalhd \ --disable-dc1394 --disable-decklink --disable-dsm \ --disable-dv1394 --disable-fdkaac --disable-gst-decode \ --disable-gles2 --disable-kai --disable-kva --disable-mpg123 \ --disable-vnc --disable-opencv --disable-projectm --disable-schroedinger \ --disable-secret --disable-soxr --disable-telx \ --disable-tiger --disable-tremor --disable-udev \ --disable-update-check --disable-vsxu \ --disable-wasapi --disable-x26410b \ --with-kde-solid=${PREFIX}/share/solid/actions \ ac_cv_search_pthread_rwlock_init=-pthread \ BUILDCC="${CC}" .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif CFLAGS_i386= -fomit-frame-pointer OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDREAD \ DEBUG DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \ GOOM HARFBUZZ JACK JPEG KATE LIBBLURAY LIBPLACEBO LIBRSVG2 LIBSSH2 LIRC \ LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP MUSEPACK \ NCURSES NFS NLS NOTIFY OGG OGGSPOTS OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \ QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY \ SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \ TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI OPTIONS_DEFINE_powerpc= ALTIVEC OPTIONS_DEFINE_powerpc64= ALTIVEC OPTIONS_DEFAULT=ASS AVAHI DAV1D DBUS DVDREAD DVDNAV GNUTLS HARFBUZZ JPEG \ LIVEMEDIA LUA OGG OPTIMIZED_CFLAGS \ OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \ UPNP V4L VAAPI VCD VDPAU VORBIS WAYLAND X11 OPTIONS_DEFAULT_powerpc= ALTIVEC OPTIONS_DEFAULT_powerpc64= ALTIVEC OPTIONS_SUB= yes AOM_DESC= AV1 video encoding/decoding via libaom ASS_DESC= ASS/SSA subtitle rendering CHROMECAST_DESC=Streaming to Chromecast devices DAV1D_DESC= AV1 video decoding via libdav1d DVDREAD_DESC= DVD Playback support DVDNAV_DESC= DVD menu navigation FLUID_DESC= Fluidsynth MIDI support FREERDP_DESC= RDP support GME_DESC= Game Music Emu (libgme) support GOOM_DESC= Goom visualisation plugin HARFBUZZ_DESC= OpenType text shaping engine KATE_DESC= Kate codec support LIBPLACEBO_DESC=HDR tonemapping support through libplacebo LIBSSH2_DESC= SCP/SFTP support via libssh2 MFX_DESC= Intel MediaSDK (aka Quick Sync Video) OGGSPOTS_DESC= Experimental OggSpots codec REALRTSP_DESC= Real RTSP access module RUNROOT_DESC= Enable running as root SIDPLAY_DESC= C64 sid demux support SKINS_DESC= Skins interface module STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support VCD_DESC= Audio/Video CD support ZVBI_DESC= VBI decoding support A52_CONFIGURE_ENABLE= a52 A52_CONFIGURE_ON= --with-a52=${LOCALBASE} A52_LIB_DEPENDS= liba52.so:audio/liba52 AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_ENABLE= aa ASS_LIB_DEPENDS= libass.so:multimedia/libass ASS_CONFIGURE_ENABLE= libass ALTIVEC_CONFIGURE_ENABLE= altivec AOM_LIB_DEPENDS= libaom.so:multimedia/aom AOM_CONFIGURE_ENABLE= aom AVAHI_LIB_DEPENDS= libavahi-common.so:net/avahi-app AVAHI_CONFIGURE_ENABLE= avahi CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_ENABLE= caca CHROMECAST_LIB_DEPENDS= libprotobuf-lite.so:devel/protobuf CHROMECAST_CONFIGURE_ENABLE= chromecast DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d DAV1D_CONFIGURE_ENABLE= dav1d DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_ENABLE= dbus DCA_LIB_DEPENDS= libdca.so:multimedia/libdca DCA_CONFIGURE_ENABLE= dca DVDREAD_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread DVDREAD_CONFIGURE_ENABLE= dvdread DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav DVDNAV_CONFIGURE_ENABLE=dvdnav FAAD_LIB_DEPENDS= libfaad.so:audio/faad FAAD_CONFIGURE_ENABLE= faad FAAD_CONFIGURE_ENV= CPPFLAGS_faad="-I${LOCALBASE}/include" \ LIBS_faad="-L${LOCALBASE}/lib" FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_ENABLE= flac FLUID_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUID_CONFIGURE_ENABLE= fluidsynth FREERDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp FREERDP_CONFIGURE_ENABLE= freerdp FREERDP_CONFIGURE_ENV= FREERDP_CFLAGS="-I${LOCALBASE}/include/freerdp2 \ -I${LOCALBASE}/include/winpr2" \ FREERDP_LIBS="-L${LOCALBASE}/lib" FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CONFIGURE_ENABLE= fribidi GME_LIB_DEPENDS= libgme.so:audio/libgme GME_CONFIGURE_ENABLE= gme GME_CONFIGURE_ENV= LIBS_gme="-L${LOCALBASE}/lib -lgme" GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ENABLE=gnutls GOOM_LIB_DEPENDS= libgoom2.so:graphics/goom GOOM_CONFIGURE_ENABLE= goom HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz HARFBUZZ_CONFIGURE_ENABLE= harfbuzz JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpeg KATE_LIB_DEPENDS= libkate.so:multimedia/libkate KATE_CONFIGURE_ENABLE= kate LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= bluray LIBPLACEBO_LIB_DEPENDS= libplacebo.so:graphics/libplacebo LIBPLACEBO_CONFIGURE_ENABLE= libplacebo LIBRSVG2_USE= GNOME=librsvg2,cairo LIBRSVG2_CONFIGURE_ENABLE= svg LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 LIBSSH2_CONFIGURE_ENABLE= sftp LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_ENABLE= lirc LIRC_CONFIGURE_ENV= LIBS_lirc="-L${LOCALBASE}/lib -llirc_client" LIVEMEDIA_USES= ssl LIVEMEDIA_LIB_DEPENDS= libliveMedia.so:net/liveMedia LIVEMEDIA_CONFIGURE_ENABLE= live555 LIVEMEDIA_CONFIGURE_ENV= \ LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \ -I${LOCALBASE}/include/UsageEnvironment \ -I${LOCALBASE}/include/groupsock \ -I${LOCALBASE}/include/BasicUsageEnvironment" \ LIVE555_LIBS="-L${LOCALBASE}/lib -lliveMedia \ -lgroupsock -lBasicUsageEnvironment \ -lUsageEnvironment \ -L${OPENSSLLIB} -lssl -lcrypto" LUA_USES= lua LUA_CONFIGURE_ENABLE= lua LUA_CONFIGURE_ON= LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MAD_LIB_DEPENDS= libmad.so:audio/libmad MAD_CONFIGURE_ENABLE= mad MAD_CONFIGURE_ON= --with-mad=${LOCALBASE} MFX_LIB_DEPENDS= libmfx.so:multimedia/intel-media-sdk MFX_CONFIGURE_ENABLE= mfx MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MODPLUG_CONFIGURE_ENABLE= mod MPEG2_LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2 MPEG2_CONFIGURE_ENABLE= libmpeg2 MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CONFIGURE_ENABLE= mtp MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack MUSEPACK_CONFIGURE_ENABLE= mpc MUSEPACK_CONFIGURE_ENV= LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec" NCURSES_USES= ncurses NCURSES_CONFIGURE_ENV= NCURSES_CFLAGS="-I${NCURSESINC}" \ NCURSES_LIBS="-L${NCURSESLIB} -lncursesw" NCURSES_CONFIGURE_ENABLE= ncurses NFS_LIB_DEPENDS= libnfs.so:net/libnfs NFS_CONFIGURE_ENABLE= nfs NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_USE= GNOME=gtk30,cairo NOTIFY_CONFIGURE_ENABLE=notify OGG_LIB_DEPENDS= libogg.so:audio/libogg OGG_CONFIGURE_ENABLE= ogg OGGSPOTS_CONFIGURE_ENABLE= oggspots OGGSPOTS_IMPLIES= OGG OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= opus PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_ENABLE= png PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse QT5_USES= qt:5 QT5_USE= QT=gui,core,svg,widgets,x11extras,buildtools:build QT5_CONFIGURE_ENABLE= qt QT5_IMPLIES= X11 REALRTSP_CONFIGURE_ENABLE= realrtsp RUNROOT_CONFIGURE_ENABLE= run-as-root SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate SDL_USES= sdl SDL_USE= SDL=image SDL_CONFIGURE_ENABLE= sdl-image SIDPLAY_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2 SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders SIDPLAY_CONFIGURE_ENABLE= sid CONFIGURE_ARGS+= --disable-sid SKINS_USE= XORG=xext,xinerama,xpm minizip SKINS_LIB_DEPENDS= libtar.so:devel/libtar SKINS_CONFIGURE_ENABLE= skins2 libtar SKINS_IMPLIES= QT5 SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout SHOUTCAST_CONFIGURE_ENABLE= shout SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ENABLE= sndio SMB_USES= samba:lib SMB_CONFIGURE_ENABLE= smbclient STREAM_CONFIGURE_ENABLE=sout SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp SPEEX_CONFIGURE_ENABLE= speex TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CONFIGURE_ENABLE=taglib THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CONFIGURE_ENABLE=theora TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_ENABLE= twolame UPNP_LIB_DEPENDS= libupnp.so:devel/upnp UPNP_CONFIGURE_ENABLE= upnp V4L_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_ENABLE= v4l2 VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= libva VCD_LIB_DEPENDS= libcddb.so:audio/libcddb VCD_CONFIGURE_ENABLE= vcd libcddb VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VDPAU_IMPLIES= X11 VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_ENABLE= vpx VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE=vorbis WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CONFIGURE_ENABLE= wayland X11_USE= GL=gl XORG=xcb,xorgproto,sm,ice,x11 X11_USES= gl xorg X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms X11_CONFIGURE_ENABLE= xcb xvideo X11_CONFIGURE_WITH= x X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= x264 X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_CONFIGURE_ENABLE= x265 ZVBI_LIB_DEPENDS= libzvbi.so:devel/libzvbi ZVBI_CONFIGURE_ENABLE= zvbi PORTDATA= * PORTDOCS= * WITH_CDROM_DEVICE?=/dev/cd0 WITH_DVD_DEVICE?=/dev/cd0 .include .if ${PORT_OPTIONS:MX11} .endif .if ${PORT_OPTIONS:MDEBUG} WITH_DEBUG=yes CONFIGURE_ARGS+=--enable-debug --disable-optimizations CFLAGS+=-g -O0 CXXFLAGS+=-g -O0 .endif post-patch: @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ -e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \ ${WRKSRC}/src/libvlc-module.c @${RM} -r ${WRKSRC}/modules/access/v4l2/linux # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c @${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \ -type f -o -type l >> ${TMPPLIST}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/vlc/plugins/*/*.so # plugin cache becomes stale after strip. Regenerate it: ${WRKSRC}/bin/vlc-cache-gen ${STAGEDIR}${PREFIX}/lib/vlc/plugins .include diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index a7a1f58bf737..abbf084ed951 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651168440 -SHA256 (vlc-3.0.17.4.tar.xz) = 8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 -SIZE (vlc-3.0.17.4.tar.xz) = 26567148 +TIMESTAMP = 1669325843 +SHA256 (vlc-3.0.18.tar.xz) = 57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec +SIZE (vlc-3.0.18.tar.xz) = 26631372 diff --git a/multimedia/vlc/files/patch-arch-vlc-live-media-2021 b/multimedia/vlc/files/patch-arch-vlc-live-media-2021 deleted file mode 100644 index 700c3f9b4953..000000000000 --- a/multimedia/vlc/files/patch-arch-vlc-live-media-2021 +++ /dev/null @@ -1,17 +0,0 @@ -Obtained from - https://github.com/archlinux/svntogit-packages/blob/packages/vlc/trunk/vlc-live-media-2021.patch - -diff -ru vlc-3.0.13.orig/modules/access/live555.cpp vlc-3.0.13/modules/access/live555.cpp ---- modules/access/live555.cpp.orig 2019-03-29 20:01:15.000000000 +0100 -+++ modules/access/live555.cpp 2021-05-03 16:04:38.030121796 +0200 -@@ -852,7 +852,9 @@ - if( !p_sys->b_multicast ) - { - /* We need different rollover behaviour for multicast */ -- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() ); -+ struct sockaddr_storage tempAddr; -+ sub->getConnectionEndpointAddress(tempAddr); -+ p_sys->b_multicast = IsMulticastAddress( tempAddr ); - } - - tk = (live_track_t*)malloc( sizeof( live_track_t ) ); diff --git a/multimedia/vlc/files/patch-dav1d-1.0 b/multimedia/vlc/files/patch-dav1d-1.0 deleted file mode 100644 index 764f124819d8..000000000000 --- a/multimedia/vlc/files/patch-dav1d-1.0 +++ /dev/null @@ -1,136 +0,0 @@ -https://code.videolan.org/videolan/vlc/-/merge_requests/605 - -codec/dav1d.c:66:57: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'? - add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, - ^~~~~~~~~~~~~~~~~~~~~~~ - DAV1D_OBU_FRAME_HDR -../include/vlc_plugin.h:434:34: note: expanded from macro 'add_integer_with_range' - change_integer_range( i_min, i_max ) - ^ -../include/vlc_plugin.h:490:66: note: expanded from macro 'change_integer_range' - vlc_config_set (VLC_CONFIG_RANGE, (int64_t)(minv), (int64_t)(maxv)); - ^ -../include/vlc_plugin.h:246:54: note: expanded from macro 'vlc_config_set' -#define vlc_config_set(...) vlc_set (opaque, config, __VA_ARGS__) - ^ -/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here - DAV1D_OBU_FRAME_HDR = 3, - ^ -codec/dav1d.c:68:56: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS' - add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, - ^ -codec/dav1d.c:286:14: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); - ~~~~~~~~ ^ -codec/dav1d.c:287:18: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - if (p_sys->s.n_tile_threads == 0) - ~~~~~~~~ ^ -codec/dav1d.c:288:18: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - p_sys->s.n_tile_threads = - ~~~~~~~~ ^ -codec/dav1d.c:292:14: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' - p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); - ~~~~~~~~ ^ -codec/dav1d.c:293:18: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' - if (p_sys->s.n_frame_threads == 0) - ~~~~~~~~ ^ -codec/dav1d.c:294:18: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' - p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; - ~~~~~~~~ ^ -codec/dav1d.c:306:39: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' - dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); - ~~~~~~~~ ^ -../include/vlc_messages.h:87:38: note: expanded from macro 'msg_Dbg' - msg_Generic(p_this, VLC_MSG_DBG, __VA_ARGS__) - ^~~~~~~~~~~ -../include/vlc_messages.h:79:23: note: expanded from macro 'msg_Generic' - __func__, __VA_ARGS__) - ^~~~~~~~~~~ -codec/dav1d.c:306:65: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' - dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); - ~~~~~~~~ ^ -../include/vlc_messages.h:87:38: note: expanded from macro 'msg_Dbg' - msg_Generic(p_this, VLC_MSG_DBG, __VA_ARGS__) - ^~~~~~~~~~~ -../include/vlc_messages.h:79:23: note: expanded from macro 'msg_Generic' - __func__, __VA_ARGS__) - ^~~~~~~~~~~ -codec/dav1d.c:310:46: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' - dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); - ~~~~~~~~ ^ - ---- modules/codec/dav1d.c.orig 2021-04-27 13:18:39 UTC -+++ modules/codec/dav1d.c -@@ -53,6 +53,8 @@ static void CloseDecoder(vlc_object_t *); - #define THREAD_FRAMES_LONGTEXT N_( "Max number of threads used for frame decoding, default 0=auto" ) - #define THREAD_TILES_TEXT N_("Tiles Threads") - #define THREAD_TILES_LONGTEXT N_( "Max number of threads used for tile decoding, default 0=auto" ) -+#define THREAD_TEXT N_("Threads") -+#define THREAD_LONGTEXT N_( "Max number of threads used for decoding, default 0=auto" ) - - - vlc_module_begin () -@@ -63,10 +65,18 @@ vlc_module_begin () - set_category(CAT_INPUT) - set_subcategory(SUBCAT_INPUT_VCODEC) - -+#if DAV1D_API_VERSION_MAJOR <= 5 - add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, - THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) - add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, - THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) -+#else -+ add_obsolete_integer("dav1d-thread-frames") -+ add_obsolete_integer("dav1d-thread-tiles") -+ -+ add_integer_with_range("dav1d-threads", 0, 0, DAV1D_MAX_THREADS, -+ THREAD_TEXT, THREAD_LONGTEXT, false) -+#endif - vlc_module_end () - - /***************************************************************************** -@@ -283,6 +293,8 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_ENOMEM; - - dav1d_default_settings(&p_sys->s); -+ -+#if DAV1D_API_VERSION_MAJOR <= 5 - p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); - if (p_sys->s.n_tile_threads == 0) - p_sys->s.n_tile_threads = -@@ -292,6 +304,12 @@ static int OpenDecoder(vlc_object_t *p_this) - p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); - if (p_sys->s.n_frame_threads == 0) - p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; -+#else -+ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-threads"); -+ if (p_sys->s.n_threads == 0) -+ p_sys->s.n_threads = i_core_count; -+#endif -+ - p_sys->s.allocator.cookie = dec; - p_sys->s.allocator.alloc_picture_callback = NewPicture; - p_sys->s.allocator.release_picture_callback = FreePicture; -@@ -302,13 +320,20 @@ static int OpenDecoder(vlc_object_t *p_this) - return VLC_EGENERIC; - } - -+#if DAV1D_API_VERSION_MAJOR <= 5 - msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", - dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); - -- dec->pf_decode = Decode; -- dec->pf_flush = FlushDecoder; - dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); -+#else -+ msg_Dbg(p_this, "Using dav1d version %s with %d threads", -+ dav1d_version(), p_sys->s.n_threads); - -+ dec->i_extra_picture_buffers = (p_sys->s.max_frame_delay - 1); -+#endif -+ -+ dec->pf_decode = Decode; -+ dec->pf_flush = FlushDecoder; - dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; - dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; - dec->fmt_out.i_codec = VLC_CODEC_I420; diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist index bddb44be1c3f..2eea1c4fe42a 100644 --- a/multimedia/vlc/pkg-plist +++ b/multimedia/vlc/pkg-plist @@ -1,228 +1,228 @@ bin/cvlc %%NCURSES%%bin/nvlc %%QT5%%bin/qvlc bin/rvlc %%SKINS%%bin/svlc bin/vlc bin/vlc-wrapper 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 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_renderer_discoverer.h include/vlc/libvlc_version.h include/vlc/libvlc_vlm.h 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 include/vlc/plugins/vlc_arrays.h include/vlc/plugins/vlc_atomic.h 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 include/vlc/plugins/vlc_config.h include/vlc/plugins/vlc_config_cat.h include/vlc/plugins/vlc_configuration.h include/vlc/plugins/vlc_cpu.h include/vlc/plugins/vlc_demux.h include/vlc/plugins/vlc_dialog.h include/vlc/plugins/vlc_epg.h include/vlc/plugins/vlc_es.h include/vlc/plugins/vlc_es_out.h include/vlc/plugins/vlc_events.h include/vlc/plugins/vlc_filter.h include/vlc/plugins/vlc_fingerprinter.h include/vlc/plugins/vlc_fourcc.h include/vlc/plugins/vlc_fs.h include/vlc/plugins/vlc_gcrypt.h include/vlc/plugins/vlc_http.h include/vlc/plugins/vlc_httpd.h 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_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 include/vlc/plugins/vlc_mime.h include/vlc/plugins/vlc_modules.h include/vlc/plugins/vlc_mouse.h include/vlc/plugins/vlc_mtime.h include/vlc/plugins/vlc_network.h include/vlc/plugins/vlc_objects.h include/vlc/plugins/vlc_opengl.h include/vlc/plugins/vlc_picture.h include/vlc/plugins/vlc_picture_fifo.h include/vlc/plugins/vlc_picture_pool.h 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 include/vlc/plugins/vlc_vout_osd.h include/vlc/plugins/vlc_vout_window.h include/vlc/plugins/vlc_xlib.h include/vlc/plugins/vlc_xml.h include/vlc/vlc.h lib/libvlc.so lib/libvlc.so.5 -lib/libvlc.so.5.6.0 +lib/libvlc.so.5.6.1 lib/libvlccore.so lib/libvlccore.so.9 -lib/libvlccore.so.9.0.0 +lib/libvlccore.so.9.0.1 libdata/pkgconfig/libvlc.pc libdata/pkgconfig/vlc-plugin.pc man/man1/vlc-wrapper.1.gz man/man1/vlc.1.gz share/applications/vlc.desktop 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 share/icons/hicolor/16x16/apps/vlc.xpm share/icons/hicolor/256x256/apps/vlc.png share/icons/hicolor/32x32/apps/vlc-xmas.xpm share/icons/hicolor/32x32/apps/vlc.png share/icons/hicolor/32x32/apps/vlc.xpm share/icons/hicolor/48x48/apps/vlc-xmas.png share/icons/hicolor/48x48/apps/vlc.png %%NLS%%share/locale/ach/LC_MESSAGES/vlc.mo %%NLS%%share/locale/af/LC_MESSAGES/vlc.mo %%NLS%%share/locale/am/LC_MESSAGES/vlc.mo %%NLS%%share/locale/am_ET/LC_MESSAGES/vlc.mo %%NLS%%share/locale/an/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ar/LC_MESSAGES/vlc.mo %%NLS%%share/locale/as_IN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ast/LC_MESSAGES/vlc.mo %%NLS%%share/locale/be/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bn_IN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/br/LC_MESSAGES/vlc.mo %%NLS%%share/locale/brx/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bs/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ca/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ca@valencia/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cgg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/co/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cs/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cy/LC_MESSAGES/vlc.mo %%NLS%%share/locale/da/LC_MESSAGES/vlc.mo %%NLS%%share/locale/de/LC_MESSAGES/vlc.mo %%NLS%%share/locale/el/LC_MESSAGES/vlc.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/vlc.mo %%NLS%%share/locale/es/LC_MESSAGES/vlc.mo %%NLS%%share/locale/es_MX/LC_MESSAGES/vlc.mo %%NLS%%share/locale/et/LC_MESSAGES/vlc.mo %%NLS%%share/locale/eu/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fa/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ff/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fi/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fur/LC_MESSAGES/vlc.mo %%NLS%%share/locale/fy/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ga/LC_MESSAGES/vlc.mo %%NLS%%share/locale/gd/LC_MESSAGES/vlc.mo %%NLS%%share/locale/gl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/gu/LC_MESSAGES/vlc.mo %%NLS%%share/locale/he/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hi/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hu/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hy/LC_MESSAGES/vlc.mo %%NLS%%share/locale/id/LC_MESSAGES/vlc.mo %%NLS%%share/locale/is/LC_MESSAGES/vlc.mo %%NLS%%share/locale/it/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ja/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ka/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kab/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/km/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ko/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ks_IN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ku_IQ/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ky/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lt/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lv/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mai/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ml/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ms/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nb/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ne/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/oc/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pa/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ps/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pt_PT/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ro/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ru/LC_MESSAGES/vlc.mo %%NLS%%share/locale/si/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sq/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/sv/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ta/LC_MESSAGES/vlc.mo %%NLS%%share/locale/te/LC_MESSAGES/vlc.mo %%NLS%%share/locale/th/LC_MESSAGES/vlc.mo %%NLS%%share/locale/tr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/tt/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ug/LC_MESSAGES/vlc.mo %%NLS%%share/locale/uk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/uz/LC_MESSAGES/vlc.mo %%NLS%%share/locale/vi/LC_MESSAGES/vlc.mo %%NLS%%share/locale/wa/LC_MESSAGES/vlc.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/vlc.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/vlc.mo %%NLS%%share/locale/zu/LC_MESSAGES/vlc.mo share/metainfo/vlc.appdata.xml share/solid/actions/vlc-openbd.desktop share/solid/actions/vlc-opencda.desktop share/solid/actions/vlc-opendvd.desktop share/solid/actions/vlc-openvcd.desktop