<!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>[145978] 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/145978">145978</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-02-23 09:08:08 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gpac: use the right compiler, even during the configure phase; do not look explicitly in /sw nor /opt/local; fix syntax error in Makefile; set the right applications dir (not that it's used); remove outdated comments</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediagpacPortfile">trunk/dports/multimedia/gpac/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/multimedia/gpac/files/</li>
<li><a href="#trunkdportsmultimediagpacfilespatchMakefilediff">trunk/dports/multimedia/gpac/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsmultimediagpacfilespatchconfigurediff">trunk/dports/multimedia/gpac/files/patch-configure.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 (145977 => 145978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/Portfile 2016-02-23 17:07:43 UTC (rev 145977)
+++ trunk/dports/multimedia/gpac/Portfile 2016-02-23 17:08:08 UTC (rev 145978)
</span><span class="lines">@@ -45,17 +45,19 @@
</span><span class="cx"> port:mesa \
</span><span class="cx"> port:xorg-libXv
</span><span class="cx">
</span><del>-# This project's build system misuses the prefix "cpp" to refer to the C++ compiler instead of the C preprocessor.
-# https://sourceforge.net/p/gpac/bugs/287/
-# Unfortunately setting cc and cpp doesn't actually do anything.
-# https://sourceforge.net/p/gpac/bugs/286/
</del><ins>+patchfiles patch-configure.diff \
+ patch-Makefile.diff
</ins><span class="cx">
</span><ins>+post-patch {
+ reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/configure
+}
+
</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 class="cx">
</span><span class="cx"> configure.args --cc="${configure.cc}" \
</span><del>- --cpp="${configure.cxx}" \
</del><ins>+ --cxx="${configure.cxx}" \
</ins><span class="cx"> --extra-cflags="-I${prefix}/include/openjpeg-1.5 ${configure.cc_archflags}" \
</span><span class="cx"> --extra-ldflags="${configure.ld_archflags}" \
</span><span class="cx"> --mandir=${prefix}/share/man \
</span><span class="lines">@@ -63,10 +65,6 @@
</span><span class="cx"> --disable-pulseaudio \
</span><span class="cx"> --use-js=no
</span><span class="cx">
</span><del>-# use the RightCompiler
-
-build.args-append CC="${configure.cc}"
-
</del><span class="cx"> # This project's build system detects CPU and endianness at configure time.
</span><span class="cx"> # muniversal is worth a try.
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportsmultimediagpacfilespatchMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/gpac/files/patch-Makefile.diff (0 => 145978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/multimedia/gpac/files/patch-Makefile.diff 2016-02-23 17:08:08 UTC (rev 145978)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+/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> /dev/null)
+ VERSION:=$(shell echo `git --git-dir=$(SRC_PATH)/.git describe --tags --long || echo "UNKNOWN"` | sed "s/^$(TAG)-//")
+-BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
++BRANCH:=$(shell git --git-dir=$(SRC_PATH)/.git rev-parse --abbrev-ref HEAD 2> /dev/null || echo "UNKNOWN")
+
+ version:
+ @if [ -d $(SRC_PATH)/".git" ]; then \
</ins></span></pre></div>
<a id="trunkdportsmultimediagpacfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/gpac/files/patch-configure.diff (0 => 145978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/gpac/files/patch-configure.diff (rev 0)
+++ trunk/dports/multimedia/gpac/files/patch-configure.diff 2016-02-23 17:08:08 UTC (rev 145978)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+--- configure.orig 2016-02-19 07:01:44.000000000 -0600
++++ configure 2016-02-23 10:40:59.000000000 -0600
+@@ -546,17 +546,7 @@
+ xul_flags=-DXP_MAC
+ CFLAGS_DIR="-I$prefix/include"
+ LDFLAGS="-L$prefix/lib"
+- if test -d /sw/bin ; then
+- alt_macosx_dir="/sw"
+- CFLAGS_DIR="-I/sw/include $CFLAGS_DIR"
+- LDFLAGS="-L/sw/lib $LDFLAGS"
+- elif test -d /opt/local/bin ; then
+- alt_macosx_dir="/opt/local"
+- CFLAGS_DIR="-I/opt/local/include $CFLAGS_DIR"
+- LDFLAGS="-L/opt/local/lib $LDFLAGS"
+- fi
+- cc="cc"
+- Mac_Applications="/Applications"
++ Mac_Applications="@APPLICATIONS_DIR@"
+ SHFLAGS="-dynamiclib"
+ DYN_LIB_SUFFIX=".dylib"
+ extralibs=""
</ins></span></pre>
</div>
</div>
</body>
</html>