Hi! Below is an update to multimedia/mpv (0.8.3 => 0.9.1). New version has several fixes including those we distribute in this port right now.
Comments? OKs? -- Dmitrij D. Czarkoff Index: Makefile =================================================================== RCS file: /var/cvs/ports/multimedia/mpv/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 27 Mar 2015 08:13:02 -0000 1.9 +++ Makefile 4 May 2015 21:26:53 -0000 @@ -5,9 +5,8 @@ ONLY_FOR_ARCHS = amd64 COMMENT = movie player based on MPlayer/mplayer2 -V = 0.8.3 +V = 0.9.1 DISTNAME = mpv-${V} -REVISION = 0 GH_ACCOUNT= mpv-player GH_PROJECT= mpv @@ -62,12 +61,12 @@ CONFIGURE_ARGS += --confdir=${SYSCONFDIR --disable-enca \ --disable-jack \ --disable-libguess \ - --disable-mpg123 \ --disable-ossaudio \ --disable-optimization \ --disable-openal \ --disable-pulse \ --disable-rsound +CONFIGURE_ENV += TMPDIR=${WRKBUILD} # pkg-config says smbclient's version is 0 CONFIGURE_ARGS += --enable-smb \ Index: distinfo =================================================================== RCS file: /var/cvs/ports/multimedia/mpv/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 27 Mar 2015 06:11:27 -0000 1.4 +++ distinfo 4 May 2015 21:22:06 -0000 @@ -1,2 +1,2 @@ -SHA256 (mpv-0.8.3.tar.gz) = CRA4yAKGaEjjZH8qUCFfpk6tDcNvkRRFfbizU1KGic8= -SIZE (mpv-0.8.3.tar.gz) = 2664730 +SHA256 (mpv-0.9.1.tar.gz) = XSNohXXSzESE9/7vYoxpD2gBbjhWIiAYlNAssjjqF54= +SIZE (mpv-0.9.1.tar.gz) = 2698031 Index: patches/patch-audio_out_ao_sndio_c =================================================================== RCS file: patches/patch-audio_out_ao_sndio_c diff -N patches/patch-audio_out_ao_sndio_c --- patches/patch-audio_out_ao_sndio_c 11 Jan 2015 08:21:39 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,39 +0,0 @@ -$OpenBSD: patch-audio_out_ao_sndio_c,v 1.1.1.1 2015/01/11 08:21:39 bentley Exp $ ---- audio/out/ao_sndio.c.orig Sat Dec 20 12:00:13 2014 -+++ audio/out/ao_sndio.c Fri Jan 2 14:34:21 2015 -@@ -125,7 +125,7 @@ static int init(struct ao *ao) - const struct af_to_par *ap; - int i; - -- p->hdl = sio_open(p->dev, SIO_PLAY, 1); -+ p->hdl = sio_open(p->dev, SIO_PLAY, 0); - if (p->hdl == NULL) { - MP_ERR(ao, "can't open sndio %s\n", p->dev); - goto error; -@@ -304,25 +304,7 @@ static void audio_pause(struct ao *ao) - */ - static void audio_resume(struct ao *ao) - { -- struct priv *p = ao->priv; -- int n, count, todo; -- -- /* -- * we want to start with buffers full, because mpv uses -- * get_delay() as clock, which would cause video to -- * accelerate while buffers are filled. -- */ -- todo = p->par.bufsz * p->par.pchan * p->par.bps; -- while (todo > 0) { -- count = todo; -- if (count > SILENCE_NMAX) -- count = SILENCE_NMAX; -- n = sio_write(p->hdl, p->silence, count); -- if (n == 0) -- break; -- todo -= n; -- p->delay += n; -- } -+ return; - } - - #define OPT_BASE_STRUCT struct priv Index: patches/patch-old-configure =================================================================== RCS file: patches/patch-old-configure diff -N patches/patch-old-configure --- patches/patch-old-configure 17 Feb 2015 01:27:11 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,56 +0,0 @@ -$OpenBSD: patch-old-configure,v 1.2 2015/02/17 01:27:11 brad Exp $ ---- old-configure.orig Mon Jan 26 20:23:08 2015 -+++ old-configure Fri Feb 13 21:55:41 2015 -@@ -191,7 +191,7 @@ options_state_machine() { - opt_yes_no _libavresample "libavresample (preferred over libswresample)" - opt_yes_no _libswresample "libswresample" - opt_yes_no _caca "CACA video output" -- opt_yes_no _sdl2 "SDL2 video and audio outputs" no -+ opt_yes_no _sdl2 "SDL2 video and audio outputs" - opt_yes_no _xv "Xv video output" - opt_yes_no _vdpau "VDPAU acceleration" - opt_yes_no _vaapi "VAAPI acceleration" -@@ -328,7 +328,7 @@ test -z "$_bindir" && _bindir="$_prefix/bin" - test -z "$_mandir" && _mandir="$_prefix/share/man" - test -z "$_confdir" && _confdir="$_prefix/etc/mpv" - --mplayer_tmpdir=$(mktemp -d --tmpdir mpv-configure-XXXX) -+mplayer_tmpdir=$(mktemp -d mpv-configure-XXXXXX) - test -n "$mplayer_tmpdir" || die "Unable to create tmpdir." - trap 'rm -rf "$mplayer_tmpdir"' EXIT - -@@ -665,6 +665,8 @@ EOF - _gl_wayland=yes - libs_mplayer="$libs_mplayer -lGL -lEGL" - test "$_gl_wayland" = yes && res_comment="$res_comment wayland" -+ else -+ _gl_wayland=no - fi - if test "$_x11" = yes && test "$_gl" = yes && pkg_config_add "egl"; then - _gl_x11_egl=yes -@@ -863,9 +865,11 @@ test_lua() { - - test_lua "lua >= 5.1.0 lua < 5.2.0" - test_lua "lua5.1 >= 5.1.0" # debian -+test_lua "lua51 >= 5.1.0" # OpenBSD - test_lua "luajit >= 2.0.0" - test_lua "lua >= 5.2.0" - test_lua "lua5.2 >= 5.2.0" # debian -+test_lua "lua52 >= 5.2.0" # OpenBSD - - test "$_lua" != yes && check_yes_no no LUA - -@@ -983,8 +987,13 @@ cat > $TMPC << EOF - #define HAVE_NETBSD_THREAD_NAME 0 - #define HAVE_DXVA2_HWACCEL 0 - -+#ifdef __OpenBSD__ -+#define DEFAULT_CDROM_DEVICE "/dev/rcd0c" -+#define DEFAULT_DVD_DEVICE "/dev/rcd0c" -+#else - #define DEFAULT_CDROM_DEVICE "/dev/cdrom" - #define DEFAULT_DVD_DEVICE "/dev/dvd" -+#endif - #define PATH_DEV_DSP "/dev/dsp" - #define PATH_DEV_MIXER "/dev/mixer" -