<!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>[127729] trunk/dports/multimedia/mplayer2</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/127729">127729</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-11-02 02:35:53 -0800 (Sun, 02 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mplayer2: fix build against new libdvdnav, closes #45387</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediamplayer2Portfile">trunk/dports/multimedia/mplayer2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediamplayer2filespatchstream_dvdnavdiff">trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediamplayer2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mplayer2/Portfile (127728 => 127729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mplayer2/Portfile 2014-11-02 10:06:15 UTC (rev 127728)
+++ trunk/dports/multimedia/mplayer2/Portfile 2014-11-02 10:35:53 UTC (rev 127729)
</span><span class="lines">@@ -65,7 +65,8 @@
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.diff \
</span><del>- patch-libmpdemux-demuxer.h.diff
</del><ins>+ patch-libmpdemux-demuxer.h.diff \
+ patch-stream_dvdnav.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|#!/usr/bin/env python3|#!$prefix/bin/python3.4|g" \
</span><span class="lines">@@ -178,7 +179,7 @@
</span><span class="cx"> --disable-static \
</span><span class="cx"> --extra-cflags=\"${configure.cppflags} ${configure.optflags} [get_canonical_archflags cc] -Wno-pointer-sign\" \
</span><span class="cx"> --extra-ldflags=\"${configure.ldflags} [get_canonical_archflags ld]\" \
</span><del>- --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lavresample -lswscale -lpostproc -ldv -lxvidcore -lm -ldvdnavmini -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl -llcms2 \"
</del><ins>+ --extra-libs=\"-liconv -lncurses -lpng -lz -lmng -lz -ljpeg -ldvdread -lfreetype -lfontconfig -lass -lfribidi -lenca -lz -lmad -lvorbis -logg -lspeex -ltheora -logg -la52 -ldca -lfaad -lavutil -lavcodec -lavformat -lavresample -lswscale -lpostproc -ldv -lxvidcore -lm -lpthread -lm -framework IOKit -framework Cocoa -framework OpenGL -framework QuartzCore -lSDLmain -lSDL -framework CoreAudio -framework AudioUnit -framework AudioToolbox -lintl -llcms2 \"
</ins><span class="cx">
</span><span class="cx"> # leave out libass, as configure doesn't handle it correctly
</span><span class="cx"> # --enable-libass \
</span></span></pre></div>
<a id="trunkdportsmultimediamplayer2filespatchstream_dvdnavdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff (0 => 127729)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff (rev 0)
+++ trunk/dports/multimedia/mplayer2/files/patch-stream_dvdnav.diff 2014-11-02 10:35:53 UTC (rev 127729)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+From 5ed3bfa479e5c121e8f82e2ab8fc67e81bead2e1 Mon Sep 17 00:00:00 2001
+From: sherpya <sherpya@netfarm.it>
+Date: Wed, 12 Mar 2014 03:11:42 +0100
+Subject: [PATCH 27/29] dvdnav: use dvdnav/read from videolan git
+
+see: https://github.com/sherpya/mplayer-be/blob/master/patches/mp/0027-dvdnav-use-dvdnav-read-from-videolan-git.patch
+
+---
+ configure | 4 ++--
+ stream/stream_dvdnav.c | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git configure configure
+index de443b1..5aeb761 100755
+--- configure
++++ configure
+@@ -8193,8 +8193,8 @@ if test "$_dvdnav" = yes ; then
+ cflags_libdvdnav="-Ilibdvdnav"
+ inputmodules="dvdnav(internal) $inputmodules"
+ else
+- extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
+- extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
++ extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnav)"
++ extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnav)"
+ inputmodules="dvdnav $inputmodules"
+ fi
+ else
+diff --git stream/stream_dvdnav.c stream/stream_dvdnav.c
+index dbf4226..c6b69e7 100644
+--- stream/stream_dvdnav.c
++++ stream/stream_dvdnav.c
+@@ -714,13 +714,13 @@ static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t l
+
+ format = dvdnav_audio_stream_format(priv->dvdnav, lg);
+ switch(format) {
+- case DVDNAV_FORMAT_AC3:
++ case DVD_AUDIO_FORMAT_AC3:
+ return index + 128;
+- case DVDNAV_FORMAT_DTS:
++ case DVD_AUDIO_FORMAT_DTS:
+ return index + 136;
+- case DVDNAV_FORMAT_LPCM:
++ case DVD_AUDIO_FORMAT_LPCM:
+ return index + 160;
+- case DVDNAV_FORMAT_MPEGAUDIO:
++ case DVD_AUDIO_FORMAT_MPEG2_EXT:
+ return index;
+ default:
+ return -1;
+--
+2.1.1
</ins></span></pre>
</div>
</div>
</body>
</html>