From 28ada0658224b8f8f2d08b3b613abacfc5cc758f Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 30 Mar 2016 05:39:59 +0100 Subject: [PATCH] RPi/RPi2: Update Confluence patches --- ...-Confluence-001-jarvis-rbp-backports.patch | 98 ++++++++++++++++++- ...-Confluence-001-jarvis-rbp-backports.patch | 98 ++++++++++++++++++- 2 files changed, 192 insertions(+), 4 deletions(-) diff --git a/projects/RPi/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch b/projects/RPi/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch index b8c6a5c300..84ea8d1914 100644 --- a/projects/RPi/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch +++ b/projects/RPi/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch @@ -1,7 +1,7 @@ -From 3ea5de3b27203ea08529101f42534285cff0e1c0 Mon Sep 17 00:00:00 2001 +From 01759c5adfb050b1ba0c8a8fc4e20a875a98c0e5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 18:58:37 +0100 -Subject: [PATCH] confluence: Remove media-overlay.jpg for when video is +Subject: [PATCH 1/2] confluence: Remove media-overlay.jpg for when video is backgrounded --- @@ -21,3 +21,97 @@ index cc996da..d6aa595 100644 [Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) VisibleFadeEffect +-- +2.5.0 + + +From d99f70c094006144f07bdf739f5847b733030245 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 22 Jul 2013 23:19:15 +0100 +Subject: [PATCH 2/2] [confluence] Use animated gif as a cheaper working + spinner + +--- + 720p/DialogBusy.xml | 4 ++-- + media/busy.gif | Bin 0 -> 3199 bytes + 2 files changed, 2 insertions(+), 2 deletions(-) + create mode 100644 media/busy.gif + +diff --git a/720p/DialogBusy.xml b/720p/DialogBusy.xml +index b5df91f..8e84fed 100644 +--- a/720p/DialogBusy.xml ++++ b/720p/DialogBusy.xml +@@ -25,9 +25,9 @@ + 20 + 32 + 32 +- busy.png ++ busy.gif + keep +- conditional ++ + + + Busy label +diff --git a/media/busy.gif b/media/busy.gif +new file mode 100644 +index 0000000000000000000000000000000000000000..f856ed0b44fdc7e9b0520c7e39a9bebc04136897 +GIT binary patch +literal 3199 +zcmc(fX;f2Z9>y=ZH#f_@I(Toefj|vNK&XX)Kv`7?5Fj9nfFK|eqk^a)i$D+vOGrT0 +z5Y~W_Kw^kiL|j0tWs!ndI9M0djt#Zlzxi?2cy3&gq6Zb5u5$@@ybycc*-E=i(!PE0#hKFr +z8YwHA>k$o6chjKaEI)p!$wAoDL&l~=#v-6#Yi*r{$k>ZaBy{Iun&<0smBO`6!} +z&StP`{nE=0r$xK_71$KwBW33sD3@jYuko!${Lx^a-L6nm0XI6%X29c~=ih=uThmJ) +z0`sx_;Y1skXCCRh-xeI%QSoNyoC$Wv8mqotx(oQi`#)m+fqj0FJ-Ty#;#jn=BdyK1 +z=B6qP9+rpm>D&te;)?^%P6X=O1hYo3EX2|KvKf!7 +zPC<6`-z>t4dt|sDMs?7$3qAAwp-9+}MG!&HJG +zR56mo+HAFw+XYc`x>Q}qx+NXw8e)#H8!s@v;-0BxXf+|F!d7fF@#p{m^y-r6hhl}(OBf7Z9T-XA592wChCS0 +zghE0dyCjN1p_XlCgFCZKa-d{)QY(vcG`ORqtd3Hv5q9cwWnZ4q9qQ6`p6gJt`i)yI +z(k}USCso)D$=T8}kwkOttLQTdyk*$=N_P3zvI>gu=+%v7SlP7u{o}wK&@wvs;D^UR +z_hrU2=hu&--McI1v8!sb^Bc*rSV@S1`PqwVQ`z9M6-zo`(fwU?)%?V6L!Su!wg%>{ +z_Ap6;JlsqFZs&4*_Hyca%X9UeJIQa&rOjqikQOUh?PJH$+b_COMJv9VKYa@bFkHLx +zuWLOM>d88zwur244toBqkoynF%QKPCmFw0Ka@mD&l3lo%OWd7hoRh}_r7X*^);1h% +zS0Y48mAJw~sY5l#+K!_g>SODUoZ~jI`sJw?F0nP#X1q5bEJf^ykCn3huW0t=Buk;; +z>>ir2ELZoSz5-s3JdcW?Z_9fzG0p9c+f +zF75u0#&QywaXZ%t%wx{@Fph2 +z8>d4#CVRatgPNLgq_yn;r95LtQ=1x5s+u(jzg=bD(&G)*)dYbk>S|JZ)~LT9sTL@u +zECM`$!UZY^R=O23aIrSC7%KKzN9#j7fanO3;b9=-Uc$Ny%r0K&Q!3cxIY#cXS+p(!;!p<8t|C$aCa +zmw^IV`QJZ}KB=L;O)P3iejKViBr3riXEU+Os6+HSe_FAg!SQwiv}qZC3nHl$W!6d@ +z71S4lX+^(KPOx(Lj8E2YV-Zqp(+-;Kb+HVT)!}eMBgt)5sl=u6D6D9$YloY~9dexu +zC}LF_6A=VFoaEBm3%6lfCWlPwM@VL+UM3*w1;PDiz0>h(8VN;V8aTNv3fh%t9zvN$ +za|0i22m!`XM6L*S0Fdda0iPRhpr2%l$fxG?zK7#0^aKDQU~07$CjLum>`5g?|W04 +zWxRT@I!WkM-tG!!7x5q%CKh;dv|7?pi#(SC(n*+0 +z_JkG+)}Xfm$~B~iw*|Y6V&e#09^^HH!`DEm|CuKkbWa-O@fsst>tv+k@8)}8 +zIQam3jP;F3e?*@>`tHd{w(%sqW=s(>)3Q9u09{KSdvd$zkgeI0Rru=vq=DF#Oe*oT +zUC2Jj$)htMM58IqjK$$@6z*jZz{EVhT7wY1hm0T)9FAM%LDXn*5`t*q1rLmYg^^Y_ +z5X0LrM!i=K-AxOOl={&<{L5D6K +z>;#ZUjACfyRUVK|-3P;Ja2nW>ZDDm2Hk|&>-$hEgc>zg*B6Z$SRsZ~{lGhZr?x1$s1t=S{s}LNuEC0*wfD$uoK%8ST1Gwr7S<)+ +z9iovkGf8Q-PRuArxY*wt@#b!a<6hm>8dJ&H!R +z$Oeur6$C~7PILzO;&4;G^(D-5m{@KUl(MQ1yKs>x+CMqUUllb3x?=fppG8_v>@)ZY +xGUUb21Yb|%0k3;EZL|UA71ss70{N2%rZhjU!V8TtZxzYw_F;tVxR3z1e*p+ht@8i? + +literal 0 +HcmV?d00001 + +-- +2.5.0 + diff --git a/projects/RPi2/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch b/projects/RPi2/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch index b8c6a5c300..84ea8d1914 100644 --- a/projects/RPi2/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch +++ b/projects/RPi2/patches/kodi-theme-Confluence/kodi-theme-Confluence-001-jarvis-rbp-backports.patch @@ -1,7 +1,7 @@ -From 3ea5de3b27203ea08529101f42534285cff0e1c0 Mon Sep 17 00:00:00 2001 +From 01759c5adfb050b1ba0c8a8fc4e20a875a98c0e5 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sun, 10 Aug 2014 18:58:37 +0100 -Subject: [PATCH] confluence: Remove media-overlay.jpg for when video is +Subject: [PATCH 1/2] confluence: Remove media-overlay.jpg for when video is backgrounded --- @@ -21,3 +21,97 @@ index cc996da..d6aa595 100644 [Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) VisibleFadeEffect +-- +2.5.0 + + +From d99f70c094006144f07bdf739f5847b733030245 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Mon, 22 Jul 2013 23:19:15 +0100 +Subject: [PATCH 2/2] [confluence] Use animated gif as a cheaper working + spinner + +--- + 720p/DialogBusy.xml | 4 ++-- + media/busy.gif | Bin 0 -> 3199 bytes + 2 files changed, 2 insertions(+), 2 deletions(-) + create mode 100644 media/busy.gif + +diff --git a/720p/DialogBusy.xml b/720p/DialogBusy.xml +index b5df91f..8e84fed 100644 +--- a/720p/DialogBusy.xml ++++ b/720p/DialogBusy.xml +@@ -25,9 +25,9 @@ + 20 + 32 + 32 +- busy.png ++ busy.gif + keep +- conditional ++ + + + Busy label +diff --git a/media/busy.gif b/media/busy.gif +new file mode 100644 +index 0000000000000000000000000000000000000000..f856ed0b44fdc7e9b0520c7e39a9bebc04136897 +GIT binary patch +literal 3199 +zcmc(fX;f2Z9>y=ZH#f_@I(Toefj|vNK&XX)Kv`7?5Fj9nfFK|eqk^a)i$D+vOGrT0 +z5Y~W_Kw^kiL|j0tWs!ndI9M0djt#Zlzxi?2cy3&gq6Zb5u5$@@ybycc*-E=i(!PE0#hKFr +z8YwHA>k$o6chjKaEI)p!$wAoDL&l~=#v-6#Yi*r{$k>ZaBy{Iun&<0smBO`6!} +z&StP`{nE=0r$xK_71$KwBW33sD3@jYuko!${Lx^a-L6nm0XI6%X29c~=ih=uThmJ) +z0`sx_;Y1skXCCRh-xeI%QSoNyoC$Wv8mqotx(oQi`#)m+fqj0FJ-Ty#;#jn=BdyK1 +z=B6qP9+rpm>D&te;)?^%P6X=O1hYo3EX2|KvKf!7 +zPC<6`-z>t4dt|sDMs?7$3qAAwp-9+}MG!&HJG +zR56mo+HAFw+XYc`x>Q}qx+NXw8e)#H8!s@v;-0BxXf+|F!d7fF@#p{m^y-r6hhl}(OBf7Z9T-XA592wChCS0 +zghE0dyCjN1p_XlCgFCZKa-d{)QY(vcG`ORqtd3Hv5q9cwWnZ4q9qQ6`p6gJt`i)yI +z(k}USCso)D$=T8}kwkOttLQTdyk*$=N_P3zvI>gu=+%v7SlP7u{o}wK&@wvs;D^UR +z_hrU2=hu&--McI1v8!sb^Bc*rSV@S1`PqwVQ`z9M6-zo`(fwU?)%?V6L!Su!wg%>{ +z_Ap6;JlsqFZs&4*_Hyca%X9UeJIQa&rOjqikQOUh?PJH$+b_COMJv9VKYa@bFkHLx +zuWLOM>d88zwur244toBqkoynF%QKPCmFw0Ka@mD&l3lo%OWd7hoRh}_r7X*^);1h% +zS0Y48mAJw~sY5l#+K!_g>SODUoZ~jI`sJw?F0nP#X1q5bEJf^ykCn3huW0t=Buk;; +z>>ir2ELZoSz5-s3JdcW?Z_9fzG0p9c+f +zF75u0#&QywaXZ%t%wx{@Fph2 +z8>d4#CVRatgPNLgq_yn;r95LtQ=1x5s+u(jzg=bD(&G)*)dYbk>S|JZ)~LT9sTL@u +zECM`$!UZY^R=O23aIrSC7%KKzN9#j7fanO3;b9=-Uc$Ny%r0K&Q!3cxIY#cXS+p(!;!p<8t|C$aCa +zmw^IV`QJZ}KB=L;O)P3iejKViBr3riXEU+Os6+HSe_FAg!SQwiv}qZC3nHl$W!6d@ +z71S4lX+^(KPOx(Lj8E2YV-Zqp(+-;Kb+HVT)!}eMBgt)5sl=u6D6D9$YloY~9dexu +zC}LF_6A=VFoaEBm3%6lfCWlPwM@VL+UM3*w1;PDiz0>h(8VN;V8aTNv3fh%t9zvN$ +za|0i22m!`XM6L*S0Fdda0iPRhpr2%l$fxG?zK7#0^aKDQU~07$CjLum>`5g?|W04 +zWxRT@I!WkM-tG!!7x5q%CKh;dv|7?pi#(SC(n*+0 +z_JkG+)}Xfm$~B~iw*|Y6V&e#09^^HH!`DEm|CuKkbWa-O@fsst>tv+k@8)}8 +zIQam3jP;F3e?*@>`tHd{w(%sqW=s(>)3Q9u09{KSdvd$zkgeI0Rru=vq=DF#Oe*oT +zUC2Jj$)htMM58IqjK$$@6z*jZz{EVhT7wY1hm0T)9FAM%LDXn*5`t*q1rLmYg^^Y_ +z5X0LrM!i=K-AxOOl={&<{L5D6K +z>;#ZUjACfyRUVK|-3P;Ja2nW>ZDDm2Hk|&>-$hEgc>zg*B6Z$SRsZ~{lGhZr?x1$s1t=S{s}LNuEC0*wfD$uoK%8ST1Gwr7S<)+ +z9iovkGf8Q-PRuArxY*wt@#b!a<6hm>8dJ&H!R +z$Oeur6$C~7PILzO;&4;G^(D-5m{@KUl(MQ1yKs>x+CMqUUllb3x?=fppG8_v>@)ZY +xGUUb21Yb|%0k3;EZL|UA71ss70{N2%rZhjU!V8TtZxzYw_F;tVxR3z1e*p+ht@8i? + +literal 0 +HcmV?d00001 + +-- +2.5.0 +