[99286] trunk/dports/devel/libdlna

jeremyhu at macports.org jeremyhu at macports.org
Tue Oct 30 21:07:13 PDT 2012


Revision: 99286
          http://trac.macports.org//changeset/99286
Author:   jeremyhu at macports.org
Date:     2012-10-30 21:07:13 -0700 (Tue, 30 Oct 2012)
Log Message:
-----------
libdlna: Fix build with newer ffmpeg (#36830).

Modified Paths:
--------------
    trunk/dports/devel/libdlna/Portfile

Added Paths:
-----------
    trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff

Modified: trunk/dports/devel/libdlna/Portfile
===================================================================
--- trunk/dports/devel/libdlna/Portfile	2012-10-31 04:01:23 UTC (rev 99285)
+++ trunk/dports/devel/libdlna/Portfile	2012-10-31 04:07:13 UTC (rev 99286)
@@ -23,6 +23,7 @@
 checksums           md5 2c974f95b711e5fd07f78fc4ebfcca66
 
 patchfiles          patch-configure.diff \
+                    patch-src-profiles.c.diff \
                     patch-src-profiles.h.diff \
                     patch-src-av_mpeg4_part2.c.diff \
                     patch-src-av_mpeg4_part10.c.diff \

Added: trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff
===================================================================
--- trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff	                        (rev 0)
+++ trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff	2012-10-31 04:07:13 UTC (rev 99286)
@@ -0,0 +1,45 @@
+--- src/profiles.c.orig	2012-10-30 14:12:10.000000000 -0600
++++ src/profiles.c	2012-10-30 14:13:49.000000000 -0600
+@@ -204,14 +204,24 @@
+ 
+   for (i = 0; i < ctx->nb_streams; i++)
+   {
++#if LIBAVFORMAT_BUILD < 4621
+     if (audio_stream == -1 &&
+         ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++#else
++    if (audio_stream == -1 &&
++        ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
++#endif 
+     {
+       audio_stream = i;
+       continue;
+     }
++#if LIBAVFORMAT_BUILD < 4621
+     else if (video_stream == -1 &&
+              ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
++#else
++    else if (video_stream == -1 &&
++             ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
++#endif
+     {
+       video_stream = i;
+       continue;
+@@ -280,7 +290,7 @@
+   if (!dlna->inited)
+     dlna = dlna_init ();
+   
+-  if (av_open_input_file (&ctx, filename, NULL, 0, NULL) != 0)
++  if (avformat_open_input (&ctx, filename, NULL, NULL) != 0)
+   {
+     if (dlna->verbosity)
+       fprintf (stderr, "can't open file: %s\n", filename);
+@@ -334,7 +344,7 @@
+     p = p->next;
+   }
+ 
+-  av_close_input_file (ctx);
++  avformat_close_input (ctx);
+   free (codecs);
+   return profile;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121030/f58576fb/attachment-0001.html>


More information about the macports-changes mailing list