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

pixilla at macports.org pixilla at macports.org
Sat Apr 26 15:26:58 PDT 2014


Revision: 119477
          https://trac.macports.org/changeset/119477
Author:   pixilla at macports.org
Date:     2014-04-26 15:26:58 -0700 (Sat, 26 Apr 2014)
Log Message:
-----------
multimedia/mythtv-core.27:
- Update version to 0.27-Fixes-20140404. Maintainer patch.

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

Added Paths:
-----------
    trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff

Removed Paths:
-------------
    trunk/dports/multimedia/mythtv-core.27/files/patch-configure-configincludepath.diff
    trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv-libs-libmythtv-NuppelVideoRecorder.cpp.diff
    trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv-libs-libmythtv-avformatwriter.cpp.diff
    trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv_settings.pro.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	2014-04-26 22:23:24 UTC (rev 119476)
+++ trunk/dports/multimedia/mythtv-core.27/Portfile	2014-04-26 22:26:58 UTC (rev 119477)
@@ -4,19 +4,17 @@
 PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           qt4 1.0
-PortGroup           conflicts_build 1.0
 
-set shorthash       cb744f81
-# set fullhash      cb744f810c6133aa293ad95d65225890371951f0
+set shorthash       39686c6c
+# set fullhash      39686c6c6800053fe25764d2f27cfdfc2dd21fab
 set majorversion    .27
 set minorversion    ""
 github.setup        MythTV mythtv ${shorthash}
-checksums           rmd160  630243203a78cb441a96b0e37f022f08b97a1079 \
-                    sha256  4ad0f81376797b2e4203d0024d41f48d85d157917a55289d821e328df9bf2bda
+checksums           rmd160  bf830de2168ad591b27e3e2b009816996e1649e7 \
+                    sha256  17b7c454d07a4237a1b3583651712a195e9712a88e04582a50868ea33b0c697e
 
 name                mythtv-core${majorversion}
-version             0${majorversion}${minorversion}-Fixes-20131129
-revision            3
+version             0${majorversion}${minorversion}-Fixes-20140404
 categories          multimedia
 platforms           darwin
 # i386 unsupported -- https://trac.macports.org/ticket/40337
@@ -76,7 +74,6 @@
 depends_build       port:yasm  port:pkgconfig
 
 conflicts           mythtv-core.25 mythtv-core.26
-conflicts_build     mythtv-core.25 mythtv-core.26 mythtv-core.27
 
 depends_run         port:logrotate
 
@@ -87,8 +84,9 @@
     }
 }
 
-patchfiles          patch-configure-configincludepath.diff \
-                    patch-mythtv_settings.pro.diff
+#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
@@ -97,10 +95,6 @@
 # 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
@@ -189,10 +183,11 @@
 #
 # 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.
+# Most recent version of clang seems OK, let's try again
 
 compiler.fallback-append apple-gcc-4.2
-compiler.blacklist-append *clang*
+compiler.blacklist-append { clang <= 500.2.79 } \
+    macports-clang*
 
 # Clear all MacPorts flags...MythTV is smart enough to set up its own.
 # (ala qt4-mac/Portfile)
@@ -222,6 +217,7 @@
                     --disable-firewire \
                     --disable-audio-jack --disable-indev=jack \
                     --disable-libvpx --disable-libxvid \
+                    --disable-qtdbus \
                     --disable-sdl \
                     --disable-xrandr \
                     --enable-libmp3lame \
@@ -434,5 +430,5 @@
 #
 ############################################################################"
 
-livecheck.version       ${version}
-livecheck.regex         "tarball/v(0.27\[^\"\]+)"
+livecheck.version       ${majorversion}${minorversion}
+livecheck.regex         "archive/v(0.27\[\\.\\d\]?)${extract.suffix}"

Deleted: trunk/dports/multimedia/mythtv-core.27/files/patch-configure-configincludepath.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/patch-configure-configincludepath.diff	2014-04-26 22:23:24 UTC (rev 119476)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-configure-configincludepath.diff	2014-04-26 22:26:58 UTC (rev 119477)
@@ -1,20 +0,0 @@
---- mythtv/configure.orig	2013-06-04 22:25:57.000000000 -0400
-+++ mythtv/configure	2013-06-05 20:48:04.000000000 -0400
-@@ -3001,7 +3001,7 @@
- ranlib="${cross_prefix}${ranlib}"
- strip_default="${cross_prefix}${strip_default}"
- 
--sysinclude_default="${sysroot}/usr/include"
-+#sysinclude_default="${sysroot}/usr/include"
- 
- case "$toolchain" in
-     clang-asan)
-@@ -4389,7 +4389,7 @@
- set_default nm
- 
- set_default $MYTHTV_PATHS_LIST
--append CONFIG_INCLUDEPATH $sysinclude "${sysroot}${prefix}"
-+#append CONFIG_INCLUDEPATH $sysinclude "${sysroot}${prefix}"
- 
- append CCONFIG "$compile_type"
- if test x$compile_type = x"profile" ; then

Added: trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff	                        (rev 0)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff	2014-04-26 22:26:58 UTC (rev 119477)
@@ -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.27/files/patch-mythtv-libs-libmythtv-NuppelVideoRecorder.cpp.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv-libs-libmythtv-NuppelVideoRecorder.cpp.diff	2014-04-26 22:23:24 UTC (rev 119476)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv-libs-libmythtv-NuppelVideoRecorder.cpp.diff	2014-04-26 22:26:58 UTC (rev 119477)
@@ -1,24 +0,0 @@
---- mythtv/libs/libmythtv/NuppelVideoRecorder.cpp	2012-09-18 17:58:13.000000000 -0700
-+++ mythtv/libs/libmythtv/NuppelVideoRecorder.cpp	2012-10-01 19:33:09.000000000 -0700
-@@ -33,10 +33,17 @@
- #include "vbitext/cc.h"
- #include "vbitext/vbi.h"
- 
--#if HAVE_BIGENDIAN
--extern "C" {
--#include "byteswap.h"
--}
-+#if HAVE_BYTESWAP_H
-+#include <byteswap.h>
-+#elif HAVE_SYS_ENDIAN_H
-+#include <sys/endian.h>
-+#elif CONFIG_DARWIN
-+#include <libkern/OSByteOrder.h>
-+#define bswap_16 OSSwapInt16
-+#define bswap_32 OSSwapInt32
-+#define bswap_64 OSSwapInt64
-+#elif HAVE_BIGENDIAN
-+#error No bswap functions defined
- #endif
- 
- extern "C" {

Deleted: trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv-libs-libmythtv-avformatwriter.cpp.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv-libs-libmythtv-avformatwriter.cpp.diff	2014-04-26 22:23:24 UTC (rev 119476)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv-libs-libmythtv-avformatwriter.cpp.diff	2014-04-26 22:26:58 UTC (rev 119477)
@@ -1,23 +0,0 @@
---- mythtv/libs/libmythtv/avformatwriter.cpp	2012-09-18 17:58:13.000000000 -0700
-+++ mythtv/libs/libmythtv/avformatwriter.cpp	2012-10-01 19:33:15.000000000 -0700
-@@ -24,10 +24,16 @@
- #include "NuppelVideoRecorder.h"
- #include "avformatwriter.h"
- 
--#if HAVE_BIGENDIAN
--extern "C" {
--#include "byteswap.h"
--}
-+#if HAVE_BYTESWAP_H
-+#include <byteswap.h>
-+#elif HAVE_SYS_ENDIAN_H
-+#include <sys/endian.h>
-+#elif CONFIG_DARWIN
-+#include <libkern/OSByteOrder.h>
-+#define bswap_16 OSSwapInt16
-+#define bswap_32 OSSwapInt32
-+#elif HAVE_BIGENDIAN
-+#error No bswap functions defined
- #endif
- 
- #define LOC QString("AVFW(%1): ").arg(m_filename)

Deleted: trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv_settings.pro.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv_settings.pro.diff	2014-04-26 22:23:24 UTC (rev 119476)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-mythtv_settings.pro.diff	2014-04-26 22:26:58 UTC (rev 119477)
@@ -1,13 +0,0 @@
---- mythtv/settings.pro.orig	2013-06-05 20:51:44.000000000 -0400
-+++ mythtv/settings.pro	2013-06-05 20:52:35.000000000 -0400
-@@ -113,8 +113,8 @@
- # qmake 4.8.2 & 4.8.3 messes up OSX "-arch i386 -arch x86_64"
- # clang 3.0 on Linux does not like duplicate arguments.
- macx {
--QMAKE_CFLAGS   += $$CPPFLAGS   $$CFLAGS
--QMAKE_CXXFLAGS += $$CXXPPFLAGS $$ECXXFLAGS
-+QMAKE_CFLAGS   = $$CPPFLAGS   $$CFLAGS
-+QMAKE_CXXFLAGS = $$CXXPPFLAGS $$ECXXFLAGS
- } else {
- QMAKE_CFLAGS   *= $$CPPFLAGS   $$CFLAGS
- QMAKE_CXXFLAGS *= $$CXXPPFLAGS $$ECXXFLAGS

Deleted: 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	2014-04-26 22:23:24 UTC (rev 119476)
+++ trunk/dports/multimedia/mythtv-core.27/files/patch-various_c++_v_stdc++.diff	2014-04-26 22:26:58 UTC (rev 119477)
@@ -1,32 +0,0 @@
-
---- 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/20140426/324e2271/attachment-0001.html>


More information about the macports-changes mailing list