From owner-svn-ports-all@freebsd.org Fri Apr 15 16:46:26 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 2CD3DAEED58; Fri, 15 Apr 2016 16:46:26 +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 07C4F1CBA; Fri, 15 Apr 2016 16:46:25 +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 u3FGkPal002627; Fri, 15 Apr 2016 16:46:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FGkP9K002625; Fri, 15 Apr 2016 16:46:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201604151646.u3FGkP9K002625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 15 Apr 2016 16:46:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413354 - in head/multimedia/libxine: . 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.21 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: Fri, 15 Apr 2016 16:46:26 -0000 Author: jbeich Date: Fri Apr 15 16:46:24 2016 New Revision: 413354 URL: https://svnweb.freebsd.org/changeset/ports/413354 Log: multimedia/libxine: unbreak build with ffmpeg 3.0 ff_audio_decoder.c:593:22: error: implicit declaration of function 'avcodec_alloc_frame' is invalid in C99 [-Werror,-Wimplicit-function-declaration] this->av_frame = avcodec_alloc_frame (); ^ ff_audio_decoder.c:1074:5: error: implicit declaration of function 'avcodec_free_frame' is invalid in C99 [-Werror,-Wimplicit-function-declaration] avcodec_free_frame (&this->av_frame); ^ PR: 208817 Reported by: antoine (via exp-run) Submitted by: Ben Woods Obtained from: Arch Linux MFH: 2016Q2 (just-in-case "fix it" blanket) Added: head/multimedia/libxine/files/patch-ffmpeg3 (contents, props changed) Modified: head/multimedia/libxine/Makefile (contents, props changed) Modified: head/multimedia/libxine/Makefile ============================================================================== --- head/multimedia/libxine/Makefile Fri Apr 15 16:30:09 2016 (r413353) +++ head/multimedia/libxine/Makefile Fri Apr 15 16:46:24 2016 (r413354) @@ -3,7 +3,7 @@ PORTNAME= xine PORTVERSION= 1.2.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib Added: head/multimedia/libxine/files/patch-ffmpeg3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libxine/files/patch-ffmpeg3 Fri Apr 15 16:46:24 2016 (r413354) @@ -0,0 +1,57 @@ +Index: src/combined/ffmpeg/ff_audio_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c ++++ src/combined/ffmpeg/ff_audio_decoder.c +@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec + int got_frame; + float gain = this->class->gain; + if (!this->av_frame) +- this->av_frame = avcodec_alloc_frame (); ++ this->av_frame = av_frame_alloc (); + + consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); + if ((consumed >= 0) && got_frame) { +@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode + /* try to reset the wma decoder */ + if( this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco + + if( this->context && this->decoder_ok ) { + #if AVAUDIO > 3 +- avcodec_free_frame (&this->av_frame); ++ av_frame_free (&this->av_frame); + #endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); +Index: src/combined/ffmpeg/ff_video_decoder.c +=================================================================== +--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c ++++ src/combined/ffmpeg/ff_video_decoder.c +@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl + this->stream = stream; + this->class = (ff_video_class_t *) class_gen; + +- this->av_frame = avcodec_alloc_frame(); ++ this->av_frame = av_frame_alloc(); + this->context = avcodec_alloc_context(); + this->context->opaque = this; + #if AVPALETTE == 1 +Index: src/dxr3/ffmpeg_encoder.c +=================================================================== +--- src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000 ++++ src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000 +@@ -161,7 +161,7 @@ + "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n"); + return 0; + } +- this->picture = avcodec_alloc_frame(); ++ this->picture = av_frame_alloc(); + if (!this->picture) { + xprintf(drv->class->xine, XINE_VERBOSITY_LOG, + "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");