[114355] trunk/dports/multimedia/mythtv-core.27

pixilla at macports.org pixilla at macports.org
Thu Dec 5 13:01:50 PST 2013


Revision: 114355
          https://trac.macports.org/changeset/114355
Author:   pixilla at macports.org
Date:     2013-12-05 13:01:49 -0800 (Thu, 05 Dec 2013)
Log Message:
-----------
multimedia/mythtv-core.27:
- Maintainer patch.
- Update to version 0.27-Fixes-20131129.
- Fix build on Mavericks for stricter libc++ compatibility. Closes #41371
- Fix Freetype includes.
- Blacklist clang to avoid run-time failures.  Underlying cause not known.
- Modify launchd parameter so failed backend attempts to launch less often.
- Stop backend logging to Console as well as own logs.

Modified Paths:
--------------
    trunk/dports/multimedia/mythtv-core.27/Portfile
    trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist

Added Paths:
-----------
    trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff
    trunk/dports/multimedia/mythtv-core.27/files/patch-various_c++_v_stdc++.diff

Modified: trunk/dports/multimedia/mythtv-core.27/Portfile
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/Portfile	2013-12-05 20:01:16 UTC (rev 114354)
+++ trunk/dports/multimedia/mythtv-core.27/Portfile	2013-12-05 21:01:49 UTC (rev 114355)
@@ -4,20 +4,18 @@
 PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           qt4 1.0
-PortGroup           compiler_blacklist_versions 1.0
 PortGroup           conflicts_build 1.0
 
-set shorthash       ea5af908
-# set fullhash      ea5af9081d46b566b638856204793c7ddc032da4
+set shorthash       cb744f81
+# set fullhash      cb744f810c6133aa293ad95d65225890371951f0
 set majorversion    .27
 set minorversion    ""
 github.setup        MythTV mythtv ${shorthash}
-checksums           rmd160  a1c9a90f36da08846c08f4da89195495f0942d56 \
-                    sha256  b9fa80bff1546bf1d1736e37882554fe2931875d60e24ca62b62f16384e08199
+checksums           rmd160  630243203a78cb441a96b0e37f022f08b97a1079 \
+                    sha256  4ad0f81376797b2e4203d0024d41f48d85d157917a55289d821e328df9bf2bda
 
 name                mythtv-core${majorversion}
-version             0${majorversion}${minorversion}-Fixes-20131102
-revision            1
+version             0${majorversion}${minorversion}-Fixes-20131129
 categories          multimedia
 platforms           darwin
 # i386 unsupported -- https://trac.macports.org/ticket/40337
@@ -77,7 +75,7 @@
 depends_build       port:yasm  port:pkgconfig
 
 conflicts           mythtv-core.25 mythtv-core.26
-conflicts_build     mythtv-core.25 mythtv-core.26
+conflicts_build     mythtv-core.25 mythtv-core.26 mythtv-core.27
 
 depends_run         port:logrotate
 
@@ -98,6 +96,14 @@
 # revert rpath linking stuff as it is non-functional in MacPorts
 patchfiles-append   patch-rpath_linking.diff
 
+# patches to support libc++ runtime with new Clang (v. libstdc++)
+#  http://code.mythtv.org/trac/ticket/11966
+patchfiles-append   patch-various_c++_v_stdc++.diff
+
+# 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
+
 post-extract {
     file mkdir ${worksrcpath}/macports
     foreach {applescript} ${applescripts} {
@@ -179,9 +185,13 @@
 # environment variables, which is required for compiling
 # this port when using MacPorts.  The versions seem to be: MacPorts
 # CLANG 3.0 or earlier, and Apple CLANG 318.0.61 or older (XCode 4.3.3 and prior).
+#
+# See http://code.mythtv.org/trac/ticket/11070
+# Run-time failures experienced with certain versions of Clang.  Unable to discern cause.
+# Blacklist clang completely until better understood.
 
 compiler.fallback-append apple-gcc-4.2
-compiler.blacklist-append { clang <= 318.0.61 } macports-clang-2.9 macports-clang-3.0
+compiler.blacklist-append *clang*
 
 # Clear all MacPorts flags...MythTV is smart enough to set up its own.
 # (ala qt4-mac/Portfile)

Modified: trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist	2013-12-05 20:01:16 UTC (rev 114354)
+++ trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist	2013-12-05 21:01:49 UTC (rev 114355)
@@ -24,8 +24,11 @@
         <string>@MYTHTVPIDFILE@</string>
         <string>--loglevel</string>
         <string>info</string>
+        <string>--quiet</string>
     </array>
     <key>RunAtLoad</key>
     <true/>
+    <key>ThrottleInterval</key>
+    <string>300</string>
 </dict>
 </plist>

Added: trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff	2013-12-05 21:01:49 UTC (rev 114355)
@@ -0,0 +1,24 @@
+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

Added: trunk/dports/multimedia/mythtv-core.27/files/patch-various_c++_v_stdc++.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/patch-various_c++_v_stdc++.diff	                        (rev 0)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-various_c++_v_stdc++.diff	2013-12-05 21:01:49 UTC (rev 114355)
@@ -0,0 +1,32 @@
+
+--- mythtv/libs/libmythui/mythgesture.cpp.orig	2013-11-02 09:19:17.000000000 -0400
++++ mythtv/libs/libmythui/mythgesture.cpp	2013-11-29 21:28:27.000000000 -0500
+@@ -29,6 +29,8 @@
+ #include "mythgesture.h"
+ 
+ #include <cmath>
++#include <stdlib.h>     /* abs */
++using namespace std;
+ #include <algorithm>
+ 
+ #include <QMutex>
+
+--- mythtv/libs/libmythui/mythpainter.cpp.orig	2013-11-02 09:19:17.000000000 -0400
++++ mythtv/libs/libmythui/mythpainter.cpp	2013-11-29 21:43:32.000000000 -0500
+@@ -1,5 +1,7 @@
+ #include <stdint.h>
+ #include <algorithm>
++#include <cmath>        // std::abs
++using namespace std;
+ 
+ // QT headers
+ #include <QRect>
+@@ -212,7 +214,7 @@
+ 
+     QFontMetrics fm(font.face());
+     int totalHeight = fm.height() + outlineSize +
+-        std::max(outlineSize, std::abs(shadowOffset.y()));
++        std::max(outlineSize, abs((shadowOffset.y())));
+ 
+     // initialPaddingX is the number of pixels from the left of the
+     // input QRect to the left of the actual text.  It is always 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131205/8c20f19b/attachment.html>


More information about the macports-changes mailing list