diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile index c902f08d205..89a15b8b000 100644 --- a/x11/mplayer/Makefile +++ b/x11/mplayer/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.296 2019/03/24 09:03:35 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.297 2019/03/30 17:17:54 ajacoutot Exp $ COMMENT= movie player supporting many formats -V= 20180916 +V= 20190330 FFMPEG_V= 4.1.2 DISTNAME= mplayer-${V} -REVISION= 3 CATEGORIES= x11 multimedia MASTER_SITES= https://comstyle.com/source/ EXTRACT_SUFX= .tar.xz diff --git a/x11/mplayer/distinfo b/x11/mplayer/distinfo index c66e20abae5..db2bb4acd3e 100644 --- a/x11/mplayer/distinfo +++ b/x11/mplayer/distinfo @@ -1,2 +1,2 @@ -SHA256 (mplayer-20180916.tar.xz) = 3TwfU0oWYoGK0QllpTNZR1GQmnCy8vgzxV5OZiRS9wE= -SIZE (mplayer-20180916.tar.xz) = 5175908 +SHA256 (mplayer-20190330.tar.xz) = GLiXDzUVOT08jkEyjS8Su4TMtbMQAzAHDv1mxHHoUOU= +SIZE (mplayer-20190330.tar.xz) = 5162516 diff --git a/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1 b/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1 index 57d2e5df1ab..b9202f6b35a 100644 --- a/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1 +++ b/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1 @@ -1,4 +1,5 @@ -$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.17 2018/09/22 07:06:05 ajacoutot Exp $ +$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.18 2019/03/30 17:17:54 ajacoutot Exp $ + Index: DOCS/man/en/mplayer.1 --- DOCS/man/en/mplayer.1.orig +++ DOCS/man/en/mplayer.1 diff --git a/x11/mplayer/patches/patch-DOCS_xml_en_usage_xml b/x11/mplayer/patches/patch-DOCS_xml_en_usage_xml index 2402796dfc0..a4573753a57 100644 --- a/x11/mplayer/patches/patch-DOCS_xml_en_usage_xml +++ b/x11/mplayer/patches/patch-DOCS_xml_en_usage_xml @@ -1,6 +1,8 @@ -$OpenBSD: patch-DOCS_xml_en_usage_xml,v 1.1 2010/11/08 21:25:44 edd Exp $ ---- DOCS/xml/en/usage.xml.orig Tue Oct 26 12:49:00 2010 -+++ DOCS/xml/en/usage.xml Tue Oct 26 12:50:35 2010 +$OpenBSD: patch-DOCS_xml_en_usage_xml,v 1.2 2019/03/30 17:17:54 ajacoutot Exp $ + +Index: DOCS/xml/en/usage.xml +--- DOCS/xml/en/usage.xml.orig ++++ DOCS/xml/en/usage.xml @@ -452,7 +452,7 @@ syntax is the same, except that you need to use dvdnav diff --git a/x11/mplayer/patches/patch-Makefile b/x11/mplayer/patches/patch-Makefile index d057f4065f1..f1b762276aa 100644 --- a/x11/mplayer/patches/patch-Makefile +++ b/x11/mplayer/patches/patch-Makefile @@ -1,4 +1,5 @@ -$OpenBSD: patch-Makefile,v 1.31 2018/09/22 07:06:05 ajacoutot Exp $ +$OpenBSD: patch-Makefile,v 1.32 2019/03/30 17:17:54 ajacoutot Exp $ + Index: Makefile --- Makefile.orig +++ Makefile diff --git a/x11/mplayer/patches/patch-configure b/x11/mplayer/patches/patch-configure index ae097f0a1e1..0ed73312db2 100644 --- a/x11/mplayer/patches/patch-configure +++ b/x11/mplayer/patches/patch-configure @@ -1,8 +1,9 @@ -$OpenBSD: patch-configure,v 1.84 2019/02/25 22:42:19 sthen Exp $ +$OpenBSD: patch-configure,v 1.85 2019/03/30 17:17:54 ajacoutot Exp $ + Index: configure --- configure.orig +++ configure -@@ -1497,39 +1497,39 @@ echo configuration: $configuration > "$TMPLOG" +@@ -1498,39 +1498,39 @@ echo configuration: $configuration > "$TMPLOG" echo >> "$TMPLOG" @@ -74,7 +75,7 @@ Index: configure list_subparts() { test ! -e ffmpeg/libav${3} && return 1 pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p" -@@ -2431,7 +2431,7 @@ case "$host_arch" in +@@ -2432,7 +2432,7 @@ case "$host_arch" in arch='sparc' iproc='sparc' if test "$host_arch" = "sparc64" ; then @@ -83,7 +84,7 @@ Index: configure proc='ultrasparc' def_fast_64bit='#define HAVE_FAST_64BIT 1' elif sunos ; then -@@ -2800,7 +2800,7 @@ cat > $TMPC << EOF +@@ -2801,7 +2801,7 @@ cat > $TMPC << EOF int ff_extern; EOF cc_check -c || die "Symbol mangling check failed." @@ -92,7 +93,7 @@ Index: configure extern_prefix=${sym%%ff_extern*} def_extern_asm="#define EXTERN_ASM $extern_prefix" def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\"" -@@ -2860,7 +2860,7 @@ else +@@ -2861,7 +2861,7 @@ else fi CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS" @@ -101,7 +102,7 @@ Index: configure # On glibc, add some more CPPFLAGS for enabling required functionality. cpp_condition_check features.h "defined __GLIBC__" && -@@ -2941,7 +2941,7 @@ elif test $relocatable = "yes" ; then +@@ -2942,7 +2942,7 @@ elif test $relocatable = "yes" ; then fi echores $relocatable @@ -110,7 +111,7 @@ Index: configure # Checking assembler (_as) compatibility... # Added workaround for older as that reads from stdin by default - atmos as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p') -@@ -4310,8 +4310,8 @@ echores "$gettimeofday" +@@ -4331,8 +4331,8 @@ echores "$gettimeofday" echocheck "clock_gettime()" clock_gettime=no def_clock_gettime='#undef HAVE_CLOCK_GETTIME' @@ -121,7 +122,7 @@ Index: configure echores "$clock_gettime" -@@ -6322,7 +6322,7 @@ echocheck "cdparanoia" +@@ -6343,7 +6343,7 @@ echocheck "cdparanoia" if test "$_cdparanoia" = auto ; then _cdparanoia=no for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do @@ -130,7 +131,7 @@ Index: configure _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break done fi -@@ -8162,6 +8162,7 @@ extra_ldflags="$extra_ldflags $libm" +@@ -8183,6 +8183,7 @@ extra_ldflags="$extra_ldflags $libm" # XML documentation tests echocheck "XML catalogs" for try_catalog in \ @@ -138,7 +139,7 @@ Index: configure /etc/sgml/catalog \ /usr/share/xml/docbook/*/catalog.xml \ /opt/local/share/xml/docbook-xml/*/catalog.xml \ -@@ -8189,6 +8190,7 @@ fi +@@ -8210,6 +8211,7 @@ fi echocheck "XML chunked stylesheet" for try_chunk_xsl in \ @@ -146,7 +147,7 @@ Index: configure /usr/share/xml/docbook/*/html/chunk.xsl \ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \ /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \ -@@ -8214,6 +8216,7 @@ fi +@@ -8235,6 +8237,7 @@ fi echocheck "XML monolithic stylesheet" for try_docbook_xsl in \ @@ -154,7 +155,7 @@ Index: configure /usr/share/xml/docbook/*/html/docbook.xsl \ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \ /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \ -@@ -8267,6 +8270,7 @@ EOF +@@ -8288,6 +8291,7 @@ EOF echocheck "XML DTD" #FIXME: This should prefer higher version numbers, not the other way around .. for try_dtd in \ @@ -162,7 +163,7 @@ Index: configure /usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \ /usr/share/xml/docbook/*/docbookx.dtd \ /usr/share/sgml/docbook/*/docbookx.dtd \ -@@ -9414,9 +9418,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h +@@ -9442,9 +9446,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h ############################################################################ @@ -172,7 +173,7 @@ Index: configure # Create avconfig.h for FFmpeg. cat > "$TMPH" << EOF /* Generated by mpconfigure */ -@@ -9508,8 +9509,6 @@ print_enabled_components libavformat/demuxer_list.c AV +@@ -9536,8 +9537,6 @@ print_enabled_components libavformat/demuxer_list.c AV print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list $libavmuxers print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols print_enabled_filters libavfilter/filter_list.c AVFilter filter_list $libavfilters diff --git a/x11/mplayer/patches/patch-libao2_audio_out_c b/x11/mplayer/patches/patch-libao2_audio_out_c index 800b7184a3c..97cc9805b07 100644 --- a/x11/mplayer/patches/patch-libao2_audio_out_c +++ b/x11/mplayer/patches/patch-libao2_audio_out_c @@ -1,6 +1,8 @@ -$OpenBSD: patch-libao2_audio_out_c,v 1.6 2014/01/10 21:52:29 brad Exp $ ---- libao2/audio_out.c.orig Mon Jan 6 17:02:58 2014 -+++ libao2/audio_out.c Mon Jan 6 17:27:38 2014 +$OpenBSD: patch-libao2_audio_out_c,v 1.7 2019/03/30 17:17:54 ajacoutot Exp $ + +Index: libao2/audio_out.c +--- libao2/audio_out.c.orig ++++ libao2/audio_out.c @@ -55,6 +55,7 @@ extern const ao_functions_t audio_out_v4l2; extern const ao_functions_t audio_out_mpegpes; extern const ao_functions_t audio_out_pcm; diff --git a/x11/mplayer/patches/patch-libmpcodecs_vf_noise_c b/x11/mplayer/patches/patch-libmpcodecs_vf_noise_c index 899292a0bd1..7037089b51e 100644 --- a/x11/mplayer/patches/patch-libmpcodecs_vf_noise_c +++ b/x11/mplayer/patches/patch-libmpcodecs_vf_noise_c @@ -1,6 +1,8 @@ -$OpenBSD: patch-libmpcodecs_vf_noise_c,v 1.1 2015/12/21 01:08:17 sthen Exp $ ---- libmpcodecs/vf_noise.c.orig Mon Dec 21 00:38:47 2015 -+++ libmpcodecs/vf_noise.c Mon Dec 21 00:39:11 2015 +$OpenBSD: patch-libmpcodecs_vf_noise_c,v 1.2 2019/03/30 17:17:54 ajacoutot Exp $ + +Index: libmpcodecs/vf_noise.c +--- libmpcodecs/vf_noise.c.orig ++++ libmpcodecs/vf_noise.c @@ -85,7 +85,7 @@ static int8_t *initNoise(FilterParam *fp){ int8_t *noise= av_malloc(MAX_NOISE*sizeof(int8_t)); int i, j; diff --git a/x11/mplayer/patches/patch-stream_audio_in_c b/x11/mplayer/patches/patch-stream_audio_in_c index 6f355a12b79..97b30fb5767 100644 --- a/x11/mplayer/patches/patch-stream_audio_in_c +++ b/x11/mplayer/patches/patch-stream_audio_in_c @@ -1,6 +1,8 @@ -$OpenBSD: patch-stream_audio_in_c,v 1.2 2010/05/26 21:29:56 jakemsr Exp $ ---- stream/audio_in.c.orig Sat Jan 30 22:26:47 2010 -+++ stream/audio_in.c Mon Mar 8 14:28:42 2010 +$OpenBSD: patch-stream_audio_in_c,v 1.3 2019/03/30 17:17:54 ajacoutot Exp $ + +Index: stream/audio_in.c +--- stream/audio_in.c.orig ++++ stream/audio_in.c @@ -54,6 +54,12 @@ int audio_in_init(audio_in_t *ai, int type) ai->oss.device = strdup("/dev/dsp"); return 0; diff --git a/x11/mplayer/patches/patch-stream_audio_in_h b/x11/mplayer/patches/patch-stream_audio_in_h index 1d0845ff4d4..43571f1f265 100644 --- a/x11/mplayer/patches/patch-stream_audio_in_h +++ b/x11/mplayer/patches/patch-stream_audio_in_h @@ -1,6 +1,8 @@ -$OpenBSD: patch-stream_audio_in_h,v 1.2 2010/05/26 21:29:56 jakemsr Exp $ ---- stream/audio_in.h.orig Sat Jan 30 22:26:47 2010 -+++ stream/audio_in.h Mon Mar 8 14:28:42 2010 +$OpenBSD: patch-stream_audio_in_h,v 1.3 2019/03/30 17:17:54 ajacoutot Exp $ + +Index: stream/audio_in.h +--- stream/audio_in.h.orig ++++ stream/audio_in.h @@ -21,6 +21,7 @@ #define AUDIO_IN_ALSA 1 diff --git a/x11/mplayer/patches/patch-stream_stream_cdda_c b/x11/mplayer/patches/patch-stream_stream_cdda_c index bbed18b6f44..160c1a273d9 100644 --- a/x11/mplayer/patches/patch-stream_stream_cdda_c +++ b/x11/mplayer/patches/patch-stream_stream_cdda_c @@ -1,6 +1,8 @@ -$OpenBSD: patch-stream_stream_cdda_c,v 1.3 2015/09/10 08:31:36 ajacoutot Exp $ ---- stream/stream_cdda.c.orig Thu Sep 10 03:13:55 2015 -+++ stream/stream_cdda.c Thu Sep 10 03:18:41 2015 +$OpenBSD: patch-stream_stream_cdda_c,v 1.4 2019/03/30 17:17:54 ajacoutot Exp $ + +Index: stream/stream_cdda.c +--- stream/stream_cdda.c.orig ++++ stream/stream_cdda.c @@ -451,9 +451,11 @@ static int open_cdda(stream_t *st,int m, void* opts, i else if(p->search_overlap == 0) mode &= ~PARANOIA_MODE_OVERLAP; diff --git a/x11/mplayer/patches/patch-stream_tvi_bsdbt848_c b/x11/mplayer/patches/patch-stream_tvi_bsdbt848_c index cf4f594729b..621dcecf881 100644 --- a/x11/mplayer/patches/patch-stream_tvi_bsdbt848_c +++ b/x11/mplayer/patches/patch-stream_tvi_bsdbt848_c @@ -1,6 +1,8 @@ -$OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.6 2016/03/14 19:50:13 ajacoutot Exp $ ---- stream/tvi_bsdbt848.c.orig Sun Mar 6 20:23:31 2016 -+++ stream/tvi_bsdbt848.c Sun Mar 6 20:29:00 2016 +$OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.7 2019/03/30 17:17:54 ajacoutot Exp $ + +Index: stream/tvi_bsdbt848.c +--- stream/tvi_bsdbt848.c.orig ++++ stream/tvi_bsdbt848.c @@ -53,9 +53,10 @@ #include #include