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 --- Makefile25 Nov 2018 10:09:25 - 1.44 +++ Makefile29 Nov 2018 13:21:34 - @@ -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 -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 \ -
Re: update mpv to 0.29.1
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. About macppc runtime: Audio is ok, but when playing videos with the default gl video output, it segfaults, here is a backtrace: --- (gdb) run Starting program: /usr/local/bin/mpv /tmp/test.mp4 Playing: /tmp/test.mp4 (+) Video --vid=1 (*) (h264 640x480 29.970fps) (+) Audio --aid=1 (*) (aac 2ch 44100Hz) Program received signal SIGSEGV, Segmentation fault. [Switching to thread 428485] 0x0e7cc09c in gl_video_init (ra=Cannot access memory at address 0xc51e93bc ) at ../video/out/gpu/video.c:3784 3784{ (gdb) bt full #0 0x0e7cc09c in gl_video_init (ra=Cannot access memory at address #0xc51e93bc ) at ../video/out/gpu/video.c:3784 p = (struct gl_video *) 0xe010101 opts = (struct gl_video_opts *) 0x1 #1 0x0e7e2670 in preinit (vo=0xb6f7e720) at ../video/out/vo_gpu.c:286 p = (struct gpu_priv *) 0xbe9bd0a0 alpha_mode = 3 opts = {allow_sw = 0, want_alpha = 0, debug = 0, probing = false, swapchain_depth = 3} __func__ = "preinit" #2 0xa17d9ab0 in _rthread_start (v=Variable "v" is not available. ) at /usr/src/lib/librthread/rthread.c:96 No locals. #3 0xa17d9ab0 in _rthread_start (v=Variable "v" is not available. ) at /usr/src/lib/librthread/rthread.c:96 No locals. Previous frame inner to this frame (corrupt stack?) --- Using '-vo sdl' allows OpenGL accelerated display, but has no fullscreen support (scaling is wrong). Some OpenGL infos: --- machdep.allowaperture=1 Extended renderer info (GLX_MESA_query_renderer): Max GLES1 profile version: 1.1 Max GLES[23] profile version: 2.0 OpenGL vendor string: X.Org R300 Project OpenGL renderer string: ATI RV350 OpenGL version string: 2.1 Mesa 17.3.9 OpenGL shading language version string: 1.20 OpenGL ES profile version string: OpenGL ES 2.0 Mesa 17.3.9 OpenGL ES profile shading language version string: OpenGL ES GLSL ES 1.0.16 --- Mplayer runs fine with its own gl backend, and all stuff using OpenGL i've installed work properly on this box. I've totally no idea on how to fix it, but i think we can't let mpv's default invocation generates a segfault, so the diff disables '-vo gl' support only for macpcc, implicitly using the old and working Xv video output by default instead. Charlène. Index: Makefile === RCS file: /cvs/ports/multimedia/mpv/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- Makefile25 Nov 2018 10:09:25 - 1.44 +++ Makefile28 Nov 2018 11:06:43 - @@ -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 -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,11 @@ 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 expat fontconfig freetype fribidi gbm iconv jpeg lcms2 m +WANTLIB += postproc pthread sndio swresample swscale xcb xcb-dri2 xcb-glx z MODULES = lang/lua \ lang/python @@ -39,7 +35,6 @@ BUILD_DEPENDS = audio/ladspa \ LIB_DEPENDS = audio/libcdio \
Re: update mpv to 0.29.1
On Sun, Nov 18, 2018 at 12:40:54AM +0100, Klemens Nanni wrote: > Depending on the ffmpeg update, here's mpv. > > Works just fine on amd64 with various formats and codecs where > performance improvements are quite noticable. > > 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? > > Otherwise it's a simple version bump, switch to HTTPS, removal of > obsolete CONFIGURE_ARGS and simplifications for do-* targets. > > Index: Makefile > === > RCS file: /cvs/ports/multimedia/mpv/Makefile,v > retrieving revision 1.43 > diff -u -p -r1.43 Makefile > --- Makefile 13 Nov 2018 17:12:51 - 1.43 > +++ Makefile 17 Nov 2018 23:35:01 - > @@ -4,17 +4,16 @@ COMMENT = movie player based on MPlayer > > GH_ACCOUNT = mpv-player > GH_PROJECT = mpv > -GH_TAGNAME = v0.22.0 > -REVISION = 4 > +GH_TAGNAME = v0.29.1 > > CATEGORIES = multimedia x11 > > -HOMEPAGE = http://mpv.io/ > +HOMEPAGE = https://mpv.io/ > > MAINTAINER = Dmitrij D. Czarkoff > > -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,11 @@ 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 drm expat fontconfig freetype > +WANTLIB += fribidi gbm iconv jpeg lcms2 m postproc pthread sndio swresample > +WANTLIB += swscale xcb xcb-dri2 xcb-glx z > > MODULES =lang/lua \ > lang/python > @@ -37,17 +33,13 @@ MODULES = lang/lua \ > BUILD_DEPENDS = audio/ladspa \ > textproc/py-docutils > > -LIB_DEPENDS =audio/libcdio \ > - converters/libiconv \ > - devel/libdvdread \ > +LIB_DEPENDS =converters/libiconv \ > devel/sdl2 \ > graphics/ffmpeg>=20151112 \ > graphics/jpeg \ > graphics/lcms2 \ > multimedia/libass \ > - multimedia/libbluray>=0.8.0 \ > - multimedia/libdvdnav \ > - multimedia/libv4l > + multimedia/libbluray>=0.8.0 > > MODPY_RUNDEP = No > RUN_DEPENDS =devel/desktop-file-utils \ > @@ -58,16 +50,13 @@ 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 \ > --disable-jack \ > --disable-libarchive \ > - --disable-libguess \ > --disable-rubberband \ > --disable-oss-audio \ > --disable-openal \ > @@ -78,15 +67,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 \ > -
Re: update mpv to 0.29.1
Hi Klemens, * Klemens Nanni wrote: > Depending on the ffmpeg update, here's mpv. > > Works just fine on amd64 with various formats and codecs where > performance improvements are quite noticable. Thanks a lot for putting work into this update, very much appreciated! I tested both the ffmpeg and mpv update on -current amd64 with my usual workload, i.e. watching movies, youtube-dl, listening to mp3/opus and up to now it all works fine. Cheers Matthias
update mpv to 0.29.1
Depending on the ffmpeg update, here's mpv. Works just fine on amd64 with various formats and codecs where performance improvements are quite noticable. 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? Otherwise it's a simple version bump, switch to HTTPS, removal of obsolete CONFIGURE_ARGS and simplifications for do-* targets. Index: Makefile === RCS file: /cvs/ports/multimedia/mpv/Makefile,v retrieving revision 1.43 diff -u -p -r1.43 Makefile --- Makefile13 Nov 2018 17:12:51 - 1.43 +++ Makefile17 Nov 2018 23:35:01 - @@ -4,17 +4,16 @@ COMMENT = movie player based on MPlayer GH_ACCOUNT = mpv-player GH_PROJECT = mpv -GH_TAGNAME = v0.22.0 -REVISION = 4 +GH_TAGNAME = v0.29.1 CATEGORIES = multimedia x11 -HOMEPAGE = http://mpv.io/ +HOMEPAGE = https://mpv.io/ MAINTAINER = Dmitrij D. Czarkoff -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,11 @@ 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 drm expat fontconfig freetype +WANTLIB += fribidi gbm iconv jpeg lcms2 m postproc pthread sndio swresample +WANTLIB += swscale xcb xcb-dri2 xcb-glx z MODULES = lang/lua \ lang/python @@ -37,17 +33,13 @@ MODULES = lang/lua \ BUILD_DEPENDS =audio/ladspa \ textproc/py-docutils -LIB_DEPENDS = audio/libcdio \ - converters/libiconv \ - devel/libdvdread \ +LIB_DEPENDS = converters/libiconv \ devel/sdl2 \ graphics/ffmpeg>=20151112 \ graphics/jpeg \ graphics/lcms2 \ multimedia/libass \ - multimedia/libbluray>=0.8.0 \ - multimedia/libdvdnav \ - multimedia/libv4l + multimedia/libbluray>=0.8.0 MODPY_RUNDEP = No RUN_DEPENDS = devel/desktop-file-utils \ @@ -58,16 +50,13 @@ 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 \ --disable-jack \ --disable-libarchive \ - --disable-libguess \ --disable-rubberband \ --disable-oss-audio \ --disable-openal \ @@ -78,15 +67,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 @@ -105,20 +91,19 @@ CFLAGS += -march=i586 post-patch: cp