[120895] trunk/dports/multimedia/mythtv-core.27
pixilla at macports.org
pixilla at macports.org
Tue Jun 10 19:43:52 PDT 2014
Revision: 120895
https://trac.macports.org/changeset/120895
Author: pixilla at macports.org
Date: 2014-06-10 19:43:52 -0700 (Tue, 10 Jun 2014)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/dports/multimedia/mythtv-core.27/Portfile
trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist
Removed Paths:
-------------
trunk/dports/multimedia/mythtv-core.27/files/patch-freetype-2.5.1.diff
trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff
trunk/dports/multimedia/mythtv-core.27/files/patch-protect-metadata-loads-from-multiple-threads.diff
Modified: trunk/dports/multimedia/mythtv-core.27/Portfile
===================================================================
--- 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)
@@ -6,16 +6,16 @@
PortGroup qt4 1.0
PortGroup compiler_blacklist_versions 1.0
-set shorthash 39686c6c
-# set fullhash 39686c6c6800053fe25764d2f27cfdfc2dd21fab
+set shorthash 41d04b63
+# set fullhash 41d04b638fb1b8ca28c9724dec14c1e586ba049f
set majorversion .27
-set minorversion ""
+set minorversion .1
github.setup MythTV mythtv ${shorthash}
-checksums rmd160 bf830de2168ad591b27e3e2b009816996e1649e7 \
- sha256 17b7c454d07a4237a1b3583651712a195e9712a88e04582a50868ea33b0c697e
+checksums rmd160 1652f68c33ace757fa008faff2e6d123082f1799 \
+ sha256 700dd26c2fecc0a6ee838a6824fd0036334856caceb88e19e31aa0ad5bc288d0
name mythtv-core${majorversion}
-version 0${majorversion}${minorversion}-Fixes-20140404
+version 0${majorversion}${minorversion}-Fixes-20140528
categories multimedia
platforms darwin
# i386 unsupported -- https://trac.macports.org/ticket/40337
@@ -59,6 +59,8 @@
port:lame \
port:faac \
port:x264 \
+ port:openssl \
+ port:qt4-mac \
port:qt4-mac-${mysqlver}-plugin \
port:taglib \
port:zlib \
@@ -85,21 +87,9 @@
}
}
-#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
-
# revert rpath linking stuff as it is non-functional in MacPorts
patchfiles-append patch-rpath_linking.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} {
Modified: trunk/dports/multimedia/mythtv-core.27/files/org.mythtv.mythbackend.plist
===================================================================
--- 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)
@@ -29,6 +29,6 @@
<key>RunAtLoad</key>
<true/>
<key>ThrottleInterval</key>
- <string>300</string>
+ <integer>300</integer>
</dict>
</plist>
Deleted: 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 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)
@@ -1,24 +0,0 @@
-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
Deleted: trunk/dports/multimedia/mythtv-core.27/files/patch-libs_fix_linking.diff
===================================================================
--- 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)
@@ -1,31 +0,0 @@
-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-protect-metadata-loads-from-multiple-threads.diff
===================================================================
--- 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)
@@ -1,52 +0,0 @@
-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
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140610/1f467025/attachment.html>
More information about the macports-changes
mailing list