<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[125495] trunk/dports/devel/libdlna</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/125495">125495</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-09-18 13:55:08 -0700 (Thu, 18 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>libdlna: update to version 0.2.4, remove outdated patches, patch for ffmpeg-2.4 compatibility.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibdlnaPortfile">trunk/dports/devel/libdlna/Portfile</a></li>
<li><a href="#trunkdportsdevellibdlnafilespatchMakefilediff">trunk/dports/devel/libdlna/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsdevellibdlnafilespatchsrcprofilescdiff">trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibdlnafilespatchconfigurediff">trunk/dports/devel/libdlna/files/patch-configure.diff</a></li>
<li><a href="#trunkdportsdevellibdlnafilespatchsrcav_mpeg4_part10cdiff">trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff</a></li>
<li><a href="#trunkdportsdevellibdlnafilespatchsrcav_mpeg4_part2cdiff">trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff</a></li>
<li><a href="#trunkdportsdevellibdlnafilespatchsrccontainerscdiff">trunk/dports/devel/libdlna/files/patch-src-containers.c.diff</a></li>
<li><a href="#trunkdportsdevellibdlnafilespatchsrcprofileshdiff">trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibdlnaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libdlna/Portfile (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/Portfile 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/Portfile 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libdlna
</span><del>-version 0.2.3
-revision 5
</del><ins>+version 0.2.4
</ins><span class="cx"> license LGPL-2.1
</span><span class="cx"> categories devel
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -20,14 +19,11 @@
</span><span class="cx"> homepage http://libdlna.geexbox.org/
</span><span class="cx"> master_sites ${homepage}releases
</span><span class="cx"> use_bzip2 yes
</span><del>-checksums md5 2c974f95b711e5fd07f78fc4ebfcca66
</del><span class="cx">
</span><del>-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 \
- patch-src-containers.c.diff \
</del><ins>+checksums rmd160 6083bdcb7b5bc048f5b81373ef452145ba913861 \
+ sha256 4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5
+
+patchfiles patch-src-profiles.c.diff \
</ins><span class="cx"> patch-src-upnp-dms.c.diff
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libdlna/files/patch-Makefile.diff (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-Makefile.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-Makefile.diff 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/Makefile 2008-03-16 10:04:39.000000000 -0400
-+++ src/Makefile.new 2008-03-16 10:05:37.000000000 -0400
-@@ -13,7 +13,7 @@
</del><ins>+--- src/Makefile.orig 2012-02-26 11:34:00.000000000 -0800
++++ src/Makefile 2014-09-17 06:28:58.000000000 -0700
+@@ -21,7 +21,7 @@
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> LIBNAME = libdlna
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> LIBNAME_STATIC = ${LIBNAME}.a
</span><span class="cx"> LIBNAME_VERSION = $(LIBNAME_SHARED).$(VERSION)
</span><span class="cx"> LIBNAME_MAJOR = $(LIBNAME_SHARED).$(shell echo $(VERSION) | cut -f1 -d.)
</span><del>-@@ -89,13 +89,12 @@
</del><ins>+@@ -97,8 +97,7 @@
</ins><span class="cx"> @echo "#############################################"
</span><span class="cx">
</span><span class="cx"> lib_shared: lib_shared_info_pre $(LOBJS) lib_shared_info_post
</span><span class="lines">@@ -19,6 +19,9 @@
</span><span class="cx"> $(LN) -sf $(LIBNAME_VERSION) $(LIBNAME_MAJOR)
</span><span class="cx"> $(LN) -sf $(LIBNAME_MAJOR) $(LIBNAME_SHARED)
</span><span class="cx">
</span><ins>+@@ -111,7 +110,7 @@
+ ( find -name '*.[chS]' -print ) | xargs ctags -a;
+
</ins><span class="cx"> clean:
</span><span class="cx"> - -$(RM) -f *.o *.lo *.a *.so*
</span><span class="cx"> + -$(RM) -f *.o *.lo *.a *.dylib*
</span></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libdlna/files/patch-configure.diff (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-configure.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-configure.diff 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>---- configure.orig 2007-11-26 12:47:43.000000000 -0800
-+++ configure 2009-03-15 14:18:03.000000000 -0700
-@@ -610,9 +610,9 @@
- fi
-
- echolog "Checking for libavformat ..."
--check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
-+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
- echolog "Checking for libavcodec ..."
--check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
-+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
-
- #################################################
- # version
-@@ -688,7 +688,7 @@
- fi
- append_config "EXTRALIBS=$extralibs"
-
--append_config "OPTFLAGS=$CFLAGS"
-+append_config "CFLAGS=$CFLAGS"
- append_config "LDFLAGS=$LDFLAGS"
- append_config "INSTALL=$INSTALL"
-
</del></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchsrcav_mpeg4_part10cdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part10.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/av_mpeg4_part10.c.orig 2009-03-15 14:51:45.000000000 -0700
-+++ src/av_mpeg4_part10.c 2009-03-15 14:52:45.000000000 -0700
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
-
- #include "dlna_internals.h"
- #include "profiles.h"
</del></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchsrcav_mpeg4_part2cdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-av_mpeg4_part2.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/av_mpeg4_part2.c.orig 2009-03-15 14:52:04.000000000 -0700
-+++ src/av_mpeg4_part2.c 2009-03-15 14:53:20.000000000 -0700
-@@ -26,7 +26,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
-
- #include "dlna_internals.h"
- #include "profiles.h"
</del></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchsrccontainerscdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libdlna/files/patch-src-containers.c.diff (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-src-containers.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-containers.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/containers.c.orig 2009-03-15 14:29:07.000000000 -0700
-+++ src/containers.c 2009-03-15 14:29:36.000000000 -0700
-@@ -4,7 +4,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
-
- #include "containers.h"
- #include "profiles.h"
</del></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchsrcprofilescdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-profiles.c.diff 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -1,45 +1,20 @@
</span><del>---- 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 @@
</del><ins>+--- src/profiles.c.orig 2014-09-17 10:09:56.000000000 -0700
++++ src/profiles.c 2014-09-17 10:11:37.000000000 -0700
+@@ -287,7 +287,7 @@
+ return NULL;
+ }
</ins><span class="cx">
</span><del>- for (i = 0; i < ctx->nb_streams; i++)
</del><ins>+- if (av_find_stream_info (ctx) < 0)
++ if (avformat_find_stream_info (ctx, NULL) < 0)
</ins><span class="cx"> {
</span><del>-+#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)
- {
</del><span class="cx"> if (dlna->verbosity)
</span><del>- fprintf (stderr, "can't open file: %s\n", filename);
-@@ -334,7 +344,7 @@
</del><ins>+ fprintf (stderr, "can't find stream info\n");
+@@ -334,7 +334,7 @@
</ins><span class="cx"> p = p->next;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - av_close_input_file (ctx);
</span><del>-+ avformat_close_input (ctx);
</del><ins>++ avformat_close_input (&ctx);
</ins><span class="cx"> free (codecs);
</span><span class="cx"> return profile;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchsrcprofileshdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff (125494 => 125495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff 2014-09-18 20:53:06 UTC (rev 125494)
+++ trunk/dports/devel/libdlna/files/patch-src-profiles.h.diff 2014-09-18 20:55:08 UTC (rev 125495)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- src/profiles.h.orig 2009-03-15 14:24:42.000000000 -0700
-+++ src/profiles.h 2009-03-15 14:25:50.000000000 -0700
-@@ -22,8 +22,8 @@
- #ifndef _PROFILES_H_
- #define _PROFILES_H_
-
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-
- #include "dlna_internals.h"
- #include "containers.h"
</del></span></pre>
</div>
</div>
</body>
</html>