From 8fab324e8eb797162e943303884bd6a0f14692c8 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 24 Feb 2010 21:03:20 +0100 Subject: mythtv: renamed to 0.22+fixes renamed the recipes from 0.22 to 0.22+fixes as they have moved away from 0.22 and are already building the 0.22+fixes version. also renamed the mythtv-0.22 dir to mythtv Signed-off-by: Frans Meulenbroeks --- recipes/mythtv/mythplugins_0.22+fixes.bb | 330 +++++++++++++++++++++++++++++ recipes/mythtv/mythplugins_0.22.bb | 330 ----------------------------- recipes/mythtv/myththemes_0.22+fixes.bb | 22 ++ recipes/mythtv/myththemes_0.22.bb | 22 -- recipes/mythtv/mythtv-0.22/configure.patch | 61 ------ recipes/mythtv/mythtv/configure.patch | 61 ++++++ recipes/mythtv/mythtv_0.22+fixes.bb | 103 +++++++++ recipes/mythtv/mythtv_0.22.bb | 103 --------- 8 files changed, 516 insertions(+), 516 deletions(-) create mode 100644 recipes/mythtv/mythplugins_0.22+fixes.bb delete mode 100644 recipes/mythtv/mythplugins_0.22.bb create mode 100644 recipes/mythtv/myththemes_0.22+fixes.bb delete mode 100644 recipes/mythtv/myththemes_0.22.bb delete mode 100644 recipes/mythtv/mythtv-0.22/configure.patch create mode 100644 recipes/mythtv/mythtv/configure.patch create mode 100644 recipes/mythtv/mythtv_0.22+fixes.bb delete mode 100644 recipes/mythtv/mythtv_0.22.bb (limited to 'recipes') diff --git a/recipes/mythtv/mythplugins_0.22+fixes.bb b/recipes/mythtv/mythplugins_0.22+fixes.bb new file mode 100644 index 0000000000..ebe590cf3b --- /dev/null +++ b/recipes/mythtv/mythplugins_0.22+fixes.bb @@ -0,0 +1,330 @@ +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}+r1" +PV = "0.22" + +SRCREV = "23062" +SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythplugins;proto=http \ + file://sysroot.patch;patch=1 \ + file://mythplugins_wo_qtopengl.diff;patch=1 \ + file://configure.patch;patch=1 \ + file://mytharchive.pro.patch;patch=1 \ + " + + +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/mythplugins_0.22.bb b/recipes/mythtv/mythplugins_0.22.bb deleted file mode 100644 index ebe590cf3b..0000000000 --- a/recipes/mythtv/mythplugins_0.22.bb +++ /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}+r1" -PV = "0.22" - -SRCREV = "23062" -SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythplugins;proto=http \ - file://sysroot.patch;patch=1 \ - file://mythplugins_wo_qtopengl.diff;patch=1 \ - file://configure.patch;patch=1 \ - file://mytharchive.pro.patch;patch=1 \ - " - - -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 new file mode 100644 index 0000000000..f7fcd64ae1 --- /dev/null +++ b/recipes/mythtv/myththemes_0.22+fixes.bb @@ -0,0 +1,22 @@ +DEPENDS = "mythtv" +inherit qmake2 + +PR = "svnr${SRCPV}+r1" +PV = "0.22" + +SRCREV = "23062" +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/myththemes_0.22.bb b/recipes/mythtv/myththemes_0.22.bb deleted file mode 100644 index f7fcd64ae1..0000000000 --- a/recipes/mythtv/myththemes_0.22.bb +++ /dev/null @@ -1,22 +0,0 @@ -DEPENDS = "mythtv" -inherit qmake2 - -PR = "svnr${SRCPV}+r1" -PV = "0.22" - -SRCREV = "23062" -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/configure.patch b/recipes/mythtv/mythtv-0.22/configure.patch deleted file mode 100644 index 748c88d9fc..0000000000 --- a/recipes/mythtv/mythtv-0.22/configure.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: mythtv/configure -=================================================================== ---- mythtv/configure (revision 22430) -+++ mythtv/configure (working copy) -@@ -919,27 +919,27 @@ - #deprecated, use check_lib or check_lib2 instead - 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 /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " -+ LIBPATHS="`echo $LIBPATHS $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " - - HAS_IT="no" - for LIBPATH in $LIBPATHS ; do -@@ -4252,8 +4252,8 @@ - # -L from early in the link line, to ignore any old installed libmyth* - # Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include - # directories, it cannot be modified. --QMAKE_LIBDIR_QT -= $libdir --LATE_LIBS += -L$libdir -+QMAKE_LIBDIR_QT -= ${sysroot}${libdir} -+LATE_LIBS += -L${sysroot}${libdir} - EOF - - diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1 diff --git a/recipes/mythtv/mythtv/configure.patch b/recipes/mythtv/mythtv/configure.patch new file mode 100644 index 0000000000..748c88d9fc --- /dev/null +++ b/recipes/mythtv/mythtv/configure.patch @@ -0,0 +1,61 @@ +Index: mythtv/configure +=================================================================== +--- mythtv/configure (revision 22430) ++++ mythtv/configure (working copy) +@@ -919,27 +919,27 @@ + #deprecated, use check_lib or check_lib2 instead + 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 /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " ++ LIBPATHS="`echo $LIBPATHS $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " + + HAS_IT="no" + for LIBPATH in $LIBPATHS ; do +@@ -4252,8 +4252,8 @@ + # -L from early in the link line, to ignore any old installed libmyth* + # Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include + # directories, it cannot be modified. +-QMAKE_LIBDIR_QT -= $libdir +-LATE_LIBS += -L$libdir ++QMAKE_LIBDIR_QT -= ${sysroot}${libdir} ++LATE_LIBS += -L${sysroot}${libdir} + EOF + + diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1 diff --git a/recipes/mythtv/mythtv_0.22+fixes.bb b/recipes/mythtv/mythtv_0.22+fixes.bb new file mode 100644 index 0000000000..8b7dc6c5b0 --- /dev/null +++ b/recipes/mythtv/mythtv_0.22+fixes.bb @@ -0,0 +1,103 @@ +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}+r7" +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 = "23062" +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;patch=1 \ + " + +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) +} diff --git a/recipes/mythtv/mythtv_0.22.bb b/recipes/mythtv/mythtv_0.22.bb deleted file mode 100644 index 8b7dc6c5b0..0000000000 --- a/recipes/mythtv/mythtv_0.22.bb +++ /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}+r7" -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 = "23062" -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;patch=1 \ - " - -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) -} -- cgit v1.2.3