[mythtv] [mythtv-commits] mythtv branch master updated by jyavenard. v0.28-pre-1060-gb254bb0

[Craig Treleaven]

At 11:56 PM +1000 4/9/14, Jean-Yves Avenard wrote:
>On 9 April 2014 22:33, Craig Treleaven <ctreleaven at cogeco.ca> wrote:
>>
>  > Any chance of applying this to 0.27-fixes or even 0.26-fixes?

I found the patch to master wouldn't apply to .027-fixes.  Following 
works for me:

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

>I should add that this wasn't enough to entirely fix the problem..
>
>still have linkage issue when modifying some libraries, and it won't
>compile until all install libmyth* has been deleted.

Linking seems to be good for me, now.  Was able to build successfully 
with 1.5 month old version installed.

Craig