<!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>[134147] trunk/dports/multimedia/MP4Joiner</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/134147">134147</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-03-18 21:59:17 -0700 (Wed, 18 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>MP4Joiner: update to 2.2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaMP4JoinerPortfile">trunk/dports/multimedia/MP4Joiner/Portfile</a></li>
<li><a href="#trunkdportsmultimediaMP4JoinerfilespatchMakefileindiff">trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaMP4JoinerfilespatchInfoplistindiff">trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaMP4JoinerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/MP4Joiner/Portfile (134146 => 134147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/MP4Joiner/Portfile 2015-03-19 01:54:28 UTC (rev 134146)
+++ trunk/dports/multimedia/MP4Joiner/Portfile 2015-03-19 04:59:17 UTC (rev 134147)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name MP4Joiner
</span><del>-version 2.1.2
-revision 3
</del><ins>+version 2.2
</ins><span class="cx"> categories multimedia aqua
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -20,8 +19,8 @@
</span><span class="cx"> master_sites sourceforge:project/mp4joiner/MP4Joiner/${version}/
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 90d3670fe890a155dfec246ac3af248d2127454f \
- sha256 f2f3a77258e9160f5c72fb467b2a77bba0d05e112fc8ee53870fbfd2ea8ee5fc
</del><ins>+checksums rmd160 b219127b0e30ff99d039a868b0751b763452ea4f \
+ sha256 39428a63bb234c90800a261b3c1a7a19d887045bf8611ec185c1c7bdabfcaddf
</ins><span class="cx">
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx">
</span><span class="lines">@@ -33,8 +32,7 @@
</span><span class="cx"> # gpac is not universal but we only use its MP4Box program not its libraries
</span><span class="cx"> depends_skip_archcheck gpac
</span><span class="cx">
</span><del>-patchfiles patch-Info.plist.in.diff \
- patch-Makefile.in.diff \
</del><ins>+patchfiles patch-Makefile.in.diff
</ins><span class="cx">
</span><span class="cx"> configure.args --with-wxdir=${wxWidgets.wxdir}
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediaMP4JoinerfilespatchInfoplistindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff (134146 => 134147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff 2015-03-19 01:54:28 UTC (rev 134146)
+++ trunk/dports/multimedia/MP4Joiner/files/patch-Info.plist.in.diff 2015-03-19 04:59:17 UTC (rev 134147)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- Info.plist.in.orig 2013-01-12 01:56:34.000000000 -0600
-+++ Info.plist.in 2013-11-14 15:38:13.000000000 -0600
-@@ -17,7 +17,7 @@
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
-- <string>MP4Joiner</string>
-+ <string>????</string>
- <key>CFBundleVersion</key>
- <string>@VERSION@</string>
- <key>CFBundleShortVersionString</key>
</del></span></pre></div>
<a id="trunkdportsmultimediaMP4JoinerfilespatchMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff (134146 => 134147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff 2015-03-19 01:54:28 UTC (rev 134146)
+++ trunk/dports/multimedia/MP4Joiner/files/patch-Makefile.in.diff 2015-03-19 04:59:17 UTC (rev 134147)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Makefile.in.orig 2013-11-11 13:58:49.000000000 -0600
-+++ Makefile.in 2013-11-14 15:37:45.000000000 -0600
-@@ -818,21 +818,19 @@
</del><ins>+--- Makefile.in.orig 2015-03-17 01:40:48.000000000 -0500
++++ Makefile.in 2015-03-18 23:52:33.000000000 -0500
+@@ -825,32 +825,19 @@
</ins><span class="cx"> run: all
</span><span class="cx"> $(MAKE) -C src run
</span><span class="cx">
</span><span class="lines">@@ -12,15 +12,26 @@
</span><span class="cx"> -mkdir MP4Joiner.app/Contents/Resources
</span><span class="cx"> -mkdir MP4Joiner.app/Contents/Resources/English.lproj
</span><span class="cx"> cp Info.plist MP4Joiner.app/Contents/
</span><del>-- echo -n "MP4Joiner" > MP4Joiner.app/Contents/PkgInfo
</del><ins>+- echo -n "APPL????" > MP4Joiner.app/Contents/PkgInfo
</ins><span class="cx"> + printf "APPL????" > MP4Joiner.app/Contents/PkgInfo
</span><span class="cx"> cp src/mp4joiner MP4Joiner.app/Contents/MacOS/MP4Joiner
</span><span class="cx"> cp resources/mp4joiner.icns MP4Joiner.app/Contents/Resources/MP4Joiner.icns
</span><span class="cx"> -mkdir MP4Joiner.app/Contents/locale
</span><del>- (cd locale && cp -r de ru ../MP4Joiner.app/Contents/locale/)
</del><ins>+ (cd locale && cp -r de es pt ru ../MP4Joiner.app/Contents/locale/)
</ins><span class="cx"> - cp /opt/local/bin/ffmpeg MP4Joiner.app/Contents/MacOS/
</span><span class="cx"> strip MP4Joiner.app/Contents/MacOS/MP4Joiner
</span><span class="cx"> - strip MP4Joiner.app/Contents/MacOS/ffmpeg
</span><ins>+- cp /Applications/Osmo4.app/Contents/MacOS/MP4Box MP4Joiner.app/Contents/MacOS/
+- -mkdir MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libcrypto.1.0.0.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libgpac.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libjpeg.8.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libjs.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libnspr4.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libplc4.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libplds4.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libpng15.15.dylib MP4Joiner.app/Contents/MacOS/lib/
+- cp /Applications/Osmo4.app/Contents/MacOS/lib/libssl.1.0.0.dylib MP4Joiner.app/Contents/MacOS/lib/
</ins><span class="cx">
</span><span class="cx"> libs:
</span><span class="cx"> dylibbundler -od -b -x ./MP4Joiner.app/Contents/MacOS/MP4Joiner -d ./MP4Joiner.app/Contents/libs/
</span></span></pre>
</div>
</div>
</body>
</html>