vlc: update to 3.0.6
This commit is contained in:
Ryo ONODERA
parent
7fd646fac1
commit
77d756b5f1
|
|
@ -5,7 +5,7 @@ CATEGORIES= multimedia
|
|||
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
VLC_VERSION= 3.0.2
|
||||
VLC_VERSION= 3.0.6
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://www.videolan.org/
|
||||
|
|
@ -167,7 +167,7 @@ pre-configure:
|
|||
.include "../../security/libgcrypt/buildlink3.mk"
|
||||
.include "../../security/gnutls/buildlink3.mk"
|
||||
|
||||
.include "../../multimedia/ffmpeg3/buildlink3.mk"
|
||||
.include "../../multimedia/ffmpeg4/buildlink3.mk"
|
||||
.include "../../multimedia/libdvdplay/buildlink3.mk"
|
||||
.include "../../multimedia/libdvbpsi0/buildlink3.mk"
|
||||
.include "../../multimedia/libdvdnav/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@ ${PLIST.pulseaudio}lib/vlc/plugins/audio_output/libpulse_plugin.la
|
|||
lib/vlc/plugins/codec/liba52_plugin.la
|
||||
lib/vlc/plugins/codec/libadpcm_plugin.la
|
||||
lib/vlc/plugins/codec/libaes3_plugin.la
|
||||
lib/vlc/plugins/codec/libaom_plugin.la
|
||||
lib/vlc/plugins/codec/libaraw_plugin.la
|
||||
lib/vlc/plugins/codec/libavcodec_plugin.la
|
||||
lib/vlc/plugins/codec/libcc_plugin.la
|
||||
|
|
@ -276,6 +277,7 @@ lib/vlc/plugins/codec/libvorbis_plugin.la
|
|||
lib/vlc/plugins/codec/libvpx_plugin.la
|
||||
lib/vlc/plugins/codec/libwebvtt_plugin.la
|
||||
lib/vlc/plugins/codec/libx264_plugin.la
|
||||
lib/vlc/plugins/codec/libx26410b_plugin.la
|
||||
${PLIST.x11}lib/vlc/plugins/codec/libxwd_plugin.la
|
||||
${PLIST.dbus}lib/vlc/plugins/control/libdbus_plugin.la
|
||||
lib/vlc/plugins/control/libdummy_plugin.la
|
||||
|
|
@ -361,6 +363,7 @@ lib/vlc/plugins/mux/libmux_ogg_plugin.la
|
|||
lib/vlc/plugins/mux/libmux_ps_plugin.la
|
||||
lib/vlc/plugins/mux/libmux_wav_plugin.la
|
||||
lib/vlc/plugins/packetizer/libpacketizer_a52_plugin.la
|
||||
lib/vlc/plugins/packetizer/libpacketizer_av1_plugin.la
|
||||
lib/vlc/plugins/packetizer/libpacketizer_avparser_plugin.la
|
||||
lib/vlc/plugins/packetizer/libpacketizer_copy_plugin.la
|
||||
lib/vlc/plugins/packetizer/libpacketizer_dirac_plugin.la
|
||||
|
|
@ -490,6 +493,8 @@ lib/vlc/plugins/video_filter/libwave_plugin.la
|
|||
${PLIST.egl}lib/vlc/plugins/video_output/libegl_x11_plugin.la
|
||||
lib/vlc/plugins/video_output/libflaschen_plugin.la
|
||||
lib/vlc/plugins/video_output/libgl_plugin.la
|
||||
${PLIST.x11}${PLIST.vaapi}lib/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.la
|
||||
${PLIST.x11}${PLIST.vaapi}lib/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.la
|
||||
${PLIST.x11}lib/vlc/plugins/video_output/libglconv_vdpau_plugin.la
|
||||
${PLIST.x11}lib/vlc/plugins/video_output/libglx_plugin.la
|
||||
lib/vlc/plugins/video_output/libvdummy_plugin.la
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
$NetBSD: distinfo,v 1.74 2017/05/26 13:26:37 maya Exp $
|
||||
|
||||
SHA1 (vlc-3.0.2.tar.xz) = 9e50c246242cd1dd94a8534b9be11c13104bb76d
|
||||
RMD160 (vlc-3.0.2.tar.xz) = 1ae891e5c6116e942cc5628eff65c72a4f3cb57d
|
||||
SHA512 (vlc-3.0.2.tar.xz) = 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
|
||||
Size (vlc-3.0.2.tar.xz) = 25175492 bytes
|
||||
SHA1 (vlc-3.0.6.tar.xz) = b35168c1811b07844d861311bd0f2194f4bb82ac
|
||||
RMD160 (vlc-3.0.6.tar.xz) = 717f81c5ab63d7d5cdb427a198d958e0e418609f
|
||||
SHA512 (vlc-3.0.6.tar.xz) = 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
|
||||
Size (vlc-3.0.6.tar.xz) = 25699704 bytes
|
||||
SHA1 (patch-compat_Makefile.am) = 1c3e0a7c4610c55c3ec9ba80d66b9959661139b3
|
||||
SHA1 (patch-lib_core.c) = 8ec5557424e6ddc05cc365aacd1ec847d9a94605
|
||||
SHA1 (patch-lib_video.c) = 362aaf7977c264bb70a79e98cf18da923ae62e39
|
||||
SHA1 (patch-m4_dolt.m4) = a1aac0c1021001a489f9b515e218904e065ed659
|
||||
SHA1 (patch-modules_access_http_Makefile.am) = d91904c6cba1a75a6872d042e4fe87ed9ce65a22
|
||||
SHA1 (patch-modules_codec_x264.c) = 78f1a3ee0eda93e7ea32953d7d6cbb5a9d6f2fbc
|
||||
SHA1 (patch-share_Makefile.am) = 380dc4ac4a1a19cd1ccc8219b3d1d3b927585c49
|
||||
|
|
|
|||
|
|
@ -1,201 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
Cherry-pick upstream patch:
|
||||
|
||||
x264: drop <148 build support and fix 10bit support
|
||||
|
||||
Drop old #if as 148 is not that recent anymore.
|
||||
|
||||
fixes #19581
|
||||
|
||||
https://git.videolan.org/?p=vlc.git;a=commit;h=a8953ba707cca1f2de372ca24513296bcfcdaaa8
|
||||
|
||||
--- modules/codec/x264.c.orig 2017-11-29 23:35:29.000000000 +0000
|
||||
+++ modules/codec/x264.c
|
||||
@@ -84,13 +84,7 @@ static void x264_log( void *, int i_leve
|
||||
"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" \
|
||||
@@ -469,16 +463,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 )
|
||||
@@ -498,13 +486,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,
|
||||
@@ -541,22 +524,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, 6)
|
||||
-#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 */
|
||||
@@ -842,20 +821,14 @@ static int Open ( vlc_object_t *p_this
|
||||
fullrange |= p_enc->fmt_in.video.b_color_range_full;
|
||||
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" );
|
||||
- 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 bit depth encoding supported, bit depth:%d", x264_bit_depth);
|
||||
- return VLC_EGENERIC;
|
||||
- }
|
||||
+ const int mask = X264_CSP_HIGH_DEPTH;
|
||||
+# else
|
||||
+ const int mask = 0;
|
||||
# endif
|
||||
+ if( psz_profile )
|
||||
+ {
|
||||
|
||||
if( !strcmp( psz_profile, "high10" ) )
|
||||
{
|
||||
@@ -878,7 +851,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
|
||||
@@ -889,7 +861,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;
|
||||
@@ -912,6 +883,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 );
|
||||
@@ -1089,10 +1064,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;
|
||||
@@ -1108,26 +1081,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;
|
||||
@@ -1165,14 +1126,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" );
|
||||
@@ -1531,11 +1490,7 @@ static block_t *Encode( encoder_t *p_enc
|
||||
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;
|
||||
Loading…
Reference in New Issue