mythplugins: fixed remaining staging issues

2 files changed, 63 insertions, 12 deletions

diff --git a/recipes/mythtv/mythplugins/mytharchive.pro.patch b/recipes/mythtv/mythplugins/mytharchive.pro.patch
new file mode 100644
index 0000000000..e5ea1808a9
--- /dev/null
+++ b/recipes/mythtv/mythplugins/mytharchive.pro.patch
@@ -0,0 +1,41 @@
+Index: mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro
+===================================================================
+--- mythplugins-0.22rc2.orig/mytharchive/mytharchive/mytharchive.pro
++++ mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro
+@@ -32,28 +32,28 @@ SOURCES += dbcheck.cpp archiveutil.cpp s
+ SOURCES += mythburn.cpp themeselector.cpp editmetadata.cpp thumbfinder.cpp
+ SOURCES += exportnative.cpp importnative.cpp
+ 
+-burnuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
++burnuifiles.path = $${PREFIX}/share/mythtv/themes/default
+ burnuifiles.files = mythburn-ui.xml
+ 
+-scriptfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/scripts
++scriptfiles.path = $${PREFIX}/share/mythtv/mytharchive/scripts
+ scriptfiles.files = ../mythburn/scripts/*
+ 
+-introfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/intro
++introfiles.path = $${PREFIX}/share/mythtv/mytharchive/intro
+ introfiles.files = ../mythburn/intro/*.mpg
+ 
+-musicfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/music
++musicfiles.path = $${PREFIX}/share/mythtv/mytharchive/music
+ musicfiles.files = ../mythburn/music/*.ac3
+ 
+-imagefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/images
++imagefiles.path = $${PREFIX}/share/mythtv/mytharchive/images
+ imagefiles.files = ../mythburn/images/*.png
+ 
+-themefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/themes
++themefiles.path = $${PREFIX}/share/mythtv/mytharchive/themes
+ themefiles.files = ../mythburn/themes/*
+ 
+-profilefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/encoder_profiles
++profilefiles.path = $${PREFIX}/share/mythtv/mytharchive/encoder_profiles
+ profilefiles.files = ../mythburn/encoder_profiles/*.xml
+ 
+-nativeuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default
++nativeuifiles.path = $${PREFIX}/share/mythtv/themes/default
+ nativeuifiles.files = mythnative-ui.xml 
+ 
+ INSTALLS +=  scriptfiles introfiles themefiles imagefiles musicfiles 
diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb
index 63ef18ffec..43c2c58785 100644
--- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb
+++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb
@@ -4,7 +4,7 @@ DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio
 RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \
         mythgame mythmusic mythmovies mythnews mythvideo mythweather"
 PV = "0.21+0.22rc2"
-PR = "r1"
+PR = "r2"
 
 #DEFAULT_PREFERENCE = "-1"
 
@@ -14,6 +14,7 @@ SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \
         file://sysroot.patch;patch=1 \
         file://mythplugins_wo_qtopengl.diff;patch=1 \
         file://configure.patch;patch=1 \
+        file://mytharchive.pro.patch;patch=1 \
         "
 
 S = "${WORKDIR}/mythplugins-0.22rc2"
@@ -64,6 +65,8 @@ FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \
         ${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 \
@@ -194,17 +197,24 @@ 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/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 \