From d57ac93a1102d61a67340e24d6800b8571921e25 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 27 May 2014 17:53:35 +0000
Subject: mythtv & mythplugins: update to .27.1 -fixes

---
 abs/core/mythtv/stable-0.27/git_src/git_hash       |  2 +-
 abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD   |  4 +-
 ...tect-metadata-loads-from-multiple-threads.patch | 52 ----------------------
 abs/core/mythtv/stable-0.27/mythtv/PKGBUILD        |  7 +--
 4 files changed, 5 insertions(+), 60 deletions(-)
 delete mode 100644 abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch

diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash
index 560b9f7..d12df68 100644
--- a/abs/core/mythtv/stable-0.27/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.27/git_src/git_hash
@@ -1 +1 @@
-9f353cc287733cb5fc70ab67b3752557a4101753
+81c77ba1730563b7786060a372e870a995b40723
diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
index 0bf96e6..e7f7695 100644
--- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=('mytharchive'
          'mythnews'
          'mythweather'
          'mythzoneminder')
-pkgver=0.27
-pkgrel=15
+pkgver=0.27.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
 license=('GPL')
diff --git a/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch b/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
deleted file mode 100644
index d8f4a0c..0000000
--- a/abs/core/mythtv/stable-0.27/mythtv/0001-protect-metadata-loads-from-multiple-threads.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b20171597097f8b933065ef3291c63194d310fbf Mon Sep 17 00:00:00 2001
-From: George Nassas <george@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
---- a/mythtv/libs/libmythmetadata/dbaccess.cpp
-+++ b/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
-
diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
index 2442551..12328ff 100644
--- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
-pkgver=0.27
-pkgrel=15
+pkgver=0.27.1
+pkgrel=1
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -20,8 +20,6 @@ backup=()
 install='mythtv.install'
 
 patches=('myth_settings.patch' 
-         '0001-protect-metadata-loads-from-multiple-threads.patch'
-         #http://code.mythtv.org/trac/ticket/10825   thread safety in video metadata load
          'suggestedstarttime.patch.v1')
          #http://code.mythtv.org/trac/ticket/11562   next mythfilldatabase run in mythweb
 
@@ -103,6 +101,5 @@ package() {
 }
 
 md5sums=('5f3e43567e62afe17bad39f5a9b604cf'
-         '67f7316c750fba17fa578d10840b9dbd'
          '35a7fd3e3057691e3b1bf355bb9e8b16'
          '65a08d8949431ecdeb51a686dc6f9c21')
-- 
cgit v0.12

