[119264] trunk/dports/multimedia/mythtv-core.26

pixilla at macports.org pixilla at macports.org
Mon Apr 21 13:10:31 PDT 2014


Revision: 119264
          https://trac.macports.org/changeset/119264
Author:   pixilla at macports.org
Date:     2014-04-21 13:10:31 -0700 (Mon, 21 Apr 2014)
Log Message:
-----------
multimedia/mythtv-core.26:
-Update to 0.26-fixes as of Mar 21, 2014
-Add patch to fix linking issues. conflicts_build no longer necessary and eliminates a previous patch attempt.
-Add patch fixing build with clang and enable recent Clang versions.
-Disable qtdbus; only used on Linux anyway
-Disable ceton and xrandr; unneeded.
-Remove superfluous trailing '/' on xinstalls
-Fix livecheck

Modified Paths:
--------------
    trunk/dports/multimedia/mythtv-core.26/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/mythtv-core.26/files/patch-clang_fixes.diff
    trunk/dports/multimedia/mythtv-core.26/files/patch-freetype-2.5.1.diff
    trunk/dports/multimedia/mythtv-core.26/files/patch-libs_fix_linking.diff

Removed Paths:
-------------
    trunk/dports/multimedia/mythtv-core.26/files/patch-mythtv_settings.pro.diff

Modified: trunk/dports/multimedia/mythtv-core.26/Portfile
===================================================================
--- trunk/dports/multimedia/mythtv-core.26/Portfile	2014-04-21 19:53:30 UTC (rev 119263)
+++ trunk/dports/multimedia/mythtv-core.26/Portfile	2014-04-21 20:10:31 UTC (rev 119264)
@@ -5,14 +5,13 @@
 PortGroup           github 1.0
 PortGroup           qt4 1.0
 
-set shorthash       9fd7c6102
-# set fullhash      9fd7c6102b2cd1a3760337663803b110446c6ea7
+set shorthash       1a4cebf79
+# set fullhash      1a4cebf795a1400987347f57faeb57cacd0805f9
 set majorversion    .26
 set minorversion    .1
 github.setup        MythTV mythtv ${shorthash}
 name                mythtv-core${majorversion}
-version             0${majorversion}${minorversion}-Fixes-20130921
-revision            3
+version             0${majorversion}${minorversion}-Fixes-20140321
 categories          multimedia
 platforms           darwin
 # i386 unsupported -- https://trac.macports.org/ticket/40337
@@ -26,8 +25,8 @@
                     to Windows Media Center or Tivo.
 
 homepage            http://www.mythtv.org/
-checksums           rmd160  85ab191fb12a8319ca2fbb2d761846d3b643e548 \
-                    sha256  1dd2192b8d0169eb3642da8b42bc6112ad5b862fe03368d941a3f15af27b9b23
+checksums           rmd160  46c249c9746e72ffceea40310bfdce00b6491192 \
+                    sha256  efe5a6d918e0be15896bc3bdd8a397f652d6aaee919381894cc6c6c7f69048be
 
 set nick            mythtv
 set mythtvhomedir   ${prefix}/var/mythtvuser
@@ -69,11 +68,14 @@
 
 depends_run         port:logrotate
 
-# Inexplicable run-time errors on Mtn Lion with XCode 4 compilers and other versions of
-# clang.  Punt and only allow compilers known to work
-# https://trac.macports.org/ticket/40137
-compiler.whitelist gcc-4.2 apple-gcc-4.2
+# See http://code.mythtv.org/trac/ticket/11070
+# Run-time failures experienced with certain versions of Clang.  Unable to discern cause.
+# Most recent version of clang seems OK, let's try again
 
+compiler.fallback-append apple-gcc-4.2
+compiler.blacklist-append { clang <= 500.2.79 } \
+    macports-clang*
+
 pre-fetch {
     if {${os.platform} eq "darwin" && ${os.major} < 9} {
         ui_error "${name} ${version} requires Mac OS X 10.5 or greater."
@@ -81,10 +83,13 @@
     }
 }
 
-# see http://code.mythtv.org/trac/ticket/10890
-patchfiles          patch-configure-configincludepath.diff \
-                    patch-mythtv_settings.pro.diff
+# eliminate /usr/include
+patchfiles          patch-configure-configincludepath.diff
 
+#fix libmythtv linking against prior installed versions
+# see mythtv-dev thread, committed to master
+patchfiles-append   patch-libs_fix_linking.diff
+
 # following three patches currently required to support MythExpress
 # See tickets:
 #    http://code.mythtv.org/trac/ticket/10773
@@ -94,6 +99,14 @@
                     patch-protect-metadata-loads-from-multiple-threads.diff \
                     patch-restore-fe-netcontrol-play-resume-functionality.diff
 
+# Clang fixes committed to 0.27-fixes but not 0.26-fixes
+#  https://github.com/MythTV/mythtv/commit/f5e61804d7a8ad6afc4aa4484e2c05f24ddb396b
+patchfiles-append   patch-clang_fixes.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} {
@@ -170,15 +183,16 @@
     reinplace -locale C "s|@PREFIX@|${prefix}|g" ${worksrcpath}/macports/logrotate.conf
     reinplace -locale C "s|@MYTHTVLOGDIR@|${mythtvlogdir}|g" ${worksrcpath}/macports/logrotate.mythtv
     reinplace -locale C "s|xxxyyyzzz|${mythtvpidfile}|" ${worksrcpath}/mythtv/configure
-    reinplace -locale C "s|--includedir=|CC=${configure.cc} CXX=${configure.cxx} --includedir=|" \
-        ${worksrcpath}/mythtv/external/Makefile
+#    reinplace -locale C "s|--includedir=|CC=${configure.cc} CXX=${configure.cxx} --includedir=|" \
+#        ${worksrcpath}/mythtv/external/Makefile
 }
 
 ################################################################################
 # Let Myth set its own flags... (ala qt4-mac)                                  #
 ################################################################################
 
-configure.cflags
+# except workaround broken configure handling of freetype
+configure.cflags    -I${prefix}//include/freetype2
 configure.cppflags
 configure.cxxflags
 configure.objcflags
@@ -200,10 +214,14 @@
                     --cxx=${configure.cxx} \
                     --qmake=${qt_qmake_cmd} \
                     --python=${pythonbin} \
+                    --disable-ceton \
                     --disable-firewire \
                     --disable-audio-jack --disable-indev=jack \
                     --disable-libvpx --disable-libxvid \
+                    --disable-qtdbus \
                     --disable-sdl \
+                    --disable-xrandr \
+                    --enable-libfreetype \
                     --enable-libmp3lame --enable-libx264
 
 if {${configure.ccache} != "yes"} {
@@ -244,7 +262,7 @@
         ${destroot}${mythtvrundir}
 
 # install logrotate.mythtv
-    xinstall -m 400 ${worksrcpath}/macports/logrotate.mythtv ${destroot}${prefix}/etc/logrotate.d/
+    xinstall -m 400 ${worksrcpath}/macports/logrotate.mythtv ${destroot}${prefix}/etc/logrotate.d
 
 # install the launchd plist for the backend
     ui_info "Installing startupitem/launchd plist..."
@@ -261,11 +279,11 @@
 
     xinstall -m 755 \
         ${configure.dir}/database/mc.sql \
-        ${destroot}${prefix}/share/${nick}/database/
+        ${destroot}${prefix}/share/${nick}/database
     xinstall -m 755 \
         ${configure.dir}/contrib/maintenance/optimize_mythdb.pl \
         ${configure.dir}/contrib/user_jobs/mythlink.pl \
-        ${destroot}${prefix}/share/${nick}/contrib/
+        ${destroot}${prefix}/share/${nick}/contrib
 
 # install some simple Applescripts to launch common myth apps
     ui_info "Installing Applescript helpers..."
@@ -407,4 +425,5 @@
 #
 ############################################################################"
 
-livecheck.version           ${version}
+livecheck.version       ${majorversion}${minorversion}
+livecheck.regex         "archive/v(0${majorversion}\[\\.\\d\]?)${extract.suffix}"

Added: trunk/dports/multimedia/mythtv-core.26/files/patch-clang_fixes.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.26/files/patch-clang_fixes.diff	                        (rev 0)
+++ trunk/dports/multimedia/mythtv-core.26/files/patch-clang_fixes.diff	2014-04-21 20:10:31 UTC (rev 119264)
@@ -0,0 +1,84 @@
+Adapted from f5e61804d7a8ad6afc4aa4484e2c05f24ddb396b Mon Sep 17 00:00:00 2001
+From: Amar Takhar <verm at darkbeer.org>
+Date: Wed, 15 Jan 2014 21:44:48 +0000
+Subject: Fixes for FreeBSD 10.0 + clang
+
+Signed-off-by: Raymond Wagner <rwagner at mythtv.org>
+(cherry picked from commit 366b73bc672d45be94b981a944f9f415b44ea13c)
+---
+diff --git mythtv/libs/libmyth/remoteutil.h mythtv/libs/libmyth/remoteutil.h
+index 7acff6a..4dc6a54 100644
+--- mythtv/libs/libmyth/remoteutil.h
++++ mythtv/libs/libmyth/remoteutil.h
+@@ -1,6 +1,8 @@
+ #ifndef REMOTEUTIL_H_
+ #define REMOTEUTIL_H_
+ 
++#include <time.h>
++
+ #include <QStringList>
+ #include <QDateTime>
+ 
+diff --git mythtv/libs/libmythbase/mythmiscutil.h mythtv/libs/libmythbase/mythmiscutil.h
+index bfb171e..91dea13 100644
+--- mythtv/libs/libmythbase/mythmiscutil.h
++++ mythtv/libs/libmythbase/mythmiscutil.h
+@@ -2,6 +2,7 @@
+ #define MYTHMISCUTIL_H_
+ 
+ #include <stdint.h>
++#include <time.h>
+ 
+ #include <algorithm>
+ using namespace std;
+diff --git mythtv/libs/libmythbase/mythtimezone.cpp mythtv/libs/libmythbase/mythtimezone.cpp
+index ac20c5c..6bff6b3 100644
+--- mythtv/libs/libmythbase/mythtimezone.cpp
++++ mythtv/libs/libmythbase/mythtimezone.cpp
+@@ -1,6 +1,7 @@
+ #include "mythtimezone.h"
+ 
+ #include <stdlib.h> // for malloc, getenv
++#include <time.h>
+ 
+ #include <QDataStream>
+ #include <QTextStream>
+diff --git mythtv/libs/libmythui/mythgesture.cpp mythtv/libs/libmythui/mythgesture.cpp
+index 37846e4..f020f1a 100644
+--- mythtv/libs/libmythui/mythgesture.cpp
++++ mythtv/libs/libmythui/mythgesture.cpp
+@@ -30,6 +30,7 @@
+ 
+ #include <cmath>
+ #include <algorithm>
++#include <complex>
+ 
+ #include <QMutex>
+ #include <QMap>
+diff --git mythtv/libs/libmythui/mythpainter.cpp mythtv/libs/libmythui/mythpainter.cpp
+index c821a7b..29b063c 100644
+--- mythtv/libs/libmythui/mythpainter.cpp
++++ mythtv/libs/libmythui/mythpainter.cpp
+@@ -1,4 +1,5 @@
+ #include <stdint.h>
++#include <complex>
+ 
+ // QT headers
+ #include <QRect>
+diff --git mythtv/libs/libmythupnp/mmulticastsocketdevice.h mythtv/libs/libmythupnp/mmulticastsocketdevice.h
+index ad793f9..4bfdd62 100644
+--- mythtv/libs/libmythupnp/mmulticastsocketdevice.h
++++ mythtv/libs/libmythupnp/mmulticastsocketdevice.h
+@@ -13,6 +13,10 @@
+ #ifndef _MULTICAST_SOCKET_DEVICE_H_
+ #define _MULTICAST_SOCKET_DEVICE_H_
+ 
++#ifdef __FreeBSD__
++#  include <sys/types.h>
++#endif
++
+ #ifdef _WIN32
+ # ifndef _MSC_VER
+ #  include <ws2tcpip.h>
+--
+cgit v0.9.0.2-52-g1de3

Added: trunk/dports/multimedia/mythtv-core.26/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.26/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/multimedia/mythtv-core.26/files/patch-freetype-2.5.1.diff	2014-04-21 20:10:31 UTC (rev 119264)
@@ -0,0 +1,26 @@
+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/external/FFmpeg/configure.orig	2014-04-10 10:30:21.000000000 -0400
++++ mythtv/external/FFmpeg/configure	2014-04-10 10:31:22.000000000 -0400
+@@ -3161,7 +3161,7 @@
+                       { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
+                         die "ERROR: libcelt version must be >= 0.11.0."; }
+ enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+-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     && require  libgsm gsm/gsm.h gsm_create -lgsm
+ enabled libmodplug && require  libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
+ enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
+
+--- 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,7 @@
+ #include "video.h"
+ 
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
++#include FT_IMAGE_H
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #if CONFIG_FONTCONFIG

Added: trunk/dports/multimedia/mythtv-core.26/files/patch-libs_fix_linking.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.26/files/patch-libs_fix_linking.diff	                        (rev 0)
+++ trunk/dports/multimedia/mythtv-core.26/files/patch-libs_fix_linking.diff	2014-04-21 20:10:31 UTC (rev 119264)
@@ -0,0 +1,31 @@
+Adapted from 4f15d4449a31d551d61d0a00362089d8d7d8a763 Mon Sep 17 00:00:00 2001
+From: Jean-Yves Avenard <jyavenard at 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

Deleted: trunk/dports/multimedia/mythtv-core.26/files/patch-mythtv_settings.pro.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.26/files/patch-mythtv_settings.pro.diff	2014-04-21 19:53:30 UTC (rev 119263)
+++ trunk/dports/multimedia/mythtv-core.26/files/patch-mythtv_settings.pro.diff	2014-04-21 20:10:31 UTC (rev 119264)
@@ -1,13 +0,0 @@
---- mythtv/settings.pro.orig	2013-03-24 14:29:50.000000000 -0400
-+++ mythtv/settings.pro	2013-03-24 14:30:06.000000000 -0400
-@@ -110,8 +110,8 @@
- macx: QMAKE_CFLAGS_STATIC_LIB += -fno-common
- 
- # figure out compile flags based on qmake info
--QMAKE_CFLAGS   += $$CPPFLAGS   $$CFLAGS
--QMAKE_CXXFLAGS += $$CXXPPFLAGS $$ECXXFLAGS
-+QMAKE_CFLAGS   = $$CPPFLAGS   $$CFLAGS
-+QMAKE_CXXFLAGS = $$CXXPPFLAGS $$ECXXFLAGS
- 
- profile:CONFIG += debug
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140421/f0286ba1/attachment-0001.html>


More information about the macports-changes mailing list