From 38b96d1e42d7643d39de5a1f65ff034d6bc59c6e Mon Sep 17 00:00:00 2001
From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Date: Fri, 27 Aug 2010 22:38:20 +0200
Subject: mythplugins: mythplugins dir renamed to mythplugins-0.22

0.23 will get its own dir

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 recipes/mythtv/mythplugins-0.22/configure.patch    |  13 ++
 .../mythtv/mythplugins-0.22/mytharchive.pro.patch  |  41 +++++
 .../mythplugins-0.22/mythplugins_wo_qtopengl.diff  | 129 ++++++++++++++
 recipes/mythtv/mythplugins-0.22/sysroot.patch      | 197 +++++++++++++++++++++
 recipes/mythtv/mythplugins/configure.patch         |  13 --
 recipes/mythtv/mythplugins/mytharchive.pro.patch   |  41 -----
 .../mythplugins/mythplugins_wo_qtopengl.diff       | 129 --------------
 recipes/mythtv/mythplugins/sysroot.patch           | 197 ---------------------
 8 files changed, 380 insertions(+), 380 deletions(-)
 create mode 100644 recipes/mythtv/mythplugins-0.22/configure.patch
 create mode 100644 recipes/mythtv/mythplugins-0.22/mytharchive.pro.patch
 create mode 100644 recipes/mythtv/mythplugins-0.22/mythplugins_wo_qtopengl.diff
 create mode 100644 recipes/mythtv/mythplugins-0.22/sysroot.patch
 delete mode 100644 recipes/mythtv/mythplugins/configure.patch
 delete mode 100644 recipes/mythtv/mythplugins/mytharchive.pro.patch
 delete mode 100644 recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff
 delete mode 100644 recipes/mythtv/mythplugins/sysroot.patch

diff --git a/recipes/mythtv/mythplugins-0.22/configure.patch b/recipes/mythtv/mythplugins-0.22/configure.patch
new file mode 100644
index 0000000000..fd747a92e5
--- /dev/null
+++ b/recipes/mythtv/mythplugins-0.22/configure.patch
@@ -0,0 +1,13 @@
+Index: mythplugins-0.22rc1/configure
+===================================================================
+--- mythplugins-0.22rc1.orig/configure
++++ mythplugins-0.22rc1/configure
+@@ -730,7 +730,7 @@ if test "$music" = "yes" ; then
+     fi
+ 
+     if test "$taglib" = "yes" ; then
+-        echo "INCLUDEPATH += `taglib-config --prefix`/include/taglib" >> ./mythmusic/mythmusic/config.pro
++        echo "INCLUDEPATH += `taglib-config --cflags | sed 's:-I::'`" >> ./mythmusic/mythmusic/config.pro
+     fi
+ fi
+ 
diff --git a/recipes/mythtv/mythplugins-0.22/mytharchive.pro.patch b/recipes/mythtv/mythplugins-0.22/mytharchive.pro.patch
new file mode 100644
index 0000000000..e5ea1808a9
--- /dev/null
+++ b/recipes/mythtv/mythplugins-0.22/mytharchive.pro.patch
@@ -0,0 +1,41 @@
+Index: mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro
+===================================================================
+--- mythplugins-0.22rc2.orig/mytharchive/mytharchive/mytharchive.pro
++++ mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro
+@@ -32,28 +32,28 @@ SOURCES += dbcheck.cpp archiveutil.cpp s
+ SOURCES += mythburn.cpp themeselector.cpp editmetadata.cpp thumbfinder.cpp
+ SOURCES += exportnative.cpp importnative.cpp
+ 
+-burnuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
++burnuifiles.path = $${PREFIX}/share/mythtv/themes/default
+ burnuifiles.files = mythburn-ui.xml
+ 
+-scriptfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/scripts
++scriptfiles.path = $${PREFIX}/share/mythtv/mytharchive/scripts
+ scriptfiles.files = ../mythburn/scripts/*
+ 
+-introfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/intro
++introfiles.path = $${PREFIX}/share/mythtv/mytharchive/intro
+ introfiles.files = ../mythburn/intro/*.mpg
+ 
+-musicfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/music
++musicfiles.path = $${PREFIX}/share/mythtv/mytharchive/music
+ musicfiles.files = ../mythburn/music/*.ac3
+ 
+-imagefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/images
++imagefiles.path = $${PREFIX}/share/mythtv/mytharchive/images
+ imagefiles.files = ../mythburn/images/*.png
+ 
+-themefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/themes
++themefiles.path = $${PREFIX}/share/mythtv/mytharchive/themes
+ themefiles.files = ../mythburn/themes/*
+ 
+-profilefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/encoder_profiles
++profilefiles.path = $${PREFIX}/share/mythtv/mytharchive/encoder_profiles
+ profilefiles.files = ../mythburn/encoder_profiles/*.xml
+ 
+-nativeuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
++nativeuifiles.path = $${PREFIX}/share/mythtv/themes/default
+ nativeuifiles.files = mythnative-ui.xml 
+ 
+ INSTALLS +=  scriptfiles introfiles themefiles imagefiles musicfiles 
diff --git a/recipes/mythtv/mythplugins-0.22/mythplugins_wo_qtopengl.diff b/recipes/mythtv/mythplugins-0.22/mythplugins_wo_qtopengl.diff
new file mode 100644
index 0000000000..c0eb9d3075
--- /dev/null
+++ b/recipes/mythtv/mythplugins-0.22/mythplugins_wo_qtopengl.diff
@@ -0,0 +1,129 @@
+diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.pro b/mythplugins/mytharchive/mytharchive/mytharchive.pro
+index bf7f717..d20e0f7 100644
+--- mythplugins/mytharchive/mytharchive/mytharchive.pro
++++ mythplugins/mytharchive/mytharchive/mytharchive.pro
+@@ -14,7 +14,7 @@ LIBS += -lmythavcodec-$$LIBVERSION
+ LIBS += -lmythavformat-$$LIBVERSION
+ LIBS += -lmythswscale-$$LIBVERSION
+ 
+-TEMPLATE = lib opengl
++TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mytharchive
+ target.path = $${LIBDIR}/mythtv/plugins
+@@ -61,6 +61,7 @@ INSTALLS +=  profilefiles burnuifiles
+ INSTALLS +=  nativeuifiles 
+ 
+ #The following line was inserted by qt3to4
+-QT += xml sql opengl 
++QT += xml sql
++using_opengl:QT += opengl
+ 
+ include ( ../../libs-targetfix.pro )
+diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
+index ae073c1..90e413e 100644
+--- mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
++++ mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
+@@ -9,7 +9,8 @@ INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libswscale
+ DEPENDPATH *= $${INCLUDEPATH}
+ 
+ TEMPLATE = app
+-CONFIG += thread opengl
++CONFIG += thread
++using_opengl:CONFIG += opengl
+ 
+ target.path = $${PREFIX}/bin
+ 
+@@ -27,4 +28,5 @@ LIBS += -lmythavcodec-$$LIBVERSION
+ LIBS += -lmythavformat-$$LIBVERSION
+ LIBS += -lmythswscale-$$LIBVERSION
+ 
+-QT += xml sql opengl
++QT += xml sql
++using_opengl:QT += opengl
+diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
+index 98a8a9d..f689c0c 100644
+--- mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
++++ mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
+@@ -2,10 +2,12 @@ include (../../mythconfig.mak )
+ include (../../settings.pro )
+ include (../../programs-libs.pro )
+ 
+-QT += network xml sql opengl webkit
++QT += network xml sql webkit
++using_opengl:QT += opengl
+ 
+ TEMPLATE = lib
+-CONFIG += thread opengl plugin warn_on
++CONFIG += thread plugin warn_on
++using_opengl:CONFIG += opengl
+ TARGET = mythbrowser
+ target.path = $${LIBDIR}/mythtv/plugins
+ INSTALLS += target
+diff --git a/mythplugins/mythflix/mythflix/mythflix.pro b/mythplugins/mythflix/mythflix/mythflix.pro
+index 5ffa22e..4359f77 100644
+--- mythplugins/mythflix/mythflix/mythflix.pro
++++ mythplugins/mythflix/mythflix/mythflix.pro
+@@ -25,6 +25,7 @@ SOURCES += newsengine.cpp dbcheck.cpp flixutil.cpp
+ 
+ 
+ #The following line was inserted by qt3to4
+-QT += network xml sql opengl qt3support
++QT += network xml sql qt3support
++using_opengl:QT += opengl
+ 
+ include ( ../../libs-targetfix.pro )
+diff --git a/mythplugins/mythgallery/mythgallery/mythgallery.pro b/mythplugins/mythgallery/mythgallery/mythgallery.pro
+index cf8219a..4542477 100644
+--- mythplugins/mythgallery/mythgallery/mythgallery.pro
++++ mythplugins/mythgallery/mythgallery/mythgallery.pro
+@@ -37,6 +37,7 @@ opengl {
+ 
+ 
+ #The following line was inserted by qt3to4
+-QT += network opengl sql xml
++QT += network sql xml
++using_opengl:QT += opengl
+ 
+ include ( ../../libs-targetfix.pro )
+diff --git a/mythplugins/mythgame/mythgame/mythgame.pro b/mythplugins/mythgame/mythgame/mythgame.pro
+index b1f371a..39e7847 100644
+--- mythplugins/mythgame/mythgame/mythgame.pro
++++ mythplugins/mythgame/mythgame/mythgame.pro
+@@ -23,6 +23,7 @@ use_hidesyms {
+ LIBS += -lz
+ 
+ #The following line was inserted by qt3to4
+-QT += xml sql opengl qt3support 
++QT += xml sql qt3support
++using_opengl:QT += opengl
+ 
+ include ( ../../libs-targetfix.pro )
+diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.pro b/mythplugins/mythmusic/mythmusic/mythmusic.pro
+index 177a5bc..1153405 100644
+--- mythplugins/mythmusic/mythmusic/mythmusic.pro
++++ mythplugins/mythmusic/mythmusic/mythmusic.pro
+@@ -3,7 +3,8 @@ include ( ../../settings.pro )
+ include ( ../../programs-libs.pro )
+ include (config.pro)
+ 
+-QT += xml sql opengl qt3support network
++QT += xml sql qt3support network
++using_opengl:QT += opengl
+ 
+ !exists( config.pro ) {
+    error(Missing config.pro: please run the configure script)
+diff --git a/mythplugins/mythvideo/mtd/mtd.pro b/mythplugins/mythvideo/mtd/mtd.pro
+index 7c3c357..d63d170 100644
+--- mythplugins/mythvideo/mtd/mtd.pro
++++ mythplugins/mythvideo/mtd/mtd.pro
+@@ -5,7 +5,8 @@ include ( ../../programs-libs.pro )
+ QT += sql xml network
+ 
+ TEMPLATE = app
+-CONFIG += thread opengl
++CONFIG += thread
++using_opengl:CONFIG += opengl
+ TARGET = mtd
+ target.path = $${PREFIX}/bin
+ INSTALLS += target
diff --git a/recipes/mythtv/mythplugins-0.22/sysroot.patch b/recipes/mythtv/mythplugins-0.22/sysroot.patch
new file mode 100644
index 0000000000..4cf344d2d7
--- /dev/null
+++ b/recipes/mythtv/mythplugins-0.22/sysroot.patch
@@ -0,0 +1,197 @@
+Index: mythplugins/programs-libs.pro
+===================================================================
+--- mythplugins/programs-libs.pro	(revision 22430)
++++ mythplugins/programs-libs.pro	(working copy)
+@@ -4,7 +4,7 @@
+ INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmyth
+ DEPENDPATH *= $${INCLUDEPATH}
+ 
+-LIBS += -L$${LIBDIR} $$EXTRA_LIBS -lmythdb-$$LIBVERSION
++LIBS += -L$${SYSROOT}$${LIBDIR} $$EXTRA_LIBS -lmythdb-$$LIBVERSION
+ LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION
+ LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION
+ 
+Index: mythplugins/configure
+===================================================================
+--- mythplugins/configure	(revision 22430)
++++ mythplugins/configure	(working copy)
+@@ -266,24 +266,25 @@
+ 
+ has_library()
+ {
+-    if test -f /etc/ld.so.conf ; then
+-        LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
+-    else
+-        LIBPATHS=''
+-    fi
++    LIBPATHS=''
++    if test "x$sysroot" = "x" ; then
++        if test -f /etc/ld.so.conf ; then
++            LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
++        fi
+ 
+-    LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` "
+-    # Mac OS X has a different variable for this:
+-    LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
++        LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` "
++        # Mac OS X has a different variable for this:
++        LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
+ 
+-    # recurse down just one level, should be enough in most cases
+-    if test -f /etc/ld.so.conf ; then
+-        INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
+-        SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
+-        for x in $SRCH ; do
+-            LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"`
+-            LIBPATHS="$LIBPATHS $LP_APPEND"
+-        done
++        # recurse down just one level, should be enough in most cases
++        if test -f /etc/ld.so.conf ; then
++            INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
++            SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
++            for x in $SRCH ; do
++                LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"`
++                LIBPATHS="$LIBPATHS $LP_APPEND"
++            done
++        fi
+     fi
+ 
+     LIBPATHS="`echo $LIBPATHS $sysroot$prefix/$libdir_name $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
+@@ -300,8 +301,10 @@
+ has_header()
+ {
+     HPATHS="$sysroot$prefix/include $sysroot/usr/local/include $sysroot/usr/include $sysroot/usr/include/g++-v3 $sysroot/usr/X11R6/include $sysroot/"
+-    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
+-    HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` "
++    if test "x$sysroot" = "x" ; then
++        INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
++        HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` "
++    fi
+ 
+     HAS_IT="no"
+     for HPATH in $HPATHS ; do
+@@ -689,7 +692,7 @@
+         if test "$sdl" = "yes" ; then
+             echo "        libvisual      support will be included in MythMusic"
+             echo "#define LIBVISUAL_SUPPORT 1" >> ./mythmusic/mythmusic/config.h
+-            echo "INCLUDEPATH += /usr/include/libvisual-0.4" >> ./mythmusic/mythmusic/config.pro
++            echo "INCLUDEPATH += ${sysroot}/usr/include/libvisual-0.4" >> ./mythmusic/mythmusic/config.pro
+             echo "LIBS += -lvisual-0.4" >> ./mythmusic/mythmusic/config.pro
+         else
+             echo "        libvisual      support will not be included in MythMusic (requires SDL support)"
+Index: mythplugins/settings.pro
+===================================================================
+--- mythplugins/settings.pro	(revision 22430)
++++ mythplugins/settings.pro	(working copy)
+@@ -3,8 +3,8 @@
+ LIBVERSION = 0.22
+ 
+ INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
+-#INCLUDEPATH += /usr/include/cdda
+-#INCLUDEPATH += /usr/include/FLAC
++#INCLUDEPATH += $${SYSROOT}/usr/include/cdda
++#INCLUDEPATH += $${SYSROOT}/usr/include/FLAC
+ 
+ LIBS *= -L$${SYSROOT}$${PREFIX}/$${LIBDIRNAME}
+ 
+Index: mythplugins/mythgallery/mythgallery/mythgallery.pro
+===================================================================
+--- mythplugins/mythgallery/mythgallery/mythgallery.pro	(revision 22430)
++++ mythplugins/mythgallery/mythgallery/mythgallery.pro	(working copy)
+@@ -14,7 +14,7 @@
+ target.path = $${LIBDIR}/mythtv/plugins
+ INSTALLS += target
+ 
+-INCLUDEPATH += $${PREFIX}/include/mythtv
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
+ 
+ # Input
+ HEADERS += iconview.h          singleview.h
+Index: mythplugins/mythweather/mythweather/mythweather.pro
+===================================================================
+--- mythplugins/mythweather/mythweather/mythweather.pro	(revision 22430)
++++ mythplugins/mythweather/mythweather/mythweather.pro	(working copy)
+@@ -13,8 +13,8 @@
+ QMAKE_COPY_DIR = sh ../../cpsvndir
+ win32:QMAKE_COPY_DIR = sh ../../cpsimple
+ 
+-INCLUDEPATH += $${PREFIX}/include/mythtv
+-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
+ 
+ datafiles.path = $${PREFIX}/share/mythtv/mythweather/
+ datafiles.files = weather-screens.xml
+Index: mythplugins/mythflix/mythflix/mythflix.pro
+===================================================================
+--- mythplugins/mythflix/mythflix/mythflix.pro	(revision 22430)
++++ mythplugins/mythflix/mythflix/mythflix.pro	(working copy)
+@@ -8,7 +8,7 @@
+ target.path = $${LIBDIR}/mythtv/plugins
+ INSTALLS += target
+ 
+-INCLUDEPATH += $${PREFIX}/include/mythtv
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
+ 
+ installfiles.path = $${PREFIX}/share/mythtv/mythflix
+ installfiles.files = netflix-rss.xml
+Index: mythplugins/mythmovies/mythmovies/mythmovies.pro
+===================================================================
+--- mythplugins/mythmovies/mythmovies/mythmovies.pro	(revision 22430)
++++ mythplugins/mythmovies/mythmovies/mythmovies.pro	(working copy)
+@@ -10,7 +10,7 @@
+ target.path = $${LIBDIR}/mythtv/plugins
+ INSTALLS += target
+ 
+-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
+ 
+ # Input
+ HEADERS += moviesui.h helperobjects.h moviessettings.h
+Index: mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
+===================================================================
+--- mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro	(revision 22430)
++++ mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro	(working copy)
+@@ -8,7 +8,7 @@
+ target.path = $${LIBDIR}/mythtv/plugins
+ INSTALLS += target
+ 
+-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
+ 
+ # Input
+ HEADERS += zmconsole.h zmplayer.h zmevents.h zmliveplayer.h zmdefines.h 
+Index: mythplugins/mythnews/mythnews/mythnews.pro
+===================================================================
+--- mythplugins/mythnews/mythnews/mythnews.pro	(revision 22430)
++++ mythplugins/mythnews/mythnews/mythnews.pro	(working copy)
+@@ -10,9 +10,9 @@
+ target.path = $${LIBDIR}/mythtv/plugins
+ INSTALLS += target
+ 
+-INCLUDEPATH += $${PREFIX}/include/mythtv
+-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
+-INCLUDEPATH += $${PREFIX}/include/mythtv/libmythdb
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
++INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythdb
+ 
+ installfiles.path = $${PREFIX}/share/mythtv/mythnews
+ installfiles.files = news-sites.xml
+Index: mythplugins/targetdep.pro
+===================================================================
+--- mythplugins/targetdep.pro	(revision 22430)
++++ mythplugins/targetdep.pro	(working copy)
+@@ -10,10 +10,10 @@
+ MYTH_LIB_EXT  =$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
+ 
+ 
+-DEPLIBS = $${LIBDIR}
++DEPLIBS = $${SYSROOT}$${LIBDIR}
+ 
+ # On Windows, dlls were installed with exes:
+-mingw : DEPLIBS = $${PREFIX}/bin
++mingw : DEPLIBS = $${SYSROOT}$${PREFIX}/bin
+ 
+ TARGETDEPS += $${DEPLIBS}/libmyth-$${MYTH_SHLIB_EXT}
+ TARGETDEPS += $${DEPLIBS}/libmythdb-$${MYTH_SHLIB_EXT}
diff --git a/recipes/mythtv/mythplugins/configure.patch b/recipes/mythtv/mythplugins/configure.patch
deleted file mode 100644
index fd747a92e5..0000000000
--- a/recipes/mythtv/mythplugins/configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mythplugins-0.22rc1/configure
-===================================================================
---- mythplugins-0.22rc1.orig/configure
-+++ mythplugins-0.22rc1/configure
-@@ -730,7 +730,7 @@ if test "$music" = "yes" ; then
-     fi
- 
-     if test "$taglib" = "yes" ; then
--        echo "INCLUDEPATH += `taglib-config --prefix`/include/taglib" >> ./mythmusic/mythmusic/config.pro
-+        echo "INCLUDEPATH += `taglib-config --cflags | sed 's:-I::'`" >> ./mythmusic/mythmusic/config.pro
-     fi
- fi
- 
diff --git a/recipes/mythtv/mythplugins/mytharchive.pro.patch b/recipes/mythtv/mythplugins/mytharchive.pro.patch
deleted file mode 100644
index e5ea1808a9..0000000000
--- a/recipes/mythtv/mythplugins/mytharchive.pro.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro
-===================================================================
---- mythplugins-0.22rc2.orig/mytharchive/mytharchive/mytharchive.pro
-+++ mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro
-@@ -32,28 +32,28 @@ SOURCES += dbcheck.cpp archiveutil.cpp s
- SOURCES += mythburn.cpp themeselector.cpp editmetadata.cpp thumbfinder.cpp
- SOURCES += exportnative.cpp importnative.cpp
- 
--burnuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
-+burnuifiles.path = $${PREFIX}/share/mythtv/themes/default
- burnuifiles.files = mythburn-ui.xml
- 
--scriptfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/scripts
-+scriptfiles.path = $${PREFIX}/share/mythtv/mytharchive/scripts
- scriptfiles.files = ../mythburn/scripts/*
- 
--introfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/intro
-+introfiles.path = $${PREFIX}/share/mythtv/mytharchive/intro
- introfiles.files = ../mythburn/intro/*.mpg
- 
--musicfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/music
-+musicfiles.path = $${PREFIX}/share/mythtv/mytharchive/music
- musicfiles.files = ../mythburn/music/*.ac3
- 
--imagefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/images
-+imagefiles.path = $${PREFIX}/share/mythtv/mytharchive/images
- imagefiles.files = ../mythburn/images/*.png
- 
--themefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/themes
-+themefiles.path = $${PREFIX}/share/mythtv/mytharchive/themes
- themefiles.files = ../mythburn/themes/*
- 
--profilefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/encoder_profiles
-+profilefiles.path = $${PREFIX}/share/mythtv/mytharchive/encoder_profiles
- profilefiles.files = ../mythburn/encoder_profiles/*.xml
- 
--nativeuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
-+nativeuifiles.path = $${PREFIX}/share/mythtv/themes/default
- nativeuifiles.files = mythnative-ui.xml 
- 
- INSTALLS +=  scriptfiles introfiles themefiles imagefiles musicfiles 
diff --git a/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff b/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff
deleted file mode 100644
index c0eb9d3075..0000000000
--- a/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.pro b/mythplugins/mytharchive/mytharchive/mytharchive.pro
-index bf7f717..d20e0f7 100644
---- mythplugins/mytharchive/mytharchive/mytharchive.pro
-+++ mythplugins/mytharchive/mytharchive/mytharchive.pro
-@@ -14,7 +14,7 @@ LIBS += -lmythavcodec-$$LIBVERSION
- LIBS += -lmythavformat-$$LIBVERSION
- LIBS += -lmythswscale-$$LIBVERSION
- 
--TEMPLATE = lib opengl
-+TEMPLATE = lib
- CONFIG += plugin thread
- TARGET = mytharchive
- target.path = $${LIBDIR}/mythtv/plugins
-@@ -61,6 +61,7 @@ INSTALLS +=  profilefiles burnuifiles
- INSTALLS +=  nativeuifiles 
- 
- #The following line was inserted by qt3to4
--QT += xml sql opengl 
-+QT += xml sql
-+using_opengl:QT += opengl
- 
- include ( ../../libs-targetfix.pro )
-diff --git a/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro b/mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
-index ae073c1..90e413e 100644
---- mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
-+++ mythplugins/mytharchive/mytharchivehelper/mytharchivehelper.pro
-@@ -9,7 +9,8 @@ INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libswscale
- DEPENDPATH *= $${INCLUDEPATH}
- 
- TEMPLATE = app
--CONFIG += thread opengl
-+CONFIG += thread
-+using_opengl:CONFIG += opengl
- 
- target.path = $${PREFIX}/bin
- 
-@@ -27,4 +28,5 @@ LIBS += -lmythavcodec-$$LIBVERSION
- LIBS += -lmythavformat-$$LIBVERSION
- LIBS += -lmythswscale-$$LIBVERSION
- 
--QT += xml sql opengl
-+QT += xml sql
-+using_opengl:QT += opengl
-diff --git a/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro b/mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
-index 98a8a9d..f689c0c 100644
---- mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
-+++ mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
-@@ -2,10 +2,12 @@ include (../../mythconfig.mak )
- include (../../settings.pro )
- include (../../programs-libs.pro )
- 
--QT += network xml sql opengl webkit
-+QT += network xml sql webkit
-+using_opengl:QT += opengl
- 
- TEMPLATE = lib
--CONFIG += thread opengl plugin warn_on
-+CONFIG += thread plugin warn_on
-+using_opengl:CONFIG += opengl
- TARGET = mythbrowser
- target.path = $${LIBDIR}/mythtv/plugins
- INSTALLS += target
-diff --git a/mythplugins/mythflix/mythflix/mythflix.pro b/mythplugins/mythflix/mythflix/mythflix.pro
-index 5ffa22e..4359f77 100644
---- mythplugins/mythflix/mythflix/mythflix.pro
-+++ mythplugins/mythflix/mythflix/mythflix.pro
-@@ -25,6 +25,7 @@ SOURCES += newsengine.cpp dbcheck.cpp flixutil.cpp
- 
- 
- #The following line was inserted by qt3to4
--QT += network xml sql opengl qt3support
-+QT += network xml sql qt3support
-+using_opengl:QT += opengl
- 
- include ( ../../libs-targetfix.pro )
-diff --git a/mythplugins/mythgallery/mythgallery/mythgallery.pro b/mythplugins/mythgallery/mythgallery/mythgallery.pro
-index cf8219a..4542477 100644
---- mythplugins/mythgallery/mythgallery/mythgallery.pro
-+++ mythplugins/mythgallery/mythgallery/mythgallery.pro
-@@ -37,6 +37,7 @@ opengl {
- 
- 
- #The following line was inserted by qt3to4
--QT += network opengl sql xml
-+QT += network sql xml
-+using_opengl:QT += opengl
- 
- include ( ../../libs-targetfix.pro )
-diff --git a/mythplugins/mythgame/mythgame/mythgame.pro b/mythplugins/mythgame/mythgame/mythgame.pro
-index b1f371a..39e7847 100644
---- mythplugins/mythgame/mythgame/mythgame.pro
-+++ mythplugins/mythgame/mythgame/mythgame.pro
-@@ -23,6 +23,7 @@ use_hidesyms {
- LIBS += -lz
- 
- #The following line was inserted by qt3to4
--QT += xml sql opengl qt3support 
-+QT += xml sql qt3support
-+using_opengl:QT += opengl
- 
- include ( ../../libs-targetfix.pro )
-diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.pro b/mythplugins/mythmusic/mythmusic/mythmusic.pro
-index 177a5bc..1153405 100644
---- mythplugins/mythmusic/mythmusic/mythmusic.pro
-+++ mythplugins/mythmusic/mythmusic/mythmusic.pro
-@@ -3,7 +3,8 @@ include ( ../../settings.pro )
- include ( ../../programs-libs.pro )
- include (config.pro)
- 
--QT += xml sql opengl qt3support network
-+QT += xml sql qt3support network
-+using_opengl:QT += opengl
- 
- !exists( config.pro ) {
-    error(Missing config.pro: please run the configure script)
-diff --git a/mythplugins/mythvideo/mtd/mtd.pro b/mythplugins/mythvideo/mtd/mtd.pro
-index 7c3c357..d63d170 100644
---- mythplugins/mythvideo/mtd/mtd.pro
-+++ mythplugins/mythvideo/mtd/mtd.pro
-@@ -5,7 +5,8 @@ include ( ../../programs-libs.pro )
- QT += sql xml network
- 
- TEMPLATE = app
--CONFIG += thread opengl
-+CONFIG += thread
-+using_opengl:CONFIG += opengl
- TARGET = mtd
- target.path = $${PREFIX}/bin
- INSTALLS += target
diff --git a/recipes/mythtv/mythplugins/sysroot.patch b/recipes/mythtv/mythplugins/sysroot.patch
deleted file mode 100644
index 4cf344d2d7..0000000000
--- a/recipes/mythtv/mythplugins/sysroot.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-Index: mythplugins/programs-libs.pro
-===================================================================
---- mythplugins/programs-libs.pro	(revision 22430)
-+++ mythplugins/programs-libs.pro	(working copy)
-@@ -4,7 +4,7 @@
- INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmyth
- DEPENDPATH *= $${INCLUDEPATH}
- 
--LIBS += -L$${LIBDIR} $$EXTRA_LIBS -lmythdb-$$LIBVERSION
-+LIBS += -L$${SYSROOT}$${LIBDIR} $$EXTRA_LIBS -lmythdb-$$LIBVERSION
- LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION
- LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION
- 
-Index: mythplugins/configure
-===================================================================
---- mythplugins/configure	(revision 22430)
-+++ mythplugins/configure	(working copy)
-@@ -266,24 +266,25 @@
- 
- has_library()
- {
--    if test -f /etc/ld.so.conf ; then
--        LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
--    else
--        LIBPATHS=''
--    fi
-+    LIBPATHS=''
-+    if test "x$sysroot" = "x" ; then
-+        if test -f /etc/ld.so.conf ; then
-+            LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
-+        fi
- 
--    LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` "
--    # Mac OS X has a different variable for this:
--    LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
-+        LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` "
-+        # Mac OS X has a different variable for this:
-+        LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
- 
--    # recurse down just one level, should be enough in most cases
--    if test -f /etc/ld.so.conf ; then
--        INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
--        SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
--        for x in $SRCH ; do
--            LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"`
--            LIBPATHS="$LIBPATHS $LP_APPEND"
--        done
-+        # recurse down just one level, should be enough in most cases
-+        if test -f /etc/ld.so.conf ; then
-+            INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
-+            SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
-+            for x in $SRCH ; do
-+                LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"`
-+                LIBPATHS="$LIBPATHS $LP_APPEND"
-+            done
-+        fi
-     fi
- 
-     LIBPATHS="`echo $LIBPATHS $sysroot$prefix/$libdir_name $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
-@@ -300,8 +301,10 @@
- has_header()
- {
-     HPATHS="$sysroot$prefix/include $sysroot/usr/local/include $sysroot/usr/include $sysroot/usr/include/g++-v3 $sysroot/usr/X11R6/include $sysroot/"
--    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
--    HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` "
-+    if test "x$sysroot" = "x" ; then
-+        INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
-+        HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` "
-+    fi
- 
-     HAS_IT="no"
-     for HPATH in $HPATHS ; do
-@@ -689,7 +692,7 @@
-         if test "$sdl" = "yes" ; then
-             echo "        libvisual      support will be included in MythMusic"
-             echo "#define LIBVISUAL_SUPPORT 1" >> ./mythmusic/mythmusic/config.h
--            echo "INCLUDEPATH += /usr/include/libvisual-0.4" >> ./mythmusic/mythmusic/config.pro
-+            echo "INCLUDEPATH += ${sysroot}/usr/include/libvisual-0.4" >> ./mythmusic/mythmusic/config.pro
-             echo "LIBS += -lvisual-0.4" >> ./mythmusic/mythmusic/config.pro
-         else
-             echo "        libvisual      support will not be included in MythMusic (requires SDL support)"
-Index: mythplugins/settings.pro
-===================================================================
---- mythplugins/settings.pro	(revision 22430)
-+++ mythplugins/settings.pro	(working copy)
-@@ -3,8 +3,8 @@
- LIBVERSION = 0.22
- 
- INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
--#INCLUDEPATH += /usr/include/cdda
--#INCLUDEPATH += /usr/include/FLAC
-+#INCLUDEPATH += $${SYSROOT}/usr/include/cdda
-+#INCLUDEPATH += $${SYSROOT}/usr/include/FLAC
- 
- LIBS *= -L$${SYSROOT}$${PREFIX}/$${LIBDIRNAME}
- 
-Index: mythplugins/mythgallery/mythgallery/mythgallery.pro
-===================================================================
---- mythplugins/mythgallery/mythgallery/mythgallery.pro	(revision 22430)
-+++ mythplugins/mythgallery/mythgallery/mythgallery.pro	(working copy)
-@@ -14,7 +14,7 @@
- target.path = $${LIBDIR}/mythtv/plugins
- INSTALLS += target
- 
--INCLUDEPATH += $${PREFIX}/include/mythtv
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
- 
- # Input
- HEADERS += iconview.h          singleview.h
-Index: mythplugins/mythweather/mythweather/mythweather.pro
-===================================================================
---- mythplugins/mythweather/mythweather/mythweather.pro	(revision 22430)
-+++ mythplugins/mythweather/mythweather/mythweather.pro	(working copy)
-@@ -13,8 +13,8 @@
- QMAKE_COPY_DIR = sh ../../cpsvndir
- win32:QMAKE_COPY_DIR = sh ../../cpsimple
- 
--INCLUDEPATH += $${PREFIX}/include/mythtv
--INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
- 
- datafiles.path = $${PREFIX}/share/mythtv/mythweather/
- datafiles.files = weather-screens.xml
-Index: mythplugins/mythflix/mythflix/mythflix.pro
-===================================================================
---- mythplugins/mythflix/mythflix/mythflix.pro	(revision 22430)
-+++ mythplugins/mythflix/mythflix/mythflix.pro	(working copy)
-@@ -8,7 +8,7 @@
- target.path = $${LIBDIR}/mythtv/plugins
- INSTALLS += target
- 
--INCLUDEPATH += $${PREFIX}/include/mythtv
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
- 
- installfiles.path = $${PREFIX}/share/mythtv/mythflix
- installfiles.files = netflix-rss.xml
-Index: mythplugins/mythmovies/mythmovies/mythmovies.pro
-===================================================================
---- mythplugins/mythmovies/mythmovies/mythmovies.pro	(revision 22430)
-+++ mythplugins/mythmovies/mythmovies/mythmovies.pro	(working copy)
-@@ -10,7 +10,7 @@
- target.path = $${LIBDIR}/mythtv/plugins
- INSTALLS += target
- 
--INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
- 
- # Input
- HEADERS += moviesui.h helperobjects.h moviessettings.h
-Index: mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro
-===================================================================
---- mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro	(revision 22430)
-+++ mythplugins/mythzoneminder/mythzoneminder/mythzoneminder.pro	(working copy)
-@@ -8,7 +8,7 @@
- target.path = $${LIBDIR}/mythtv/plugins
- INSTALLS += target
- 
--INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
- 
- # Input
- HEADERS += zmconsole.h zmplayer.h zmevents.h zmliveplayer.h zmdefines.h 
-Index: mythplugins/mythnews/mythnews/mythnews.pro
-===================================================================
---- mythplugins/mythnews/mythnews/mythnews.pro	(revision 22430)
-+++ mythplugins/mythnews/mythnews/mythnews.pro	(working copy)
-@@ -10,9 +10,9 @@
- target.path = $${LIBDIR}/mythtv/plugins
- INSTALLS += target
- 
--INCLUDEPATH += $${PREFIX}/include/mythtv
--INCLUDEPATH += $${PREFIX}/include/mythtv/libmythui
--INCLUDEPATH += $${PREFIX}/include/mythtv/libmythdb
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythui
-+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythdb
- 
- installfiles.path = $${PREFIX}/share/mythtv/mythnews
- installfiles.files = news-sites.xml
-Index: mythplugins/targetdep.pro
-===================================================================
---- mythplugins/targetdep.pro	(revision 22430)
-+++ mythplugins/targetdep.pro	(working copy)
-@@ -10,10 +10,10 @@
- MYTH_LIB_EXT  =$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
- 
- 
--DEPLIBS = $${LIBDIR}
-+DEPLIBS = $${SYSROOT}$${LIBDIR}
- 
- # On Windows, dlls were installed with exes:
--mingw : DEPLIBS = $${PREFIX}/bin
-+mingw : DEPLIBS = $${SYSROOT}$${PREFIX}/bin
- 
- TARGETDEPS += $${DEPLIBS}/libmyth-$${MYTH_SHLIB_EXT}
- TARGETDEPS += $${DEPLIBS}/libmythdb-$${MYTH_SHLIB_EXT}
-- 
cgit 1.2.3-korg