From 2d1a99cef5b3472e847755818c3883de65e56654 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Wed, 15 Jan 2014 12:07:20 +0000 Subject: [PATCH] - Update to 0.3.2 --- multimedia/mpv/Makefile | 96 +++++++++++-------- multimedia/mpv/distinfo | 6 +- multimedia/mpv/files/patch-configure | 34 ------- multimedia/mpv/files/patch-stream-tvi_v4l2.c | 25 ----- .../mpv/files/patch-waftools-checks-custom.py | 15 +++ multimedia/mpv/pkg-plist | 2 +- 6 files changed, 76 insertions(+), 102 deletions(-) delete mode 100644 multimedia/mpv/files/patch-configure delete mode 100644 multimedia/mpv/files/patch-stream-tvi_v4l2.c create mode 100644 multimedia/mpv/files/patch-waftools-checks-custom.py diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index c11432463db6..20c31b481e5c 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -2,47 +2,54 @@ # $FreeBSD$ PORTNAME= mpv -PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTVERSION= 0.3.2 PORTEPOCH= 1 CATEGORIES= multimedia audio +MASTER_SITES= GH:0 GHC:0 https://waf.googlecode.com/files/:1 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:0 waf-${WAF_VERSION}:1 +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= gblach@FreeBSD.org COMMENT= Free and open-source general-purpose video player LICENSE= GPLv2 -LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass \ +LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ + libass.so:${PORTSDIR}/multimedia/libass \ libdvdread.so:${PORTSDIR}/multimedia/libdvdread -BUILD_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \ - rst2man:${PORTSDIR}/textproc/py-docutils -RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg +BUILD_DEPENDS= rst2man:${PORTSDIR}/textproc/py-docutils USE_GITHUB= yes GH_ACCOUNT= mpv-player GH_TAGNAME= v${PORTVERSION} -GH_COMMIT= 93ce083 +GH_COMMIT= 6b20c24 -USES= desktop-file-utils gmake iconv pkgconfig -USE_LUA= 5.1 +WAF_VERSION= 1.7.14 + +USES= compiler:c11 desktop-file-utils gmake iconv pkgconfig +USE_PYTHON_BUILD= yes +USE_LUA= 5.1-5.2 USE_XORG= x11 xv xxf86vm -HAS_CONFIGURE= yes +INSTALLS_ICONS= yes + CONFIGURE_ARGS= --prefix=${PREFIX} \ - --mandir=${PREFIX}/man \ - --cc=${CC} \ - --disable-mng \ + --mandir=${MANPREFIX}/man \ + --disable-debug-build \ --disable-mpg123 \ --disable-alsa \ --disable-portaudio \ + --disable-libguess \ --disable-pdf -OPTIONS_DEFINE= BS2B DEBUG LADSPA LCMS2 LIRC +OPTIONS_DEFINE= BS2B ENCA LADSPA LCMS2 LIRC OPTIONS_GROUP= IN VO AO -OPTIONS_GROUP_IN= CDIO LIBBLURAY V4L QUVI SMB +OPTIONS_GROUP_IN= CDIO DVDNAV LIBBLURAY V4L QUVI OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU XINERAMA OPTIONS_GROUP_AO= JACK PULSEAUDIO BS2B_DESC= Enable Bauer Stereophonic-to-Binaural DSP support +DVDNAV_DESC= Enable DVD navigation menus support +ENCA_DESC= Enable encoding detection support QUVI_DESC= Enable flash media stream support IN_DESC= Input VO_DESC= Video Output @@ -56,11 +63,10 @@ LIB_DEPENDS+= libbs2b.so:${PORTSDIR}/audio/libbs2b CONFIGURE_ARGS+= --disable-libbs2b .endif -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --disable-optimization +.if ${PORT_OPTIONS:MENCA} +LIB_DEPENDS+= libenca.so:${PORTSDIR}/converters/enca .else -CONFIGURE_ARGS+= --enable-optimization="${CFLAGS}" \ - --disable-debug +CONFIGURE_ARGS+= --disable-enca .endif .if ${PORT_OPTIONS:MLADSPA} @@ -84,20 +90,25 @@ CONFIGURE_ARGS+= --disable-lirc .if ${PORT_OPTIONS:MCDIO} LIB_DEPENDS+= libcdio.so:${PORTSDIR}/sysutils/libcdio .else -CONFIGURE_ARGS+= --disable-libcdio +CONFIGURE_ARGS+= --disable-cdda +.endif + +.if ${PORT_OPTIONS:MDVDNAV} +LIB_DEPENDS+= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav +.else +CONFIGURE_ARGS+= --disable-dvdnav .endif .if ${PORT_OPTIONS:MLIBBLURAY} LIB_DEPENDS+= libbluray.so:${PORTSDIR}/multimedia/libbluray .else -CONFIGURE_ARGS+= --disable-bluray +CONFIGURE_ARGS+= --disable-libbluray .endif .if ${PORT_OPTIONS:MV4L} BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l CONFIGURE_ARGS+= --enable-tv-v4l2 -EXTRA_LIBS+= -lv4l2 .else CONFIGURE_ARGS+= --disable-tv-v4l2 .endif @@ -105,14 +116,14 @@ CONFIGURE_ARGS+= --disable-tv-v4l2 .if ${PORT_OPTIONS:MQUVI} LIB_DEPENDS+= libquvi.so:${PORTSDIR}/multimedia/libquvi .else -CONFIGURE_ARGS+= --disable-libquvi4 --disable-libquvi9 +CONFIGURE_ARGS+= --disable-libquvi .endif -.if ${PORT_OPTIONS:MSMB} -LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient -.else -CONFIGURE_ARGS+= --disable-smb -.endif +#.if ${PORT_OPTIONS:MSMB} +#LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient +#.else +CONFIGURE_ARGS+= --disable-libsmbclient +#.endif .if ${PORT_OPTIONS:MCACA} LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca @@ -157,24 +168,29 @@ LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+= --disable-pulse .endif -.if defined(EXTRA_LIBS) -CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}" -.endif +post-extract: + ${CP} ${DISTDIR}/waf-${WAF_VERSION} ${WRKSRC}/waf + @${CHMOD} +x ${WRKSRC}/waf post-patch: -.if ${OSVERSION} >= 900010 - @${REINPLACE_CMD} -e \ - '/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.endif @${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \ -e 's|/usr/local|${PREFIX}|g' +do-configure: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ + waf configure ${_MAKE_JOBS} ${CONFIGURE_ARGS} + +do-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ + waf build ${_MAKE_JOBS} + +do-install: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ + waf install --destdir=${STAGEDIR} + post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mpv + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/mpv ${INSTALL_DATA} ${WRKSRC}/etc/example.conf ${STAGEDIR}${PREFIX}/etc/mpv/mpv.conf.sample -.for conf in encoding-example-profiles input - ${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf ${STAGEDIR}${PREFIX}/etc/mpv/${conf}.conf.sample -.endfor + ${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${STAGEDIR}${PREFIX}/etc/mpv/input.conf.sample .include diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index a71a96af2a73..ae91792e285c 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,2 +1,4 @@ -SHA256 (mpv-0.2.1.tar.gz) = a1471b789d1ee613bb70536b84954d17f3ab764e9add624628cae982a5df5fe0 -SIZE (mpv-0.2.1.tar.gz) = 2475918 +SHA256 (mpv-0.3.2.tar.gz) = 3d91142ade5020e6da8174d0fffc7faeead1b5a8e56003e6c059a5ae4c6cc9f2 +SIZE (mpv-0.3.2.tar.gz) = 2514802 +SHA256 (waf-1.7.14) = 93b2783e8a9027d5a6f6f11aed784e506765707bdcbd7c39eaeb7f000b171fe7 +SIZE (waf-1.7.14) = 90755 diff --git a/multimedia/mpv/files/patch-configure b/multimedia/mpv/files/patch-configure deleted file mode 100644 index 542ea8ef3aee..000000000000 --- a/multimedia/mpv/files/patch-configure +++ /dev/null @@ -1,34 +0,0 @@ ---- configure.bak 2013-10-26 11:34:43.000000000 +0200 -+++ configure 2013-10-26 11:43:57.000000000 +0200 -@@ -1459,7 +1459,7 @@ - echocheck "terminfo" - if test "$_terminfo" = auto ; then - _terminfo=no -- for _ld_tmp in "-lncurses" "-lncursesw"; do -+ for _ld_tmp in "/usr/lib/libncurses.so" "-lncursesw"; do - statement_check term.h 'setupterm(0, 1, 0)' $_ld_tmp && - libs_mplayer="$libs_mplayer $_ld_tmp" && _terminfo=yes && break - done -@@ -1480,7 +1480,7 @@ - echocheck "termcap" - if test "$_termcap" = auto ; then - _termcap=no -- for _ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do -+ for _ld_tmp in "/usr/lib/libncurses.so" "-ltinfo" "-ltermcap"; do - statement_check term.h 'tgetent(0, 0)' $_ld_tmp && - libs_mplayer="$libs_mplayer $_ld_tmp" && _termcap=yes && break - done -@@ -3100,11 +3100,11 @@ - if test "$lua" = auto ; then - - lua=no --test_lua 51 "lua >= 5.1.0 lua < 5.2.0" -+test_lua 51 "lua-5.1 >= 5.1.0 lua-5.1 < 5.2.0" - test_lua 51deb "lua5.1 >= 5.1.0" # debian - test_lua luajit "luajit >= 2.0.0" - # assume all our dependencies (libquvi in particular) link with 5.1 --test_lua 52 "lua >= 5.2.0" -+test_lua 52 "lua-5.2 >= 5.2.0" - test_lua 52deb "lua5.2 >= 5.2.0" # debian - - fi diff --git a/multimedia/mpv/files/patch-stream-tvi_v4l2.c b/multimedia/mpv/files/patch-stream-tvi_v4l2.c deleted file mode 100644 index 489fd4323753..000000000000 --- a/multimedia/mpv/files/patch-stream-tvi_v4l2.c +++ /dev/null @@ -1,25 +0,0 @@ ---- stream/tvi_v4l2.c~ 2012-05-10 23:45:22.000000000 -0500 -+++ stream/tvi_v4l2.c 2012-05-11 00:08:34.930938536 -0500 -@@ -52,7 +52,6 @@ known issues: - #ifdef HAVE_SYS_VIDEOIO_H - #include - #else --#include - #include - #endif - #include "mp_msg.h" -@@ -62,6 +61,14 @@ known issues: - #include "tv.h" - #include "audio_in.h" - -+#include -+#define open v4l2_open -+#define close v4l2_close -+#define dup v4l2_dup -+#define ioctl v4l2_ioctl -+#define mmap v4l2_mmap -+#define munmap v4l2_munmap -+ - #define info tvi_info_v4l2 - static tvi_handle_t *tvi_init_v4l2(tv_param_t* tv_param); - /* information about this file */ diff --git a/multimedia/mpv/files/patch-waftools-checks-custom.py b/multimedia/mpv/files/patch-waftools-checks-custom.py new file mode 100644 index 000000000000..ae88c15e08ec --- /dev/null +++ b/multimedia/mpv/files/patch-waftools-checks-custom.py @@ -0,0 +1,15 @@ +--- waftools/checks/custom.py.orig ++++ waftools/checks/custom.py +@@ -52,10 +52,12 @@ def check_lua(ctx, dependency_identifier): + lua_versions = [ + ( '51', 'lua >= 5.1.0 lua < 5.2.0'), + ( '51deb', 'lua5.1 >= 5.1.0'), # debian ++ ( '51fbsd', 'lua-5.1 >= 5.1.0'), # FreeBSD + ( 'luajit', 'luajit >= 2.0.0' ), + # assume all our dependencies (libquvi in particular) link with 5.1 + ( '52', 'lua >= 5.2.0' ), + ( '52deb', 'lua5.2 >= 5.2.0'), # debian ++ ( '52fbsd', 'lua-5.2 >= 5.2.0'), # FreeBSD + ] + + if ctx.options.LUA_VER: diff --git a/multimedia/mpv/pkg-plist b/multimedia/mpv/pkg-plist index ff4d462f7103..b0fda449b150 100644 --- a/multimedia/mpv/pkg-plist +++ b/multimedia/mpv/pkg-plist @@ -1,5 +1,5 @@ bin/mpv -etc/mpv/encoding-example-profiles.conf.sample +etc/mpv/encoding-profiles.conf etc/mpv/input.conf.sample etc/mpv/mpv.conf.sample man/man1/mpv.1.gz