pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vlc: Update to 3.0.2
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Apr 25 23:31:10 2018 +0200
Changeset: f251343d6960d6a22630ecb42f7613ae832c0789
Modified Files:
vlc/Makefile
vlc/distinfo
vlc/patches/patch-compat_Makefile.am
vlc/patches/patch-modules_codec_x264.c
Removed Files:
vlc/patches/patch-include_vlc__common.h
Log Message:
vlc: Update to 3.0.2
More NetBSD code merged upstream.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f251343d6960d6a22630ecb42f7613ae832c0789
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vlc/Makefile | 2 +-
vlc/distinfo | 13 +--
vlc/patches/patch-compat_Makefile.am | 4 +-
vlc/patches/patch-include_vlc__common.h | 39 -------
vlc/patches/patch-modules_codec_x264.c | 188 +++++++++++++++++++++++++++++++-
5 files changed, 191 insertions(+), 55 deletions(-)
diffs:
diff --git a/vlc/Makefile b/vlc/Makefile
index 2a7160b79c..80ad5fce9f 100644
--- a/vlc/Makefile
+++ b/vlc/Makefile
@@ -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.1
+VLC_VERSION= 3.0.2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.videolan.org/
diff --git a/vlc/distinfo b/vlc/distinfo
index c093cff14e..959b48c274 100644
--- a/vlc/distinfo
+++ b/vlc/distinfo
@@ -1,14 +1,13 @@
$NetBSD: distinfo,v 1.74 2017/05/26 13:26:37 maya Exp $
-SHA1 (vlc-3.0.1.tar.xz) = 9eab63eeb525f200220fe7f99ca2a67805058517
-RMD160 (vlc-3.0.1.tar.xz) = b0ecf5e2bccb916d5e0fb8fa57593ae8c5ec7741
-SHA512 (vlc-3.0.1.tar.xz) = f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c
-Size (vlc-3.0.1.tar.xz) = 25174040 bytes
-SHA1 (patch-compat_Makefile.am) = b37232bbcac799b9920189acb475c64552b15001
-SHA1 (patch-include_vlc__common.h) = e78af2312315b7771715ab6697ba03122bcba6d3
+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 (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) = 8dc705fa1c87218a3bb8b8e39623886f08c725b2
+SHA1 (patch-modules_codec_x264.c) = 7bb40e26549af4181f976b00a3895e125aa79494
SHA1 (patch-share_Makefile.am) = 380dc4ac4a1a19cd1ccc8219b3d1d3b927585c49
diff --git a/vlc/patches/patch-compat_Makefile.am b/vlc/patches/patch-compat_Makefile.am
index b619868c99..e5708d16d5 100644
--- a/vlc/patches/patch-compat_Makefile.am
+++ b/vlc/patches/patch-compat_Makefile.am
@@ -3,13 +3,13 @@ $NetBSD$
libcompat must be prebuilt with PIC properties in order to be linked
into PIC libraries.
---- compat/Makefile.am.orig 2017-11-24 15:29:17.000000000 +0000
+--- compat/Makefile.am.orig 2018-03-14 22:07:38.000000000 +0000
+++ compat/Makefile.am
@@ -1,7 +1,7 @@
-pkglib_LTLIBRARIES = libcompat.la
+noinst_LTLIBRARIES = libcompat.la
libcompat_la_SOURCES = dummy.c
- libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT)
+ libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT) $(LIBM)
-libcompat_la_LDFLAGS = -no-undefined -static
+libcompat_la_LDFLAGS = -no-undefined
diff --git a/vlc/patches/patch-include_vlc__common.h b/vlc/patches/patch-include_vlc__common.h
deleted file mode 100644
index a3c5a20525..0000000000
--- a/vlc/patches/patch-include_vlc__common.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
-Backport patch merged upstream: disable bswap* and popcount*
-functions for NetBSD, as they are part of libc.
-
---- include/vlc_common.h.orig 2017-12-21 09:51:16.000000000 +0000
-+++ include/vlc_common.h
-@@ -556,6 +556,7 @@ static inline unsigned (ctz)(unsigned x)
- #endif
- }
-
-+#if !defined(__NetBSD__)
- /** Bit weight */
- VLC_USED
- static inline unsigned (popcount)(unsigned x)
-@@ -589,6 +590,7 @@ static inline int (popcountll)(unsigned
- return count;
- #endif
- }
-+#endif
-
- VLC_USED
- static inline unsigned (parity)(unsigned x)
-@@ -602,6 +604,7 @@ static inline unsigned (parity)(unsigned
- #endif
- }
-
-+#if !defined(__NetBSD__)
- /** Byte swap (16 bits) */
- VLC_USED
- static inline uint16_t (bswap16)(uint16_t x)
-@@ -649,6 +652,7 @@ static inline uint64_t (bswap64)(uint64_
- | ((x & 0xFF00000000000000ULL) >> 56);
- #endif
- }
-+#endif
-
- /* Integer overflow */
- static inline bool uadd_overflow(unsigned a, unsigned b, unsigned *res)
diff --git a/vlc/patches/patch-modules_codec_x264.c b/vlc/patches/patch-modules_codec_x264.c
index 061cfc59e2..55bb963e52 100644
--- a/vlc/patches/patch-modules_codec_x264.c
+++ b/vlc/patches/patch-modules_codec_x264.c
@@ -1,15 +1,191 @@
$NetBSD$
-Disable X264 incompatible code for X264_BUILD >= 153.
-
--- modules/codec/x264.c.orig 2017-11-29 23:35:29.000000000 +0000
+++ modules/codec/x264.c
-@@ -842,7 +842,7 @@ static int Open ( vlc_object_t *p_this
+@@ -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
-+#if X264_BUILD >= 118 && X264_BUILD < 153
char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
- if( psz_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;
Home |
Main Index |
Thread Index |
Old Index