From owner-svn-ports-head@freebsd.org Fri Nov 4 07:21:59 2016 Return-Path: Delivered-To: svn-ports-head@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 29AC2C2F9CB; Fri, 4 Nov 2016 07:21:59 +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 mx1.freebsd.org (Postfix) with ESMTPS id F3F8614AC; Fri, 4 Nov 2016 07:21:58 +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 uA47LwPP001614; Fri, 4 Nov 2016 07:21:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA47LwD3001612; Fri, 4 Nov 2016 07:21:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611040721.uA47LwD3001612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 4 Nov 2016 07:21:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425292 - in head/multimedia/2mandvd: . 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-head@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 04 Nov 2016 07:21:59 -0000 Author: jbeich Date: Fri Nov 4 07:21:57 2016 New Revision: 425292 URL: https://svnweb.freebsd.org/changeset/ports/425292 Log: multimedia/2mandvd: unbreak build with ffmpeg 3.x videowrapper.cpp:107:40: error: use of undeclared identifier 'PIX_FMT_RGB24'; did you mean 'AV_PIX_FMT_RGB24'? pCodecCtx->height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, ^~~~~~~~~~~~~ videowrapper.cpp:128:19: error: use of undeclared identifier 'avcodec_alloc_frame' pFrameRGB=avcodec_alloc_frame(); ^ PR: 207547 Modified: head/multimedia/2mandvd/Makefile (contents, props changed) head/multimedia/2mandvd/files/patch-videowrapper.cpp (contents, props changed) Modified: head/multimedia/2mandvd/Makefile ============================================================================== --- head/multimedia/2mandvd/Makefile Fri Nov 4 07:08:39 2016 (r425291) +++ head/multimedia/2mandvd/Makefile Fri Nov 4 07:21:57 2016 (r425292) @@ -3,7 +3,7 @@ PORTNAME= 2ManDVD PORTVERSION= 1.8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://download.tuxfamily.org/2mandvd/ Modified: head/multimedia/2mandvd/files/patch-videowrapper.cpp ============================================================================== --- head/multimedia/2mandvd/files/patch-videowrapper.cpp Fri Nov 4 07:08:39 2016 (r425291) +++ head/multimedia/2mandvd/files/patch-videowrapper.cpp Fri Nov 4 07:21:57 2016 (r425292) @@ -1,7 +1,6 @@ -diff -urN videowrapper.cpp videowrapper.cpp ---- videowrapper.cpp 2012-06-06 20:25:24.000000000 +1100 -+++ videowrapper.cpp 2013-08-03 10:54:05.426228163 +1100 -@@ -38,7 +38,7 @@ +--- videowrapper.cpp.orig 2013-07-30 11:46:19 UTC ++++ videowrapper.cpp +@@ -38,7 +38,7 @@ void videowrapper::delete_videowrapper() int videowrapper::load_video(QString filename) { // *** OUVERTURE DU FICHIER VIDEO *** @@ -10,7 +9,7 @@ diff -urN videowrapper.cpp videowrapper. if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0) { #else -@@ -91,7 +91,7 @@ +@@ -91,7 +91,7 @@ int videowrapper::load_video(QString fil // *** OUVERTURE DU CODEC *** @@ -19,3 +18,31 @@ diff -urN videowrapper.cpp videowrapper. if(avcodec_open(pCodecCtx, pCodec)<0) { #else +@@ -104,11 +104,11 @@ int videowrapper::load_video(QString fil + + img_convert_ctx = sws_getContext(pCodecCtx->width, + pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width, +- pCodecCtx->height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, ++ pCodecCtx->height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, + NULL, NULL); + + // *** ON DETERMINE LA TAILLE DU BUFFER *** +- numBytes=avpicture_get_size(PIX_FMT_RGB24, pCodecCtx->width, ++ numBytes=avpicture_get_size(AV_PIX_FMT_RGB24, pCodecCtx->width, + pCodecCtx->height); + buffer=(uint8_t *)av_malloc(numBytes*sizeof(uint8_t)); + old_frame = -1; +@@ -125,10 +125,10 @@ QImage videowrapper::read_frame(int64_t + if ( num_frame != old_frame ) + { + // *** ALLOCATE VIDEO FRAME *** +- pFrameRGB=avcodec_alloc_frame(); +- pFrame=avcodec_alloc_frame(); ++ pFrameRGB=av_frame_alloc(); ++ pFrame=av_frame_alloc(); + +- avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, ++ avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, + pCodecCtx->width, pCodecCtx->height); + av_seek_frame(pFormatCtx,videoStream,0, AVSEEK_FLAG_FRAME); + compte_frame = -1;