From owner-svn-ports-head@freebsd.org Sat Feb 27 19:51:12 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 6F2A3AB7378; Sat, 27 Feb 2016 19:51:12 +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 47341755; Sat, 27 Feb 2016 19:51:12 +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 u1RJpBUi012269; Sat, 27 Feb 2016 19:51:11 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1RJpBIg012267; Sat, 27 Feb 2016 19:51:11 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201602271951.u1RJpBIg012267@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 27 Feb 2016 19:51:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409682 - in head/devel/renpy: . 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.20 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: Sat, 27 Feb 2016 19:51:12 -0000 Author: jbeich Date: Sat Feb 27 19:51:10 2016 New Revision: 409682 URL: https://svnweb.freebsd.org/changeset/ports/409682 Log: devel/renpy: prepare for ffmpeg 3.0 update Obtained from: upstream Added: head/devel/renpy/files/ head/devel/renpy/files/patch-module_ffdecode.c (contents, props changed) Modified: head/devel/renpy/Makefile (contents, props changed) Modified: head/devel/renpy/Makefile ============================================================================== --- head/devel/renpy/Makefile Sat Feb 27 19:33:47 2016 (r409681) +++ head/devel/renpy/Makefile Sat Feb 27 19:51:10 2016 (r409682) @@ -3,6 +3,7 @@ PORTNAME= renpy PORTVERSION= 6.99.8 DISTVERSIONSUFFIX=-sdk +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ Added: head/devel/renpy/files/patch-module_ffdecode.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/renpy/files/patch-module_ffdecode.c Sat Feb 27 19:51:10 2016 (r409682) @@ -0,0 +1,86 @@ +Author: Markus Koschany +https://github.com/renpy/renpy/pull/829 + +--- module/ffdecode.c.orig 2015-03-21 15:29:24 UTC ++++ module/ffdecode.c +@@ -103,8 +103,8 @@ typedef struct VideoState { + compensation */ + + #ifndef HAS_RESAMPLE +- uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ; +- uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ; ++ uint8_t audio_buf1[(192000 * 3) / 2] __attribute__ ((aligned (16))) ; ++ uint8_t audio_buf2[(192000 * 3) / 2] __attribute__ ((aligned (16))) ; + #else + uint8_t *audio_buf1; + #endif +@@ -583,7 +583,7 @@ static int video_refresh(void *opaque) + + is->first_frame = 0; + +- av_free(vp->frame); ++ av_frame_free(&vp->frame); + vp->frame = NULL; + + /* update queue size and signal for next picture */ +@@ -635,13 +635,13 @@ static void alloc_picture(void *opaque, PyObject *pysurf) + + pixel = SDL_MapRGBA(surf->format, 1, 2, 3, 4); + if (bytes[0] == 4 && bytes[1] == 1) { +- vp->fmt = PIX_FMT_ARGB; ++ vp->fmt = AV_PIX_FMT_ARGB; + } else if (bytes[0] == 4 && bytes[1] == 3) { +- vp->fmt = PIX_FMT_ABGR; ++ vp->fmt = AV_PIX_FMT_ABGR; + } else if (bytes[0] == 1) { +- vp->fmt = PIX_FMT_RGBA; ++ vp->fmt = AV_PIX_FMT_RGBA; + } else { +- vp->fmt = PIX_FMT_BGRA; ++ vp->fmt = AV_PIX_FMT_BGRA; + } + + pixel = SDL_MapRGBA(surf->format, 0, 0, 0, 255); +@@ -764,7 +764,7 @@ static int video_thread(void *arg) + double pts; + + for(;;) { +- frame = avcodec_alloc_frame(); ++ frame = av_frame_alloc(); + + while (is->paused && !is->videoq.abort_request) { + SDL_Delay(2); +@@ -824,10 +824,10 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) + int resample_changed, audio_resample; + + if (!is->frame) { +- if (!(is->frame = avcodec_alloc_frame())) ++ if (!(is->frame = av_frame_alloc())) + return AVERROR(ENOMEM); + } else +- avcodec_get_frame_defaults(is->frame); ++ av_frame_unref(is->frame); + + if (flush_complete) + break; +@@ -1244,9 +1244,9 @@ static int stream_component_open(VideoState *is, int stream_index) + /* prepare audio output */ + if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { + if (enc->channels > 0) { +- enc->request_channels = FFMIN(2, enc->channels); ++ enc->request_channel_layout = av_get_default_channel_layout(FFMIN(2, enc->channels)); + } else { +- enc->request_channels = 2; ++ enc->request_channel_layout = av_get_default_channel_layout(2); + } + } + +@@ -1653,7 +1653,7 @@ void ffpy_stream_close(VideoState *is) + for(i=0; ipictq[i]; + if (vp->frame) { +- av_free(vp->frame); ++ av_frame_free(&vp->frame); + } + } +