diff options
Diffstat (limited to 'recipes')
21 files changed, 1307 insertions, 336 deletions
diff --git a/recipes/libgtkstylus/files/gtkstylus.sh b/recipes/libgtkstylus/files/gtkstylus.sh index b1302ede0e..623ddae84b 100644 --- a/recipes/libgtkstylus/files/gtkstylus.sh +++ b/recipes/libgtkstylus/files/gtkstylus.sh @@ -1,5 +1,5 @@ #!/bin/sh -GTK_MODULES=libgtkstylus.so +GTK_MODULES=${GTK_MODULES}:libgtkstylus.so export GTK_MODULES diff --git a/recipes/libgtkstylus/libgtkstylus_0.3.bb b/recipes/libgtkstylus/libgtkstylus_0.3.bb index e19a8a9f26..5912b2dab8 100644 --- a/recipes/libgtkstylus/libgtkstylus_0.3.bb +++ b/recipes/libgtkstylus/libgtkstylus_0.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GTK plugin for stylus based systems" SECTION = "libs" DEPENDS = "gtk+" LICENSE = "LGPL" -PR = "r5" +PR = "r6" inherit autotools @@ -16,4 +16,3 @@ do_install_append() { } FILES_${PN} = "/etc ${libdir}/gtk-2.0/*/modules/*.so*" - diff --git a/recipes/mythplugins/files/mythflix.pro.patch b/recipes/mythplugins/files/mythflix.pro.patch deleted file mode 100644 index cffaeae197..0000000000 --- a/recipes/mythplugins/files/mythflix.pro.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mythplugins-0.22rc1/mythflix/mythflix/mythflix.pro -=================================================================== ---- mythplugins-0.22rc1.orig/mythflix/mythflix/mythflix.pro -+++ mythplugins-0.22rc1/mythflix/mythflix/mythflix.pro -@@ -8,7 +8,7 @@ TARGET = mythflix - 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 diff --git a/recipes/mythplugins/files/mythgallery.pro.patch b/recipes/mythplugins/files/mythgallery.pro.patch deleted file mode 100644 index 8be5ea016b..0000000000 --- a/recipes/mythplugins/files/mythgallery.pro.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mythplugins-0.22rc1/mythgallery/mythgallery/mythgallery.pro -=================================================================== ---- mythplugins-0.22rc1.orig/mythgallery/mythgallery/mythgallery.pro -+++ mythplugins-0.22rc1/mythgallery/mythgallery/mythgallery.pro -@@ -14,7 +14,7 @@ TARGET = mythgallery - target.path = $${LIBDIR}/mythtv/plugins - INSTALLS += target - --INCLUDEPATH += $${PREFIX}/include/mythtv -+INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv - - # Input - HEADERS += iconview.h singleview.h diff --git a/recipes/mythplugins/files/mythmovies.pro.patch b/recipes/mythplugins/files/mythmovies.pro.patch deleted file mode 100644 index 84e9450309..0000000000 --- a/recipes/mythplugins/files/mythmovies.pro.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mythplugins-0.22rc1/mythmovies/mythmovies/mythmovies.pro -=================================================================== ---- mythplugins-0.22rc1.orig/mythmovies/mythmovies/mythmovies.pro -+++ mythplugins-0.22rc1/mythmovies/mythmovies/mythmovies.pro -@@ -10,7 +10,7 @@ TARGET = mythmovies - 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 diff --git a/recipes/mythplugins/files/mythnews.pro.patch b/recipes/mythplugins/files/mythnews.pro.patch deleted file mode 100644 index 8b572fcb15..0000000000 --- a/recipes/mythplugins/files/mythnews.pro.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: mythplugins-0.22rc1/mythnews/mythnews/mythnews.pro -=================================================================== ---- mythplugins-0.22rc1.orig/mythnews/mythnews/mythnews.pro -+++ mythplugins-0.22rc1/mythnews/mythnews/mythnews.pro -@@ -10,9 +10,9 @@ TARGET = mythnews - 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 diff --git a/recipes/mythplugins/files/mythweather.pro.patch b/recipes/mythplugins/files/mythweather.pro.patch deleted file mode 100644 index c7fff48708..0000000000 --- a/recipes/mythplugins/files/mythweather.pro.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: mythplugins-0.22rc1/mythweather/mythweather/mythweather.pro -=================================================================== ---- mythplugins-0.22rc1.orig/mythweather/mythweather/mythweather.pro -+++ mythplugins-0.22rc1/mythweather/mythweather/mythweather.pro -@@ -13,8 +13,8 @@ INSTALLS += target - 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 diff --git a/recipes/mythplugins/files/mythzoneminder.pro.patch b/recipes/mythplugins/files/mythzoneminder.pro.patch deleted file mode 100644 index 9eb019c3ac..0000000000 --- a/recipes/mythplugins/files/mythzoneminder.pro.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mythplugins-0.22rc1/mythzoneminder/mythzoneminder/mythzoneminder.pro -=================================================================== ---- mythplugins-0.22rc1.orig/mythzoneminder/mythzoneminder/mythzoneminder.pro -+++ mythplugins-0.22rc1/mythzoneminder/mythzoneminder/mythzoneminder.pro -@@ -8,7 +8,7 @@ TARGET = mythzoneminder - 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 diff --git a/recipes/mythplugins/mythplugins_0.21+0.22rc1.bb b/recipes/mythplugins/mythplugins_0.21+0.22rc1.bb deleted file mode 100644 index 62b4accfa4..0000000000 --- a/recipes/mythplugins/mythplugins_0.21+0.22rc1.bb +++ /dev/null @@ -1,124 +0,0 @@ -inherit qmake2 qt4x11 - -DEFAULT_PREFERENCE = "-1" - -PV = "0.21+0.22rc1" -PR = "r0" -DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio" -# to add libcdparanoia - -# todo: add mythweb - -PACKAGES =+ "mythmovies mythnews mythweather" - -RDEPENDS_${PN} = "mythmovies mythnews mythweather" - -FILES_mythmovies = "${libdir}/mythtv/plugins/libmythmovies.so \ - ${bindir}/ignyte \ - ${datadir}/mythtv/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_mythnews = "${libdir}/mythtv/plugins/libmythnews.so \ - ${datadir}/mythtv/mythnews/ \ - ${datadir}/mythtv/themes/default/enclosures.png \ - ${datadir}/mythtv/themes/default/needs-download.png \ - ${datadir}/mythtv/themes/default/news-info-bg.png \ - ${datadir}/mythtv/themes/default/news-ui.xml \ - " - -FILES_mythnews-dbg = "${libdir}/mythtv/plugins/.debug/libmythnews.so" - -FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \ - ${datadir}/mythtv/mythweather/ \ - ${datadir}/mythtv/il8n/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/themes/menus/weather_settings.xml \ - " - -FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so" - -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2 \ - file://MythBackend.php.patch;patch=1 \ - file://mythflix.pro.patch;patch=1 \ - file://mythgallery.pro.patch;patch=1 \ - file://mythmovies.pro.patch;patch=1 \ - file://mythnews.pro.patch;patch=1 \ - file://mythweather.pro.patch;patch=1 \ - file://mythzoneminder.pro.patch;patch=1 \ - " - -S = "${WORKDIR}/mythplugins-0.22rc1" - -QMAKE_PROFILES = "mythplugins.pro" - -# Note: a lot of functionality is disabled because it depends on QtOpenGL -# which is not in OE at the moment - -EXTRA_OECONF = " \ - --cross-prefix=${TARGET_PREFIX} \ - --sysroot=${STAGING_DIR_HOST} \ - --prefix=${prefix} \ - --with-libdir-name=${STAGING_LIBDIR} \ - --disable-opengl \ - --disable-mytharchive \ - --disable-mythbrowser \ - --disable-mythflix \ - --disable-mythgallery \ - --disable-mythgame \ - --disable-mythmusic \ - --disable-mythvideo \ - --disable-mythzoneminder \ - \ - --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() { - ${S}/configure --qmake=qmake2 ${EXTRA_OECONF} -} - -do_install () { - oe_runmake install INSTALL_ROOT="${D}" - -} - -#ALLOW_EMPTY_${PN} = "1" diff --git a/recipes/mythplugins/files/MythBackend.php.patch b/recipes/mythtv/mythplugins/MythBackend.php.patch index 95cf86e49f..95cf86e49f 100644 --- a/recipes/mythplugins/files/MythBackend.php.patch +++ b/recipes/mythtv/mythplugins/MythBackend.php.patch diff --git a/recipes/mythtv/mythplugins/configure.patch b/recipes/mythtv/mythplugins/configure.patch new file mode 100644 index 0000000000..6eae691e9a --- /dev/null +++ b/recipes/mythtv/mythplugins/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 += ${STAGING_INCDIR}/taglib" >> ./mythmusic/mythmusic/config.pro + fi + fi + diff --git a/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff b/recipes/mythtv/mythplugins/mythplugins_wo_qtopengl.diff new file mode 100644 index 0000000000..c0eb9d3075 --- /dev/null +++ b/recipes/mythtv/mythplugins/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/sysroot.patch b/recipes/mythtv/mythplugins/sysroot.patch new file mode 100644 index 0000000000..4cf344d2d7 --- /dev/null +++ b/recipes/mythtv/mythplugins/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_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb new file mode 100644 index 0000000000..12d6f268da --- /dev/null +++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb @@ -0,0 +1,201 @@ +# todo: add mythweb +# todo: fix and add mythmusic +# todo: fix and add zoneminder +#ALLOW_EMPTY_${PN} = "1" +DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" +RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \ + mythgame mythmovies mythnews mythvideo mythweather" +PV = "0.21+0.22rc2" +PR = "r0" + +#DEFAULT_PREFERENCE = "-1" + +QMAKE_PROFILES = "mythplugins.pro" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \ + file://MythBackend.php.patch;patch=1 \ + file://sysroot.patch;patch=1 \ + file://mythplugins_wo_qtopengl.diff;patch=1 \ + file://configure.patch;patch=1 \ + " + +S = "${WORKDIR}/mythplugins-0.22rc2" + +inherit qmake2 qt4x11 + +# zoneminder needs sql files +# mythmusic has a problem with cdparanoia and private; from the cdparanoia buglist +# 'private' as a reserved keyword now being enforced by GCC 4.3, causes a build failure (patched in SVN). +EXTRA_OECONF = " \ + --cross-prefix=${TARGET_PREFIX} \ + --sysroot=${STAGING_DIR_HOST} \ + --prefix=${prefix} \ + --with-libdir-name=${STAGING_LIBDIR} \ + --disable-opengl \ + --disable-mythmusic \ + --disable-mythzoneminder \ + \ + --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() { + ${S}/configure --qmake=qmake2 ${EXTRA_OECONF} +} +do_install () { + oe_runmake install INSTALL_ROOT="${D}" +} + +PACKAGES =+ "mytharchive mytharchive-dbg \ + mythbrowser mythbrowser-dbg \ + mythflix mythflix-dbg \ + mythgallery mythgallery-dbg \ + mythgame mythgame-dbg \ + mythmovies mythmovies-dbg \ + mythnews mythnews-dbg \ + mythvideo mythvideo-dbg \ + mythweather mythweather-dbg" + +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-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/webpage.png \ + ${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/title_netflix-bg.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_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/mv_level_none.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_medium.png \ + $(datadir)/mythtv/themes/default/mv_browse_selector.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 \ + |