mythtv: removed 0.22
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>
Tue, 30 Nov 2010 08:30:36 +0000 (09:30 +0100)
committerKhem Raj <raj.khem@gmail.com>
Tue, 30 Nov 2010 18:10:34 +0000 (10:10 -0800)
probably does not build with qt4.7
this one was not maintained anyway and only stayed because a few distro's pinned it.
it is now unpinned by all so rm.
we already have 0.23 for almost a year, and the metadata for 0.23 is better

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
recipes/mythtv/mythplugins-0.22/configure.patch [deleted file]
recipes/mythtv/mythplugins-0.22/mytharchive.pro.patch [deleted file]
recipes/mythtv/mythplugins-0.22/mythplugins_wo_qtopengl.diff [deleted file]
recipes/mythtv/mythplugins-0.22/sysroot.patch [deleted file]
recipes/mythtv/mythplugins_0.22+fixes.bb [deleted file]
recipes/mythtv/myththemes_0.22+fixes.bb [deleted file]
recipes/mythtv/mythtv_0.22+fixes.bb [deleted file]

diff --git a/recipes/mythtv/mythplugins-0.22/configure.patch b/recipes/mythtv/mythplugins-0.22/configure.patch
deleted file mode 100644 (file)
index fd747a9..0000000
+++ /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-0.22/mytharchive.pro.patch b/recipes/mythtv/mythplugins-0.22/mytharchive.pro.patch
deleted file mode 100644 (file)
index e5ea180..0000000
+++ /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-0.22/mythplugins_wo_qtopengl.diff b/recipes/mythtv/mythplugins-0.22/mythplugins_wo_qtopengl.diff
deleted file mode 100644 (file)
index c0eb9d3..0000000
+++ /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-0.22/sysroot.patch b/recipes/mythtv/mythplugins-0.22/sysroot.patch
deleted file mode 100644 (file)
index 4cf344d..0000000
+++ /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}
diff --git a/recipes/mythtv/mythplugins_0.22+fixes.bb b/recipes/mythtv/mythplugins_0.22+fixes.bb
deleted file mode 100644 (file)
index 08daace..0000000
+++ /dev/null
@@ -1,330 +0,0 @@
-DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia"
-RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery mythgame \
-                  mythmusic mythmovies mythnews mythvideo mythweather mythzoneminder"
-RRECOMMENDS_${PN} = "mythweb_lighttpd"
-
-# the apache variant does not work yet, too many issues with apache+php+mysql"
-DEPENDS_mythweb_apache = "mythweb"
-RDEPENDS_mythweb_apache = "apache2"
-
-DEPENDS_mythweb_lighttpd = "mythweb"
-RDEPENDS_mythweb_lighttpd = "lighttpd lighttpd-module-cgi lighttpd-module-fastcgi \
-        lighttpd-module-rewrite php-cgi lighttpd-module-auth"
-
-PR = "svnr${SRCPV}+r0"
-PV = "0.22"
-
-SRCREV = "23710"
-SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythplugins;proto=http \
-        file://sysroot.patch \
-        file://mythplugins_wo_qtopengl.diff \
-        file://configure.patch \
-        file://mytharchive.pro.patch \
-        "
-
-
-QMAKE_PROFILES = "mythplugins.pro"
-
-S = "${WORKDIR}/mythplugins"
-
-inherit qmake2 qt4x11
-
-EXTRA_OECONF = " \
-        --cross-prefix=${TARGET_PREFIX} \
-        --sysroot=${STAGING_DIR_HOST} \
-        --prefix=${prefix} \
-        --with-libdir-name=${STAGING_LIBDIR} \
-        --disable-opengl \
-        \
-        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-ldflags="${TARGET_LDFLAGS}" \
-"
-
-do_configure() {
-        ${S}/configure --qmake=qmake2 ${EXTRA_OECONF}
-}
-
-do_install_mythweb_apache () {
-        oe_runmake install INSTALL_ROOT="${D}"
-        install -d  ${D}${datadir}/apache2
-        install -d  ${D}${datadir}/apache2/htdocs
-        install -d  ${D}/etc/apache2
-        install -d  ${D}/etc/apache2/extra
-        cp -R ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/
-        cp -R ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf
-        sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}/etc/apache2/extra/mythweb.conf
-}
-
-do_install_mythweb_lighttpd () {
-        oe_runmake install INSTALL_ROOT="${D}"
-        install -d  ${D}/www
-        install -d  ${D}/www/pages
-        cp -R ${S}/mythweb/* ${D}www/pages/
-        cp -R ${S}/mythweb/mythweb.conf.lighttpd ${D}/etc/mythweb.conf
-        sed -i -e s:/var/www/html:/www/pages:g ${D}/etc/mythweb.conf
-}
-
-pkg_postinst_mythweb_apache () {
-        chgrp -R apache /usr/share/apache2/htdocs/data
-        chmod g+rw /usr/share/apache2/htdocs/data
-        grep mythweb.conf /etc/apache2/httpd.conf || \
-              echo "Include /etc/apache2/extra/mythweb.conf" >>/etc/apache2/httpd.conf
-}
-
-pkg_postinst_mythweb_lighttpd () {
-        chgrp -R www-data /usr/share/apache2/htdocs/data
-        chmod g+rw /var/www/pages
-        grep mythweb.conf /etc/lighttpd.conf || \
-                echo "Include /etc/mythweb.conf" >>/etc/lighttpd.conf
-}
-
-PACKAGES =+ " \
-        mythweb_apache mythweb_lighttpd \
-        mytharchive mytharchive-dbg \
-        mythbrowser mythbrowser-dbg \
-        mythflix mythflix-dbg \
-        mythgallery mythgallery-dbg \
-        mythgame mythgame-dbg \
-        mythmovies mythmovies-dbg \
-        mythmusic mythmusic-dbg \
-        mythnews mythnews-dbg \
-        mythvideo mythvideo-dbg \
-        mythweather mythweather-dbg \
-        mythzoneminder mythzoneminder-dbg"
-
-FILES_mythweb_apache = "${datadir}/apache2/htdocs \
-        /etc/apache2/extra/mythweb.conf"
-
-FILES_mythweb_lighttpd = "${datadir}/www/pages \
-        /etc/mythweb.conf"
-
-FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \
-        ${bindir}/mytharchivehelper \
-        ${datadir}/mythtv/i18n/mytharchive* \
-        ${datadir}/mythtv/mytharchive/* \
-        ${datadir}/mythtv/archiveformat.xml \
-        ${datadir}/mythtv/archivemenu.xml \
-        ${datadir}/mythtv/archiveutils.xml \
-        ${datadir}/mythtv/themes/default/mytharchive-ui.xml \
-        ${datadir}/mythtv/themes/default/mythburn-ui.xml \
-        ${datadir}/mythtv/themes/default/mythnative-ui.xml \
-        ${datadir}/mythtv/themes/default/ma_*.png \
-        ${datadir}/mythtv/themes/default/mb_progressbar_background.png \
-        ${datadir}/mythtv/themes/default/mb_progressbar_fill.png \
-        ${datadir}/mythtv/themes/default-wide/mytharchive-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/mythburn-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/mythnative-ui.xml \
-        "
-FILES_mytharchive-dbg = "${bindir}/.debug/mytharchivehelper \
-        ${libdir}/mythtv/plugins/.debug/libmytharchive.so"
-
-FILES_mythbrowser = "${libdir}/mythtv/plugins/libmythbrowser.so \
-        ${bindir}/mythbrowser \
-        ${datadir}/mythtv/i18n/mythbrowser* \
-        ${datadir}/mythtv/themes/default/browser-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/browser-ui.xml \
-        "
-FILES_mythbrowser-dbg = "${libdir}/mythtv/plugins/.debug/libmythbrowser.so"
-
-FILES_mythflix = "${libdir}/mythtv/plugins/libmythflix.so \
-        ${datadir}/mythtv/i18n/mythflix* \
-        ${datadir}/mythtv/mythflix/* \
-        ${datadir}/mythtv/netflix_menu.xml \
-        ${datadir}/mythtv/themes/default/mythflix_background.png \
-        ${datadir}/mythtv/themes/default/netflix-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/netflix-ui.xml \
-        ${datadir}/mythtv/themes/default/title_netflix.png \
-        ${datadir}/mythtv/themes/default-wide/netflix-bg.png \
-        "
-FILES_mythflix-dbg = "${libdir}/mythtv/plugins/.debug/libmythflix.so"
-
-FILES_mythgallery = "${libdir}/mythtv/plugins/libmythgallery.so \
-        ${datadir}/mythtv/i18n/mythgallery* \
-        ${datadir}/mythtv/themes/default/gallery*.png \
-        ${datadir}/mythtv/themes/default/gallery-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/gallery-ui.xml \
-        "
-FILES_mythgallery-dbg = "${libdir}/mythtv/plugins/.debug/libmythgallery.so"
-
-FILES_mythgame = "${libdir}/mythtv/plugins/libmythgame.so \
-        ${datadir}/mythtv/i18n/mythgame* \
-        ${datadir}/mythtv/game_settings.xml \
-        ${datadir}/mythtv/themes/default/game-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/game-ui.xml \
-        "
-FILES_mythgame-dbg = "${libdir}/mythtv/plugins/.debug/libmythgame.so"
-
-FILES_mythmovies = "${libdir}/mythtv/plugins/libmythmovies.so \
-        ${bindir}/ignyte \
-        ${datadir}/mythtv/mythmovies/* \
-        ${datadir}/mythtv/i18n/mythmovies* \
-        ${datadir}/mythtv/themes/default/movies-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/movies-ui.xml \
-        "
-FILES_mythmovies-dbg = "${bindir}/.debug/ignyte \
-        ${libdir}/mythtv/plugins/.debug/libmythmovies.so"
-
-FILES_mythmusic = "${libdir}/mythtv/plugins/libmythmusic.so \
-        ${datadir}/mythtv/mythmusic/* \
-        ${datadir}/mythtv/i18n/mythmusic* \
-        ${datadir}/mythtv/music_settings.xml \
-        ${datadir}/mythtv/musicmenu.xml \
-        ${datadir}/mythtv/themes/default/selectionbar.png \
-        ${datadir}/mythtv/themes/default/mm_browser_back_reg.png \
-        ${datadir}/mythtv/themes/default/music-sel-bg.png \
-        ${datadir}/mythtv/themes/default/mm_rip_banner.png \
-        ${datadir}/mythtv/themes/default/mm_prev_on.png \
-        ${datadir}/mythtv/themes/default/next_button_off.png \
-        ${datadir}/mythtv/themes/default/mm_next_pushed.png \
-        ${datadir}/mythtv/themes/default/stop_button_pushed.png \
-        ${datadir}/mythtv/themes/default/mm_folder.png \
-        ${datadir}/mythtv/themes/default/mm_left_arrow.png \
-        ${datadir}/mythtv/themes/default/rew_button_on.png \
-        ${datadir}/mythtv/themes/default/next_button_pushed.png \
-        ${datadir}/mythtv/themes/default/mm_trans_background.png \
-        ${datadir}/mythtv/themes/default/prev_button_off.png \
-        ${datadir}/mythtv/themes/default/mm_browser_back_sel.png \
-        ${datadir}/mythtv/themes/default/ff_button_off.png \
-        ${datadir}/mythtv/themes/default/mm_volume_tick.png \
-        ${datadir}/mythtv/themes/default/stop_button_off.png \
-        ${datadir}/mythtv/themes/default/mm_progress-fg.png \
-        ${datadir}/mythtv/themes/default/mm_rip_background.png \
-        ${datadir}/mythtv/themes/default/rew_button_pushed.png \
-        ${datadir}/mythtv/themes/default/mm_next_off.png \
-        ${datadir}/mythtv/themes/default/mm_next_on.png \
-        ${datadir}/mythtv/themes/default/pause_button_pushed.png \
-        ${datadir}/mythtv/themes/default/mm_nothumb.png \
-        ${datadir}/mythtv/themes/default/stop_button_on.png \
-        ${datadir}/mythtv/themes/default/mm_blackhole_border.png \
-        ${datadir}/mythtv/themes/default/mm_prev_pushed.png \
-        ${datadir}/mythtv/themes/default/pause_button_on.png \
-        ${datadir}/mythtv/themes/default/play_button_pushed.png \
-        ${datadir}/mythtv/themes/default/mm_progress_foreground.png \
-        ${datadir}/mythtv/themes/default/pause_button_off.png \
-        ${datadir}/mythtv/themes/default/play_button_off.png \
-        ${datadir}/mythtv/themes/default/mm_progress_background.png \
-        ${datadir}/mythtv/themes/default/mm_up_arrow.png \
-        ${datadir}/mythtv/themes/default/prev_button_on.png \
-        ${datadir}/mythtv/themes/default/mm_volume_background.png \
-        ${datadir}/mythtv/themes/default/ff_button_pushed.png \
-        ${datadir}/mythtv/themes/default/mm_prev_off.png \
-        ${datadir}/mythtv/themes/default/miniplayer_background.png \
-        ${datadir}/mythtv/themes/default/mm_progress-bg.png \
-        ${datadir}/mythtv/themes/default/track_info_background.png \
-        ${datadir}/mythtv/themes/default/mm_waiting.png \
-        ${datadir}/mythtv/themes/default/play_button_on.png \
-        ${datadir}/mythtv/themes/default/prev_button_pushed.png \
-        ${datadir}/mythtv/themes/default/mm_right_arrow.png \
-        ${datadir}/mythtv/themes/default/ff_button_on.png \
-        ${datadir}/mythtv/themes/default/mm_down_arrow.png \
-        ${datadir}/mythtv/themes/default/next_button_on.png \
-        ${datadir}/mythtv/themes/default/mm_rating.png \
-        ${datadir}/mythtv/themes/default/rew_button_off.png \
-        ${datadir}/mythtv/themes/default/mm-titlelines.png \
-        ${datadir}/mythtv/themes/default-wide/music-sel-bg.png \
-        ${datadir}/mythtv/themes/default-wide/mm_blackhole_border.png \
-        ${datadir}/mythtv/themes/default-wide/mm_volume_background.png \
-        ${datadir}/mythtv/themes/default-wide/mm_waiting.png \
-        ${datadir}/mythtv/themes/default-wide/mm-titlelines.png \
-        ${datadir}/mythtv/themes/default/music-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/music-ui.xml \
-        "
-FILES_mythmusic-dbg = "${libdir}/mythtv/plugins/.debug/libmythmusic.so"
-
-FILES_mythnews = "${libdir}/mythtv/plugins/libmythnews.so \
-        ${datadir}/mythtv/mythnews/* \
-        ${datadir}/mythtv/i18n/mythnews* \
-        ${datadir}/mythtv/themes/default/enclosures.png \
-        ${datadir}/mythtv/themes/default/need-download.png \
-        ${datadir}/mythtv/themes/default/podcast.png \
-        ${datadir}/mythtv/themes/default/news-info-bg.png \
-        ${datadir}/mythtv/themes/default/news-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/news-ui.xml \
-        "
-FILES_mythnews-dbg = "${libdir}/mythtv/plugins/.debug/libmythnews.so"
-
-FILES_mythvideo = "${libdir}/mythtv/plugins/libmythvideo.so \
-        ${bindir}/mtd \
-        ${datadir}/mythtv/mythvideo/* \
-        ${datadir}/mythtv/i18n/mythvideo* \
-        ${datadir}/mythtv/themes/default/md_progress_background.png \
-        ${datadir}/mythtv/themes/default/md_rip_banner.png \
-        ${datadir}/mythtv/themes/default/mv_level_none.png \
-        ${datadir}/mythtv/themes/default/mv_browse_background.png \
-        ${datadir}/mythtv/themes/default/mv_itemdetail_popup.png \
-        ${datadir}/mythtv/themes/default/mv_filerequest.png  \
-        ${datadir}/mythtv/themes/default/mv_level_high.png \
-        ${datadir}/mythtv/themes/default/mv_results_popup.png \
-        ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \
-        ${datadir}/mythtv/themes/default/mv_level_low.png \
-        ${datadir}/mythtv/themes/default/mv_level_lowest.png \
-        ${datadir}/mythtv/themes/default/mv_level_medium.png \
-        ${datadir}/mythtv/themes/default/mv_browse_selector.png \
-        ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \
-        ${datadir}/mythtv/themes/default-wide/mv_browse_selector.png \
-        ${datadir}/mythtv/themes/default-wide/mv_browse_background.png \
-        ${datadir}/mythtv/themes/default-wide/mv_browse_nocover_large.png \
-        ${datadir}/mythtv/themes/default-wide/mv_itemdetail_popup.png \
-        ${datadir}/mythtv/themes/default-wide/movies-ui.xml \
-        ${datadir}/mythtv/themes/default/dvd-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/dvd-ui.xml \
-        ${datadir}/mythtv/themes/default/video-ui.xml \
-        ${datadir}/mythtv/themes/default-wide/video-ui.xml \
-        ${datadir}/mythtv/video_settings.xml \
-        ${datadir}/mythtv/videomenu.xml \
-        "
-FILES_mythvideo-dbg = "${bindir}/.debug/mtd \
-        ${libdir}/mythtv/plugins/.debug/libmythvideo.so"
-
-FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \
-        ${datadir}/mythtv/mythweather/* \
-        ${datadir}/mythtv/i18n/mythweather* \
-        ${datadir}/mythtv/themes/default-wide/mw-background.png \
-        ${datadir}/mythtv/themes/default-wide/mw-lines.png \
-        ${datadir}/mythtv/themes/default-wide/mw-map-sat.png \
-        ${datadir}/mythtv/themes/default-wide/mw-map.png \
-        ${datadir}/mythtv/themes/default-wide/mw-popup.png \
-        ${datadir}/mythtv/themes/default-wide/weather-ui.xml \
-        ${datadir}/mythtv/themes/default/cloudy.png \
-        ${datadir}/mythtv/themes/default/fair.png \
-        ${datadir}/mythtv/themes/default/flurries.png \
-        ${datadir}/mythtv/themes/default/fog.png \
-        ${datadir}/mythtv/themes/default/logo.png \
-        ${datadir}/mythtv/themes/default/lshowers.png \
-        ${datadir}/mythtv/themes/default/mcloudy.png \
-        ${datadir}/mythtv/themes/default/mw_background.png \
-        ${datadir}/mythtv/themes/default/mw_checked.png \
-        ${datadir}/mythtv/themes/default/mw_checked_high.png \
-        ${datadir}/mythtv/themes/default/mw_lines.png \
-        ${datadir}/mythtv/themes/default/mw_map-sat.png \
-        ${datadir}/mythtv/themes/default/mw_map.png \
-        ${datadir}/mythtv/themes/default/mw_popup.png \
-        ${datadir}/mythtv/themes/default/mw_shading.png \
-        ${datadir}/mythtv/themes/default/mw_unchecked.png \
-        ${datadir}/mythtv/themes/default/mw_unchecked_high.png \
-        ${datadir}/mythtv/themes/default/mwmain.png \
-        ${datadir}/mythtv/themes/default/pcloudy.png \
-        ${datadir}/mythtv/themes/default/rainsnow.png \
-        ${datadir}/mythtv/themes/default/showers.png \
-        ${datadir}/mythtv/themes/default/snowshow.png \
-        ${datadir}/mythtv/themes/default/sunny.png \
-        ${datadir}/mythtv/themes/default/thunshowers.png \
-        ${datadir}/mythtv/themes/default/unknown.png \
-        ${datadir}/mythtv/themes/default/weather-ui.xml \
-        ${datadir}/mythtv/weather_settings.xml \
-        "
-FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so"
-
-FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \
-        ${datadir}/mythtv/zonemindermenu.xml \
-        ${datadir}/mythtv/i18n/mythzoneminder* \
-        ${datadir}/mythtv/themes/default/zoneminder-ui.xml \
-        ${datadir}/mythtv/themes/default/mz_black.png \
-        ${datadir}/mythtv/themes/default/mz_browser_back_sel.png \
-        ${datadir}/mythtv/themes/default/mz_browser_back_reg.png \
-        ${datadir}/mythtv/themes/default/mz_function_popup.png \
-        ${datadir}/mythtv/themes/default/mz_testcard.png \
-        ${datadir}/mythtv/themes/default-wide/zoneminder-ui.xml \
-        "
-FILES_mythzoneminder-dbg = "${libdir}/mythtv/plugins/.debug/libmythzoneminder.so"
diff --git a/recipes/mythtv/myththemes_0.22+fixes.bb b/recipes/mythtv/myththemes_0.22+fixes.bb
deleted file mode 100644 (file)
index 2b4d8de..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-DEPENDS = "mythtv"
-inherit qmake2
-
-PR = "svnr${SRCPV}+r0"
-PV = "0.22"
-
-SRCREV = "23710"
-SRC_URI = \
-"svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=myththemes;proto=http"
-
-FILES_${PN} =+ "${datadir}"
-
-S = "${WORKDIR}/myththemes"
-
-do_configure() {
-        ${S}/configure  --qmake=qmake2 --sysroot=${STAGING_DIR_HOST} --prefix=${prefix} 
-}
-
-do_install () {
-        oe_runmake install INSTALL_ROOT=${D}
-}
-
diff --git a/recipes/mythtv/mythtv_0.22+fixes.bb b/recipes/mythtv/mythtv_0.22+fixes.bb
deleted file mode 100644 (file)
index effab19..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-require mythtv.inc
-
-DEPENDS_{PN} += "libmyth"
-DEPENDS_libmyth = "libmythdb libmythavutil libmythavcodec libmythavformat libmythswscale libmythhdhomerun \
-        libmythtv libmythui libmythfreemheg libmythupnp libmythlivemedia"
-
-RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database \
-mysql5-server mysql5-client libmysqlclient qt4-plugin-sqldriver-sqlmysql xmltv"
-RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16"
-
-PR = "svnr${SRCPV}+r0"
-PV = "0.22"
-
-# REALPV is here to support release candidates
-# OE in that case has as PV something like 0.21+0.22rc1
-# but for packaging the real PV is needed
-REALPV = "0.22"
-
-SRCREV = "24225"
-SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtv;proto=http"
-
-S = "${WORKDIR}/mythtv"
-
-ALLOW_EMPTY_${PN} = "1"
-
-QMAKE_PROFILES = "mythtv.pro"
-
-SRC_URI += " \
-        file://configure.patch \
-        "
-
-inherit qmake2 qt4x11
-
-EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8"
-EXTRA_MYTHTVCONF_armv5te = "--cpu=armv5te"
-EXTRA_MYTHTVCONF ?= ""
-EXTRA_OECONF = " \
-        --cross-prefix=${TARGET_PREFIX} \
-        --sysroot=${STAGING_DIR_HOST} \
-        --prefix=${prefix} \
-        --arch=${TARGET_ARCH} \
-        \
-        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-ldflags="${TARGET_LDFLAGS}" \
-        ${EXTRA_MYTHTVCONF} \
-"
-
-do_configure_prepend() {
-# it's not autotools anyway, so we call ./configure directly
-        find . -name "Makefile"|xargs rm -f
-        ./configure     --qmake=qmake2          \
-                        --disable-altivec        \
-                         --disable-opengl        \
-                        --disable-stripping        \
-                        --disable-xvmc                \
-                        --enable-v4l                \
-                        --enable-audio-oss        \
-                        --enable-dvb                \
-                        --enable-libmp3lame \
-            --dvb-path=${STAGING_INCDIR} \
-                        --without-bindings=perl,python \
-                        ${EXTRA_OECONF}
-}
-
-do_install() {
-        oe_runmake INSTALL_ROOT=${D} install
-        install -d ${D}${datadir}/mythtv
-        install -d ${D}${datadir}/mythtv/sql
-        install -m 0644 ${S}/database/mc.sql ${D}${datadir}/mythtv/sql
-}
-
-PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database"
-PACKAGES_DYNAMIC = "mythtv-theme-*"
-
-FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
-FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
-FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
-FILES_mythtv-bin = "${bindir}/*"
-FILES_mythtv-filters = "${libdir}/mythtv/filters/*"
-FILES_mythtv-database = "${datadir}/mythtv/sql/"
-
-RRECOMMENDS_mythtv-frontend += "mythtv-theme-defaultmenu mythtv-theme-terra"
-
-mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
-
-python __anonymous () {
-    import bb
-    mythlibs = bb.data.getVar('mythlibs', d).split()
-    pv = bb.data.expand(bb.data.getVar("REALPV", d), d)
-    for m in mythlibs:
-        bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d)
-        bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d)
-    packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split())
-    bb.data.setVar("PACKAGES", packages, d)
-}
-python populate_packages_prepend () {
-        new_packages = []
-        def the_hook(file, pkg, pattern, format, basename):
-                new_packages.append(pkg)
-        do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True)
-        bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d)
-}