From owner-svn-ports-all@FreeBSD.ORG Mon Oct 28 14:37:34 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4A65FFEE; Mon, 28 Oct 2013 14:37:34 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 276B023B4; Mon, 28 Oct 2013 14:37:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SEbYEJ092342; Mon, 28 Oct 2013 14:37:34 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SEbXZM092340; Mon, 28 Oct 2013 14:37:33 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310281437.r9SEbXZM092340@svn.freebsd.org> From: William Grzybowski Date: Mon, 28 Oct 2013 14:37:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331860 - in head/multimedia/ffmpeg2theora: . 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.14 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: Mon, 28 Oct 2013 14:37:34 -0000 Author: wg Date: Mon Oct 28 14:37:33 2013 New Revision: 331860 URL: http://svnweb.freebsd.org/changeset/ports/331860 Log: multimedia/ffmpeg2theora: fix build with newer ffmpeg - Add patch to build with ffmpeg 2.0 - Remove useless PTHREAD_CFLAGS from CFLAGS - Take maintainership Reported by: marino Added: head/multimedia/ffmpeg2theora/files/patch-ffmpeg2 (contents, props changed) Modified: head/multimedia/ffmpeg2theora/Makefile Modified: head/multimedia/ffmpeg2theora/Makefile ============================================================================== --- head/multimedia/ffmpeg2theora/Makefile Mon Oct 28 14:20:17 2013 (r331859) +++ head/multimedia/ffmpeg2theora/Makefile Mon Oct 28 14:37:33 2013 (r331860) @@ -6,7 +6,7 @@ PORTVERSION= 0.29 CATEGORIES= multimedia MASTER_SITES= http://v2v.cc/~j/ffmpeg2theora/downloads/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= wg@FreeBSD.org COMMENT= Reencode many media file formats to Ogg Theora LICENSE= GPLv3 @@ -19,7 +19,7 @@ USE_BZIP2= yes USES= iconv pkgconfig scons MAKE_ENV= APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_FILES= bin/ffmpeg2theora man/man1/ffmpeg2theora.1.gz Added: head/multimedia/ffmpeg2theora/files/patch-ffmpeg2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg2theora/files/patch-ffmpeg2 Mon Oct 28 14:37:33 2013 (r331860) @@ -0,0 +1,40 @@ +commit d3435a6a83dc656379de9e6523ecf8d565da6ca6 +Author: Jan Gerber +Date: Sun May 26 15:25:42 2013 +0200 + + don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE + +diff --git src/ffmpeg2theora.c.orig src/ffmpeg2theora.c +index cde63b9..8bebf28 100644 +--- src/ffmpeg2theora.c ++++ src/ffmpeg2theora.c +@@ -47,6 +47,9 @@ + #include "ffmpeg2theora.h" + #include "avinfo.h" + ++#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++ ++ + #define LENGTH(x) (sizeof(x) / sizeof(*x)) + + enum { +@@ -1069,8 +1072,8 @@ void ff2theora_output(ff2theora this) { + int first = 1; + int audio_eos = 0, video_eos = 0, audio_done = 0, video_done = 0; + int ret; +- int16_t *audio_buf=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE); +- int16_t *resampled=av_malloc(4*AVCODEC_MAX_AUDIO_FRAME_SIZE); ++ int16_t *audio_buf=av_malloc(4*MAX_AUDIO_FRAME_SIZE); ++ int16_t *resampled=av_malloc(4*MAX_AUDIO_FRAME_SIZE); + int16_t *audio_p=NULL; + int no_frames; + int no_samples; +@@ -1531,7 +1534,7 @@ void ff2theora_output(ff2theora this) { + while((audio_eos && !audio_done) || avpkt.size > 0 ) { + int samples=0; + int samples_out=0; +- int data_size = 4*AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ int data_size = 4*MAX_AUDIO_FRAME_SIZE; + int bytes_per_sample = av_get_bytes_per_sample(aenc->sample_fmt); + + if (avpkt.size > 0) {