[107034] trunk/dports/multimedia/mythtv-core.25
pixilla at macports.org
pixilla at macports.org
Fri Jun 14 16:59:42 PDT 2013
Revision: 107034
https://trac.macports.org/changeset/107034
Author: pixilla at macports.org
Date: 2013-06-14 16:59:42 -0700 (Fri, 14 Jun 2013)
Log Message:
-----------
multimedia/mythtv-core.25:
- Maintainer update to version 0.25.3-Fixes-20130529.
Modified Paths:
--------------
trunk/dports/multimedia/mythtv-core.25/Portfile
trunk/dports/multimedia/mythtv-core.25/files/Myth_Frontend.applescript
Added Paths:
-----------
trunk/dports/multimedia/mythtv-core.25/files/patch-bonjour-correction.diff
trunk/dports/multimedia/mythtv-core.25/files/patch-protect-metadata-loads-from-multiple-threads.diff
trunk/dports/multimedia/mythtv-core.25/files/patch-restore-fe-netcontrol-play-resume-functionality.diff
Modified: trunk/dports/multimedia/mythtv-core.25/Portfile
===================================================================
--- trunk/dports/multimedia/mythtv-core.25/Portfile 2013-06-14 22:00:34 UTC (rev 107033)
+++ trunk/dports/multimedia/mythtv-core.25/Portfile 2013-06-14 23:59:42 UTC (rev 107034)
@@ -4,17 +4,14 @@
PortSystem 1.0
PortGroup github 1.0
PortGroup qt4 1.0
-PortGroup conflicts_build 1.0
-PortGroup compiler_blacklist_versions 1.0
-set shorthash 117b611e
-# set fullhash 117b611ebdaf1c1710a1ccbcb2ffdeee06c92057
+set shorthash ed3b7d10
+# set fullhash ed3b7d10a63178bff5ce4134613ff86a85d73830
set majorversion .25
set minorversion .3
github.setup MythTV mythtv ${shorthash}
name mythtv-core${majorversion}
-version 0${majorversion}${minorversion}-Fixes-20121025
-revision 3
+version 0${majorversion}${minorversion}-Fixes-20130529
categories multimedia
platforms darwin
license GPL-2
@@ -31,8 +28,8 @@
more.
homepage http://www.mythtv.org/
-checksums rmd160 d27c5ec16923e0e2e159f09271aa331ff739250f \
- sha256 8af9451307c70b43104beccfe6c4ab8835ea2f459934940b60e4e65423b1fa2d
+checksums rmd160 2fac47782c03f25ba8b0afa2600bc998063edab8 \
+ sha256 8225de4738010d7a1617c91d5ccf16543924c01e0ecb148199dc89ef085856bc
set nick mythtv
set mythtvhomedir ${prefix}/var/mythtvuser
@@ -57,6 +54,7 @@
port:libsdl \
port:freetype \
port:lame \
+ port:faac \
port:x264 \
port:qt4-mac-${mysqlver}-plugin \
port:libpng \
@@ -72,39 +70,22 @@
depends_build port:yasm port:pkgconfig
-conflicts_build libdvdnav ffmpeg ffmpeg-devel
-
depends_run port:logrotate
patchfiles patch-bindings-python-mythtv-utility.diff \
patch-greedyh.asm.diff \
- patch-util-osx-objC.diff \
patch-mythtv-libs-libmythtv-NuppelVideoRecorder.cpp.diff \
patch-mythtv-libs-libmythtv-avformatwriter.cpp.diff
-# See https://trac.macports.org/ticket/35934
-compiler.blacklist llvm-gcc-4.2 macports-llvm-gcc-4.2 macports-clang-3.1 \
- dragonegg-3.0 dragonegg-3.1 apple-gcc-4.2
+# following three patches currently required to support MythExpress
+# See tickets:
+# http://code.mythtv.org/trac/ticket/10773
+# http://code.mythtv.org/trac/ticket/10825
+# http://code.mythtv.org/trac/ticket/11032
+patchfiles-append patch-bonjour-correction.diff \
+ patch-protect-metadata-loads-from-multiple-threads.diff \
+ patch-restore-fe-netcontrol-play-resume-functionality.diff
-# Run time failures with XCode 4.4.x and 4.5.0
-compiler.blacklist-append {clang >= 421}
-
-compiler.fallback-append macports-clang-3.0
-
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
-
- # base 2.1.x ignores the argument and just use ${configure.compiler}
- if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
- }
-
- if {[string match macports-gcc* ${configure.compiler}]} {
- depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
- }
-}
-
post-extract {
file mkdir ${worksrcpath}/macports
foreach {applescript} ${applescripts} {
@@ -176,18 +157,35 @@
reinplace -locale C "s|xxxyyyzzz|${mythtvpidfile}|" ${worksrcpath}/mythtv/configure
}
+
+# Clear all MacPorts flags...MythTV is smart enough to set up its own.
+# (ala qt4-mac/Portfile)
+
+configure.cflags
+configure.cppflags
+configure.cxxflags
+configure.objcflags
+configure.ldflags
+
+configure.universal_cflags
+configure.universal_cppflags
+configure.universal_cxxflags
+configure.universal_ldflags
+
+configure.cc_archflags
+configure.cxx_archflags
+configure.ld_archflags
+
configure.dir ${worksrcpath}/mythtv
configure.args --compile-type=release \
--runprefix=${prefix} \
--cc=${configure.cc} \
--cxx=${configure.cxx} \
--qmake=${qt_qmake_cmd} \
- --extra-ldflags='-F/System/Library/Frameworks' \
--python=${pythonbin} \
- --disable-distcc \
--disable-firewire \
--disable-audio-jack --disable-indev=jack \
- --enable-libmp3lame --enable-libx264
+ --enable-libx264 --enable-libfaac --enable-nonfree
if {${configure.ccache} != "yes"} {
configure.args-append --disable-ccache
Modified: trunk/dports/multimedia/mythtv-core.25/files/Myth_Frontend.applescript
===================================================================
--- trunk/dports/multimedia/mythtv-core.25/files/Myth_Frontend.applescript 2013-06-14 22:00:34 UTC (rev 107033)
+++ trunk/dports/multimedia/mythtv-core.25/files/Myth_Frontend.applescript 2013-06-14 23:59:42 UTC (rev 107034)
@@ -3,6 +3,8 @@
Author: Craig Treleaven, ctreleaven at cogeco.ca
Version: 0.25.0
Modified: 2012May15
+ 2012Nov20 -- handle 'thread not shut down error' on exit, add --quiet to prevent
+ console output from being returned to AppleScript, allow experimental AirPlay
*)
property MFEappPath : "@PREFIX@/bin/mythfrontend"
@@ -10,10 +12,18 @@
property MFElogLevel : "info" -- single string
property MFEverboseLevel : {"none", "general"} -- a list, can be multiple strings
-set CmdList to {MFEappPath, MFElogArg, "--loglevel " & MFElogLevel, "--verbose " & joinlist(MFEverboseLevel, ",")}
+set CmdList to {"AIRPLAY=\"1\"", MFEappPath, MFElogArg, "--loglevel " & MFElogLevel, "--verbose " & joinlist(MFEverboseLevel, ","), "--quiet"}
set Cmd to (joinlist(CmdList, " "))
-do shell script Cmd & " &" -- run it!
+try
+ do shell script Cmd
+on error the error_message number the error_number
+ if the error_number is not 133 then
+ set the error_text to "Error: " & the error_number & ". " & the error_message
+ display dialog the error_text buttons {"OK"} default button 1
+ return the error_text
+ end if
+end try
-- -- -- -- -- -- -- --
-- Handlers
Added: trunk/dports/multimedia/mythtv-core.25/files/patch-bonjour-correction.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.25/files/patch-bonjour-correction.diff (rev 0)
+++ trunk/dports/multimedia/mythtv-core.25/files/patch-bonjour-correction.diff 2013-06-14 23:59:42 UTC (rev 107034)
@@ -0,0 +1,32 @@
+From 8929314e77dfc5fe9bcc58f4ace4e7ba6fea9bef Mon Sep 17 00:00:00 2001
+From: George Nassas <george at nassas.com>
+Date: Tue, 29 May 2012 10:11:38 -0400
+Subject: [PATCH] make backend's bonjour service name dns-compliant
+
+---
+ mythtv/programs/mythbackend/mediaserver.cpp | 7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/mythtv/programs/mythbackend/mediaserver.cpp b/mythtv/programs/mythbackend/mediaserver.cpp
+index 043140d..19d0eb9 100644
+--- mythtv/programs/mythbackend/mediaserver.cpp
++++ mythtv/programs/mythbackend/mediaserver.cpp
+@@ -256,13 +256,10 @@ void MediaServer::Init(bool bIsMaster, bool bDisableUPnp /* = false */)
+ m_bonjour = new BonjourRegister();
+ if (m_bonjour)
+ {
+- QByteArray dummy;
+ QByteArray name("Mythbackend on ");
+ name.append(gCoreContext->GetHostName());
+- m_bonjour->Register(nPort,
+- bIsMaster ? "_mythbackend-master._tcp" :
+- "_mythbackend-slave._tcp",
+- name, dummy);
++ QByteArray txt(bIsMaster ? "\x0Clevel=master" : "\x0Blevel=slave");
++ m_bonjour->Register(nPort, "_mythbackend._tcp", name, txt);
+ }
+ #endif
+ }
+--
+1.7.2.5
+
Added: trunk/dports/multimedia/mythtv-core.25/files/patch-protect-metadata-loads-from-multiple-threads.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.25/files/patch-protect-metadata-loads-from-multiple-threads.diff (rev 0)
+++ trunk/dports/multimedia/mythtv-core.25/files/patch-protect-metadata-loads-from-multiple-threads.diff 2013-06-14 23:59:42 UTC (rev 107034)
@@ -0,0 +1,52 @@
+From b20171597097f8b933065ef3291c63194d310fbf Mon Sep 17 00:00:00 2001
+From: George Nassas <george at 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
+
Added: trunk/dports/multimedia/mythtv-core.25/files/patch-restore-fe-netcontrol-play-resume-functionality.diff
===================================================================
--- trunk/dports/multimedia/mythtv-core.25/files/patch-restore-fe-netcontrol-play-resume-functionality.diff (rev 0)
+++ trunk/dports/multimedia/mythtv-core.25/files/patch-restore-fe-netcontrol-play-resume-functionality.diff 2013-06-14 23:59:42 UTC (rev 107034)
@@ -0,0 +1,27 @@
+From 2fb4b7bb111d7ec256f0b0f96c7271bcc0f61766 Mon Sep 17 00:00:00 2001
+From: George Nassas <george at nassas.com>
+Date: Fri, 24 Aug 2012 00:17:08 -0400
+Subject: [PATCH 4/4] restore fe netcontrol play/resume functionality
+
+---
+ mythtv/programs/mythfrontend/playbackbox.cpp | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
+index 734cce1..44bb343 100644
+--- mythtv/programs/mythfrontend/playbackbox.cpp
++++ mythtv/programs/mythfrontend/playbackbox.cpp
+@@ -3723,7 +3723,9 @@ void PlaybackBox::processNetworkControlCommand(const QString &command)
+
+ pginfo.SetPathname(pginfo.GetPlaybackURL());
+
+- PlayX(pginfo, true, true);
++ bool ignoreBookmark = tokens[1] == "PLAY";
++
++ PlayX(pginfo, ignoreBookmark, true);
+ }
+ else
+ {
+--
+1.7.2.5
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130614/297c2d0f/attachment-0001.html>
More information about the macports-changes
mailing list