From owner-svn-ports-all@freebsd.org Sun Jun 26 21:41:10 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B816EB81B35; Sun, 26 Jun 2016 21:41:10 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B53328A8; Sun, 26 Jun 2016 21:41:10 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5QLf9E4077604; Sun, 26 Jun 2016 21:41:09 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5QLf9RE077592; Sun, 26 Jun 2016 21:41:09 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201606262141.u5QLf9RE077592@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Sun, 26 Jun 2016 21:41:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417619 - in head/multimedia/mpv: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jun 2016 21:41:10 -0000 Author: cpm Date: Sun Jun 26 21:41:08 2016 New Revision: 417619 URL: https://svnweb.freebsd.org/changeset/ports/417619 Log: - Update to 0.18.0 release - Update waf to 1.9.0pre3 release - Remove unneeded patches (applied upstream) - Fix CONFIGURE_ARGS adding/disabling certain features - Add patches to fix "-Wmissing-braces" warning, so the compiler is happy - Switch to USES=localbase framework - Bump library version in pkg-plist Changelog: https://github.com/mpv-player/mpv/releases/tag/v0.18.0 Reviewed by: junovitch (mentor) Approved by: junovitch (mentor) Differential Revision: D6965 Added: head/multimedia/mpv/files/patch-player_command.c (contents, props changed) head/multimedia/mpv/files/patch-video_out_opengl_hwdec__vaegl.c (contents, props changed) Deleted: head/multimedia/mpv/files/patch-audio_out_ao__lavc.c head/multimedia/mpv/files/patch-common_encode__lavc.c head/multimedia/mpv/files/patch-common_encode__lavc.h head/multimedia/mpv/files/patch-video_out_vo__lavc.c head/multimedia/mpv/files/patch-wscript Modified: head/multimedia/mpv/Makefile head/multimedia/mpv/distinfo head/multimedia/mpv/files/patch-video_out_opengl_video.c head/multimedia/mpv/pkg-plist Modified: head/multimedia/mpv/Makefile ============================================================================== --- head/multimedia/mpv/Makefile Sun Jun 26 20:43:14 2016 (r417618) +++ head/multimedia/mpv/Makefile Sun Jun 26 21:41:08 2016 (r417619) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= mpv -PORTVERSION= 0.17.0 +PORTVERSION= 0.18.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio @@ -20,23 +19,18 @@ BUILD_DEPENDS= rst2man:textproc/py-docut USE_GITHUB= yes GH_ACCOUNT= mpv-player waf-project:waf GH_PROJECT= waf:waf -GH_TAGNAME= waf-1.9.0pre1:waf +GH_TAGNAME= waf-1.9.0pre3:waf WAF_CMD= ${WRKSRC_waf}/waf-light -USES= compiler:c11 desktop-file-utils iconv pkgconfig python:build waf +USES= compiler:c11 desktop-file-utils iconv localbase pkgconfig python:build waf USE_LDCONFIG= yes -CPPFLAGS+= -I.. -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - CONFIGURE_ARGS= --docdir=${EXAMPLESDIR} \ --mandir=${MANPREFIX}/man \ --prefix=${PREFIX} \ --disable-debug-build \ - --disable-d3d11va-hwaccel \ - --disable-dxva2-hwaccel \ - --disable-gpl3 \ + --disable-d3d-hwaccel \ --disable-optimize \ --disable-pdf \ --disable-rubberband \ Modified: head/multimedia/mpv/distinfo ============================================================================== --- head/multimedia/mpv/distinfo Sun Jun 26 20:43:14 2016 (r417618) +++ head/multimedia/mpv/distinfo Sun Jun 26 21:41:08 2016 (r417619) @@ -1,4 +1,5 @@ -SHA256 (mpv-player-mpv-v0.17.0_GH0.tar.gz) = 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e -SIZE (mpv-player-mpv-v0.17.0_GH0.tar.gz) = 2882629 -SHA256 (waf-project-waf-waf-1.9.0pre1_GH0.tar.gz) = c4f971db873fedb93af163a4245a25ac80f76ebbf138acc257d8905c540d5da4 -SIZE (waf-project-waf-waf-1.9.0pre1_GH0.tar.gz) = 1394546 +TIMESTAMP = 1466848940 +SHA256 (mpv-player-mpv-v0.18.0_GH0.tar.gz) = b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b +SIZE (mpv-player-mpv-v0.18.0_GH0.tar.gz) = 2758960 +SHA256 (waf-project-waf-waf-1.9.0pre3_GH0.tar.gz) = f9adc2059fe6821b21d901ea3795b92610a59e2b2675d42b368388fe32e4d852 +SIZE (waf-project-waf-waf-1.9.0pre3_GH0.tar.gz) = 1396329 Added: head/multimedia/mpv/files/patch-player_command.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mpv/files/patch-player_command.c Sun Jun 26 21:41:08 2016 (r417619) @@ -0,0 +1,11 @@ +--- player/command.c.orig 2016-06-25 10:10:43 UTC ++++ player/command.c +@@ -2801,7 +2801,7 @@ static int mp_property_vo_performance(vo + return M_PROPERTY_OK; + } + +- struct voctrl_performance_data data = {0}; ++ struct voctrl_performance_data data = {{0}}; + if (vo_control(mpctx->video_out, VOCTRL_PERFORMANCE_DATA, &data) <= 0) + return M_PROPERTY_UNAVAILABLE; + Added: head/multimedia/mpv/files/patch-video_out_opengl_hwdec__vaegl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mpv/files/patch-video_out_opengl_hwdec__vaegl.c Sun Jun 26 21:41:08 2016 (r417619) @@ -0,0 +1,11 @@ +--- video/out/opengl/hwdec_vaegl.c.orig 2016-06-25 10:09:55 UTC ++++ video/out/opengl/hwdec_vaegl.c +@@ -367,7 +367,7 @@ static bool test_format(struct gl_hwdec + va_surface_init_subformat(surface); + struct mp_image_params params = surface->params; + if (reinit(hw, ¶ms) >= 0) { +- struct gl_hwdec_frame frame = {0}; ++ struct gl_hwdec_frame frame = {{{0}}}; + ok = map_frame(hw, surface, &frame) >= 0; + } + unmap_frame(hw); Modified: head/multimedia/mpv/files/patch-video_out_opengl_video.c ============================================================================== --- head/multimedia/mpv/files/patch-video_out_opengl_video.c Sun Jun 26 20:43:14 2016 (r417618) +++ head/multimedia/mpv/files/patch-video_out_opengl_video.c Sun Jun 26 21:41:08 2016 (r417619) @@ -1,6 +1,15 @@ ---- video/out/opengl/video.c.orig 2016-04-12 22:17:16 UTC +--- video/out/opengl/video.c.orig 2016-06-25 01:23:40 UTC +++ video/out/opengl/video.c -@@ -1003,7 +1003,7 @@ static void pass_prepare_src_tex(struct +@@ -881,7 +881,7 @@ static void uninit_video(struct gl_video + gl->DeleteTextures(1, &plane->gl_texture); + gl->DeleteBuffers(1, &plane->gl_buffer); + } +- *vimg = (struct video_image){0}; ++ *vimg = (struct video_image){{{0}}}; + + // Invalidate image_params to ensure that gl_video_config() will call + // init_video() on uninitialized gl_video. +@@ -933,7 +933,7 @@ static void pass_prepare_src_tex(struct static void render_pass_quad(struct gl_video *p, int vp_w, int vp_h, const struct mp_rect *dst) { @@ -9,3 +18,21 @@ struct gl_transform t; gl_transform_ortho(&t, 0, vp_w, 0, vp_h); +@@ -2931,7 +2931,7 @@ static bool map_image(struct gl_video *p + // This assumes nv12, with textures set to GL_NEAREST filtering. + static void reinterleave_vdpau(struct gl_video *p, struct gl_hwdec_frame *frame) + { +- struct gl_hwdec_frame res = {0}; ++ struct gl_hwdec_frame res = {{{0}}}; + for (int n = 0; n < 2; n++) { + struct fbotex *fbo = &p->vdpau_deinterleave_fbo[n]; + // This is an array of the 2 to-merge planes. +@@ -2989,7 +2989,7 @@ static bool gl_video_upload_image(struct + + if (p->hwdec_active) { + // Hardware decoding +- struct gl_hwdec_frame gl_frame = {0}; ++ struct gl_hwdec_frame gl_frame = {{{0}}}; + gl_timer_start(p->upload_timer); + bool ok = p->hwdec->driver->map_frame(p->hwdec, vimg->mpi, &gl_frame) >= 0; + gl_timer_stop(p->upload_timer); Modified: head/multimedia/mpv/pkg-plist ============================================================================== --- head/multimedia/mpv/pkg-plist Sun Jun 26 20:43:14 2016 (r417618) +++ head/multimedia/mpv/pkg-plist Sun Jun 26 21:41:08 2016 (r417619) @@ -5,7 +5,7 @@ include/mpv/opengl_cb.h include/mpv/qthelper.hpp lib/libmpv.so lib/libmpv.so.1 -lib/libmpv.so.1.20.0 +lib/libmpv.so.1.21.0 libdata/pkgconfig/mpv.pc man/man1/mpv.1.gz share/applications/mpv.desktop