<!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>[120895] trunk/dports/multimedia/mythtv-core.27</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/120895">120895</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2014-06-10 19:43:52 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>multimedia/mythtv-core.27:
- Update to 0.27.1 plus fixes through 20140528.
- Add missing openssl dependency.
- Correct launchd plist specification.
- Eliminate patches applied upstream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediamythtvcore27Portfile">trunk/dports/multimedia/mythtv-core.27/Portfile</a></li>
<li><a href="#trunkdportsmultimediamythtvcore27filesorgmythtvmythbackendplist">trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediamythtvcore27filespatchfreetype251diff">trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff</a></li>
<li><a href="#trunkdportsmultimediamythtvcore27filespatchlibs_fix_linkingdiff">trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff</a></li>
<li><a href="#trunkdportsmultimediamythtvcore27filespatchprotectmetadataloadsfrommultiplethreadsdiff">trunk/dports/multimedia/mythtv-core.27/files/patch-protect-metadata-loads-from-multiple-threads.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediamythtvcore27Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mythtv-core.27/Portfile (120894 => 120895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mythtv-core.27/Portfile 2014-06-11 02:18:51 UTC (rev 120894)
+++ trunk/dports/multimedia/mythtv-core.27/Portfile 2014-06-11 02:43:52 UTC (rev 120895)
</span><span class="lines">@@ -6,16 +6,16 @@
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><del>-set shorthash 39686c6c
-# set fullhash 39686c6c6800053fe25764d2f27cfdfc2dd21fab
</del><ins>+set shorthash 41d04b63
+# set fullhash 41d04b638fb1b8ca28c9724dec14c1e586ba049f
</ins><span class="cx"> set majorversion .27
</span><del>-set minorversion ""
</del><ins>+set minorversion .1
</ins><span class="cx"> github.setup MythTV mythtv ${shorthash}
</span><del>-checksums rmd160 bf830de2168ad591b27e3e2b009816996e1649e7 \
- sha256 17b7c454d07a4237a1b3583651712a195e9712a88e04582a50868ea33b0c697e
</del><ins>+checksums rmd160 1652f68c33ace757fa008faff2e6d123082f1799 \
+ sha256 700dd26c2fecc0a6ee838a6824fd0036334856caceb88e19e31aa0ad5bc288d0
</ins><span class="cx">
</span><span class="cx"> name mythtv-core${majorversion}
</span><del>-version 0${majorversion}${minorversion}-Fixes-20140404
</del><ins>+version 0${majorversion}${minorversion}-Fixes-20140528
</ins><span class="cx"> categories multimedia
</span><span class="cx"> platforms darwin
</span><span class="cx"> # i386 unsupported -- https://trac.macports.org/ticket/40337
</span><span class="lines">@@ -59,6 +59,8 @@
</span><span class="cx"> port:lame \
</span><span class="cx"> port:faac \
</span><span class="cx"> port:x264 \
</span><ins>+ port:openssl \
+ port:qt4-mac \
</ins><span class="cx"> port:qt4-mac-${mysqlver}-plugin \
</span><span class="cx"> port:taglib \
</span><span class="cx"> port:zlib \
</span><span class="lines">@@ -85,21 +87,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#fix libmythtv linking against prior installed versions
-# see mythtv-dev thread, committed to master
-patchfiles-append patch-libs_fix_linking.diff
-
-# following patch currently required to support MythExpress
-# See ticket: http://code.mythtv.org/trac/ticket/10825
-patchfiles-append patch-protect-metadata-loads-from-multiple-threads.diff
-
</del><span class="cx"> # revert rpath linking stuff as it is non-functional in MacPorts
</span><span class="cx"> patchfiles-append patch-rpath_linking.diff
</span><span class="cx">
</span><del>-# patches to support freetype 2.5.1 changes to include layout
-# http://code.mythtv.org/trac/ticket/11967
-patchfiles-append patch-freetype-2.5.1.diff
-
</del><span class="cx"> post-extract {
</span><span class="cx"> file mkdir ${worksrcpath}/macports
</span><span class="cx"> foreach {applescript} ${applescripts} {
</span></span></pre></div>
<a id="trunkdportsmultimediamythtvcore27filesorgmythtvmythbackendplist"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist (120894 => 120895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist 2014-06-11 02:18:51 UTC (rev 120894)
+++ trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist 2014-06-11 02:43:52 UTC (rev 120895)
</span><span class="lines">@@ -29,6 +29,6 @@
</span><span class="cx"> <key>RunAtLoad</key>
</span><span class="cx"> <true/>
</span><span class="cx"> <key>ThrottleInterval</key>
</span><del>- <string>300</string>
</del><ins>+ <integer>300</integer>
</ins><span class="cx"> </dict>
</span><span class="cx"> </plist>
</span></span></pre></div>
<a id="trunkdportsmultimediamythtvcore27filespatchfreetype251diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff (120894 => 120895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff 2014-06-11 02:18:51 UTC (rev 120894)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff 2014-06-11 02:43:52 UTC (rev 120895)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-Based on patch to FFmpeg port for freetype 2.5.1 changes to include layout
-https://trac.macports.org/browser/trunk/dports/multimedia/ffmpeg/files/patch-freetype-2.5.1.diff?rev=114100
-
---- mythtv/configure.orig 2013-11-30 11:03:11.000000000 -0500
-+++ mythtv/configure 2013-11-30 11:04:13.000000000 -0500
-@@ -5005,7 +5005,7 @@
- enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
- flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
- enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs
--enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
- enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
- check_lib "${gsm_hdr}" gsm_create -lgsm && break;
- done || die "ERROR: libgsm not found"; }
---- mythtv/external/FFmpeg/libavfilter/vf_drawtext.c.orig 2013-11-30 11:07:18.000000000 -0500
-+++ mythtv/external/FFmpeg/libavfilter/vf_drawtext.c 2013-11-30 11:08:16.000000000 -0500
-@@ -48,7 +48,6 @@
- #include "video.h"
-
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #if CONFIG_FONTCONFIG
</del></span></pre></div>
<a id="trunkdportsmultimediamythtvcore27filespatchlibs_fix_linkingdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff (120894 => 120895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff 2014-06-11 02:18:51 UTC (rev 120894)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff 2014-06-11 02:43:52 UTC (rev 120895)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-Adapted from 4f15d4449a31d551d61d0a00362089d8d7d8a763 Mon Sep 17 00:00:00 2001
-From: Jean-Yves Avenard <jyavenard@mythtv.org>
-Date: Sat, 05 Apr 2014 14:55:04 +0000
-Subject: Fix linking issues.
-
-Spotted by Craig Treleaven, freetype linking parameters were added twice and too early,
-causing general linking with installed system libraries first, and then local tree ones.
-Configure also automatically adds all libraries checked for to EXTRALIBS define
----
-diff -u mythtv/libs/libmythtv/libmythtv.pro.orig mythtv/libs/libmythtv/libmythtv.pro
---- mythtv/libs/libmythtv/libmythtv.pro.orig 2014-04-09 10:50:56.000000000 -0400
-+++ mythtv/libs/libmythtv/libmythtv.pro 2014-04-09 10:51:46.000000000 -0400
-@@ -50,7 +50,6 @@
- INCLUDEPATH += $$POSTINC
-
- QMAKE_CXXFLAGS += $${FREETYPE_CFLAGS}
--QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS}
-
- macx {
- # Mac OS X Frameworks
-diff -u mythtv/settings.pro.orig mythtv/settings.pro
---- mythtv/settings.pro.orig 2014-04-09 10:47:39.000000000 -0400
-+++ mythtv/settings.pro 2014-04-09 10:54:04.000000000 -0400
-@@ -158,7 +158,6 @@
- }
- EXTRA_LIBS = $$EXTRALIBS
-
--EXTRA_LIBS += $$FREETYPE_LIBS
- EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS
-
- EXTRA_LIBS += $$LOCAL_LIBDIR_OGL
</del></span></pre></div>
<a id="trunkdportsmultimediamythtvcore27filespatchprotectmetadataloadsfrommultiplethreadsdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mythtv-core.27/files/patch-protect-metadata-loads-from-multiple-threads.diff (120894 => 120895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mythtv-core.27/files/patch-protect-metadata-loads-from-multiple-threads.diff 2014-06-11 02:18:51 UTC (rev 120894)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-protect-metadata-loads-from-multiple-threads.diff 2014-06-11 02:43:52 UTC (rev 120895)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-From b20171597097f8b933065ef3291c63194d310fbf Mon Sep 17 00:00:00 2001
-From: George Nassas <george@nassas.com>
-Date: Sun, 10 Jun 2012 13:36:42 -0400
-Subject: [PATCH] protect metadata loads from multiple threads
-
----
- mythtv/libs/libmythmetadata/dbaccess.cpp | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/mythtv/libs/libmythmetadata/dbaccess.cpp b/mythtv/libs/libmythmetadata/dbaccess.cpp
-index 67cd904..46adb7a 100644
---- mythtv/libs/libmythmetadata/dbaccess.cpp
-+++ mythtv/libs/libmythmetadata/dbaccess.cpp
-@@ -47,8 +47,11 @@ class SingleValueImp
-
- virtual ~SingleValueImp() {}
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
-@@ -271,8 +274,11 @@ class MultiValueImp
- .arg(m_value_name).arg(m_table_name).arg(m_id_name);
- }
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
-@@ -730,8 +736,11 @@ class FileAssociationsImp
- }
- }
-
-+ mutable QMutex mutex;
-+
- void load_data()
- {
-+ QMutexLocker locker(&mutex);
- if (!m_ready)
- {
- fill_from_db();
---
-1.7.2.5
-
</del></span></pre>
</div>
</div>
</body>
</html>