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 -0000 1.43
> +++ Makefile 17 Nov 2018 23:35:01 -0000
> @@ -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 <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,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 ${DISTDIR}/${WAF:T} ${WAF}
>
> +DO_WAF = cd ${WRKSRC} && \
> + ${SETENV} ${MAKE_ENV} ${MODPY_BIN} ${WAF} ${MAKE_FLAGS}
> +
> do-configure:
> - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} ${WAF} \
> - ${MAKE_FLAGS} configure ${CONFIGURE_ARGS}
> + ${DO_WAF} configure ${CONFIGURE_ARGS}
>
> do-build:
> - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} ${WAF} \
> - ${MAKE_FLAGS} build -v
> + ${DO_WAF} build -v
>
> do-install:
> - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} ${WAF} \
> - ${MAKE_FLAGS} install
> + ${DO_WAF} install
> ${INSTALL_DATA} ${WRKDIST}/TOOLS/mpv_identify.sh \
> - ${WRKDIST}/TOOLS/umpv \
> - ${PREFIX}/share/examples/mpv
> + ${WRKDIST}/TOOLS/umpv ${PREFIX}/share/examples/mpv
> ${MODPY_BIN_ADJ} ${PREFIX}/share/examples/mpv/umpv
> sed -Ei 's,(/dev/dvd|/dev/cdrom),/dev/rcd0c,g' ${PREFIX}/man/man1/mpv.1
>
> 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 14 Nov 2018 00:53:42 -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 14 Nov 2018 00:56:01 -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",
>
Hi,
Running the updated ffmpeg and mpv for about a week now on and it works very
well on amd64.
CPU usage seems much lower too and I don't experience mpv not closing sometimes
either.
Thanks for the work on this port, it is much appreciated!
--
Kind regards,
Hiltjo
No comments:
Post a Comment