Update to mplayer-20160306.

from Brad (maintainer)

x11/mplayer/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.259 2016/01/14 06:10:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.260 2016/03/14 19:50:13 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,10 +7,9 @@ ONLY_FOR_ARCHS=	${GCC4_ARCHS}
 
 COMMENT=	movie player supporting many formats
 
-V=		20150910
+V=		20160306
 FFMPEG_V=	20160113
 DISTNAME=	mplayer-${V}
-REVISION=	3
 CATEGORIES=	x11 multimedia
 MASTER_SITES=	http://comstyle.com/source/
 EXTRACT_SUFX=	.tar.xz
@@ -27,7 +26,8 @@ WANTLIB=	EGL GL SDL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass \
 		avcodec avformat avutil bluray bz2 c cdda_interface \
 		cdda_paranoia crypto dv dvdnav dvdread enca fontconfig \
 		freetype fribidi gif jpeg m mng mp3lame ncurses png postproc \
-		pthread sndio stdc++ swscale swresample util x264 xvidcore z
+		pthread sndio ssl stdc++ swscale swresample util x264 xvidcore \
+		z
 
 MODULES+=	converters/libiconv \
 		lang/clang
@@ -112,7 +112,8 @@ CONFIGURE_ARGS+=--disable-alsa \
 CONFIGURE_ARGS+=--enable-menu
 
 # CONFIGURE_ARGS that enable external stuff
-CONFIGURE_ARGS+=--with-sdl-config=${LOCALBASE}/bin/sdl-config
+CONFIGURE_ARGS+=--enable-openssl-nondistributable \
+		--with-sdl-config=${LOCALBASE}/bin/sdl-config
 
 # CONFIGURE_ARGS that disable external stuff
 CONFIGURE_ARGS+=--disable-caca \

x11/mplayer/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mplayer-20150910.tar.xz) = YTG3oTItA3IajKV1OIbcZSTtDSIu18BxdtOIYPYlnYE=
+SHA256 (mplayer-20160306.tar.xz) = U/lKd7aoqUlQyla5j4MDKWpfnKxx8zJLxJ11g8i3Wcw=
-SIZE (mplayer-20150910.tar.xz) = 5167116
+SIZE (mplayer-20160306.tar.xz) = 5160012

x11/mplayer/patches/patch-DOCS_man_en_mplayer_1

@@ -1,6 +1,6 @@
-$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.14 2015/05/11 23:23:17 ajacoutot Exp $
+$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.15 2016/03/14 19:50:13 ajacoutot Exp $
---- DOCS/man/en/mplayer.1.orig	Sun May 10 18:35:34 2015
+--- DOCS/man/en/mplayer.1.orig	Sun Mar  6 20:23:14 2016
-+++ DOCS/man/en/mplayer.1	Sun May 10 18:40:30 2015
++++ DOCS/man/en/mplayer.1	Sun Mar  6 20:29:00 2016
 @@ -1546,7 +1546,7 @@ May be negative.
  .
  .TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.14 2015/05/11 23:23:17 ajacoutot Exp $
  .
  .TP
  .B \-channels <number> (also see \-af channels)
-@@ -12264,7 +12264,7 @@ mplayer dvd://1 \-dvdangle 2
+@@ -12268,7 +12268,7 @@ mplayer dvd://1 \-dvdangle 2
  .PP
  .B Play from a different DVD device:
  .nf
@@ -19,7 +19,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.14 2015/05/11 23:23:17 ajacoutot Exp $
  .fi
  .
  .PP
-@@ -12330,11 +12330,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12334,11 +12334,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
  .PP
  .B Play DTS-CD with passthrough:
  .nf

x11/mplayer/patches/patch-Makefile

@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.29 2014/11/14 06:18:42 brad Exp $
+$OpenBSD: patch-Makefile,v 1.30 2016/03/14 19:50:13 ajacoutot Exp $
---- Makefile.orig	Mon Nov  3 01:28:57 2014
+--- Makefile.orig	Sun Mar  6 20:22:53 2016
-+++ Makefile	Mon Nov  3 01:34:51 2014
++++ Makefile	Sun Mar  6 20:29:00 2016
 @@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF)                += osdep/vsscanf.
  # conditional source declarations
  SRCS_AUDIO_INPUT-$(ALSA)             += stream/ai_alsa.c
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.29 2014/11/14 06:18:42 brad Exp $
  SRCS_COMMON-$(AUDIO_INPUT)           += $(SRCS_AUDIO_INPUT-yes)
  SRCS_COMMON-$(BITMAP_FONT)           += sub/font_load.c
  SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c            \
-@@ -615,7 +616,8 @@ SRCS_MPLAYER = command.c                \
+@@ -612,7 +613,8 @@ SRCS_MPLAYER = command.c                \
                 libvo/vo_mpegpes.c       \
                 libvo/vo_null.c          \
                 sub/spuenc.c             \

x11/mplayer/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.79 2016/03/14 19:50:13 ajacoutot Exp $
---- configure.orig	Thu Sep 10 03:13:54 2015
+--- configure.orig	Sun Mar  6 20:23:29 2016
-+++ configure	Thu Sep 10 03:18:41 2015
++++ configure	Sun Mar 13 21:32:53 2016
-@@ -1498,39 +1498,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1503,39 +1503,39 @@ echo configuration: $configuration > "$TMPLOG"
  echo >> "$TMPLOG"
  
  
@@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
  list_subparts() {
    test ! -e ffmpeg/libav${3} && return 1
    pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -2399,7 +2399,7 @@ case "$host_arch" in
+@@ -2415,7 +2415,7 @@ case "$host_arch" in
      arch='sparc'
      iproc='sparc'
      if test "$host_arch" = "sparc64" ; then
@@ -82,16 +82,25 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
        proc='ultrasparc'
        def_fast_64bit='#define HAVE_FAST_64BIT 1'
      elif sunos ; then
-@@ -2747,7 +2747,7 @@ cat > $TMPC << EOF
+@@ -2787,7 +2787,7 @@ cat > $TMPC << EOF
  int ff_extern;
  EOF
  cc_check -c || die "Symbol mangling check failed."
--sym=$($_nm -P -g $TMPEXE)
+-sym=$($_nm -P -g $TMPEXE | grep ff_extern)
 +sym=$($_nm -g $TMPEXE | grep ff_extern | cut -d ' ' -f 3)
  extern_prefix=${sym%%ff_extern*}
  def_extern_asm="#define EXTERN_ASM $extern_prefix"
  def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2875,7 +2875,7 @@ elif test $relocatable = "yes" ; then
+@@ -2847,7 +2847,7 @@ else
+ fi
+ 
+ CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
+-HOSTCFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg -O3"
++HOSTCFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
+ 
+ # On glibc, add some more CPPFLAGS for enabling required functionality.
+ cpp_condition_check features.h "defined __GLIBC__" &&
+@@ -2924,7 +2924,7 @@ elif test $relocatable = "yes" ; then
  fi
  echores $relocatable
  
@@ -100,7 +109,7 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
    # 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')
-@@ -6190,7 +6190,7 @@ echocheck "cdparanoia"
+@@ -6247,7 +6247,7 @@ echocheck "cdparanoia"
  if test "$_cdparanoia" = auto ; then
      _cdparanoia=no
      for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@@ -109,7 +118,7 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
          _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
      done
  fi
-@@ -8103,6 +8103,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8164,6 +8164,7 @@ extra_ldflags="$extra_ldflags $libm"
  # XML documentation tests
  echocheck "XML catalogs"
  for try_catalog in \
@@ -117,7 +126,7 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
    /etc/sgml/catalog \
    /usr/share/xml/docbook/*/catalog.xml \
    /opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8130,6 +8131,7 @@ fi
+@@ -8191,6 +8192,7 @@ fi
  
  echocheck "XML chunked stylesheet"
  for try_chunk_xsl in \
@@ -125,7 +134,7 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
    /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 \
-@@ -8155,6 +8157,7 @@ fi
+@@ -8216,6 +8218,7 @@ fi
  
  echocheck "XML monolithic stylesheet"
  for try_docbook_xsl in \
@@ -133,7 +142,7 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
    /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 \
-@@ -8208,6 +8211,7 @@ EOF
+@@ -8269,6 +8272,7 @@ EOF
  echocheck "XML DTD"
  #FIXME: This should prefer higher version numbers, not the other way around ..
  for try_dtd in \
@@ -141,3 +150,22 @@ $OpenBSD: patch-configure,v 1.78 2015/09/10 08:31:36 ajacoutot Exp $
    /usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
    /usr/share/xml/docbook/*/docbookx.dtd \
    /usr/share/sgml/docbook/*/docbookx.dtd \
+@@ -9405,9 +9409,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
+ 
+ ############################################################################
+ 
+-# Create FFmpeg config files only for internal ffmpeg
+-if test "$ffmpeg_a" = yes; then
+-
+ # Create avconfig.h for FFmpeg.
+ cat > "$TMPH" << EOF
+ /* Generated by mpconfigure */
+@@ -9452,8 +9453,6 @@ cat > ffmpeg/config.h << EOF
+ #include "../config.h"
+ EOF
+ touch ffmpeg/.config
+-
+-fi
+ 
+ #############################################################################
+ 

x11/mplayer/patches/patch-libmpdemux_mp_taglists_c

@@ -0,0 +1,30 @@
+$OpenBSD: patch-libmpdemux_mp_taglists_c,v 1.8 2016/03/14 19:50:13 ajacoutot Exp $
+
+Allow building with FFmpeg 2.8.
+
+--- libmpdemux/mp_taglists.c.orig	Sun Mar 13 21:35:58 2016
++++ libmpdemux/mp_taglists.c	Sun Mar 13 21:36:42 2016
+@@ -34,7 +34,6 @@ struct AVCodecTag {
+ static const struct AVCodecTag mp_wav_tags[] = {
+     { AV_CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A') },
+     { AV_CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x') },
+-    { AV_CODEC_ID_ADPCM_AICA,        MKTAG('A', 'I', 'C', 'A') },
+     { AV_CODEC_ID_ADPCM_AFC,         MKTAG('A', 'F', 'C', ' ') },
+     { AV_CODEC_ID_ADPCM_DTK,         MKTAG('D', 'T', 'K', ' ') },
+     { AV_CODEC_ID_ADPCM_IMA_APC,     MKTAG('A', 'P', 'C', 'A') },
+@@ -47,7 +46,6 @@ static const struct AVCodecTag mp_wav_tags[] = {
+     { AV_CODEC_ID_ADPCM_IMA_EA_EACS, MKTAG('E', 'A', 'C', 'S') },
+     { AV_CODEC_ID_ADPCM_IMA_ISS,     MKTAG('A', 'I', 'S', 'S') },
+     { AV_CODEC_ID_ADPCM_IMA_WS,      MKTAG('A', 'I', 'W', 'S') },
+-    { AV_CODEC_ID_ADPCM_PSX,         MKTAG('A', 'P', 'S', 'X') },
+     { AV_CODEC_ID_ADPCM_SBPRO_2,     0x3253 },
+     { AV_CODEC_ID_ADPCM_SBPRO_3,     0x3353 },
+     { AV_CODEC_ID_ADPCM_SBPRO_4,     0x3453 },
+@@ -70,7 +68,6 @@ static const struct AVCodecTag mp_wav_tags[] = {
+     { AV_CODEC_ID_EVRC,              MKTAG('s', 'e', 'v', 'c') },
+     { AV_CODEC_ID_FFWAVESYNTH,       MKTAG('F', 'F', 'W', 'S') },
+     { AV_CODEC_ID_G723_1,            MKTAG('7', '2', '3', '1') },
+-    { AV_CODEC_ID_INTERPLAY_ACM,     0x97280301 },
+     { AV_CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A') },
+     { AV_CODEC_ID_ILBC,              MKTAG('i', 'l', 'b', 'c') },
+     { AV_CODEC_ID_MLP,               MKTAG('M', 'L', 'P', ' ') },

x11/mplayer/patches/patch-stream_tvi_bsdbt848_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
+$OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.6 2016/03/14 19:50:13 ajacoutot Exp $
---- stream/tvi_bsdbt848.c.orig	Mon Aug 19 10:49:11 2013
+--- stream/tvi_bsdbt848.c.orig	Sun Mar  6 20:23:31 2016
-+++ stream/tvi_bsdbt848.c	Tue Aug 20 02:51:59 2013
++++ stream/tvi_bsdbt848.c	Sun Mar  6 20:29:00 2016
-@@ -51,9 +51,10 @@
+@@ -53,9 +53,10 @@
  #include <signal.h>
  #include <string.h>
  #include <errno.h>
@@ -13,7 +13,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  #include <sys/audioio.h>
  #endif
  
-@@ -65,6 +66,9 @@
+@@ -67,6 +68,9 @@
  #include IOCTL_BT848_H_NAME
  #endif
  
@@ -23,7 +23,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  #ifdef HAVE_SYS_SOUNDCARD_H
  #include <sys/soundcard.h>
  #else
-@@ -74,6 +78,7 @@
+@@ -76,6 +80,7 @@
  #include <machine/soundcard.h>
  #endif
  #endif
@@ -31,7 +31,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  
  #include "libaf/af_format.h"
  #include "libmpcodecs/img_format.h"
-@@ -103,7 +108,13 @@ typedef struct priv {
+@@ -105,7 +110,13 @@ typedef struct priv {
  /* Audio */
      char *dspdev;
      int dspready;
@@ -45,7 +45,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
      int dspsamplesize;
      int dspstereo;
      int dspspeed;
-@@ -111,6 +122,9 @@ typedef struct priv {
+@@ -113,6 +124,9 @@ typedef struct priv {
      int dspframesize;
      int dsprate;
      long long dspbytesread;
@@ -55,7 +55,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  
  /* Video */
      char *btdev;
-@@ -160,6 +174,15 @@ static priv_t *G_private=NULL;
+@@ -162,6 +176,15 @@ static priv_t *G_private=NULL;
  
  static int getinput(int innumber);
  
@@ -71,7 +71,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  static void processframe(int signal)
  {
  struct timeval curtime;
-@@ -220,7 +243,9 @@ static tvi_handle_t *tvi_init_bsdbt848(tv_param_t* tv_
+@@ -222,7 +245,9 @@ static tvi_handle_t *tvi_init_bsdbt848(tv_param_t* tv_
  
      /* set audio device name */
      if (!tv_param->adevice)
@@ -82,7 +82,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
          priv->dspdev = strdup("/dev/sound");
  #else
          priv->dspdev = strdup("/dev/dsp");
-@@ -329,12 +354,39 @@ static int control(priv_t *priv, int cmd, void *arg)
+@@ -331,12 +356,39 @@ static int control(priv_t *priv, int cmd, void *arg)
          {
          int dspspeed = *(int *)arg;
  
@@ -123,7 +123,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
          priv->dspspeed = dspspeed;
  
          priv->dspframesize = priv->dspspeed*priv->dspsamplesize/8/
-@@ -643,12 +695,76 @@ priv->dspready = 1;
+@@ -645,12 +697,76 @@ priv->dspready = 1;
  priv->dspsamplesize = 16;
  priv->dspstereo = 1;
  priv->dspspeed = 44100;
@@ -200,7 +200,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  if((priv->dspfd = open (priv->dspdev, O_RDONLY, 0)) < 0)
      {
      mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848ErrorOpeningDspDev, strerror(errno));
-@@ -674,6 +790,8 @@ if(priv->dspready &&
+@@ -676,6 +792,8 @@ if(priv->dspready &&
      priv->dspready = 0;
      }
  
@@ -209,7 +209,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  return 1;
  }
  
-@@ -697,7 +815,9 @@ if(ioctl(priv->btfd, METEORSSIGNAL, &marg) < 0)
+@@ -699,7 +817,9 @@ if(ioctl(priv->btfd, METEORSSIGNAL, &marg) < 0)
      return 0;
      }
  
@@ -219,7 +219,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  
  gettimeofday(&curtime, NULL);
  
-@@ -736,10 +856,15 @@ if(ioctl(priv->btfd, METEORCAPTUR, &marg) < 0 )
+@@ -738,10 +858,15 @@ if(ioctl(priv->btfd, METEORCAPTUR, &marg) < 0 )
      return 0;
      }
  
@@ -237,7 +237,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
  priv->btfd = -1;
  
  priv->dspready = priv->videoready = 0;
-@@ -819,13 +944,21 @@ gettimeofday(&curtime, NULL);
+@@ -821,13 +946,21 @@ gettimeofday(&curtime, NULL);
  
  /* Get exactly one frame of audio, which forces video sync to audio.. */
  
@@ -260,7 +260,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.5 2013/09/06 23:14:40 brad Exp $
          {
          mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848ErrorReadingAudio, strerror(errno));
          return 0;
-@@ -858,13 +991,19 @@ return priv->dspbytesread * 1.0 / priv->dsprate;
+@@ -860,13 +993,19 @@ return priv->dspbytesread * 1.0 / priv->dsprate;
  static int get_audio_framesize(priv_t *priv)
  {
  int bytesavail;