<!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>[147843] trunk/dports/multimedia/gpac</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/147843">147843</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-04-17 12:30:10 -0700 (Sun, 17 Apr 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>gpac: update to 0.6.1</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagpacPortfile">trunk/dports/multimedia/gpac/Portfile</a></li>
<li><a href="#trunkdportsmultimediagpacfilespatchconfigurediff">trunk/dports/multimedia/gpac/files/patch-configure.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagpacfilespatchMakefilediff">trunk/dports/multimedia/gpac/files/patch-Makefile.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediagpacPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gpac/Portfile (147842 => 147843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/Portfile        2016-04-17 18:55:35 UTC (rev 147842)
+++ trunk/dports/multimedia/gpac/Portfile        2016-04-17 19:30:10 UTC (rev 147843)
</span><span class="lines">@@ -2,10 +2,10 @@
</span><span class="cx"> # $Id$
</span><span class="cx"> 
</span><span class="cx"> PortSystem          1.0
</span><ins>+PortGroup           conflicts_build 1.0
</ins><span class="cx"> PortGroup           github 1.0
</span><span class="cx"> 
</span><del>-github.setup        gpac gpac 0.6.0 v
-revision            1
</del><ins>+github.setup        gpac gpac 0.6.1 v
</ins><span class="cx"> categories          multimedia
</span><span class="cx"> platforms           darwin
</span><span class="cx"> maintainers         nomaintainer
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> 
</span><span class="cx"> homepage            http://gpac.wp.mines-telecom.fr/
</span><span class="cx"> 
</span><del>-checksums           rmd160  b4ef2467f983dba561f7aa9d59ad59d50cd18208 \
-                    sha256  cd9c83e347a3f1323121ea68a816a26c9c7709f41ebf09e31b118a55692cfced
</del><ins>+checksums           rmd160  d0974957588167f2401fbe7e789fce1479558a4f \
+                    sha256  7e91530a925b7d2e1dbf02c767755b40669f6bdd413e6f60dbdcf0aaa76f6671
</ins><span class="cx"> 
</span><span class="cx"> depends_build       port:pkgconfig \
</span><span class="cx">                     port:zlib
</span><span class="lines">@@ -46,13 +46,15 @@
</span><span class="cx">                     port:mesa \
</span><span class="cx">                     port:xorg-libXv
</span><span class="cx"> 
</span><del>-patchfiles          patch-configure.diff \
-                    patch-Makefile.diff
</del><ins>+patchfiles          patch-configure.diff
</ins><span class="cx"> 
</span><span class="cx"> post-patch {
</span><span class="cx">     reinplace &quot;s|@APPLICATIONS_DIR@|${applications_dir}|g&quot; ${worksrcpath}/configure
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+# https://github.com/gpac/gpac/issues/432
+conflicts_build     ${name}
+
</ins><span class="cx"> # external spidermonkey (--use-js=no) is not recognized because it doesn't provide a pkg-config file and build fails with local copy
</span><span class="cx"> # pulseaudio is recognized if installed but build fails
</span><span class="cx"> # builds with openjpeg15 if include path is added, build fails using openjpeg 2.1
</span></span></pre></div>
<a id="trunkdportsmultimediagpacfilespatchMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/gpac/files/patch-Makefile.diff (147842 => 147843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/files/patch-Makefile.diff        2016-04-17 18:55:35 UTC (rev 147842)
+++ trunk/dports/multimedia/gpac/files/patch-Makefile.diff        2016-04-17 19:30:10 UTC (rev 147843)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-/bin/sh:  echo: command not found
---- Makefile.orig        2016-02-19 07:01:44.000000000 -0600
-+++ Makefile        2016-02-23 10:57:17.000000000 -0600
-@@ -15,7 +15,7 @@
- GITREV_PATH:=$(SRC_PATH)/include/gpac/revision.h
- TAG:=$(shell git --git-dir=$(SRC_PATH)/.git describe --tags --abbrev=0 2&gt; /dev/null)
- VERSION:=$(shell echo `git --git-dir=$(SRC_PATH)/.git describe --tags --long  || echo &quot;UNKNOWN&quot;` | sed &quot;s/^$(TAG)-//&quot;)
--BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2&gt; /dev/null || echo &quot;UNKNOWN&quot;)
-+BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2&gt; /dev/null || echo &quot;UNKNOWN&quot;)

- version:
-         @if [ -d $(SRC_PATH)/&quot;.git&quot; ]; then \
</del></span></pre></div>
<a id="trunkdportsmultimediagpacfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/gpac/files/patch-configure.diff (147842 => 147843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/files/patch-configure.diff        2016-04-17 18:55:35 UTC (rev 147842)
+++ trunk/dports/multimedia/gpac/files/patch-configure.diff        2016-04-17 19:30:10 UTC (rev 147843)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.orig        2016-02-19 07:01:44.000000000 -0600
-+++ configure        2016-02-23 10:40:59.000000000 -0600
-@@ -546,17 +546,7 @@
</del><ins>+--- configure.orig        2016-03-04 10:03:40.000000000 -0600
++++ configure        2016-04-17 14:20:52.000000000 -0500
+@@ -546,16 +546,7 @@
</ins><span class="cx">          xul_flags=-DXP_MAC
</span><span class="cx">          CFLAGS_DIR=&quot;-I$prefix/include&quot;
</span><span class="cx">          LDFLAGS=&quot;-L$prefix/lib&quot;
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> -            CFLAGS_DIR=&quot;-I/opt/local/include $CFLAGS_DIR&quot;
</span><span class="cx"> -            LDFLAGS=&quot;-L/opt/local/lib $LDFLAGS&quot;
</span><span class="cx"> -        fi
</span><del>--        cc=&quot;cc&quot;
</del><span class="cx"> -        Mac_Applications=&quot;/Applications&quot;
</span><span class="cx"> +        Mac_Applications=&quot;@APPLICATIONS_DIR@&quot;
</span><span class="cx">          SHFLAGS=&quot;-dynamiclib&quot;
</span></span></pre>
</div>
</div>

</body>
</html>