[arch-commits] Commit in renpy/trunk (PKGBUILD renpy-ffmpeg30.patch)

[Maxime Gauduin]

    Date: Tuesday, February 16, 2016 @ 18:48:18
  Author: alucryd
Revision: 161858

ffmpeg 3.0 rebuild: renpy 6.99.8-2

Added:
  renpy/trunk/renpy-ffmpeg30.patch
Modified:
  renpy/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    9 +++-
 renpy-ffmpeg30.patch |   94 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-16 17:08:03 UTC (rev 161857)
+++ PKGBUILD	2016-02-16 17:48:18 UTC (rev 161858)
@@ -7,7 +7,7 @@
 pkgbase=renpy
 pkgname=('renpy' 'renpy-demos')
 pkgver=6.99.8
-pkgrel=1
+pkgrel=2
 pkgdesc="The Ren'Py Visual Novel Engine"
 arch=('i686' 'x86_64')
 url='http://www.renpy.org'
@@ -17,15 +17,18 @@
 source=("http://www.renpy.org/dl/${pkgver}/renpy-${pkgver}-source.tar.bz2"
         'renpy'
         'renpy.desktop'
-        'renpy.png')
+        'renpy.png'
+        'renpy-ffmpeg30.patch')
 sha256sums=('0eb0c763bf7e977db06039c69751f1ed5e69c4b738f7f6d975e99e8729eff58e'
             'd12cccb8d5acbe28f6740d7efc58ceb78fb4f303a50724a43c47812d51897c6a'
             'fccde3461617a098a78d938d9db782d403eda410a84ab52825a597498ab95834'
-            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5')
+            '611edc07a40ccb8e04e8858847fc1d2a066d29c2ed54e5b357880a0605818dc5'
+            'c2d27a3f6b74f874a790ce6c12e9d4b718784478d8a8aa23c879d186f60a25ab')
 
 prepare() {
   cd renpy-${pkgver}-source
 
+  patch -Np1 -i ../renpy-ffmpeg30.patch
   sed 's/python/python2/' -i renpy.py launcher/game/tkaskdir.py
 }
 

Added: renpy-ffmpeg30.patch
===================================================================
--- renpy-ffmpeg30.patch	                        (rev 0)
+++ renpy-ffmpeg30.patch	2016-02-16 17:48:18 UTC (rev 161858)
@@ -0,0 +1,94 @@
+From 4aac7ca5a59960ec776e3c4cd74a30f269342502 Mon Sep 17 00:00:00 2001
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 27 Jan 2016 00:43:37 +0100
+Subject: [PATCH] ffmpeg
+
+---
+ module/ffdecode.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/module/ffdecode.c b/module/ffdecode.c
+index 71704cf..085000d 100644
+--- a/module/ffdecode.c
++++ b/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; i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
+         vp = &is->pictq[i];
+         if (vp->frame) {
+-            av_free(vp->frame);
++            av_frame_free(&vp->frame);
+         }
+     }
+