<!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>[145993] 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/145993">145993</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-02-23 15:07:39 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>libdlna: patch for ffmpeg 3.0 compatibility, no revision increment needed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibdlnaPortfile">trunk/dports/devel/libdlna/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibdlnafilespatchffmpeg30diff">trunk/dports/devel/libdlna/files/patch-ffmpeg-3.0.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 (145992 => 145993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/Portfile 2016-02-23 22:30:00 UTC (rev 145992)
+++ trunk/dports/devel/libdlna/Portfile 2016-02-23 23:07:39 UTC (rev 145993)
</span><span class="lines">@@ -24,7 +24,8 @@
</span><span class="cx"> sha256 4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5
</span><span class="cx">
</span><span class="cx"> patchfiles patch-src-profiles.c.diff \
</span><del>- patch-src-upnp-dms.c.diff
</del><ins>+ patch-src-upnp-dms.c.diff \
+ patch-ffmpeg-3.0.diff
</ins><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx"> patchfiles-append patch-Makefile.diff
</span></span></pre></div>
<a id="trunkdportsdevellibdlnafilespatchffmpeg30diff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libdlna/files/patch-ffmpeg-3.0.diff (0 => 145993)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libdlna/files/patch-ffmpeg-3.0.diff (rev 0)
+++ trunk/dports/devel/libdlna/files/patch-ffmpeg-3.0.diff 2016-02-23 23:07:39 UTC (rev 145993)
</span><span class="lines">@@ -0,0 +1,248 @@
</span><ins>+diff -ur src.orig/image_jpeg.c src/image_jpeg.c
+--- src.orig/image_jpeg.c 2016-02-23 14:34:43.000000000 -0800
++++ src/image_jpeg.c 2016-02-23 14:35:36.000000000 -0800
+@@ -92,10 +92,10 @@
+ return NULL;
+
+ /* check for JPEG compliant codec */
+- if (codecs->vc->codec_id != CODEC_ID_MJPEG &&
+- codecs->vc->codec_id != CODEC_ID_MJPEGB &&
+- codecs->vc->codec_id != CODEC_ID_LJPEG &&
+- codecs->vc->codec_id != CODEC_ID_JPEGLS)
++ if (codecs->vc->codec_id != AV_CODEC_ID_MJPEG &&
++ codecs->vc->codec_id != AV_CODEC_ID_MJPEGB &&
++ codecs->vc->codec_id != AV_CODEC_ID_LJPEG &&
++ codecs->vc->codec_id != AV_CODEC_ID_JPEGLS)
+ return NULL;
+
+ for (i = 0; jpeg_profiles_mapping[i].profile; i++)
+diff -ur src.orig/audio_amr.c src/audio_amr.c
+--- src.orig/audio_amr.c 2016-02-23 14:39:15.000000000 -0800
++++ src/audio_amr.c 2016-02-23 14:42:30.000000000 -0800
+@@ -53,7 +53,7 @@
+ if (!ac)
+ return 0;
+
+- if (ac->codec_id != CODEC_ID_AMR_NB)
++ if (ac->codec_id != AV_CODEC_ID_AMR_NB)
+ return 0;
+
+ /* only mono is supported */
+@@ -89,7 +89,7 @@
+ if (!ac)
+ return 0;
+
+- if (ac->codec_id != CODEC_ID_AMR_WB)
++ if (ac->codec_id != AV_CODEC_ID_AMR_WB)
+ return 0;
+
+ /* valid sampling rates: 8, 16, 24, 32 and 48 kHz */
+diff -ur src.orig/audio_atrac3.c src/audio_atrac3.c
+--- src.orig/audio_atrac3.c 2016-02-23 14:39:15.000000000 -0800
++++ src/audio_atrac3.c 2016-02-23 14:42:56.000000000 -0800
+@@ -39,7 +39,7 @@
+ return AUDIO_PROFILE_INVALID;
+
+ #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
+- if (ac->codec_id == CODEC_ID_ATRAC3)
++ if (ac->codec_id == AV_CODEC_ID_ATRAC3)
+ return AUDIO_PROFILE_ATRAC;
+ #endif
+
+diff -ur src.orig/audio_g726.c src/audio_g726.c
+--- src.orig/audio_g726.c 2016-02-23 14:39:15.000000000 -0800
++++ src/audio_g726.c 2016-02-23 14:43:19.000000000 -0800
+@@ -31,7 +31,7 @@
+ if (!ac)
+ return AUDIO_PROFILE_INVALID;
+
+- if (ac->codec_id != CODEC_ID_ADPCM_G726)
++ if (ac->codec_id != AV_CODEC_ID_ADPCM_G726)
+ return AUDIO_PROFILE_INVALID;
+
+ if (ac->channels != 1)
+diff -ur src.orig/audio_lpcm.c src/audio_lpcm.c
+--- src.orig/audio_lpcm.c 2016-02-23 14:39:15.000000000 -0800
++++ src/audio_lpcm.c 2016-02-23 14:43:56.000000000 -0800
+@@ -45,8 +45,8 @@
+ return AUDIO_PROFILE_INVALID;
+
+ /* check for 16-bit signed network-endian PCM codec */
+- if (ac->codec_id != CODEC_ID_PCM_S16BE &&
+- ac->codec_id != CODEC_ID_PCM_S16LE)
++ if (ac->codec_id != AV_CODEC_ID_PCM_S16BE &&
++ ac->codec_id != AV_CODEC_ID_PCM_S16LE)
+ return AUDIO_PROFILE_INVALID;
+
+ /* supported channels: mono or stereo */
+diff -ur src.orig/audio_mp2.c src/audio_mp2.c
+--- src.orig/audio_mp2.c 2016-02-23 14:39:15.000000000 -0800
++++ src/audio_mp2.c 2016-02-23 14:44:16.000000000 -0800
+@@ -31,7 +31,7 @@
+ if (!ac)
+ return AUDIO_PROFILE_INVALID;
+
+- if (ac->codec_id != CODEC_ID_MP2)
++ if (ac->codec_id != AV_CODEC_ID_MP2)
+ return AUDIO_PROFILE_INVALID;
+
+ if (ac->channels > 5)
+diff -ur src.orig/audio_mp3.c src/audio_mp3.c
+--- src.orig/audio_mp3.c 2016-02-23 14:39:15.000000000 -0800
++++ src/audio_mp3.c 2016-02-23 14:44:37.000000000 -0800
+@@ -47,7 +47,7 @@
+ return 0;
+
+ /* check for MP3 codec */
+- if (ac->codec_id != CODEC_ID_MP3)
++ if (ac->codec_id != AV_CODEC_ID_MP3)
+ return 0;
+
+ /* only mono and stereo are supported */
+diff -ur src.orig/audio_wma.c src/audio_wma.c
+--- src.orig/audio_wma.c 2016-02-23 14:39:15.000000000 -0800
++++ src/audio_wma.c 2016-02-23 14:45:02.000000000 -0800
+@@ -55,7 +55,7 @@
+ return ap;
+
+ /* check for WMA codec */
+- if (ac->codec_id != CODEC_ID_WMAV1 && ac->codec_id != CODEC_ID_WMAV2)
++ if (ac->codec_id != AV_CODEC_ID_WMAV1 && ac->codec_id != AV_CODEC_ID_WMAV2)
+ return ap;
+
+ if (ac->sample_rate <= 48000)
+diff -ur src.orig/av_mpeg1.c src/av_mpeg1.c
+--- src.orig/av_mpeg1.c 2016-02-23 14:39:15.000000000 -0800
++++ src/av_mpeg1.c 2016-02-23 14:45:32.000000000 -0800
+@@ -42,7 +42,7 @@
+ return NULL;
+
+ /* check for MPEG-1 video codec */
+- if (codecs->vc->codec_id != CODEC_ID_MPEG1VIDEO)
++ if (codecs->vc->codec_id != AV_CODEC_ID_MPEG1VIDEO)
+ return NULL;
+
+ /* video bitrate must be CBR at 1,151,929.1 bps */
+@@ -72,7 +72,7 @@
+ return NULL;
+
+ /* check for MPEG-1 Layer-2 audio codec */
+- if (codecs->ac->codec_id != CODEC_ID_MP2)
++ if (codecs->ac->codec_id != AV_CODEC_ID_MP2)
+ return NULL;
+
+ /* supported channels: stereo only */
+diff -ur src.orig/av_mpeg2.c src/av_mpeg2.c
+--- src.orig/av_mpeg2.c 2016-02-23 14:39:15.000000000 -0800
++++ src/av_mpeg2.c 2016-02-23 14:46:45.000000000 -0800
+@@ -453,7 +453,7 @@
+ int i;
+
+ /* check for MPEG-2 MP@LL profile */
+- if (codecs->ac->codec_id == CODEC_ID_AAC)
++ if (codecs->ac->codec_id == AV_CODEC_ID_AAC)
+ {
+ /* 352x288 only */
+ if (codecs->vc->width != 352 && codecs->vc->height != 288)
+@@ -535,7 +535,7 @@
+ if (ctx->bit_rate > 19392700)
+ return NULL;
+
+- if (codecs->ac->codec_id != CODEC_ID_AC3)
++ if (codecs->ac->codec_id != AV_CODEC_ID_AC3)
+ return NULL;
+
+ /* 48 KHz only */
+@@ -615,7 +615,7 @@
+ return NULL;
+
+ /* check for MPEG-2 video codec */
+- if (codecs->vc->codec_id != CODEC_ID_MPEG2VIDEO)
++ if (codecs->vc->codec_id != AV_CODEC_ID_MPEG2VIDEO)
+ return NULL;
+
+ switch (st)
+diff -ur src.orig/av_mpeg4_part10.c src/av_mpeg4_part10.c
+--- src.orig/av_mpeg4_part10.c 2016-02-23 14:39:15.000000000 -0800
++++ src/av_mpeg4_part10.c 2016-02-23 14:47:03.000000000 -0800
+@@ -1221,7 +1221,7 @@
+ return NULL;
+
+ /* check for H.264/AVC codec */
+- if (codecs->vc->codec_id != CODEC_ID_H264)
++ if (codecs->vc->codec_id != AV_CODEC_ID_H264)
+ return NULL;
+
+ /* check for a supported container */
+diff -ur src.orig/av_mpeg4_part2.c src/av_mpeg4_part2.c
+--- src.orig/av_mpeg4_part2.c 2016-02-23 14:39:15.000000000 -0800
++++ src/av_mpeg4_part2.c 2016-02-23 14:47:49.000000000 -0800
+@@ -42,13 +42,13 @@
+ int codec_id;
+ mpeg4_vcodec_type_t type;
+ } avf_vcodec_mapping[] = {
+- { CODEC_ID_H263, MPEG4_VCODEC_H263 },
+- { CODEC_ID_H263I, MPEG4_VCODEC_H263 },
+- { CODEC_ID_H263P, MPEG4_VCODEC_H263 },
+- { CODEC_ID_MPEG4, MPEG4_VCODEC_P2 },
+- { CODEC_ID_MSMPEG4V1, MPEG4_VCODEC_P2 },
+- { CODEC_ID_MSMPEG4V2, MPEG4_VCODEC_P2 },
+- { CODEC_ID_MSMPEG4V3, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_H263, MPEG4_VCODEC_H263 },
++ { AV_CODEC_ID_H263I, MPEG4_VCODEC_H263 },
++ { AV_CODEC_ID_H263P, MPEG4_VCODEC_H263 },
++ { AV_CODEC_ID_MPEG4, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_MSMPEG4V1, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_MSMPEG4V2, MPEG4_VCODEC_P2 },
++ { AV_CODEC_ID_MSMPEG4V3, MPEG4_VCODEC_P2 },
+ { -1, 0 }
+ };
+
+diff -ur src.orig/av_wmv9.c src/av_wmv9.c
+--- src.orig/av_wmv9.c 2016-02-23 14:39:15.000000000 -0800
++++ src/av_wmv9.c 2016-02-23 14:48:13.000000000 -0800
+@@ -245,7 +245,7 @@
+ return NULL;
+
+ /* check for WMV3 (Simple and Main profiles) video codec */
+- if (codecs->vc->codec_id != CODEC_ID_WMV3)
++ if (codecs->vc->codec_id != AV_CODEC_ID_WMV3)
+ return NULL;
+
+ /* get video profile */
+diff -ur src.orig/image_png.c src/image_png.c
+--- src.orig/image_png.c 2016-02-23 14:39:15.000000000 -0800
++++ src/image_png.c 2016-02-23 14:48:32.000000000 -0800
+@@ -76,7 +76,7 @@
+ return NULL;
+
+ /* check for PNG compliant codec */
+- if (codecs->vc->codec_id != CODEC_ID_PNG)
++ if (codecs->vc->codec_id != AV_CODEC_ID_PNG)
+ return NULL;
+
+ for (i = 0; png_profiles_mapping[i].profile; i++)
+diff -ur src.orig/audio_aac.c src/audio_aac.c
+--- src.orig/audio_aac.c 2016-02-23 14:52:38.000000000 -0800
++++ src/audio_aac.c 2016-02-23 14:53:06.000000000 -0800
+@@ -311,7 +311,7 @@
+ return AUDIO_PROFILE_INVALID;
+
+ /* check for AAC variants codec */
+- if (ac->codec_id != CODEC_ID_AAC)
++ if (ac->codec_id != AV_CODEC_ID_AAC)
+ return AUDIO_PROFILE_INVALID;
+
+ switch (type)
+diff -ur src.orig/audio_ac3.c src/audio_ac3.c
+--- src.orig/audio_ac3.c 2016-02-23 14:54:50.000000000 -0800
++++ src/audio_ac3.c 2016-02-23 14:55:32.000000000 -0800
+@@ -39,7 +39,7 @@
+ return AUDIO_PROFILE_INVALID;
+
+ /* check for AC3 codec */
+- if (ac->codec_id != CODEC_ID_AC3)
++ if (ac->codec_id != AV_CODEC_ID_AC3)
+ return AUDIO_PROFILE_INVALID;
+
+ /* supported channels: 1/0, 2/0, 3/0, 2/1, 3/1, 2/2, 3/2 */
</ins></span></pre>
</div>
</div>
</body>
</html>