<!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>[132827] trunk/dports/multimedia/HandBrake</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/132827">132827</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-02-11 01:03:58 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>HandBrake: Update to 0.10.0, create HandBrakeCLI subport
- Update to newest upstream release (#43778).
- Create HandBrakeCLI subport (#31139).
- HandBrake installs the GUI only; HandBrakeCLI installs the
command-line interface and simple text docs.
- HandBrake can only build on Mountain Lion and later because the
MacGui uses modern Objective-C features; HandBrakeCLI can still
build on Lion.
- Depend on cmake to build bundled x265.
- Depend on fontconfig for its fonts, configuration, and cache (#36298).
- Remove all existing patches. As far as I can tell, none are necessary
anymore.
- Restrict compiler selection to those available to Xcode projects.
- Build bundled libraries verbosely.
- Force builds to use MacPorts' tools, if possible.
- Completely excise Sparkle (#37327).
- Make progress towards getting the entire build system to honor
`configure.build_arch` and `macosx_deployment_target`. Still a WIP.
- Patch and use build system's install targets instead of a custom
destroot script.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaHandBrakePortfile">trunk/dports/multimedia/HandBrake/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaHandBrakefiles0001Addadefaultfontdirectoryforfontconfigtousewpatch">trunk/dports/multimedia/HandBrake/files/0001-Add-a-default-font-directory-for-fontconfig-to-use-w.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0002BuildSystemCreateconfigsforOSXYosemitepatch">trunk/dports/multimedia/HandBrake/files/0002-BuildSystem-Create-configs-for-OS-X-Yosemite.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0003Buildcontribsverboselypatch">trunk/dports/multimedia/HandBrake/files/0003-Build-contribs-verbosely.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0004MPBuildSystemAllowXcodecompileroverridepatch">trunk/dports/multimedia/HandBrake/files/0004-MP-BuildSystem-Allow-Xcode-compiler-override.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0005MPBuildSystemDontabortonmissingGCCpatch">trunk/dports/multimedia/HandBrake/files/0005-MP-BuildSystem-Don-t-abort-on-missing-GCC.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0006MPBuildSystemAddtargetsforMacGuiandCLIpatch">trunk/dports/multimedia/HandBrake/files/0006-MP-BuildSystem-Add-targets-for-MacGui-and-CLI.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0007MPBuildSystemDestrootandinstalltorightlocatiopatch">trunk/dports/multimedia/HandBrake/files/0007-MP-BuildSystem-Destroot-and-install-to-right-locatio.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0008MPForcecontribbuildstouseMacPortstoolspatch">trunk/dports/multimedia/HandBrake/files/0008-MP-Force-contrib-builds-to-use-MacPorts-tools.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0009MPMacGuiDisableSparklepatch">trunk/dports/multimedia/HandBrake/files/0009-MP-MacGui-Disable-Sparkle.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0010MPfontconfigUseourportsconfigurationpatch">trunk/dports/multimedia/HandBrake/files/0010-MP-fontconfig-Use-our-port-s-configuration.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0011MPlibavRespectourcompilerselectiononDarwini3patch">trunk/dports/multimedia/HandBrake/files/0011-MP-libav-Respect-our-compiler-selection-on-Darwin-i3.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0012libvpxAddbuildtargetsforOSX1010Yosemitepatch">trunk/dports/multimedia/HandBrake/files/0012-libvpx-Add-build-targets-for-OS-X-10.10-Yosemite.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0013libvpxFixdiscoveryofDarwinSDKspatch">trunk/dports/multimedia/HandBrake/files/0013-libvpx-Fix-discovery-of-Darwin-SDKs.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0014libvpxFixClangcrossbuildingonOSXpatch">trunk/dports/multimedia/HandBrake/files/0014-libvpx-Fix-Clang-cross-building-on-OS-X.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0015MPlibvpxEnableccacheifrequestedpatch">trunk/dports/multimedia/HandBrake/files/0015-MP-libvpx-Enable-ccache-if-requested.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefiles0016MPlibvpxSetbuildtargetexplicitlypatch">trunk/dports/multimedia/HandBrake/files/0016-MP-libvpx-Set-build-target-explicitly.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaHandBrakefilesffmpegjackosxpatch">trunk/dports/multimedia/HandBrake/files/ffmpeg-jack-osx.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefileslibsampleratecarbonpatch">trunk/dports/multimedia/HandBrake/files/libsamplerate-carbon.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefilesmissingdelegatepatch">trunk/dports/multimedia/HandBrake/files/missing-delegate.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefilesmp4v2r355clangcompatibilitysrcbmfftypebmffcpppatch">trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch</a></li>
<li><a href="#trunkdportsmultimediaHandBrakefilesmp4v2r355clangcompatibilitysrcitmftypecpppatch">trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaHandBrakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/HandBrake/Portfile (132826 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/Portfile 2015-02-11 09:03:44 UTC (rev 132826)
+++ trunk/dports/multimedia/HandBrake/Portfile 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -2,25 +2,52 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup xcodeversion 1.0
</ins><span class="cx">
</span><span class="cx"> name HandBrake
</span><del>-version 0.9.8
</del><ins>+version 0.10.0
</ins><span class="cx"> categories multimedia aqua
</span><span class="cx"> platforms macosx
</span><span class="cx"> license GPL-2
</span><span class="cx"> maintainers larryv
</span><span class="cx">
</span><ins>+subport HandBrakeCLI {
+ categories-delete aqua
+}
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> description The open source video transcoder
</span><span class="cx"> long_description HandBrake is a tool for converting video from \
</span><span class="cx"> nearly any format to a selection of modern, \
</span><span class="cx"> widely supported codecs.
</span><span class="cx"> homepage http://handbrake.fr/
</span><span class="cx">
</span><ins>+subport HandBrakeCLI {
+ description-append (CLI)
+ long_description-append {*}{(This port provides the command-line
+ interface only; install the `HandBrake`
+ port for the graphical user interface.)}
+}
</ins><span class="cx">
</span><del>-if {${os.platform} eq "darwin" && ${os.major} < 10} {
</del><ins>+
+# The MacGui uses NS_ENUM, boolean literals, NSDictionary
+# subscripting, and other modern Objective-C features
+# (https://developer.apple.com/library/mac/releasenotes/ObjectiveC/ObjCAvailabilityIndex).
+minimum_xcodeversions {12 4.4}
+set minDarwinVersion 12
+
+subport HandBrakeCLI {
+ # TODO: Fix build on Snow Leopard. All the contribs build fine,
+ # but linking the HandBrakeCLI executable fails.
+ minimum_xcodeversions
+ set minDarwinVersion 11
+}
+
+set minOSXVersion 10.[expr {$minDarwinVersion - 4}]
+if {${os.platform} eq "darwin" && ${os.major} < $minDarwinVersion} {
</ins><span class="cx"> pre-fetch {
</span><del>- ui_error "Building ${name} ${version} requires OS X 10.6 or later."
</del><ins>+ ui_error "Building ${subport} ${version} requires\
+ OS X $minOSXVersion or later."
</ins><span class="cx"> return -code error "unsupported platform"
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -43,10 +70,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Autotools: fribidi, libdvdnav, libdvdread, libogg, libvorbis
</span><ins>+# CMake: x265
</ins><span class="cx"> # Python: configure script
</span><del>-# Yasm: libvpx, x264
</del><ins>+# Yasm: libav, libvpx, x264, x265
</ins><span class="cx"> depends_build port:autoconf \
</span><span class="cx"> port:automake \
</span><ins>+ port:cmake \
</ins><span class="cx"> port:libtool \
</span><span class="cx"> port:pkgconfig \
</span><span class="cx"> {bin:python2(\.(4|5|6|7))?:python27} \
</span><span class="lines">@@ -59,7 +88,16 @@
</span><span class="cx"> port:libiconv \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+# Configure the bundled fontconfig to use the port's fonts.
+depends_lib-append port:fontconfig
</ins><span class="cx">
</span><ins>+subport HandBrake {
+ depends_run port:HandBrakeCLI
+}
+
+# TODO: Sort out depends_skip_archcheck.
+
+
</ins><span class="cx"> # Many of the contrib build systems detect CPU features at build time.
</span><span class="cx"> archive_sites
</span><span class="cx">
</span><span class="lines">@@ -69,51 +107,39 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums HandBrake-0.9.8.tar.bz2 \
- rmd160 7392fa8783f8b114bf0cdc4adc6b96d148f75e09 \
- sha256 dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798 \
- a52dec-0.7.4.tar.gz \
- rmd160 5f8ff682a43ffdafdb88a4231bfa64bb40f138d8 \
- sha256 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47 \
- faac-1.28.tar.gz \
- rmd160 03902393488f04223aabdc804bfe77bb32a61c94 \
- sha256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df \
- faad2-2.7.tar.gz \
- rmd160 3f0ca461e2953014d5b17edccb3337767d478b8d \
- sha256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 \
- ffmpeg-v0.7-1696-gcae4f4b.tar.bz2 \
- rmd160 351d04575a50c042fe042c85b1feccd045a8804e \
- sha256 f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497 \
- fribidi-0.19.2.tar.gz \
- rmd160 4fafb4b3140bbbcf4c2c58c714b02db2d71e5491 \
- sha256 49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177 \
</del><ins>+# The subports use the same distfiles.
+dist_subdir ${name}
+
+checksums ${distname}${extract.suffix} \
+ rmd160 c0140fd33b4ca3fea3dd43a5960a71055a00acc8 \
+ sha256 a91042da3cc08454844f7c171ee2fde4f0ed08176407fc0328d5118227ed4114 \
</ins><span class="cx"> fontconfig-2.8.0.tar.gz \
</span><span class="cx"> rmd160 fefee412cad4fa71b573e997e14f1df12f439be2 \
</span><span class="cx"> sha256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 \
</span><span class="cx"> freetype-2.4.7.tar.bz2 \
</span><span class="cx"> rmd160 48abfcd4546cbd6626796ab121252e804ddcc6d8 \
</span><span class="cx"> sha256 ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77 \
</span><ins>+ fribidi-0.19.2.tar.gz \
+ rmd160 4fafb4b3140bbbcf4c2c58c714b02db2d71e5491 \
+ sha256 49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177 \
</ins><span class="cx"> lame-3.98.tar.gz \
</span><span class="cx"> rmd160 c10c20128622e16f9cac3d346bea8e390e4bfdc5 \
</span><span class="cx"> sha256 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686 \
</span><span class="cx"> libass-0.10.0-1.tar.gz \
</span><span class="cx"> rmd160 da29a27a4ae107629d0ea6dd7ec21f1d36167b16 \
</span><span class="cx"> sha256 a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867 \
</span><del>- libbluray-0.0.1-pre-213-ga869da8.tar.gz \
- rmd160 77ea3b642fa1b58fe3acef32ee457173586ed403 \
- sha256 4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76 \
- libdca-r81-strapped.tar.gz \
- rmd160 f8af6ac0df89e221d0b95caf68ee3aa3904ab178 \
- sha256 ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1 \
- libdvdnav-svn1168.tar.gz \
- rmd160 9628b3cf9cf29bf617047da6c387552d35de5e3d \
- sha256 7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7 \
- libdvdread-svn1168.tar.gz \
- rmd160 25d1460a175e4dedb0c463d0b2a9f1c826238c80 \
- sha256 a489b618962e31a2b151b2e6d7b0c3fcb42cccc196ec7cb352c559898c3f1f1e \
- libmkv-0.6.5-0-g82075ae.tar.gz \
- rmd160 00b9ec85c000eae76349fb4e0a7176daf36b4e0d \
- sha256 7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97 \
</del><ins>+ libav-v10.1.tar.bz2 \
+ rmd160 fc9420a1ce8f081df592dbc2ac4500771103b38b \
+ sha256 bc3807426d4e73fe8c245730b0df4ba95766cf7e17e47c738ee302f73d066ac9 \
+ libbluray-0.5.0.tar.bz2 \
+ rmd160 7816daf8dced33765be85621ab3cd3da61edd76d \
+ sha256 d414b548ff97c081e1a2f337c0904f44e65d91a00d2efa4a46a1ecd3de285b4d \
+ libdvdnav-5.0.1-0-gaa3659d.tar.gz \
+ rmd160 a712563c197a3f24636be7aa87396400f110e0f7 \
+ sha256 574b7af7ff52e21048ab62c0b14271e651faafb5d46f8efc64dbd82ff34e162b \
+ libdvdread-5.0.0-6-gcb1ae87.tar.gz \
+ rmd160 708aa5031b16c9b63d6382e9dd223da874702d53 \
+ sha256 d2e4200c3c5d5f812892f9c14851c94e2f707d54e7328946c6397ac999f15f17 \
</ins><span class="cx"> libogg-1.3.0.tar.gz \
</span><span class="cx"> rmd160 143fa1639ee2175a6609f32287414d6b23deea6f \
</span><span class="cx"> sha256 a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780 \
</span><span class="lines">@@ -126,18 +152,18 @@
</span><span class="cx"> libvorbis-aotuv_b6.03.tar.bz2 \
</span><span class="cx"> rmd160 6e25b9b6545b2e568038349fafe559999b9c3387 \
</span><span class="cx"> sha256 95455420f07e4b3abdf32bda9f5921e9ed3f1afdc3739098dc090150a42fd7fd \
</span><ins>+ libvpx-v1.3.0.tar.bz2 \
+ rmd160 bf74821ac8f20ed30f44b6e01473ee1f332f721c \
+ sha256 d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9 \
</ins><span class="cx"> libxml2-2.7.7.tar.gz \
</span><span class="cx"> rmd160 9f72c778c3e9e348a68eada0cf624c012658c085 \
</span><span class="cx"> sha256 af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68 \
</span><del>- mp4v2-trunk-r355.tar.bz2 \
- rmd160 cc942dd7f20bb943cccfd9443694ebbd63558818 \
- sha256 5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f \
- mpeg2dec-0.5.1.tar.gz \
- rmd160 3986798a30b33e689b1d7c5390380c13b74f8c76 \
- sha256 161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71 \
- x264-r2146-bcd41db.tar.gz \
- rmd160 9747178126c529c4bc807de356b57c077c95285b \
- sha256 7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1
</del><ins>+ x264-r2479-dd79a61.tar.gz \
+ rmd160 da2113422d71a85518533499defb2c63f096c6a3 \
+ sha256 7307a83085f4110f8ae690748f00b5acb4882ec34b83ef260fec264c018c49e9 \
+ x265-8768-5e604833c5aa-1.4.tar.bz2 \
+ rmd160 c6cc8072db0b98482760e43216f3926729f225c5 \
+ sha256 7e7f5f2883ccd39dd0e26c7f3ef3c9f80234d669e29811016d8993987d47ab92
</ins><span class="cx">
</span><span class="cx"> # Use `checksums` to construct `distfiles`, instead of maintaining and
</span><span class="cx"> # synchronizing two separate lists.
</span><span class="lines">@@ -155,47 +181,83 @@
</span><span class="cx"> post-extract {
</span><span class="cx"> # Make contrib distfiles available to the build.
</span><span class="cx"> ln -s ${distpath} ${worksrcpath}/download
</span><del>-
- # make mp4v2 build with clang, see
- # http://code.google.com/p/mp4v2/issues/detail?id=80
- file copy ${filespath}/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch \
- ${worksrcpath}/contrib/mp4v2/A01-clang-compatibility.patch
- file copy ${filespath}/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch \
- ${worksrcpath}/contrib/mp4v2/A02-clang-compatibility.patch
- # make ffmpeg build with jack support on OS X, see
- # http://ffmpeg.org/trac/ffmpeg/ticket/43
- file copy ${filespath}/ffmpeg-jack-osx.patch \
- ${worksrcpath}/contrib/ffmpeg/A06-jack-osx.patch
-
- # Fix missing <Carbon.h>
- file copy ${filespath}/libsamplerate-carbon.patch \
- ${worksrcpath}/contrib/libsamplerate/A01-libsamplerate-carbon.patch
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+# Patches maintained at https://github.com/larryv/HandBrake.
+patch.pre_args -p1
</ins><span class="cx"> patchfiles \
</span><del>- missing-delegate.patch
</del><ins>+ 0001-Add-a-default-font-directory-for-fontconfig-to-use-w.patch \
+ 0002-BuildSystem-Create-configs-for-OS-X-Yosemite.patch \
+ 0003-Build-contribs-verbosely.patch \
+ 0004-MP-BuildSystem-Allow-Xcode-compiler-override.patch \
+ 0005-MP-BuildSystem-Don-t-abort-on-missing-GCC.patch \
+ 0006-MP-BuildSystem-Add-targets-for-MacGui-and-CLI.patch \
+ 0007-MP-BuildSystem-Destroot-and-install-to-right-locatio.patch \
+ 0008-MP-Force-contrib-builds-to-use-MacPorts-tools.patch \
+ 0009-MP-MacGui-Disable-Sparkle.patch \
+ 0010-MP-fontconfig-Use-our-port-s-configuration.patch \
+ 0011-MP-libav-Respect-our-compiler-selection-on-Darwin-i3.patch \
+ 0012-libvpx-Add-build-targets-for-OS-X-10.10-Yosemite.patch \
+ 0013-libvpx-Fix-discovery-of-Darwin-SDKs.patch \
+ 0014-libvpx-Fix-Clang-cross-building-on-OS-X.patch \
+ 0015-MP-libvpx-Enable-ccache-if-requested.patch \
+ 0016-MP-libvpx-Set-build-target-explicitly.patch
</ins><span class="cx">
</span><span class="cx">
</span><ins>+# Since HandBrake itself is built using Xcode, restrict ourselves to the
+# Xcode-provided compilers.
+compiler.blacklist apple* macports*
+set xcGCCVersion \
+ [switch ${configure.compiler} {
+ clang {expr {"com.apple.compilers.llvm.clang.1_0"}}
+ gcc-4.0 {expr {"4.0"}}
+ gcc-4.2 {expr {"4.2"}}
+ llvm-gcc-4.2 {expr {"com.apple.compilers.llvmgcc42"}}
+ }]
+
+# TODO: Respect deployment target in all contrib builds.
+set xcconfigOS osx[string map {. {}} ${macosx_deployment_target}]
+
</ins><span class="cx"> configure.args --arch=${configure.build_arch} \
</span><span class="cx"> --curl=false \
</span><span class="cx"> --fetch=curl \
</span><span class="cx"> --gcc='${configure.cc}' \
</span><span class="cx"> --verbose \
</span><ins>+ --xcode-config=${xcconfigOS}.${configure.build_arch} \
</ins><span class="cx"> --xcode-driver=terminal \
</span><del>- BUILD.jobs=${build.jobs}
</del><ins>+ APPLICATIONS_DIR='${applications_dir}' \
+ BUILD.jobs=${build.jobs} \
+ CCACHE=${configure.ccache} \
+ GCC_VERSION=$xcGCCVersion
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> build.type gnu
</span><span class="cx"> build.dir ${worksrcpath}/build
</span><del>-build.target build
</del><ins>+build.target macosx.gui.build
+build.args X265.CONFIGURE.exe='${prefix}/bin/cmake'
</ins><span class="cx">
</span><del>-destroot {
- file copy ${worksrcpath}/build/xroot/${name}.app \
- ${destroot}${applications_dir}/${name}.app
</del><ins>+destroot.target macosx.gui.install
+
+subport HandBrakeCLI {
+ build.target macosx.cli.build
+ destroot.target macosx.cli.install
+ # Since HandBrake depends on HandBrakeCLI, install the docs through
+ # HandBrakeCLI so they're always available.
+ post-destroot {
+ set docDir ${destroot}${prefix}/share/doc/${name}
+ xinstall -d $docDir
+ xinstall -m 0644 -W ${worksrcpath} \
+ AUTHORS COPYING CREDITS NEWS THANKS TRANSLATIONS $docDir
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url https://handbrake.fr/downloads.php
</span><span class="cx"> livecheck.regex {Current Version: (\d(?:\.\d+)+)}
</span><ins>+
+subport HandBrakeCLI {
+ livecheck.url https://handbrake.fr/downloads2.php
+ livecheck.regex {Command Line Version: (\d(?:\.\d+)+)}
+}
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0001Addadefaultfontdirectoryforfontconfigtousewpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0001-Add-a-default-font-directory-for-fontconfig-to-use-w.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0001-Add-a-default-font-directory-for-fontconfig-to-use-w.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0001-Add-a-default-font-directory-for-fontconfig-to-use-w.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+From ff44f9a2c7bd1a38a7edbff70f8401b179e77d71 Mon Sep 17 00:00:00 2001
+From: ritsuka <ritsuka@b64f7644-9d1e-0410-96f1-a4d463321fa5>
+Date: Fri, 30 Jan 2015 09:21:47 +0000
+Subject: [PATCH 01/16] Add a default font directory for fontconfig to use when
+ there isn't a configuration file available. Move the font cache to the user
+ directory.
+
+git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6828 b64f7644-9d1e-0410-96f1-a4d463321fa5
+(cherry picked from commit c50d645b3f9049fc99e5c5504813c8ee4396e8ee)
+---
+ contrib/fontconfig/module.defs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
+index b527731..0bf9421 100644
+--- a/contrib/fontconfig/module.defs
++++ b/contrib/fontconfig/module.defs
+@@ -86,7 +86,9 @@ FONTCONFIG.CONFIGURE.extra += \
+ LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
+ LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
+ --with-fcpath=/usr/X11/lib/X11/fontconfig \
+- --with-cache-dir=/usr/X11/var/cache/fontconfig
++ --with-cache-dir=~/Library/Caches/fontconfig \
++ --with-default-fonts=/Library/Fonts \
++ --with-add-fonts=/System/Library/Fonts,~/Library/Fonts
+ else ifeq (linux,$(BUILD.system))
+ FONTCONFIG.CONFIGURE.extra += \
+ --with-fcpath=/etc/fonts \
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0002BuildSystemCreateconfigsforOSXYosemitepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0002-BuildSystem-Create-configs-for-OS-X-Yosemite.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0002-BuildSystem-Create-configs-for-OS-X-Yosemite.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0002-BuildSystem-Create-configs-for-OS-X-Yosemite.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+From 4100b61c3c9ff9aba9ab7148321700cdc4844ff1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Tue, 20 Jan 2015 18:28:16 -0500
+Subject: [PATCH 02/16] BuildSystem: Create configs for OS X Yosemite
+
+---
+ macosx/xcconfig/base/os.osx1010.xcconfig | 2 ++
+ macosx/xcconfig/osx1010.i386.xcconfig | 3 +++
+ macosx/xcconfig/osx1010.x86_64.xcconfig | 3 +++
+ 3 files changed, 8 insertions(+)
+ create mode 100644 macosx/xcconfig/base/os.osx1010.xcconfig
+ create mode 100644 macosx/xcconfig/osx1010.i386.xcconfig
+ create mode 100644 macosx/xcconfig/osx1010.x86_64.xcconfig
+
+diff --git a/macosx/xcconfig/base/os.osx1010.xcconfig b/macosx/xcconfig/base/os.osx1010.xcconfig
+new file mode 100644
+index 0000000..d06a9d3
+--- /dev/null
++++ b/macosx/xcconfig/base/os.osx1010.xcconfig
+@@ -0,0 +1,2 @@
++SDKROOT = macosx10.10
++MACOSX_DEPLOYMENT_TARGET = 10.10
+diff --git a/macosx/xcconfig/osx1010.i386.xcconfig b/macosx/xcconfig/osx1010.i386.xcconfig
+new file mode 100644
+index 0000000..beb8e33
+--- /dev/null
++++ b/macosx/xcconfig/osx1010.i386.xcconfig
+@@ -0,0 +1,3 @@
++#include "base/os.osx1010.xcconfig"
++#include "base/arch.i386.xcconfig"
++EXTERNAL_XCCONFIG = osx1010.i386
+diff --git a/macosx/xcconfig/osx1010.x86_64.xcconfig b/macosx/xcconfig/osx1010.x86_64.xcconfig
+new file mode 100644
+index 0000000..5f17649
+--- /dev/null
++++ b/macosx/xcconfig/osx1010.x86_64.xcconfig
+@@ -0,0 +1,3 @@
++#include "base/os.osx1010.xcconfig"
++#include "base/arch.x86_64.xcconfig"
++EXTERNAL_XCCONFIG = osx1010.x86_64
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0003Buildcontribsverboselypatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0003-Build-contribs-verbosely.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0003-Build-contribs-verbosely.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0003-Build-contribs-verbosely.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+From e17dd8f8defdae269b0efacd8422d4a769a5323a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Sat, 24 Jan 2015 00:41:59 -0500
+Subject: [PATCH 03/16] Build contribs verbosely
+
+---
+ contrib/fdk-aac/module.defs | 2 ++
+ contrib/fribidi/module.defs | 2 +-
+ contrib/libdvdnav/module.defs | 2 ++
+ contrib/libdvdread/module.defs | 2 ++
+ contrib/libvpx/module.defs | 5 +++++
+ contrib/x265/module.defs | 3 ++-
+ 6 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/fdk-aac/module.defs b/contrib/fdk-aac/module.defs
+index 454858a..08b3500 100644
+--- a/contrib/fdk-aac/module.defs
++++ b/contrib/fdk-aac/module.defs
+@@ -3,6 +3,8 @@ $(eval $(call import.CONTRIB.defs,FDKAAC))
+
+ FDKAAC.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fdk-aac-v0.1.1-6-gbae4553.tar.bz2
+
++FDKAAC.CONFIGURE.extra = --disable-silent-rules
++
+ ## optional static libs need to be marked
+ FDKAAC.OSL.libs = fdk-aac
+ FDKAAC.OSL.files = $(foreach i,$(FDKAAC.OSL.libs),$(call fn.ABSOLUTE,$(CONTRIB.build/)lib/lib$(i).a))
+diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
+index b291326..d64e580 100644
+--- a/contrib/fribidi/module.defs
++++ b/contrib/fribidi/module.defs
+@@ -3,4 +3,4 @@ $(eval $(call import.CONTRIB.defs,FRIBIDI))
+
+ FRIBIDI.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz
+
+-FRIBIDI.CONFIGURE.bootstrap = ./bootstrap;
++FRIBIDI.CONFIGURE.bootstrap = ./bootstrap --verbose;
+diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
+index b6ba27a..5adcdfe 100644
+--- a/contrib/libdvdnav/module.defs
++++ b/contrib/libdvdnav/module.defs
+@@ -12,3 +12,5 @@ ifeq (1,$(FEATURE.local_pkgconfig))
+ LIBDVDNAV.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+ LIBDVDNAV.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+ endif
++
++LIBDVDNAV.CONFIGURE.extra = --disable-silent-rules
+diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
+index c546b3b..4ab0fab 100644
+--- a/contrib/libdvdread/module.defs
++++ b/contrib/libdvdread/module.defs
+@@ -12,3 +12,5 @@ ifeq (1,$(FEATURE.local_pkgconfig))
+ LIBDVDREAD.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+ LIBDVDREAD.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
+ endif
++
++LIBDVDREAD.CONFIGURE.extra += --disable-silent-rules
+diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
+index e257d34..1fb861d 100644
+--- a/contrib/libvpx/module.defs
++++ b/contrib/libvpx/module.defs
+@@ -23,3 +23,8 @@ ifeq (1-i686,$(BUILD.cross)-$(BUILD.machine))
+ else ifeq (1-x86_64,$(BUILD.cross)-$(BUILD.machine))
+ LIBVPX.CONFIGURE.extra += --target=x86_64-win64-gcc
+ endif
++
++LIBVPX.BUILD.extra = quiet:=''
++LIBVPX.INSTALL.extra = quiet:=''
++LIBVPX.UNINSTALL.extra = quiet:=''
++LIBVPX.CLEAN.extra = quiet:=''
+diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
+index e2e27b0..ed85679 100644
+--- a/contrib/x265/module.defs
++++ b/contrib/x265/module.defs
+@@ -9,7 +9,8 @@ X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)"
+ X265.CONFIGURE.deps =
+ X265.CONFIGURE.static =
+ X265.CONFIGURE.shared = -DENABLE_SHARED=OFF
+-X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF
++X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF \
++ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+
+ ifeq (1,$(BUILD.cross))
+ ifeq (mingw,$(BUILD.system))
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0004MPBuildSystemAllowXcodecompileroverridepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0004-MP-BuildSystem-Allow-Xcode-compiler-override.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0004-MP-BuildSystem-Allow-Xcode-compiler-override.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0004-MP-BuildSystem-Allow-Xcode-compiler-override.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+From cc4a255132cccc1c7c549dc70c227d0a94e6b895 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Tue, 3 Feb 2015 20:00:08 -0500
+Subject: [PATCH 04/16] (MP) BuildSystem: Allow Xcode compiler override
+
+If `GCC_VERSION` is not passed to the build, HandBrake's baked-in
+compiler setting will be used.
+---
+ macosx/module.defs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/macosx/module.defs b/macosx/module.defs
+index d864b7f..773a8a1 100644
+--- a/macosx/module.defs
++++ b/macosx/module.defs
+@@ -53,6 +53,8 @@ MACOSX.XCODE = $(strip \
+ $(MACOSX.configuration) \
+ $(MACOSX.xcconfig) \
+ \
++ $(if $(GCC_VERSION),GCC_VERSION='$(GCC_VERSION)') \
++ \
+ SYMROOT='$(XCODE.symroot)' \
+ CONFIGURATION_BUILD_DIR='$(XCODE.symroot)' \
+ CONFIGURATION_TEMP_DIR='$(XCODE.symroot)' \
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0005MPBuildSystemDontabortonmissingGCCpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0005-MP-BuildSystem-Don-t-abort-on-missing-GCC.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0005-MP-BuildSystem-Don-t-abort-on-missing-GCC.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0005-MP-BuildSystem-Don-t-abort-on-missing-GCC.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+From acb2f01cabd310c193942db7e87635f153d9e9ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Mon, 9 Feb 2015 22:50:13 -0500
+Subject: [PATCH 05/16] (MP) BuildSystem: Don't abort on missing GCC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Trace mode hides all `gcc` executables from the configure script if
+`configure.compiler` is “`clang`”, causing it to fail. Make this
+non-fatal because we pass the correct compiler using `--gcc` anyway.
+---
+ make/configure.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/make/configure.py b/make/configure.py
+index 1bac087..b968a18 100644
+--- a/make/configure.py
++++ b/make/configure.py
+@@ -1403,7 +1403,7 @@ try:
+ ar = ToolProbe( 'AR.exe', 'ar' )
+ cp = ToolProbe( 'CP.exe', 'cp' )
+ curl = ToolProbe( 'CURL.exe', 'curl', abort=False )
+- gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '*-*-cygwin*' ))
++ gcc = ToolProbe( 'GCC.gcc', 'gcc', IfHost( 'gcc-4', '*-*-cygwin*' ), abort=False)
+
+ if host.match( '*-*-darwin*' ):
+ gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' )
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0006MPBuildSystemAddtargetsforMacGuiandCLIpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0006-MP-BuildSystem-Add-targets-for-MacGui-and-CLI.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0006-MP-BuildSystem-Add-targets-for-MacGui-and-CLI.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0006-MP-BuildSystem-Add-targets-for-MacGui-and-CLI.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+From e52c4d30415d57822f39a9c65c8d4c51dded185c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Wed, 4 Feb 2015 14:54:57 -0500
+Subject: [PATCH 06/16] (MP) BuildSystem: Add targets for MacGui and CLI
+
+This allows the GUI and CLI to be built and installed independently.
+---
+ macosx/module.xcodebuild | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/macosx/module.xcodebuild b/macosx/module.xcodebuild
+index 26b34a9..e16a515 100644
+--- a/macosx/module.xcodebuild
++++ b/macosx/module.xcodebuild
+@@ -16,9 +16,23 @@ clean: macosx.clean
+ install: macosx.install
+ xclean: clean
+
++.PHONY: macosx.gui.build macosx.gui.install macosx.cli.build macosx.cli.install
++
++macosx.gui.build:
++ $(call MACOSX.XCODE,HandBrake,build)
++
++macosx.gui.install:
++ $(call MACOSX.XCODE,HandBrake,install)
++
++macosx.cli.build:
++ $(call MACOSX.XCODE,HandBrakeCLI,build)
++
++macosx.cli.install:
++ $(call MACOSX.XCODE,HandBrakeCLI,install)
++
+ ###############################################################################
+
+-MACOSX.goals = $(filter-out build clean install,$(MAKECMDGOALS))
++MACOSX.goals = $(filter-out build clean install macosx.gui.build macosx.gui.install macosx.cli.build macosx.cli.install,$(MAKECMDGOALS))
+
+ $(MACOSX.goals): __goals__
+ @true
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0007MPBuildSystemDestrootandinstalltorightlocatiopatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0007-MP-BuildSystem-Destroot-and-install-to-right-locatio.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0007-MP-BuildSystem-Destroot-and-install-to-right-locatio.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0007-MP-BuildSystem-Destroot-and-install-to-right-locatio.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+From 2b4ccddd7e0bc83666860541c28a10190905041f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Wed, 28 Jan 2015 14:58:26 -0500
+Subject: [PATCH 07/16] (MP) BuildSystem: Destroot and install to right
+ locations
+
+`APPLICATIONS_DIR` and `DESTDIR` should be passed to `make install` as
+command-line arguments. `PREFIX` is subsituted into the makefile by the
+configure script.
+---
+ macosx/HandBrake.xcodeproj/project.pbxproj | 2 ++
+ macosx/module.defs | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
+index 15c4c5b..e9b2a8e 100644
+--- a/macosx/HandBrake.xcodeproj/project.pbxproj
++++ b/macosx/HandBrake.xcodeproj/project.pbxproj
+@@ -1375,6 +1375,7 @@
+ "\"$(EXTERNAL_BUILD)/libhb\"",
+ "\"$(EXTERNAL_BUILD)/contrib/include\"",
+ );
++ INSTALL_PATH = "$(PREFIX)/bin";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(EXTERNAL_BUILD)/libhb\"",
+@@ -1420,6 +1421,7 @@
+ "\"$(EXTERNAL_BUILD)/contrib/include\"",
+ );
+ INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
++ INSTALL_PATH = "$(APPLICATIONS_DIR)";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(EXTERNAL_BUILD)/libhb\"",
+diff --git a/macosx/module.defs b/macosx/module.defs
+index 773a8a1..e856b68 100644
+--- a/macosx/module.defs
++++ b/macosx/module.defs
+@@ -55,6 +55,10 @@ MACOSX.XCODE = $(strip \
+ \
+ $(if $(GCC_VERSION),GCC_VERSION='$(GCC_VERSION)') \
+ \
++ APPLICATIONS_DIR='$(APPLICATIONS_DIR)' \
++ DSTROOT='$(DESTDIR)' \
++ PREFIX='$(PREFIX)' \
++ \
+ SYMROOT='$(XCODE.symroot)' \
+ CONFIGURATION_BUILD_DIR='$(XCODE.symroot)' \
+ CONFIGURATION_TEMP_DIR='$(XCODE.symroot)' \
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0008MPForcecontribbuildstouseMacPortstoolspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0008-MP-Force-contrib-builds-to-use-MacPorts-tools.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0008-MP-Force-contrib-builds-to-use-MacPorts-tools.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0008-MP-Force-contrib-builds-to-use-MacPorts-tools.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,153 @@
</span><ins>+From ece6e4ed61f20605a7a77bb820177a42a06ef45c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Mon, 2 Feb 2015 23:22:40 -0500
+Subject: [PATCH 08/16] (MP) Force contrib builds to use MacPorts' tools
+
+Specifically:
+- fribidi: Autotools, Make
+- libdvdnav: Autotools
+- libdvdread: Autotools
+- libogg: Autotools
+- libvorbis: Autotools
+
+Some component of the build (I can't figure out which) prepends Xcode's
+toolchain directories to `PATH`, causing Xcode's tools to shadow
+MacPorts'. Xcode 3.x in particular provides old versions of Autotools,
+which break at least one contrib build.
+---
+ contrib/fribidi/A01-use-MacPorts-tools.patch | 62 ++++++++++++++++++++++++++++
+ contrib/fribidi/module.defs | 2 +-
+ contrib/libdvdnav/module.defs | 2 +-
+ contrib/libdvdread/module.defs | 2 +-
+ contrib/libogg/module.defs | 2 +-
+ contrib/libvorbis/module.defs | 2 +-
+ 6 files changed, 67 insertions(+), 5 deletions(-)
+ create mode 100644 contrib/fribidi/A01-use-MacPorts-tools.patch
+
+diff --git a/contrib/fribidi/A01-use-MacPorts-tools.patch b/contrib/fribidi/A01-use-MacPorts-tools.patch
+new file mode 100644
+index 0000000..f6ec6dd
+--- /dev/null
++++ b/contrib/fribidi/A01-use-MacPorts-tools.patch
+@@ -0,0 +1,62 @@
++Index: fribidi-0.19.2/bootstrap
++===================================================================
++--- fribidi-0.19.2.orig/bootstrap
+++++ fribidi-0.19.2/bootstrap
++@@ -100,7 +100,7 @@ test -n "$INSTALL" && ADDMISSING=--add-m
++
++ # use autoreconf if possible, just check for version 2+
++ if test "$AUTORECONF" = auto; then
++- case `autoreconf --version 2>/dev/null` in
+++ case `$PREFIX/bin/autoreconf --version 2>/dev/null` in
++ *"autoreconf (GNU Autoconf) 2."* )
++ echo Usable autoreconf found, running
++ ;
++@@ -111,34 +111,34 @@ if test "$AUTORECONF" = auto; then
++ fi
++
++ if test -n "$AUTORECONF"; then
++- $DRYRUN autoreconf $HELP $VERSION $VERBOSE $DEBUG $FORCE $INSTALL $SYMLINK $MAKE $WARNS $AUTORECONFFLAGS || exit $?
+++ $DRYRUN $PREFIX/bin/autoreconf $HELP $VERSION $VERBOSE $DEBUG $FORCE $INSTALL $SYMLINK $MAKE $WARNS $AUTORECONFFLAGS || exit $?
++ else
++
++ # add files 'config.guess', 'config.sub', 'ltconfig', 'ltmain.sh'
++ test -f Makefile.am && MY_LIBTOOLIZEFLAGS=--automake
++
++ if grep -q '^ *AC_PROG_LIBTOOL' configure.ac configure.in 2>/dev/null; then
++- $DRYRUN libtoolize $HELP $VERSION $COPY $DEBUG $FORCE $MY_LIBTOOLIZEFLAGS $LIBTOOLIZEFLAGS || exit $?
+++ $DRYRUN $PREFIX/bin/glibtoolize $HELP $VERSION $COPY $DEBUG $FORCE $MY_LIBTOOLIZEFLAGS $LIBTOOLIZEFLAGS || exit $?
++ fi
++
++ # generate 'aclocal.m4'
++ if test -f configure.ac -o configure.in; then
++- $DRYRUN aclocal $HELP $VERSION $VERBOSE $FORCE $ACLOCALFLAGS || exit $?
+++ $DRYRUN $PREFIX/bin/aclocal $HELP $VERSION $VERBOSE $FORCE $ACLOCALFLAGS || exit $?
++ fi
++
++ # generate 'config.h.in'
++ if test -f configure.ac -o configure.in; then
++- $DRYRUN autoheader $HELP $VERSION $VERBOSE $DEBUG $FORCE $WARNS $AUTOHEADERFLAGS || exit $?
+++ $DRYRUN $PREFIX/bin/autoheader $HELP $VERSION $VERBOSE $DEBUG $FORCE $WARNS $AUTOHEADERFLAGS || exit $?
++ fi
++
++ # generate Makefile.in's from Makefile.am's
++ if test -f Makefile.am; then
++- $DRYRUN automake $HELP $VERSION $VERBOSE $ADDMISSING $COPY $FORCE $WARNS $AUTOMAKEFLAGS || exit $?
+++ $DRYRUN $PREFIX/bin/automake $HELP $VERSION $VERBOSE $ADDMISSING $COPY $FORCE $WARNS $AUTOMAKEFLAGS || exit $?
++ fi
++
++ # generate configure from configure.ac
++ if test -f configure.ac -o -f configure.in; then
++- $DRYRUN autoconf $HELP $VERSION $VERBOSE $DEBUG $FORCE $WARNS $AUTOCONFFLAGS || exit $?
+++ $DRYRUN $PREFIX/bin/autoconf $HELP $VERSION $VERBOSE $DEBUG $FORCE $WARNS $AUTOCONFFLAGS || exit $?
++ fi
++
++ fi # !AUTOCONF
++@@ -156,6 +156,6 @@ fi
++ # make
++ if test -n "$MAKE"; then
++ if test -f Makefile; then
++- $DRYRUN make $MAKEFLAGS || exit $?
+++ $DRYRUN $MAKE_CMD $MAKEFLAGS || exit $?
++ fi
++ fi
+diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
+index d64e580..64259b3 100644
+--- a/contrib/fribidi/module.defs
++++ b/contrib/fribidi/module.defs
+@@ -3,4 +3,4 @@ $(eval $(call import.CONTRIB.defs,FRIBIDI))
+
+ FRIBIDI.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz
+
+-FRIBIDI.CONFIGURE.bootstrap = ./bootstrap --verbose;
++FRIBIDI.CONFIGURE.bootstrap = MAKE_CMD="$(MAKE)" PREFIX="$(PREFIX)" ./bootstrap --verbose;
+diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
+index 5adcdfe..0de5c1f 100644
+--- a/contrib/libdvdnav/module.defs
++++ b/contrib/libdvdnav/module.defs
+@@ -2,7 +2,7 @@ $(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,PKGCONFIG LIBDVDREAD))
+ $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
+
+ LIBDVDNAV.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1-0-gaa3659d.tar.gz
+-LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
++LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; $(PREFIX)/bin/autoreconf -I m4 -fiv;
+
+ ifneq (max,$(LIBDVDNAV.GCC.g))
+ LIBDVDNAV.GCC.D += NDEBUG
+diff --git a/contrib/libdvdread/module.defs b/contrib/libdvdread/module.defs
+index 4ab0fab..7f26c6d 100644
+--- a/contrib/libdvdread/module.defs
++++ b/contrib/libdvdread/module.defs
+@@ -2,7 +2,7 @@ $(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread,PKGCONFIG))
+ $(eval $(call import.CONTRIB.defs,LIBDVDREAD))
+
+ LIBDVDREAD.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz
+-LIBDVDREAD.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
++LIBDVDREAD.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; $(PREFIX)/bin/autoreconf -I m4 -fiv;
+
+ ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+ LIBDVDREAD.CONFIGURE.extra = --enable-dlfcn
+diff --git a/contrib/libogg/module.defs b/contrib/libogg/module.defs
+index 4b1c8c9..c758c98 100644
+--- a/contrib/libogg/module.defs
++++ b/contrib/libogg/module.defs
+@@ -6,4 +6,4 @@ LIBOGG.EXTRACT.tarbase = libogg-1.3.0
+
+ LIBOGG.CONFIGURE.extra = --disable-sdl
+
+-LIBOGG.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;
++LIBOGG.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; $(PREFIX)/bin/autoreconf -fiv;
+diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs
+index 84d018f..05a8755 100644
+--- a/contrib/libvorbis/module.defs
++++ b/contrib/libvorbis/module.defs
+@@ -6,4 +6,4 @@ LIBVORBIS.EXTRACT.tarbase = aotuv-b6.03_20110424
+
+ LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) HAVE_PKG_CONFIG="no"
+
+-LIBVORBIS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
++LIBVORBIS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; $(PREFIX)/bin/autoreconf -I m4 -fiv;
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0009MPMacGuiDisableSparklepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0009-MP-MacGui-Disable-Sparkle.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0009-MP-MacGui-Disable-Sparkle.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0009-MP-MacGui-Disable-Sparkle.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,137 @@
</span><ins>+From 33c69cc59448cfd262c20ab816b35627100f0cfd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Tue, 20 Jan 2015 18:28:51 -0500
+Subject: [PATCH 09/16] (MP) MacGui: Disable Sparkle
+
+---
+ macosx/English.lproj/MainMenu.xib | 7 +------
+ macosx/English.lproj/Preferences.xib | 12 ++----------
+ macosx/HandBrake.xcodeproj/project.pbxproj | 6 ------
+ 3 files changed, 3 insertions(+), 22 deletions(-)
+
+diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
+index 4fe7a91..7b7dbcb 100644
+--- a/macosx/English.lproj/MainMenu.xib
++++ b/macosx/English.lproj/MainMenu.xib
+@@ -432,11 +432,7 @@
+ <action selector="orderFrontStandardAboutPanel:" target="-2" id="W6s-9y-dwJ"/>
+ </connections>
+ </menuItem>
+- <menuItem title="Check for Updates…" id="4964">
+- <connections>
+- <action selector="checkForUpdates:" target="4963" id="4966"/>
+- </connections>
+- </menuItem>
++ <menuItem title="Check for Updates…" enabled="NO" id="4964"/>
+ <menuItem isSeparatorItem="YES" id="970">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+@@ -1124,7 +1120,6 @@ DQ
+ <outlet property="presetsMenu" destination="1949" id="bkm-2h-uFI"/>
+ </connections>
+ </customObject>
+- <customObject id="4963" customClass="SUUpdater"/>
+ <userDefaultsController representsSharedInstance="YES" id="5676"/>
+ </objects>
+ </document>
+diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib
+index c2e0f97..d7b642e 100644
+--- a/macosx/English.lproj/Preferences.xib
++++ b/macosx/English.lproj/Preferences.xib
+@@ -60,7 +60,7 @@
+ <popUpButton verticalHuggingPriority="750" id="414">
+ <rect key="frame" x="324" y="315" width="104" height="22"/>
+ <autoresizingMask key="autoresizingMask"/>
+- <popUpButtonCell key="cell" type="push" title="Weekly" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="604800" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="417" id="415">
++ <popUpButtonCell key="cell" type="push" title="Weekly" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" enabled="NO" state="on" borderStyle="borderAndBezel" tag="604800" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="417" id="415">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="smallSystem"/>
+ <menu key="menu" title="OtherViews" id="416">
+@@ -71,10 +71,6 @@
+ </items>
+ </menu>
+ </popUpButtonCell>
+- <connections>
+- <binding destination="410" name="enabled" keyPath="automaticallyChecksForUpdates" id="433"/>
+- <binding destination="410" name="selectedTag" keyPath="updateCheckInterval" id="434"/>
+- </connections>
+ </popUpButton>
+ <popUpButton verticalHuggingPriority="750" id="289">
+ <rect key="frame" x="255" y="184" width="96" height="22"/>
+@@ -144,13 +140,10 @@
+ <button id="243">
+ <rect key="frame" x="124" y="318" width="197" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+- <buttonCell key="cell" type="check" title="Automatically check for updates:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="305">
++ <buttonCell key="cell" type="check" title="Automatically check for updates:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" enabled="NO" inset="2" id="305">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="smallSystem"/>
+ </buttonCell>
+- <connections>
+- <binding destination="410" name="value" keyPath="automaticallyChecksForUpdates" id="429"/>
+- </connections>
+ </button>
+ <textField verticalHuggingPriority="750" id="242">
+ <rect key="frame" x="18" y="276" width="103" height="14"/>
+@@ -622,6 +615,5 @@
+ </subviews>
+ <point key="canvasLocation" x="-50" y="-68"/>
+ </customView>
+- <customObject id="410" userLabel="Updater" customClass="SUUpdater"/>
+ </objects>
+ </document>
+diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
+index e9b2a8e..1efa18d 100644
+--- a/macosx/HandBrake.xcodeproj/project.pbxproj
++++ b/macosx/HandBrake.xcodeproj/project.pbxproj
+@@ -42,7 +42,6 @@
+ 273F20C814ADC4FF0021BE6D /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20C714ADC4FF0021BE6D /* QTKit.framework */; };
+ 273F20C914ADC5150021BE6D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202F14ADB9790021BE6D /* AudioToolbox.framework */; };
+ 273F20CB14ADC89A0021BE6D /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+- 273F20CC14ADC8A10021BE6D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+ 273F214C14ADCBF80021BE6D /* Delete.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212514ADCBF70021BE6D /* Delete.png */; };
+ 273F214D14ADCBF80021BE6D /* DeleteHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212614ADCBF70021BE6D /* DeleteHighlight.png */; };
+ 273F214E14ADCBF80021BE6D /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */; };
+@@ -68,7 +67,6 @@
+ 273F219014ADDDA10021BE6D /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218614ADDDA10021BE6D /* Preferences.xib */; };
+ 273F219114ADDDA10021BE6D /* Queue.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218814ADDDA10021BE6D /* Queue.xib */; };
+ 273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; };
+- 273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; };
+ 27D6C72514B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; };
+ 27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; };
+ 27D6C74314B102DA00B785E4 /* libass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72814B102DA00B785E4 /* libass.a */; };
+@@ -221,7 +219,6 @@
+ dstSubfolderSpec = 10;
+ files = (
+ 273F20CB14ADC89A0021BE6D /* Growl.framework in CopyFiles */,
+- 273F20CC14ADC8A10021BE6D /* Sparkle.framework in CopyFiles */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+@@ -276,7 +273,6 @@
+ 273F20AA14ADBE670021BE6D /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; };
+ 273F20BD14ADC09F0021BE6D /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
+ 273F20BF14ADC1250021BE6D /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
+- 273F20C014ADC1250021BE6D /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
+ 273F20C714ADC4FF0021BE6D /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
+ 273F212514ADCBF70021BE6D /* Delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Delete.png; sourceTree = "<group>"; };
+ 273F212614ADCBF70021BE6D /* DeleteHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlight.png; sourceTree = "<group>"; };
+@@ -478,7 +474,6 @@
+ 273F20C614ADC4F50021BE6D /* IOKit.framework in Frameworks */,
+ 273F20C814ADC4FF0021BE6D /* QTKit.framework in Frameworks */,
+ A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */,
+- 273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */,
+ 273F20C414ADC4B60021BE6D /* libbz2.dylib in Frameworks */,
+ 273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */,
+ 273F20C514ADC4BD0021BE6D /* libz.dylib in Frameworks */,
+@@ -647,7 +642,6 @@
+ isa = PBXGroup;
+ children = (
+ 273F20BF14ADC1250021BE6D /* Growl.framework */,
+- 273F20C014ADC1250021BE6D /* Sparkle.framework */,
+ );
+ name = "Frameworks (bundled)";
+ sourceTree = "<group>";
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0010MPfontconfigUseourportsconfigurationpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0010-MP-fontconfig-Use-our-port-s-configuration.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0010-MP-fontconfig-Use-our-port-s-configuration.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0010-MP-fontconfig-Use-our-port-s-configuration.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+From 20ef145c9b4eb3b5fd1258d02745482b3b2e1bde Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Mon, 2 Feb 2015 02:20:48 -0500
+Subject: [PATCH 10/16] (MP) fontconfig: Use our port's configuration
+
+FC_CACHEDIR and FONTCONFIG_PATH are preprocessed into some of the build
+products, although I'm not sure if the static library is one of them.
+I think the font paths are only stored in the generated fonts.conf
+(which the build discards), but let's maintain consistency with the port
+just in case.
+---
+ contrib/fontconfig/module.defs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
+index 0bf9421..da8a1f7 100644
+--- a/contrib/fontconfig/module.defs
++++ b/contrib/fontconfig/module.defs
+@@ -85,10 +85,10 @@ ifeq (darwin,$(BUILD.system))
+ FONTCONFIG.CONFIGURE.extra += \
+ LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
+ LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
+- --with-fcpath=/usr/X11/lib/X11/fontconfig \
+- --with-cache-dir=~/Library/Caches/fontconfig \
++ --with-fcpath=$(PREFIX)/etc/fonts \
++ --with-cache-dir=$(PREFIX)/var/cache/fontconfig \
+ --with-default-fonts=/Library/Fonts \
+- --with-add-fonts=/System/Library/Fonts,~/Library/Fonts
++ --with-add-fonts=/usr/X11/lib/X11/fonts,$(PREFIX)/share/fonts,/Network/Library/Fonts,/System/Library/Fonts
+ else ifeq (linux,$(BUILD.system))
+ FONTCONFIG.CONFIGURE.extra += \
+ --with-fcpath=/etc/fonts \
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0011MPlibavRespectourcompilerselectiononDarwini3patch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0011-MP-libav-Respect-our-compiler-selection-on-Darwin-i3.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0011-MP-libav-Respect-our-compiler-selection-on-Darwin-i3.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0011-MP-libav-Respect-our-compiler-selection-on-Darwin-i3.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+From acc2913ec106e474a343b548f3f9664aaa2f1918 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Tue, 27 Jan 2015 21:13:08 -0500
+Subject: [PATCH 11/16] (MP) libav: Respect our compiler selection on Darwin
+ i386
+
+The override doesn't seem necessary for the configurations we support.
+---
+ contrib/ffmpeg/module.defs | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
+index 9956083..e64b719 100644
+--- a/contrib/ffmpeg/module.defs
++++ b/contrib/ffmpeg/module.defs
+@@ -109,11 +109,6 @@ FFMPEG.BUILD.extra = V=1
+ ## on darwin i386 - unclear if it is a source code or llvm bug.
+ ##
+ ifeq (darwin-i386,$(BUILD.system)-$(BUILD.machine))
+- ## optimize mode hack: use clang
+- ifneq (none,$(FFMPEG.GCC.O))
+- FFMPEG.GCC.gcc = clang
+- endif
+-
+ ## debug mode hack: omit frame pointer
+ ifneq (none,$(FFMPEG.GCC.g))
+ FFMPEG.GCC.args.extra += -fomit-frame-pointer
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0012libvpxAddbuildtargetsforOSX1010Yosemitepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0012-libvpx-Add-build-targets-for-OS-X-10.10-Yosemite.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0012-libvpx-Add-build-targets-for-OS-X-10.10-Yosemite.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0012-libvpx-Add-build-targets-for-OS-X-10.10-Yosemite.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+From 471c9f34d219c6aaad1942292e8a2ba821b97871 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Thu, 22 Jan 2015 20:54:19 -0500
+Subject: [PATCH 12/16] libvpx: Add build targets for OS X 10.10 Yosemite
+
+Adapted from upstream:
+https://chromium.googlesource.com/webm/libvpx/+/4fe4c28%5E%21/
+---
+ .../libvpx/P00-darwin-add-yosemite-targets.patch | 54 ++++++++++++++++++++++
+ 1 file changed, 54 insertions(+)
+ create mode 100644 contrib/libvpx/P00-darwin-add-yosemite-targets.patch
+
+diff --git a/contrib/libvpx/P00-darwin-add-yosemite-targets.patch b/contrib/libvpx/P00-darwin-add-yosemite-targets.patch
+new file mode 100644
+index 0000000..884631e
+--- /dev/null
++++ b/contrib/libvpx/P00-darwin-add-yosemite-targets.patch
+@@ -0,0 +1,54 @@
++Index: libvpx-v1.3.0/build/make/configure.sh
++===================================================================
++--- libvpx-v1.3.0.orig/build/make/configure.sh
+++++ libvpx-v1.3.0/build/make/configure.sh
++@@ -658,6 +658,10 @@ process_common_toolchain() {
++ tgt_isa=x86_64
++ tgt_os=darwin13
++ ;;
+++ *darwin14*)
+++ tgt_isa=x86_64
+++ tgt_os=darwin14
+++ ;;
++ x86_64*mingw32*)
++ tgt_os=win64
++ ;;
++@@ -760,6 +764,10 @@ process_common_toolchain() {
++ add_cflags "-mmacosx-version-min=10.9"
++ add_ldflags "-mmacosx-version-min=10.9"
++ ;;
+++ *-darwin14-*)
+++ add_cflags "-mmacosx-version-min=10.10"
+++ add_ldflags "-mmacosx-version-min=10.10"
+++ ;;
++ esac
++
++ # Handle Solaris variants. Solaris 10 needs -lposix4
++Index: libvpx-v1.3.0/configure
++===================================================================
++--- libvpx-v1.3.0.orig/configure
+++++ libvpx-v1.3.0/configure
++@@ -118,6 +118,7 @@ all_platforms="${all_platforms} x86-darw
++ all_platforms="${all_platforms} x86-darwin11-gcc"
++ all_platforms="${all_platforms} x86-darwin12-gcc"
++ all_platforms="${all_platforms} x86-darwin13-gcc"
+++all_platforms="${all_platforms} x86-darwin14-gcc"
++ all_platforms="${all_platforms} x86-linux-gcc"
++ all_platforms="${all_platforms} x86-linux-icc"
++ all_platforms="${all_platforms} x86-os2-gcc"
++@@ -134,6 +135,7 @@ all_platforms="${all_platforms} x86_64-d
++ all_platforms="${all_platforms} x86_64-darwin11-gcc"
++ all_platforms="${all_platforms} x86_64-darwin12-gcc"
++ all_platforms="${all_platforms} x86_64-darwin13-gcc"
+++all_platforms="${all_platforms} x86_64-darwin14-gcc"
++ all_platforms="${all_platforms} x86_64-linux-gcc"
++ all_platforms="${all_platforms} x86_64-linux-icc"
++ all_platforms="${all_platforms} x86_64-solaris-gcc"
++@@ -149,6 +151,7 @@ all_platforms="${all_platforms} universa
++ all_platforms="${all_platforms} universal-darwin11-gcc"
++ all_platforms="${all_platforms} universal-darwin12-gcc"
++ all_platforms="${all_platforms} universal-darwin13-gcc"
+++all_platforms="${all_platforms} universal-darwin14-gcc"
++ all_platforms="${all_platforms} generic-gnu"
++
++ # all_targets is a list of all targets that can be configured
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0013libvpxFixdiscoveryofDarwinSDKspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0013-libvpx-Fix-discovery-of-Darwin-SDKs.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0013-libvpx-Fix-discovery-of-Darwin-SDKs.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0013-libvpx-Fix-discovery-of-Darwin-SDKs.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+From ebe2db65e27291595e2ef2f9a5ab444bcc212f23 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Fri, 23 Jan 2015 22:54:00 -0500
+Subject: [PATCH 13/16] libvpx: Fix discovery of Darwin SDKs
+
+Adapted from upstream:
+https://chromium.googlesource.com/webm/libvpx/+/ad314c1%5E%21/
+---
+ contrib/libvpx/P01-darwin-fix-sdk-detection.patch | 51 +++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+ create mode 100644 contrib/libvpx/P01-darwin-fix-sdk-detection.patch
+
+diff --git a/contrib/libvpx/P01-darwin-fix-sdk-detection.patch b/contrib/libvpx/P01-darwin-fix-sdk-detection.patch
+new file mode 100644
+index 0000000..2f3b62f
+--- /dev/null
++++ b/contrib/libvpx/P01-darwin-fix-sdk-detection.patch
+@@ -0,0 +1,51 @@
++Index: libvpx-v1.3.0/build/make/configure.sh
++===================================================================
++--- libvpx-v1.3.0.orig/build/make/configure.sh
+++++ libvpx-v1.3.0/build/make/configure.sh
++@@ -595,6 +595,13 @@ setup_gnu_toolchain() {
++ EXE_SFX=
++ }
++
+++# Reliably find the newest available Darwin SDKs. (Older versions of
+++# xcrun don't support --show-sdk-path.)
+++show_darwin_sdk_path() {
+++ xcrun --sdk $1 --show-sdk-path 2>/dev/null ||
+++ xcodebuild -sdk $1 -version Path 2>/dev/null
+++}
+++
++ process_common_toolchain() {
++ if [ -z "$toolchain" ]; then
++ gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}"
++@@ -717,28 +724,14 @@ process_common_toolchain() {
++ # platforms, so find the newest SDK available.
++ case ${toolchain} in
++ *-darwin*)
++- if [ -z "${DEVELOPER_DIR}" ]; then
++- DEVELOPER_DIR=`xcode-select -print-path 2> /dev/null`
++- [ $? -ne 0 ] && OSX_SKIP_DIR_CHECK=1
++- fi
++- if [ -z "${OSX_SKIP_DIR_CHECK}" ]; then
++- OSX_SDK_ROOTS="${DEVELOPER_DIR}/SDKs"
++- OSX_SDK_VERSIONS="MacOSX10.4u.sdk MacOSX10.5.sdk MacOSX10.6.sdk"
++- OSX_SDK_VERSIONS="${OSX_SDK_VERSIONS} MacOSX10.7.sdk"
++- for v in ${OSX_SDK_VERSIONS}; do
++- if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then
++- osx_sdk_dir="${OSX_SDK_ROOTS}/${v}"
++- fi
++- done
+++ osx_sdk_dir="$(show_darwin_sdk_path macosx)"
+++ if [ -d "${osx_sdk_dir}" ]; then
+++ add_cflags "-isysroot ${osx_sdk_dir}"
+++ add_ldflags "-isysroot ${osx_sdk_dir}"
++ fi
++ ;;
++ esac
++
++- if [ -d "${osx_sdk_dir}" ]; then
++- add_cflags "-isysroot ${osx_sdk_dir}"
++- add_ldflags "-isysroot ${osx_sdk_dir}"
++- fi
++-
++ case ${toolchain} in
++ *-darwin8-*)
++ add_cflags "-mmacosx-version-min=10.4"
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0014libvpxFixClangcrossbuildingonOSXpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0014-libvpx-Fix-Clang-cross-building-on-OS-X.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0014-libvpx-Fix-Clang-cross-building-on-OS-X.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0014-libvpx-Fix-Clang-cross-building-on-OS-X.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+From 618e60b32aae5f75361c37ac910dd6e257d2556c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Mon, 26 Jan 2015 23:26:24 -0500
+Subject: [PATCH 14/16] libvpx: Fix Clang cross-building on OS X
+
+The configure script doesn't really deal with Clang very well. When we
+cross-compile on OS X (e.g., build i386 on x86_64), it thinks we're
+using GCC and tries to invoke nonexistent executables like
+"i386-apple-darwin14.0.0-gcc".
+
+The proper solution might be to add new "*-darwin*-clang" build targets,
+but for now, we'll mimic the toolchain setup used by iOS builds.
+---
+ .../P02-darwin-fix-clang-cross-building.patch | 32 ++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+ create mode 100644 contrib/libvpx/P02-darwin-fix-clang-cross-building.patch
+
+diff --git a/contrib/libvpx/P02-darwin-fix-clang-cross-building.patch b/contrib/libvpx/P02-darwin-fix-clang-cross-building.patch
+new file mode 100644
+index 0000000..158bfc3
+--- /dev/null
++++ b/contrib/libvpx/P02-darwin-fix-clang-cross-building.patch
+@@ -0,0 +1,32 @@
++Index: libvpx-v1.3.0/build/make/configure.sh
++===================================================================
++--- libvpx-v1.3.0.orig/build/make/configure.sh
+++++ libvpx-v1.3.0/build/make/configure.sh
++@@ -1065,9 +1065,25 @@ EOF
++ gcc*)
++ add_cflags -m${bits}
++ add_ldflags -m${bits}
++- link_with_cc=gcc
++ tune_cflags="-march="
++- setup_gnu_toolchain
+++ case ${CC} in
+++ *clang*)
+++ XCRUN_FIND="xcrun --sdk macosx --find"
+++ AR="${AR:-$(${XCRUN_FIND} ar)}"
+++ AS="${AS:-$(${XCRUN_FIND} as)}"
+++ CC="${CC:-$(${XCRUN_FIND} clang)}"
+++ CXX="${CXX:-$(${XCRUN_FIND} clang++)}"
+++ LD="${LD:-$(${XCRUN_FIND} clang)}"
+++ NM="${NM:-$(${XCRUN_FIND} nm)}"
+++ RANLIB="${RANLIB:-$(${XCRUN_FIND} ranlib)}"
+++ STRIP="${STRIP:-$(${XCRUN_FIND} strip)}"
+++ AS_SFX=.s
+++ ;;
+++ *)
+++ link_with_cc=gcc
+++ setup_gnu_toolchain
+++ ;;
+++ esac
++ #for 32 bit x86 builds, -O3 did not turn on this flag
++ enabled optimizations && disabled gprof && check_add_cflags -fomit-frame-pointer
++ ;;
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0015MPlibvpxEnableccacheifrequestedpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0015-MP-libvpx-Enable-ccache-if-requested.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0015-MP-libvpx-Enable-ccache-if-requested.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0015-MP-libvpx-Enable-ccache-if-requested.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+From e420845341622103879360f803bfaf5d425a6619 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Tue, 27 Jan 2015 00:37:24 -0500
+Subject: [PATCH 15/16] (MP) libvpx: Enable ccache if requested
+
+---
+ contrib/libvpx/module.defs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
+index 1fb861d..0293db8 100644
+--- a/contrib/libvpx/module.defs
++++ b/contrib/libvpx/module.defs
+@@ -24,6 +24,10 @@ else ifeq (1-x86_64,$(BUILD.cross)-$(BUILD.machine))
+ LIBVPX.CONFIGURE.extra += --target=x86_64-win64-gcc
+ endif
+
++ifeq (yes,$(CCACHE))
++ LIBVPX.CONFIGURE.extra += --enable-ccache
++endif
++
+ LIBVPX.BUILD.extra = quiet:=''
+ LIBVPX.INSTALL.extra = quiet:=''
+ LIBVPX.UNINSTALL.extra = quiet:=''
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefiles0016MPlibvpxSetbuildtargetexplicitlypatch"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/HandBrake/files/0016-MP-libvpx-Set-build-target-explicitly.patch (0 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/0016-MP-libvpx-Set-build-target-explicitly.patch (rev 0)
+++ trunk/dports/multimedia/HandBrake/files/0016-MP-libvpx-Set-build-target-explicitly.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+From 10a6d771171114c873684ef0443abd4e41d83754 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lawrence=20Vel=C3=A1zquez?= <larryv@macports.org>
+Date: Fri, 23 Jan 2015 22:57:04 -0500
+Subject: [PATCH 16/16] (MP) libvpx: Set build target explicitly
+
+This should get libvpx's build to respect our desired deployment target
+and build architecture.
+---
+ contrib/libvpx/module.defs | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
+index 0293db8..6e46459 100644
+--- a/contrib/libvpx/module.defs
++++ b/contrib/libvpx/module.defs
+@@ -28,6 +28,23 @@ ifeq (yes,$(CCACHE))
+ LIBVPX.CONFIGURE.extra += --enable-ccache
+ endif
+
++ifeq (darwin,$(BUILD.system))
++ osx_minor_version := $(word 2,$(subst ., ,$(MACOSX_DEPLOYMENT_TARGET)))
++ ifneq ($(osx_minor_version),)
++ darwin_vers := $(shell echo $$(($(osx_minor_version) + 4)))
++ ifeq (i386,$(BUILD.arch))
++ LIBVPX.CONFIGURE.extra += \
++ --target=x86-darwin$(darwin_vers)-gcc
++ else ifeq (ppc,$(BUILD.arch))
++ LIBVPX.CONFIGURE.extra += \
++ --target=ppc32-darwin$(darwin_vers)-gcc
++ else
++ LIBVPX.CONFIGURE.extra += \
++ --target=$(BUILD.arch)-darwin$(darwin_vers)-gcc
++ endif
++ endif
++endif
++
+ LIBVPX.BUILD.extra = quiet:=''
+ LIBVPX.INSTALL.extra = quiet:=''
+ LIBVPX.UNINSTALL.extra = quiet:=''
+--
+2.3.0
+
</ins></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefilesffmpegjackosxpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/HandBrake/files/ffmpeg-jack-osx.patch (132826 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/ffmpeg-jack-osx.patch 2015-02-11 09:03:44 UTC (rev 132826)
+++ trunk/dports/multimedia/HandBrake/files/ffmpeg-jack-osx.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -1,119 +0,0 @@
</span><del>-diff --git ffmpeg-r25689/configure ffmpeg-r25689/configure
-index 3fceb31..a0317d4 100755
---- ffmpeg-r25689/configure
-+++ ffmpeg-r25689/configure
-@@ -1085,6 +1085,7 @@ HAVE_LIST="
- lrint
- lrintf
- lzo1x_999_compress
-+ mach_semaphore_h
- machine_ioctl_bt848_h
- machine_ioctl_meteor_h
- malloc_h
-@@ -1500,6 +1501,8 @@ ffserver_extralibs='$ldl'
-
- doc_deps="texi2html"
-
-+mach_semaphore_deps="mach_semaphore_h"
-+
- # tests
-
- test_deps(){
-@@ -2951,6 +2954,8 @@ check_header soundcard.h
-
- enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
-
-+check_header mach/semaphore.h
-+
- enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack
-
- enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
-diff --git ffmpeg-r25689/libavdevice/jack_audio.c ffmpeg-r25689/libavdevice/jack_audio.c
-index 9062e7f..274380d 100644
---- ffmpeg-r25689/libavdevice/jack_audio.c
-+++ ffmpeg-r25689/libavdevice/jack_audio.c
-@@ -21,7 +21,12 @@
- */
-
- #include "config.h"
-+#ifdef HAVE_MACH_SEMAPHORE_H
-+#include <mach/task.h>
-+#include <mach/semaphore.h>
-+#endif
- #include <semaphore.h>
-+
- #include <jack/jack.h>
-
- #include "libavutil/log.h"
-@@ -38,7 +43,11 @@
- typedef struct {
- jack_client_t * client;
- int activated;
-+#ifdef HAVE_MACH_SEMAPHORE_H
-+ semaphore_t packet_count;
-+#else
- sem_t packet_count;
-+#endif
- jack_nframes_t sample_rate;
- jack_nframes_t buffer_size;
- jack_port_t ** ports;
-@@ -99,7 +108,11 @@ static int process_callback(jack_nframes_t nframes, void *arg)
-
- /* Send the now filled packet back, and increase packet counter */
- av_fifo_generic_write(self->filled_pkts, &pkt, sizeof(pkt), NULL);
-+#ifdef HAVE_MACH_SEMAPHORE_H
-+ semaphore_signal(self->packet_count);
-+#else
- sem_post(&self->packet_count);
-+#endif
-
- return 0;
- }
-@@ -150,7 +163,11 @@ static int start_jack(AVFormatContext *context, AVFormatParameters *params)
- return AVERROR(EIO);
- }
-
-+#ifdef HAVE_MACH_SEMAPHORE_H
-+ semaphore_create(TASK_NULL, &self->packet_count, 0, 0);
-+#else
- sem_init(&self->packet_count, 0, 0);
-+#endif
-
- self->sample_rate = jack_get_sample_rate(self->client);
- self->nports = params->channels;
-@@ -212,7 +229,11 @@ static void stop_jack(JackData *self)
- jack_deactivate(self->client);
- jack_client_close(self->client);
- }
-+#ifdef HAVE_MACH_SEMAPHORE_H
-+ semaphore_destroy(TASK_NULL, self->packet_count);
-+#else
- sem_destroy(&self->packet_count);
-+#endif
- free_pkt_fifo(self->new_pkts);
- free_pkt_fifo(self->filled_pkts);
- av_freep(&self->ports);
-@@ -253,7 +274,11 @@ static int audio_read_header(AVFormatContext *context, AVFormatParameters *param
- static int audio_read_packet(AVFormatContext *context, AVPacket *pkt)
- {
- JackData *self = context->priv_data;
-+#ifdef HAVE_MACH_SEMAPHORE_H
-+ mach_timespec_t timeout = {0, 0};
-+#else
- struct timespec timeout = {0, 0};
-+#endif
- int test;
-
- /* Activate the JACK client on first packet read. Activating the JACK client
-@@ -274,7 +299,11 @@ static int audio_read_packet(AVFormatContext *context, AVPacket *pkt)
-
- /* Wait for a packet comming back from process_callback(), if one isn't available yet */
- timeout.tv_sec = av_gettime() / 1000000 + 2;
-+#ifdef HAVE_MACH_SEMAPHORE_H
-+ if (semaphore_timedwait(self->packet_count, timeout)) {
-+#else
- if (sem_timedwait(&self->packet_count, &timeout)) {
-+#endif
- if (errno == ETIMEDOUT) {
- av_log(context, AV_LOG_ERROR,
- "Input error: timed out when waiting for JACK process callback output\n");
</del></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefileslibsampleratecarbonpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/HandBrake/files/libsamplerate-carbon.patch (132826 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/libsamplerate-carbon.patch 2015-02-11 09:03:44 UTC (rev 132826)
+++ trunk/dports/multimedia/HandBrake/files/libsamplerate-carbon.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-diff -Naurp libsamplerate.orig/examples/audio_out.c libsamplerate/examples/audio_out.c
---- libsamplerate.orig/examples/audio_out.c 2008-07-02 05:23:56.000000000 -0700
-+++ libsamplerate/examples/audio_out.c 2012-09-23 11:32:30.000000000 -0700
-@@ -169,7 +169,7 @@ linux_close (AUDIO_OUT *audio_out)
-
- #if (defined (__MACH__) && defined (__APPLE__)) /* MacOSX */
-
--#include <Carbon.h>
-+#include <Carbon/Carbon.h>
- #include <CoreAudio/AudioHardware.h>
-
- #define MACOSX_MAGIC MAKE_MAGIC ('M', 'a', 'c', ' ', 'O', 'S', ' ', 'X')
</del></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefilesmissingdelegatepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/HandBrake/files/missing-delegate.patch (132826 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/missing-delegate.patch 2015-02-11 09:03:44 UTC (rev 132826)
+++ trunk/dports/multimedia/HandBrake/files/missing-delegate.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- macosx/HBQueueController.h.orig 2010-07-19 10:02:43.000000000 -0700
-+++ macosx/HBQueueController.h 2012-09-23 11:50:18.000000000 -0700
-@@ -48,7 +48,7 @@ BOOL fIsDragging;
-
-
-
--@interface HBQueueController : NSWindowController
-+@interface HBQueueController : NSWindowController <NSToolbarDelegate>
- {
- hb_handle_t *fQueueEncodeLibhb; // reference to libhb
- HBController *fHBController; // reference to HBController
</del></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefilesmp4v2r355clangcompatibilitysrcbmfftypebmffcpppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch (132826 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch 2015-02-11 09:03:44 UTC (rev 132826)
+++ trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-Index: mp4v2-trunk-r355/src/bmff/typebmff.cpp
-===================================================================
---- mp4v2-trunk-r355/src/bmff/typebmff.cpp (revision 441)
-+++ mp4v2-trunk-r355/src/bmff/typebmff.cpp (revision 442)
-@@ -23,19 +23,12 @@
-
- #include "impl.h"
-
--// VStudio idiocy prevents defining template instanced static data
--// in a namespace. Workaround it by defining in global scope.
--// Other platforms will continue to put things in the proper namespace.
--#if defined( _MSC_VER )
--using namespace mp4v2::impl::bmff;
--#else
--namespace mp4v2 { namespace impl { namespace bmff {
--#endif
-+namespace mp4v2 { namespace impl {
-
- ///////////////////////////////////////////////////////////////////////////////
-
- template <>
--const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
-+const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
- { mp4v2::impl::bmff::ILC_AAR, "aar", "Afar" },
- { mp4v2::impl::bmff::ILC_ABK, "abk", "Abkhazian" },
- { mp4v2::impl::bmff::ILC_ACE, "ace", "Achinese" },
-@@ -526,9 +519,7 @@
-
- ///////////////////////////////////////////////////////////////////////////////
-
--#if defined( _MSC_VER )
--namespace mp4v2 { namespace impl { namespace bmff {
--#endif
-+namespace bmff {
-
- ///////////////////////////////////////////////////////////////////////////////
-
</del></span></pre></div>
<a id="trunkdportsmultimediaHandBrakefilesmp4v2r355clangcompatibilitysrcitmftypecpppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch (132826 => 132827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch 2015-02-11 09:03:44 UTC (rev 132826)
+++ trunk/dports/multimedia/HandBrake/files/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch 2015-02-11 09:03:58 UTC (rev 132827)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-Index: mp4v2-trunk-r355/src/itmf/type.cpp
-===================================================================
---- mp4v2-trunk-r355/src/itmf/type.cpp (revision 441)
-+++ mp4v2-trunk-r355/src/itmf/type.cpp (revision 442)
-@@ -24,19 +24,12 @@
-
- #include "impl.h"
-
--// VStudio idiocy prevents defining template instanced static data
--// in a namespace. Workaround it by defining in global scope.
--// Other platforms will continue to put things in the proper namespace.
--#if defined( _MSC_VER )
--using namespace mp4v2::impl::itmf;
--#else
--namespace mp4v2 { namespace impl { namespace itmf {
--#endif
-+namespace mp4v2 { namespace impl {
-
- ///////////////////////////////////////////////////////////////////////////////
-
- template <>
--const EnumBasicType::Entry EnumBasicType::data[] = {
-+const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
- { mp4v2::impl::itmf::BT_IMPLICIT, "implicit", "implicit" },
- { mp4v2::impl::itmf::BT_UTF8, "utf8", "UTF-8" },
- { mp4v2::impl::itmf::BT_UTF16, "utf16", "UTF-16" },
-@@ -64,7 +57,7 @@
- ///////////////////////////////////////////////////////////////////////////////
-
- template <>
--const EnumGenreType::Entry EnumGenreType::data[] = {
-+const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
- { mp4v2::impl::itmf::GENRE_BLUES, "blues", "Blues" },
- { mp4v2::impl::itmf::GENRE_CLASSIC_ROCK, "classicrock", "Classic Rock" },
- { mp4v2::impl::itmf::GENRE_COUNTRY, "country", "Country" },
-@@ -200,7 +193,7 @@
- ///////////////////////////////////////////////////////////////////////////////
-
- template <>
--const EnumStikType::Entry EnumStikType::data[] = {
-+const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
- { mp4v2::impl::itmf::STIK_OLD_MOVIE, "oldmovie", "Movie" },
- { mp4v2::impl::itmf::STIK_NORMAL, "normal", "Normal" },
- { mp4v2::impl::itmf::STIK_AUDIOBOOK, "audiobook", "Audio Book" },
-@@ -216,7 +209,7 @@
- ///////////////////////////////////////////////////////////////////////////////
-
- template <>
--const EnumAccountType::Entry EnumAccountType::data[] = {
-+const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
- { mp4v2::impl::itmf::AT_ITUNES, "itunes", "iTunes" },
- { mp4v2::impl::itmf::AT_AOL, "aol", "AOL" },
-
-@@ -226,7 +219,7 @@
- ///////////////////////////////////////////////////////////////////////////////
-
- template <>
--const EnumCountryCode::Entry EnumCountryCode::data[] = {
-+const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
- { mp4v2::impl::itmf::CC_USA, "usa", "United States" },
- { mp4v2::impl::itmf::CC_USA, "fra", "France" },
- { mp4v2::impl::itmf::CC_DEU, "ger", "Germany" },
-@@ -256,7 +249,7 @@
- ///////////////////////////////////////////////////////////////////////////////
-
- template <>
--const EnumContentRating::Entry EnumContentRating::data[] = {
-+const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
- { mp4v2::impl::itmf::CR_NONE, "none", "None" },
- { mp4v2::impl::itmf::CR_CLEAN, "clean", "Clean" },
- { mp4v2::impl::itmf::CR_EXPLICIT, "explicit", "Explicit" },
-@@ -266,9 +259,7 @@
-
- ///////////////////////////////////////////////////////////////////////////////
-
--#if defined( _MSC_VER )
--namespace mp4v2 { namespace impl { namespace itmf {
--#endif
-+namespace itmf {
-
- ///////////////////////////////////////////////////////////////////////////////
-
</del></span></pre>
</div>
</div>
</body>
</html>