From 1dcc4c76b9692821048e8c3dc2f3507bb1b3d1ac Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mythtv.org>
Date: Mon, 4 Jun 2012 03:13:21 +1000
Subject: [PATCH] Fix 32 bits compilation on mac and Quartz playback

[cherry-picked from ecd76efe28b413a91bd909a1f8b4d9abf85157c9]
---
 mythtv/filters/filters.pro          | 7 ++++++-
 mythtv/libs/libmythtv/libmythtv.pro | 8 ++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mythtv/filters/filters.pro b/mythtv/filters/filters.pro
index 3cb266cb925..25731a30578 100644
--- a/mythtv/filters/filters.pro
+++ b/mythtv/filters/filters.pro
@@ -5,10 +5,15 @@ TEMPLATE = subdirs
 
 # Directories
 SUBDIRS += invert linearblend denoise3d quickdnr kerneldeint crop force
-SUBDIRS += adjust onefield bobdeint ivtc greedyhdeint yadif fieldorder
+SUBDIRS += adjust onefield bobdeint ivtc yadif fieldorder
 
 contains(CONFIG_POSTPROC, yes): SUBDIRS += postprocess
 
+# greeydy doesn't compile on 32 bits
+contains( QMAKE_CXXFLAGS, "x86_64" ) {
+    SUBDIRS += greedyhdeint
+}
+
 # This filter is currently broken.
 # SUBDIRS += convert
 
diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
index 6df71d08c6e..111280e5116 100644
--- a/mythtv/libs/libmythtv/libmythtv.pro
+++ b/mythtv/libs/libmythtv/libmythtv.pro
@@ -90,13 +90,9 @@ macx {
         FWKS += CoreVideo
     }
 
-    using_firewire:using_backend: FWKS += IOKit
+    FC = $$join(FWKS,",")
 
-    # The following trick shortens the command line, but depends on
-    # the shell expanding Csh-style braces. Luckily, Bash and Zsh do.
-    FC = $$join(FWKS,",","{","}")
-
-    QMAKE_CXXFLAGS += -F/System/Library/Frameworks/$${FC}.framework/Frameworks
+    QMAKE_CXXFLAGS += -F$${FC}
     LIBS           += -framework $$join(FWKS," -framework ")
 
     using_firewire:using_backend {