From owner-svn-ports-head@freebsd.org Wed May 2 18:34:16 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A24E0FB12CD; Wed, 2 May 2018 18:34:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB997F581; Wed, 2 May 2018 18:34:16 +0000 (UTC) (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3215614B16; Wed, 2 May 2018 18:34:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w42IYGag008608; Wed, 2 May 2018 18:34:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42IYFio008606; Wed, 2 May 2018 18:34:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805021834.w42IYFio008606@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 May 2018 18:34:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468863 - in head/multimedia: zoneminder-h264/files zoneminder/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/multimedia: zoneminder-h264/files zoneminder/files X-SVN-Commit-Revision: 468863 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2018 18:34:16 -0000 Author: jbeich Date: Wed May 2 18:34:15 2018 New Revision: 468863 URL: https://svnweb.freebsd.org/changeset/ports/468863 Log: multimedia/zoneminder: AVFMT_RAWPICTURE is part of libavformat Modified: head/multimedia/zoneminder-h264/files/patch-ffmpeg4 (contents, props changed) head/multimedia/zoneminder/files/patch-ffmpeg4 (contents, props changed) Modified: head/multimedia/zoneminder-h264/files/patch-ffmpeg4 ============================================================================== --- head/multimedia/zoneminder-h264/files/patch-ffmpeg4 Wed May 2 18:30:13 2018 (r468862) +++ head/multimedia/zoneminder-h264/files/patch-ffmpeg4 Wed May 2 18:34:15 2018 (r468863) @@ -30,7 +30,7 @@ Partially based on https://github.com/ZoneMinder/zonem } video_outbuf = NULL; -+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0) ++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0) if ( !(of->flags & AVFMT_RAWPICTURE) ) +#endif { @@ -40,7 +40,7 @@ Partially based on https://github.com/ZoneMinder/zonem AVPacket *pkt = packet_buffers[packet_index]; av_init_packet( pkt ); int got_packet = 0; -+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0) ++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0) if ( of->flags & AVFMT_RAWPICTURE ) { #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2) @@ -108,7 +108,7 @@ Partially based on https://github.com/ZoneMinder/zonem /*opkt.flags |= AV_PKT_FLAG_KEY;*/ -+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0) ++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0) if (video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (fmt->flags & AVFMT_RAWPICTURE)) { /* store AVPicture in AVPacket, as expected by the output format */ avpicture_fill(&pict, opkt.data, video_st->codec->pix_fmt, video_st->codec->width, video_st->codec->height); Modified: head/multimedia/zoneminder/files/patch-ffmpeg4 ============================================================================== --- head/multimedia/zoneminder/files/patch-ffmpeg4 Wed May 2 18:30:13 2018 (r468862) +++ head/multimedia/zoneminder/files/patch-ffmpeg4 Wed May 2 18:34:15 2018 (r468863) @@ -30,7 +30,7 @@ Partially based on https://github.com/ZoneMinder/zonem } video_outbuf = NULL; -+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0) ++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0) if ( !(of->flags & AVFMT_RAWPICTURE) ) +#endif { @@ -40,7 +40,7 @@ Partially based on https://github.com/ZoneMinder/zonem AVPacket *pkt = packet_buffers[packet_index]; av_init_packet( pkt ); int got_packet = 0; -+#if !LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0) ++#if !LIBAVFORMAT_VERSION_CHECK(57, 0, 0, 0, 0) if ( of->flags & AVFMT_RAWPICTURE ) { #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)