Re: update mpv to 0.29.1

On Wed, 28 Nov 2018 12:39:04 +0100
Charlene Wendling wrote:

> Hi,
>
> At first, thanks Klemens :) The ffmpeg+mpv build required no changes
> on macppc.
>
> On Sun, 18 Nov 2018 00:40:54 +0100
> Klemens Nanni wrote:
>
> > According to `port-lib-depends-check' the cd, dvd and v4l related
> > libraries where extra, so I blatantly removed them including their
> > LDEP.
> >
> > Since I don't have access to CD/DVD (readers), can anyone test mpv
> > with playing physical media?
> >
>
> I don't have DVDs, but cdda support will require to bring back
> libcdio, and reenable support. The diff at the bottom reintroduces
> it, and still works fine here.
>

Hi,

I've managed to get some DVDs, it will need as well to enable dvd
support (that's why [1]) and bringing back libraries and wantlibs.

It works fine on amd64.

On macppc, it's pretty bad:

---
(gdb) run
Starting program: /usr/local/bin/mpv dvd://
Playing: dvd://
libdvdnav: Using dvdnav version 5.0.3

[finding all VOBs successfully...]

AO: [sdl] 48000Hz 5.1 6ch s32
VO: [xv] 720x576 => 1024x576 yuv420p
[New process 75636]
AV: 00:00:00 / 02:23:22 (0%) A-V: 0.000

AV: 00:00:06 / 02:23:22 (0%) A-V: 0.000 Dropped: 3
Program received signal SIGSEGV, Segmentation fault.
filter_resample_output (p=0x9b039a20, in=0x84e1aba0)
at ../filters/f_swresample.c:407 407 old_planes[n] =
planes[n]; (gdb) bt full
#0 filter_resample_output (p=0x9b039a20, in=0x84e1aba0)
#at ../filters/f_swresample.c:407
out = (struct mp_aframe *) 0xac569ca0
s = Variable "s" is not available.
---

Once again, i tested against mplayer, that works fine.

I'm joining a diff with DVD enabled.

Charlène.

[1] https://github.com/mpv-player/mpv/releases/tag/v0.25.0


Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 25 Nov 2018 10:09:25 -0000 1.44
+++ Makefile 29 Nov 2018 13:21:34 -0000
@@ -4,17 +4,16 @@ COMMENT = movie player based on MPlayer

GH_ACCOUNT = mpv-player
GH_PROJECT = mpv
-GH_TAGNAME = v0.22.0
-REVISION = 5
+GH_TAGNAME = v0.29.1

CATEGORIES = multimedia x11

-HOMEPAGE = http://mpv.io/
+HOMEPAGE = https://mpv.io/

MAINTAINER = Dmitrij D. Czarkoff <czarkoff@openbsd.org>

-WAF = ${WRKSRC}/waf-1.8.19
-MASTER_SITES0 = http://waf.io/
+WAF = ${WRKSRC}/waf-2.0.12
+MASTER_SITES0 = https://waf.io/
DISTFILES = ${DISTNAME}{${GH_TAGNAME}}${EXTRACT_SUFX} ${WAF:T}:0
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}

@@ -22,14 +21,12 @@ EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUF
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes

-WANTLIB += EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xinerama Xrandr Xrender Xss Xv Xxf86vm ass avcodec
-WANTLIB += avdevice avfilter avformat avresample avutil bluray
-WANTLIB += c cdio cdio_cdda cdio_paranoia drm dvdnav dvdread expat
-WANTLIB += fontconfig freetype fribidi gbm iconv jpeg lcms2 m
-WANTLIB += opus postproc pthread sndio speex swresample
-WANTLIB += swscale v4l2 v4lconvert vpx x264 x265 xcb xcb-dri2
-WANTLIB += xcb-glx z ${MODLUA_WANTLIB}
+WANTLIB += ${MODLUA_WANTLIB} EGL GL SDL2 X11 X11-xcb Xau Xdamage Xdmcp Xext
+WANTLIB += Xfixes Xinerama Xrandr Xrender Xss Xv Xxf86vm ass avcodec avdevice
+WANTLIB += avfilter avformat avutil bluray c cdio cdio_cdda cdio_paranoia
+WANTLIB += drm dvdnav dvdread expat fontconfig freetype fribidi gbm iconv
+WANTLIB += jpeg lcms2 m postproc pthread sndio swresample swscale xcb
+WANTLIB += xcb-dri2 xcb-glx z

MODULES = lang/lua \
lang/python
@@ -58,16 +55,16 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
--mandir=${LOCALBASE}/man \
--docdir=${LOCALBASE}/share/examples/mpv \
--zshdir=${LOCALBASE}/share/zsh/vendor-completions \
- --enable-encoding \
--enable-sndio \
--enable-sdl2 \
--enable-zsh-comp \
--disable-alsa \
--disable-caca \
- --disable-enca \
+ --enable-cdda \
+ --enable-dvdnav \
+ --enable-dvdread \
--disable-jack \
--disable-libarchive \
- --disable-libguess \
--disable-rubberband \
--disable-oss-audio \
--disable-openal \
@@ -78,15 +75,12 @@ CONFIGURE_ARGS = --confloaddir=${SYSCONF
--disable-uchardet \
--disable-vaapi \
--disable-vaapi-glx \
- --disable-vaapi-hwaccel \
--disable-vaapi-x-egl \
--disable-vaapi-x11 \
--disable-vaapi-wayland \
--disable-vapoursynth \
--disable-vapoursynth-lazy \
--disable-vdpau \
- --disable-vdpau-hwaccel \
- --disable-videotoolbox-hwaccel \
--disable-videotoolbox-gl \
--disable-wayland

@@ -102,11 +96,21 @@ WRKBUILD = ${WRKSRC}/${MACHINE_ARCH}
CFLAGS += -march=i586
.endif

+# mpv segfaults on macppc when playing videos with the default gl backend
+# 0x0e7cc09c in gl_video_init (ra=Cannot access memory at address 0xc51e93bc
+# ) at ../video/out/gpu/video.c:3784
+.if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ARGS += --disable-gl
+.endif
+
DO_WAF = cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} \
${WAF} ${MAKE_FLAGS}

post-patch:
cp ${DISTDIR}/${WAF:T} ${WAF}
+
+DO_WAF = cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MODPY_BIN} ${WAF} ${MAKE_FLAGS}

do-configure:
${DO_WAF} configure ${CONFIGURE_ARGS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/mpv/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 25 Nov 2016 15:02:43 -0000 1.19
+++ distinfo 29 Nov 2018 13:21:34 -0000
@@ -1,4 +1,4 @@
-SHA256 (mpv-0.22.0.tar.gz) = wPmsjw43o5HRkAezM++Hh8L0XXWg1EAcAJjN5SxQgvY=
-SHA256 (waf-1.8.19) = LtVHGgjfJY+FV4dXYarWfoCy3IRkgtwRE1o1x3yRtLM=
-SIZE (mpv-0.22.0.tar.gz) = 2822645
-SIZE (waf-1.8.19) = 100743
+SHA256 (mpv-0.29.1.tar.gz) = +fnUYdGZD5coZgtMyw6MtdzinMqmr1Z77EgbeSkcpiM=
+SHA256 (waf-2.0.12) = CXnKh/RZKODXUgSasvQ76FUSSb5z3FVjuUTsVPiHHR8=
+SIZE (mpv-0.29.1.tar.gz) = 3059503
+SIZE (waf-2.0.12) = 103377
Index: patches/patch-waftools_detections_compiler_py
===================================================================
RCS file: /cvs/ports/multimedia/mpv/patches/patch-waftools_detections_compiler_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-waftools_detections_compiler_py
--- patches/patch-waftools_detections_compiler_py 10 Jul 2016 15:27:55 -0000 1.1
+++ patches/patch-waftools_detections_compiler_py 29 Nov 2018 13:21:34 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-waftools_detections_compiler_py,v 1.1 2016/07/10 15:27:55 czarkoff Exp $
---- waftools/detections/compiler.py.orig Fri Jul 8 14:14:10 2016
-+++ waftools/detections/compiler.py Fri Jul 8 14:14:33 2016
-@@ -41,9 +41,7 @@ def __add_generic_flags__(ctx):
+Index: waftools/detections/compiler.py
+--- waftools/detections/compiler.py.orig
++++ waftools/detections/compiler.py
+@@ -42,9 +42,7 @@ def __add_generic_flags__(ctx):
def __add_gcc_flags__(ctx):
ctx.env.CFLAGS += ["-Wall", "-Wundef", "-Wmissing-prototypes", "-Wshadow",
"-Wno-switch", "-Wparentheses", "-Wpointer-arith",