ziggi/bsdports
1
0
Fork 0
mirror of https://github.com/beard7n/bsdports.git synced 2026-04-10 10:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated vlc3

Browse Source
This commit is contained in:
Oleg Borodin
2022-04-04 18:24:39 +02:00
parent a781c45a4a
commit 11bf17cdc1
7 changed files with 229 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xapp/vlc3/Makefile
View File

@@ -2,7 +2,7 @@
# $Id$
#
PORTNAME= vlc
DISTVERSION= 3.0.16
DISTVERSION= 3.0.17.3
CATEGORIES= multimedia audio net www
MASTER_SITES+= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/
MASTER_SITES+= http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/

6
xapp/vlc3/distinfo
View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1637343680
SHA256 (vlc-3.0.16.tar.xz) = ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6
SIZE (vlc-3.0.16.tar.xz) = 26439328
TIMESTAMP = 1649014110
SHA256 (vlc-3.0.17.3.tar.xz) = 6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
SIZE (vlc-3.0.17.3.tar.xz) = 26393440

46
xapp/vlc3/files/__patch-x-configure Normal file
View File

@@ -0,0 +1,46 @@
--- ./configure~ 2020-05-16 07:54:00.352230000 +0200
+++ ./configure 2020-05-16 07:57:37.753013000 +0200
@@ -45871,12 +45871,12 @@
pkg_cv_X264_CFLAGS="$X264_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x264 >= 0.148") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.142\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x264 >= 0.142") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_X264_CFLAGS=`$PKG_CONFIG --cflags "x264 >= 0.148" 2>/dev/null`
+ pkg_cv_X264_CFLAGS=`$PKG_CONFIG --cflags "x264 >= 0.142" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -45888,12 +45888,12 @@
pkg_cv_X264_LIBS="$X264_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x264 >= 0.148") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.142\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x264 >= 0.142") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_X264_LIBS=`$PKG_CONFIG --libs "x264 >= 0.148" 2>/dev/null`
+ pkg_cv_X264_LIBS=`$PKG_CONFIG --libs "x264 >= 0.142" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -45914,9 +45914,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x264 >= 0.148" 2>&1`
+ X264_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x264 >= 0.142" 2>&1`
else
- X264_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x264 >= 0.148" 2>&1`
+ X264_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x264 >= 0.142" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$X264_PKG_ERRORS" >&5

30
xapp/vlc3/files/patch-configure
View File

@@ -1,30 +0,0 @@
--- configure.orig 2018-02-26 14:47:53 UTC
+++ configure
@@ -9027,9 +9027,6 @@ case "${host_os}" in
;;
freebsd*)
SYS=freebsd
- CFLAGS="${CFLAGS} -pthread"
- CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
- LDFLAGS="${LDFLAGS} -L/usr/local/lib"
ac_cv_ld_z_defs=no
;;
openbsd*)
@@ -25572,7 +25569,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
_Thread_local int foo = 0;
int main() {}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
@@ -27072,7 +27069,7 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_c_visibility_hidden=yes

136
xapp/vlc3/files/patch-dav1d-1.0 Normal file
View File

@@ -0,0 +1,136 @@
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;

31
xapp/vlc3/files/patch-x-configure
View File

@@ -1,38 +1,47 @@
--- ./configure~ 2020-05-16 07:54:00.352230000 +0200
+++ ./configure 2020-05-16 07:57:37.753013000 +0200
@@ -45871,12 +45871,12 @@
--- ./configure.orig 2022-04-03 21:30:27.409742000 +0200
+++ ./configure 2022-04-03 21:30:58.655735000 +0200
@@ -47975,19 +47975,19 @@
if test "${enable_x264}" != "no"; then
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x264 >= 0.148" >&5
-printf %s "checking for x264 >= 0.148... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x264 >= 0.142" >&5
+printf %s "checking for x264 >= 0.142... " >&6; }
if test -n "$X264_CFLAGS"; then
pkg_cv_X264_CFLAGS="$X264_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x264 >= 0.148") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.142\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.142\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x264 >= 0.142") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_X264_CFLAGS=`$PKG_CONFIG --cflags "x264 >= 0.148" 2>/dev/null`
+ pkg_cv_X264_CFLAGS=`$PKG_CONFIG --cflags "x264 >= 0.142" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -45888,12 +45888,12 @@
@@ -47999,12 +47999,12 @@
pkg_cv_X264_LIBS="$X264_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.148\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x264 >= 0.148") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.142\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x264 >= 0.142\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x264 >= 0.142") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_X264_LIBS=`$PKG_CONFIG --libs "x264 >= 0.148" 2>/dev/null`
+ pkg_cv_X264_LIBS=`$PKG_CONFIG --libs "x264 >= 0.142" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -45914,9 +45914,9 @@
@@ -48025,9 +48025,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then

32
xapp/vlc3/pkg-plist
View File

@@ -122,6 +122,8 @@ lib/vlc/plugins/access_output/libaccess_output_http_plugin.la
lib/vlc/plugins/access_output/libaccess_output_http_plugin.so
lib/vlc/plugins/access_output/libaccess_output_livehttp_plugin.la
lib/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so
lib/vlc/plugins/access_output/libaccess_output_rist_plugin.la
lib/vlc/plugins/access_output/libaccess_output_rist_plugin.so
lib/vlc/plugins/access_output/libaccess_output_shout_plugin.la
lib/vlc/plugins/access_output/libaccess_output_shout_plugin.so
lib/vlc/plugins/access_output/libaccess_output_udp_plugin.la
@@ -156,6 +158,8 @@ lib/vlc/plugins/access/libidummy_plugin.la
lib/vlc/plugins/access/libidummy_plugin.so
lib/vlc/plugins/access/libimem_plugin.la
lib/vlc/plugins/access/libimem_plugin.so
lib/vlc/plugins/access/librist_plugin.la
lib/vlc/plugins/access/librist_plugin.so
lib/vlc/plugins/access/librtp_plugin.la
lib/vlc/plugins/access/librtp_plugin.so
lib/vlc/plugins/access/libsatip_plugin.la
@@ -244,6 +248,8 @@ lib/vlc/plugins/codec/libadpcm_plugin.la
lib/vlc/plugins/codec/libadpcm_plugin.so
lib/vlc/plugins/codec/libaes3_plugin.la
lib/vlc/plugins/codec/libaes3_plugin.so
lib/vlc/plugins/codec/libaom_plugin.la
lib/vlc/plugins/codec/libaom_plugin.so
lib/vlc/plugins/codec/libaraw_plugin.la
lib/vlc/plugins/codec/libaraw_plugin.so
lib/vlc/plugins/codec/libavcodec_plugin.la
@@ -368,6 +374,8 @@ lib/vlc/plugins/demux/libcaf_plugin.la
lib/vlc/plugins/demux/libcaf_plugin.so
lib/vlc/plugins/demux/libdemux_cdg_plugin.la
lib/vlc/plugins/demux/libdemux_cdg_plugin.so
lib/vlc/plugins/demux/libdemux_chromecast_plugin.la
lib/vlc/plugins/demux/libdemux_chromecast_plugin.so
lib/vlc/plugins/demux/libdemux_stl_plugin.la
lib/vlc/plugins/demux/libdemux_stl_plugin.so
lib/vlc/plugins/demux/libdemuxdump_plugin.la
@@ -577,6 +585,8 @@ lib/vlc/plugins/stream_out/libstream_out_autodel_plugin.la
lib/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
lib/vlc/plugins/stream_out/libstream_out_bridge_plugin.la
lib/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
lib/vlc/plugins/stream_out/libstream_out_chromecast_plugin.la
lib/vlc/plugins/stream_out/libstream_out_chromecast_plugin.so
lib/vlc/plugins/stream_out/libstream_out_cycle_plugin.la
lib/vlc/plugins/stream_out/libstream_out_cycle_plugin.so
lib/vlc/plugins/stream_out/libstream_out_delay_plugin.la
@@ -765,6 +775,15 @@ man/man1/vlc-wrapper.1.gz
man/man1/vlc.1.gz
share/applications/vlc.desktop
share/doc/vlc/fortunes.txt
share/doc/vlc/libvlc/gtk_player.c
share/doc/vlc/libvlc/libvlc_DVD_ripper.c
share/doc/vlc/libvlc/QtPlayer/LICENSE
share/doc/vlc/libvlc/QtPlayer/main.cpp
share/doc/vlc/libvlc/QtPlayer/player.cpp
share/doc/vlc/libvlc/QtPlayer/player.h
share/doc/vlc/libvlc/QtPlayer/QtVLC.pro
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
@@ -776,6 +795,10 @@ 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
share/kde4/apps/solid/actions/vlc-openbd.desktop
share/kde4/apps/solid/actions/vlc-opencda.desktop
share/kde4/apps/solid/actions/vlc-opendvd.desktop
share/kde4/apps/solid/actions/vlc-openvcd.desktop
share/locale/ach/LC_MESSAGES/vlc.mo
share/locale/af/LC_MESSAGES/vlc.mo
share/locale/am_ET/LC_MESSAGES/vlc.mo
@@ -879,7 +902,6 @@ share/vlc/utils/video-vlc-default.sh
share/vlc/vlc.ico
@dir include/vlc/plugins
@dir include/vlc
@dir lib/pkgconfig
@dir lib/vlc/plugins/access
@dir lib/vlc/plugins/access_output
@dir lib/vlc/plugins/audio_filter
@@ -909,11 +931,6 @@ share/vlc/vlc.ico
@dir lib/vlc/plugins/visualization
@dir lib/vlc/plugins
@dir lib/vlc
@dir share/applications
@dir share/doc/vlc/libvlc/QtPlayer
@dir share/doc/vlc/libvlc
@dir share/doc/vlc
@dir share/doc
@dir share/locale/ach/LC_MESSAGES
@dir share/locale/ach
@dir share/locale/af/LC_MESSAGES
@@ -1106,8 +1123,5 @@ share/vlc/vlc.ico
@dir share/locale/zh_TW
@dir share/locale/zu/LC_MESSAGES
@dir share/locale/zu
@dir share/locale
@dir share/metainfo
@dir share/vlc/utils
@dir share/vlc
@dir share