[148142] trunk/dports/multimedia/xine-lib

[devans at macports.org]

Revision: 148142
          https://trac.macports.org/changeset/148142
Author:   devans at macports.org
Date:     2016-04-27 15:11:35 -0700 (Wed, 27 Apr 2016)
Log Message:
-----------
xine-lib: patch for ffmpeg-3.0 compatibility, increment revision (#51206).

Modified Paths:
--------------
    trunk/dports/multimedia/xine-lib/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff

Modified: trunk/dports/multimedia/xine-lib/Portfile
===================================================================
--- trunk/dports/multimedia/xine-lib/Portfile	2016-04-27 22:02:37 UTC (rev 148141)
+++ trunk/dports/multimedia/xine-lib/Portfile	2016-04-27 22:11:35 UTC (rev 148142)
@@ -4,7 +4,7 @@
 
 name		xine-lib
 version         1.2.6
-revision        1
+revision        2
 description	xine-lib is a free multimedia engine, released under the GPL.
 long_description        ${description}
 maintainers	ryandesign openmaintainer
@@ -45,7 +45,8 @@
             port:xorg-libXvMC \
             port:xorg-xcb-util
 
-patchfiles-append   patch-src-post-planar-eq2.c.diff
+patchfiles-append   patch-src-post-planar-eq2.c.diff \
+                    patch-ffmpeg-3.0.diff
 
 # bad register name `%rax'
 universal_variant   no

Added: trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff
===================================================================
--- trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff	                        (rev 0)
+++ trunk/dports/multimedia/xine-lib/files/patch-ffmpeg-3.0.diff	2016-04-27 22:11:35 UTC (rev 148142)
@@ -0,0 +1,42 @@
+diff -u src/combined/ffmpeg.orig/ff_audio_decoder.c src/combined/ffmpeg/ff_audio_decoder.c
+--- src/combined/ffmpeg.orig/ff_audio_decoder.c	2014-06-09 09:08:42.000000000 -0700
++++ src/combined/ffmpeg/ff_audio_decoder.c	2016-04-21 22:16:46.000000000 -0700
+@@ -590,7 +590,7 @@
+   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 @@
+   /* 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 @@
+ 
+   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);
+diff -u src/combined/ffmpeg.orig/ff_video_decoder.c src/combined/ffmpeg/ff_video_decoder.c
+--- src/combined/ffmpeg.orig/ff_video_decoder.c	2014-06-24 09:21:06.000000000 -0700
++++ src/combined/ffmpeg/ff_video_decoder.c	2016-04-21 22:14:45.000000000 -0700
+@@ -2523,7 +2523,7 @@
+   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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160427/5e5faede/attachment.html>