Attachment 170112 Details for Bug 209375 – Patch to update multimedia/ffmpeg2theora to 0.30

[patch] Patch to update multimedia/ffmpeg2theora to 0.30

ffmpeg2theora.diff (text/plain), 8.51 KB, created by Ben Woods on 2016-05-08 10:27:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2016-05-08 10:27:13 UTC

Size: 8.51 KB

patch

obsolete

>Index: multimedia/ffmpeg2theora/Makefile
>===================================================================
>--- multimedia/ffmpeg2theora/Makefile	(revision 414437)
>+++ multimedia/ffmpeg2theora/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ffmpeg2theora
>-PORTVERSION=	0.29
>-PORTREVISION=	2
>+PORTVERSION=	0.30
> CATEGORIES=	multimedia
> MASTER_SITES=	http://v2v.cc/~j/ffmpeg2theora/downloads/
> 
>Index: multimedia/ffmpeg2theora/distinfo
>===================================================================
>--- multimedia/ffmpeg2theora/distinfo	(revision 414437)
>+++ multimedia/ffmpeg2theora/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ffmpeg2theora-0.29.tar.bz2) = 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d
>-SIZE (ffmpeg2theora-0.29.tar.bz2) = 90143
>+SHA256 (ffmpeg2theora-0.30.tar.bz2) = 4f6464b444acab5d778e0a3359d836e0867a3dcec4ad8f1cdcf87cb711ccc6df
>+SIZE (ffmpeg2theora-0.30.tar.bz2) = 91269
>Index: multimedia/ffmpeg2theora/files/patch-SConstruct
>===================================================================
>--- multimedia/ffmpeg2theora/files/patch-SConstruct	(revision 414437)
>+++ multimedia/ffmpeg2theora/files/patch-SConstruct	(working copy)
>@@ -1,6 +1,6 @@
>---- SConstruct.orig	2012-06-25 17:15:16 UTC
>+--- SConstruct.orig	2016-01-10 04:35:56 UTC
> +++ SConstruct
>-@@ -37,7 +37,7 @@ opts.AddVariables(
>+@@ -38,7 +38,7 @@ opts.AddVariables(
>    BoolVariable('libkate', 'enable libkate support', 1),
>    BoolVariable('crossmingw', 'Set to 1 for crosscompile with mingw', 0)
>  )
>@@ -9,7 +9,7 @@
>  Help(opts.GenerateHelpText(env))
>  
>  pkg_flags="--cflags --libs"
>-@@ -151,7 +151,6 @@ if not env.GetOption('clean'):
>+@@ -152,7 +152,6 @@ if not env.GetOption('clean'):
>        "libavcodec >= 52.30.0",
>        "libpostproc",
>        "libswscale",
>@@ -17,7 +17,7 @@
>        "libavutil",
>    ]
>    if os.path.exists("./ffmpeg"):
>-@@ -200,9 +199,8 @@ if not env.GetOption('clean'):
>+@@ -214,9 +213,8 @@ if not env.GetOption('clean'):
>        env.Append(CCFLAGS=[
>          '-DHAVE_ICONV'
>        ])
>Index: multimedia/ffmpeg2theora/files/patch-ffmpeg2
>===================================================================
>--- multimedia/ffmpeg2theora/files/patch-ffmpeg2	(revision 414437)
>+++ multimedia/ffmpeg2theora/files/patch-ffmpeg2	(nonexistent)
>@@ -1,40 +0,0 @@
>-commit d3435a6a83dc656379de9e6523ecf8d565da6ca6
>-Author: Jan Gerber <j@xiph.org>
>-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) {
>
>Property changes on: multimedia/ffmpeg2theora/files/patch-ffmpeg2
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: multimedia/ffmpeg2theora/files/patch-src-subtitles.c
>===================================================================
>--- multimedia/ffmpeg2theora/files/patch-src-subtitles.c	(revision 414437)
>+++ multimedia/ffmpeg2theora/files/patch-src-subtitles.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/subtitles.c.orig	2011-09-15 20:20:46 UTC
>-+++ src/subtitles.c
>-@@ -284,7 +284,7 @@ static char *convert_subtitle_to_utf8(co
>-       return NULL;
>-     }
>-     outptr=newtext;
>--    if (iconv(cd, &inptr, &insz, &outptr, &outsz) < 0) {
>-+    if (iconv(cd, &inptr, &insz, &outptr, &outsz) == (size_t)-1) {
>-       warn(frontend, NULL, 0, "Failed to convert text to UTF-8\n");
>-       free(newtext);
>-       newtext = NULL;
>
>Property changes on: multimedia/ffmpeg2theora/files/patch-src-subtitles.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c
>===================================================================
>--- multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c	(revision 414437)
>+++ multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c	(nonexistent)
>@@ -1,14 +0,0 @@
>---- src/ffmpeg2theora.c.orig	2012-01-29 17:00:19.000000000 +0900
>-+++ src/ffmpeg2theora.c	2012-07-04 01:49:09.000000000 +0900
>-@@ -2970,7 +2970,11 @@
>-                 fprintf(stderr,"\nUnable to decode input.\n");
>-             return(1);
>-         }
>-+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,17,0)
>-+        av_close_input_file(convert->context);
>-+#else
>-         avformat_close_input(&convert->context);
>-+#endif
>-     }
>-     else{
>-         if (info.frontend)
>
>Property changes on: multimedia/ffmpeg2theora/files/patch-src__ffmpeg2theora.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c
>===================================================================
>--- multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c	(nonexistent)
>+++ multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/ffmpeg2theora.c.orig	2016-01-10 04:35:56 UTC
>++++ src/ffmpeg2theora.c
>+@@ -3103,7 +3103,11 @@ int main(int argc, char **argv) {
>+                 fprintf(stderr,"\nUnable to decode input.\n");
>+             return(1);
>+         }
>++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53,17,0)
>++        av_close_input_file(convert->context);
>++#else
>+         avformat_close_input(&convert->context);
>++#endif
>+     }
>+     else{
>+         if (info.frontend)
>
>Property changes on: multimedia/ffmpeg2theora/files/patch-src_ffmpeg2theora.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/ffmpeg2theora/files/patch-src_subtitles.c
>===================================================================
>--- multimedia/ffmpeg2theora/files/patch-src_subtitles.c	(nonexistent)
>+++ multimedia/ffmpeg2theora/files/patch-src_subtitles.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/subtitles.c.orig	2016-01-10 04:35:56 UTC
>++++ src/subtitles.c
>+@@ -284,7 +284,7 @@ static char *convert_subtitle_to_utf8(co
>+       return NULL;
>+     }
>+     outptr=newtext;
>+-    if (iconv(cd, &inptr, &insz, &outptr, &outsz) < 0) {
>++    if (iconv(cd, &inptr, &insz, &outptr, &outsz) == (size_t)-1) {
>+       warn(frontend, NULL, 0, "Failed to convert text to UTF-8\n");
>+       free(newtext);
>+       newtext = NULL;
>
>Property changes on: multimedia/ffmpeg2theora/files/patch-src_subtitles.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

woodsb02: maintainer-approval? (wg)

Actions: View | Diff

Attachments on bug 209375: 170112 | 170113 | 170117