diff options
| author | markd <markd@pkgsrc.org> | 2018-06-16 09:48:59 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2018-06-16 09:48:59 +0000 |
| commit | 88453cf220d403f27360e90143e1faea142cac38 (patch) | |
| tree | 85eeddd7700d86230d7ebbb86562b5849030a1b0 /multimedia/vlc2 | |
| parent | 69f37f0f92b7220f79183b9ea5ae697fd58009c9 (diff) | |
| download | pkgsrc-88453cf220d403f27360e90143e1faea142cac38.tar.gz | |
vlc2: Build with recent X264.
From http://mail-index.netbsd.org/pkgsrc-users/2018/04/07/msg026468.html
Diffstat (limited to 'multimedia/vlc2')
| -rw-r--r-- | multimedia/vlc2/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/vlc2/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/vlc2/patches/patch-modules_codec_x264.c | 42 |
3 files changed, 46 insertions, 2 deletions
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile index 2866076e84e..bbf015566ab 100644 --- a/multimedia/vlc2/Makefile +++ b/multimedia/vlc2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2018/04/25 22:39:02 kamil Exp $ +# $NetBSD: Makefile,v 1.71 2018/06/16 09:48:59 markd Exp $ DISTNAME= vlc-${VLC_VERSION} PKGNAME= ${DISTNAME:S/vlc/vlc2/} +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} MASTER_SITES+= http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/ diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo index 562cbdf6eb5..aa656eb53df 100644 --- a/multimedia/vlc2/distinfo +++ b/multimedia/vlc2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2018/04/25 22:39:02 kamil Exp $ +$NetBSD: distinfo,v 1.27 2018/06/16 09:49:00 markd Exp $ SHA1 (vlc-2.2.6.tar.xz) = d299dce6a5c94af4292657b6cb99c44654024f70 RMD160 (vlc-2.2.6.tar.xz) = b2727834bcbbf0d274e3a0b4a3317f3b914f9ad4 @@ -14,6 +14,7 @@ SHA1 (patch-include_vlc_atomic.h) = 3f3acc51e2e3645951b8c39c2cf61dab6c7d756d SHA1 (patch-modules_access_directory.c) = 95bc95cb7eb0bf44684c04d2cecc2c4e8339f0f7 SHA1 (patch-modules_access_file.c) = 22eb568aa5a1fea765e65a770432282024baaaf1 SHA1 (patch-modules_access_rtp_Makefile.am) = cd2c1bcbde8fc04c15f4030ff8708e32b800dd53 +SHA1 (patch-modules_codec_x264.c) = f2377f13f366c464505f751f97a4b8966888c88b SHA1 (patch-modules_gui_qt4_components_controller.cpp) = 5822f018f910d1b0e441782ffeff193ebc35b6d2 SHA1 (patch-modules_gui_qt4_components_extended__panels.cpp) = eaa7a4732fa5a462d5769fc71e097366e5bc2f70 SHA1 (patch-modules_gui_qt4_components_interface__widgets.cpp) = b630de531ec90afd1f2aecc769f34952780b6ddb diff --git a/multimedia/vlc2/patches/patch-modules_codec_x264.c b/multimedia/vlc2/patches/patch-modules_codec_x264.c new file mode 100644 index 00000000000..949f334161b --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_codec_x264.c @@ -0,0 +1,42 @@ +$NetBSD: patch-modules_codec_x264.c,v 1.1 2018/06/16 09:49:00 markd Exp $ + +Build with recent X264. +http://mail-index.netbsd.org/pkgsrc-users/2018/04/07/msg026468.html + +--- modules/codec/x264.c.orig 2015-04-13 19:54:35.000000000 +0000 ++++ modules/codec/x264.c +@@ -845,18 +845,13 @@ static int Open ( vlc_object_t *p_this + 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 bith 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" ) ) + { +@@ -913,6 +908,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 ); |