From 589ac4b8cb7a4ffb4907b2d2f38b9f726bb55e8f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 28 Feb 2023 18:22:43 -0500 Subject: linhes-theme: osd and recordings adjustments --- linhes/linhes-theme/PKGBUILD | 80 ++-- linhes/linhes-theme/osd.xml.patch | 329 ++++++++----- linhes/linhes-theme/recordings-ui.xml.patch | 719 +++++++++++++++++++++++++++- 3 files changed, 960 insertions(+), 168 deletions(-) diff --git a/linhes/linhes-theme/PKGBUILD b/linhes/linhes-theme/PKGBUILD index e622f31..a13a375 100755 --- a/linhes/linhes-theme/PKGBUILD +++ b/linhes/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=9.0.0 -pkgrel=1 +pkgrel=3 pkgdesc="Default LinHES MythTV theme" arch=('x86_64') license=('GPL2') @@ -24,6 +24,45 @@ source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xm 'image-ui.xml' 'standardsetting-ui.xml' 'LHLogo.png' 'LHLogoAndText.png') install=$pkgname.install +sha256sums=('30aa74482dfa47bb394e7926f36271ed14b43872c582b283c63fb10c399309ee' + '3394426a36f351ff5b037e7a031313564991f68756cb09d79684468f873f7f12' + '78ec99150273a6da34c7a4041bebb307de2bb74443336715f328f01dfdc9272c' + '1cb0b64ea18c1e54e3cd8c56e9460f73eb8b26dfefc27c7e0bba642b1fed11cd' + 'd799134e6c06ed6039bbae71d50edb83e7fbc4a420700a2028ec90562333d812' + 'acb2d10e897c5e05ed0069e737a272632ca7370f958968556d8d1108c8c17239' + '431a9da8a810b38d2c623d0d01247c360840ab55b8b0c8ab87a4c033c322cb06' + '28bc7e8c94454e86d3dcc9cb1e1e3712940de0a92183b8d3929b2895d6c35ff8' + 'b5a5653f60cff0368d1ebc5571128baa005f649a682fb40ff72669ad692e49c0' + 'a363df51ae3b60d2cd4f8571d1cadcb4d4c9839dde4f869f224152a152afde12' + '38601942d189519bbe9c9354a00d7f94bd1477c8e7aff6540dbbf376a20d845e' + 'fbed102b47c6255be5f90adab55a087daa8d014dca09eda1eacc401eab21cdb1' + 'd3f1135a069029419b14e5fdcf6e6732136bdb4779f4e5bac1f2343aa1a5d8d5' + 'a2e3bb5e3114299f4f539e62593d1d1c455ceae1d779a65f33569952ad28db3f' + 'e99f9c643b787b7d0f5d95ec48b9c2fe8ba746a68f557583af31bdafcd9b7577' + 'f564144e742cfefca6e7386ac0a34217d3c29c531ccc30ad61eb8acb4ef8023b' + '6dac358eeaa1448b40ae7807aa3cbebb81bf2b13f3a9e848b0f2a9000ba69937' + 'e6c6a115c6d45290aa9cfea1a09ba4abd3d15483412150746997cb786dd96ce1' + 'de53064496b5e1bd7b9b0a0a5b346c0e0263efbfb21f768d6f1ec736a6b45f41' + 'bc9a197b2144e88dc2a6477ac28a11da39c7cc6df987b318e39247ffa9456fb8' + '499e8bc9cc1ca2ce2013117637c0b15ec722ebb3430220378182a59b728ea4f1' + '65a28a164a3c86a88cc17e1960051722b96ae5631286afd02031ee850ae3e108' + '2f969fb3066e9bd4ef1c6b78a690badfeea8b44132470e90d44d0465dee2c275' + 'f9e621c2b66749818c41248529dd05361b0b1917039c6b4c55da710e85cc727d' + 'a4ce13418478d06eabf1def8971c91bdae0441c42a26a8d9ff5a6dbae4bf1976' + '70c3e66b8ef5b3f7b51f459c8411cdb2a4f74e911cdc06f3ec78d9953e9f86d1' + 'b81b03f6cbe4f842f8b5113d248c83851653e79b669f2702db557d00ab8334fc' + 'c33c83a8ea4d1f7354f7a135bfb0742fd0e0367f32e63c7ca7abb2ec03a43b06' + '9464d2a169ebf71ca658e35675833ab23ca573a22596b6a633bf08134c9b2c06' + '6c7bb8e08d23c3c386e2a3905133cb258a746aa7dad147c8494676b17a70c4df' + 'a5153a8248c89e072fd2fd1862b52de6e2eda171aae0ba6872fc56ee2c12f954' + 'a895cf07af9662875926a574863ce12a47d34dbf87c178819b1b08cd90093abd' + '6f5644916140cc5d74816b09a9eec78717c1479cb5255762c6af74ad54828a88' + '400cca5039c70ad98d87cb96f6e154b5faf3c1ce7510960e7bd38a2ac81ea039' + '0a2bb7bb3dd513c97a3760e1be80b23890689551b142fbaa7ff5d9e04f1784d5' + '7661214d94b52f90e6b536d3144f2b6287a05b30d17ca3c9414b0dcebaaf9bae' + '71dce90b226e7c5103babab959e1f81f8622acb37231a610f38848082321965d' + '366782cb94bb8dafc8f7d65cc6b50739b98b16a2bfd9b8928d7f51c86cc23478' + 'a74cee81862f10ee30077858fd3888a6327fdbc939cadadfe57faa5a12d10dbb') prepare() { _gitroot="https://github.com/MythTV-Themes/TintedGlass.git" @@ -100,42 +139,3 @@ package() { sed -i "s/MAJ_VER/${pkgver//.}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml sed -i "s/MIN_VER/${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } -md5sums=('2dca856c2a4d1f959473512c94e43b60' - '7ad16012e4c5f9419089e42c539fe6af' - '31cd00ab3f10329a15f238dbe2b43708' - 'd1d54968a2297924673d9653f707df33' - '25ff929dc4aca3b2a0bd38d9ded5a6b8' - '26a6db272dee225b9e4dc282f1494e51' - 'b90b745c72a057c78ebd0b6f2c5530b9' - 'a0ea2d3e386c0b483b31aa1a2703f9eb' - '8f8c27146e11954f60913da6d1fce073' - '09806f2e1d1e6050cc0d10cc6c5daf36' - 'cf259052229f42646d7f37023ec55f44' - '52bb1c1a6c693adc8c04227fb124955a' - '643e7d548587b8742ed5accb6d736257' - 'dd1e013e806efc26049ea89637a51f83' - '9fe3371a8b964a7028126405cfaa330b' - '9eb628e751ad0cccc199779b5b23ac16' - '373e1fd01ba18640992bd5d2e7fd7bfe' - '384871202030f41148536e2e89bb1801' - '8efbd524cef4dd3f5fbe5b7d5ad854f0' - '8312aff444945f80a76100696c81cb2e' - 'f62b200729eb9a69e3929f20f51d3d35' - '4125880d1739b196a8041ecc3d773ee2' - '5a8fb2a5f0e657d52be6f0a6a006ce72' - '274b6f8cb5cd82c5ce28422decd7754b' - 'bfc32b9fa5dca3d46dd6f365ecb449b5' - '4feb9bcc8907cd112ffcd6d69fd6c04f' - '8fcd0acc11f4db33a9442949fb1a293d' - '699e3abe05523f454db3561bfc08b4b2' - 'c3b17c90d85e9e9908d194570f2da3ac' - '39c3c560ed4d8779326f4e63861d8f33' - '60cb915909c477dbc2e18233ee6424d9' - '30ea7d2001b8562177b8f85f34f050a2' - 'e8dee86a10ce7c4423a97305b38b4668' - 'e8ac15e38b3dc99c9e889e439ba356de' - 'e8cf0d3a55ba3be47deae55c05432141' - '3f600b966bd813dd27f620762ddb3ac8' - '4f9e4db179e80eb96a202d319f1b835c' - 'b51ef0cbf8ed2d3a8c1a8257a89aceff' - '09ad14842f828b7a8d24070ec8214fe5') diff --git a/linhes/linhes-theme/osd.xml.patch b/linhes/linhes-theme/osd.xml.patch index d406747..afb478b 100644 --- a/linhes/linhes-theme/osd.xml.patch +++ b/linhes/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ ---- osd.xml.orig 2019-03-23 13:50:23.868516705 +0000 -+++ osd.xml 2019-03-22 21:48:01.193894529 +0000 +--- osd.xml.orig 2023-02-28 10:13:02.297842607 -0500 ++++ osd.xml 2023-02-28 15:34:38.449672606 -0500 @@ -7,13 +7,13 @@ 0,0,1280,720 @@ -17,198 +17,235 @@ -@@ -63,109 +63,97 @@ +@@ -63,160 +63,148 @@ 1212,40,2,120 - - +- +- - - -- +- + -- - - - - - - - -- ++ Frames Decoded/Free : + + - - -- ++ FPS : + + - - - -@@ -177,7 +165,7 @@ +- - -@@ -190,7 +178,7 @@ + +- - -@@ -199,11 +187,11 @@ + +- - -@@ -216,7 +204,7 @@ + +- - -@@ -229,7 +217,7 @@ +@@ -225,24 +213,25 @@ + medium + 994,101,130,25 + right,vcenter +- Channels : ++ Audio/Channels : -@@ -238,11 +226,11 @@ + + -@@ -252,8 +240,8 @@ +@@ -252,8 +241,8 @@ 0,0,1280,720 @@ -242,7 +281,7 @@ #e6e6e6 -@@ -315,9 +303,9 @@ +@@ -315,9 +304,9 @@ 0,0,1280,720 @@ -254,7 +293,7 @@ -@@ -375,12 +363,359 @@ +@@ -375,12 +364,359 @@ @@ -616,7 +655,7 @@ -@@ -436,12 +771,19 @@ +@@ -436,12 +772,19 @@ left,vcenter @@ -624,23 +663,23 @@ - 90,658,1100,24 + + + -@@ -470,39 +812,39 @@ +@@ -470,39 +813,39 @@ 0,0,1280,720 @@ -691,7 +730,7 @@ -@@ -628,7 +970,7 @@ +@@ -628,7 +971,7 @@ supersmallblue no allcenter @@ -700,7 +739,7 @@ -@@ -685,7 +1027,7 @@ +@@ -685,7 +1028,7 @@ supersmallblue no allcenter @@ -709,7 +748,7 @@ -@@ -787,7 +1129,7 @@ +@@ -787,7 +1130,7 @@ supersmallblue no allcenter @@ -718,7 +757,7 @@ -@@ -805,7 +1147,7 @@ +@@ -805,7 +1148,7 @@ supersmallblue no allcenter @@ -727,7 +766,7 @@ -@@ -823,7 +1165,7 @@ +@@ -823,7 +1166,7 @@ supersmallblue no allcenter @@ -736,7 +775,7 @@ -@@ -832,7 +1174,7 @@ +@@ -832,7 +1175,7 @@ supersmallblue no allcenter @@ -745,7 +784,25 @@ -@@ -865,6 +1207,15 @@ +@@ -844,7 +1187,7 @@ + supersmallblue + no + allcenter +- VideoCodec: MPEG-2 ++ VideoCodec: MPEG2 + + + +@@ -853,7 +1196,7 @@ + supersmallblue + no + allcenter +- VideoCodec: VC-1 ++ VideoCodec: VC1 + + + +@@ -865,13 +1208,22 @@ VideoCodec: H.264 @@ -761,7 +818,15 @@ + + +@@ -910,7 +1262,7 @@ supersmallblue no allcenter @@ -770,30 +835,48 @@ -@@ -919,7 +1270,7 @@ +@@ -919,7 +1271,7 @@ supersmallblue no allcenter - VideoDesc: HD_720_P -+ VideoRes: HD 720p ++ VideoRes: HD720p -@@ -928,7 +1279,7 @@ +@@ -928,7 +1280,7 @@ supersmallblue no allcenter - VideoDesc: HD_1080_I -+ VideoRes: HD 1080i ++ VideoRes: HD1080i -@@ -937,23 +1288,32 @@ +@@ -937,23 +1289,50 @@ supersmallblue no allcenter - VideoDesc: HD_1080_P -+ VideoRes: HD 1080p ++ VideoRes: HD1080p ++ ++ ++ ++ ++ ++ ++ @@ -807,28 +890,28 @@ vcenter - + -+ -+ + + +- - -- ++ + + -@@ -988,13 +1348,22 @@ +@@ -988,13 +1367,22 @@ 255 @@ -852,7 +935,7 @@ @@ -922,7 +1005,7 @@ -@@ -1084,7 +1478,7 @@ +@@ -1084,7 +1497,7 @@ @@ -931,7 +1014,7 @@ roundbox -@@ -1092,11 +1486,11 @@ +@@ -1092,11 +1505,11 @@ @@ -945,7 +1028,7 @@ -@@ -1104,30 +1498,6 @@ +@@ -1104,30 +1517,6 @@ @@ -976,7 +1059,7 @@ 1212,492,2,62 -@@ -1175,30 +1545,29 @@ +@@ -1175,30 +1564,29 @@ -@@ -1749,9 +2122,9 @@ +@@ -1749,9 +2141,9 @@ 0,0,1280,720 @@ -1092,7 +1175,7 @@ -@@ -1759,7 +2132,7 @@ +@@ -1759,7 +2151,7 @@ @@ -1101,7 +1184,7 @@ -@@ -1810,7 +2183,7 @@ +@@ -1810,7 +2202,7 @@ @@ -1110,7 +1193,7 @@ box -@@ -1822,21 +2195,21 @@ +@@ -1822,21 +2214,21 @@ @@ -1137,7 +1220,7 @@ vertical 4 yes -@@ -1922,7 +2295,7 @@ +@@ -1922,7 +2314,7 @@ 255 -@@ -1964,7 +2337,7 @@ +@@ -1964,7 +2356,7 @@ @@ -1155,7 +1238,7 @@ images/osd/lists_up_arrow.png -@@ -1978,7 +2351,7 @@ +@@ -1978,7 +2370,7 @@ diff --git a/linhes/linhes-theme/recordings-ui.xml.patch b/linhes/linhes-theme/recordings-ui.xml.patch index 205d671..353dfb5 100644 --- a/linhes/linhes-theme/recordings-ui.xml.patch +++ b/linhes/linhes-theme/recordings-ui.xml.patch @@ -1,5 +1,5 @@ ---- recordings-ui.xml.orig 2018-05-25 17:44:18.266763054 +0000 -+++ recordings-ui.xml 2019-03-24 22:52:51.874815241 +0000 +--- recordings-ui.xml.orig 2023-02-28 10:30:24.782781888 -0500 ++++ recordings-ui.xml 2023-02-28 15:35:49.612986996 -0500 @@ -105,19 +105,11 @@ @@ -60,7 +60,276 @@ no right,vcenter -@@ -579,20 +574,20 @@ +@@ -307,6 +302,15 @@ + + + yes ++ ++ ++ + + + + +@@ -340,7 +344,7 @@ + basesupersmallblue + no + allcenter +- HD720P ++ HD720p + + + +@@ -350,13 +354,79 @@ + no + allcenter + HD1080 +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ yes ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + + -@@ -606,60 +601,51 @@ +@@ -606,60 +676,51 @@ @@ -158,7 +427,7 @@ -@@ -685,12 +671,10 @@ +@@ -685,12 +746,10 @@ 255 @@ -174,3 +443,443 @@ +@@ -1042,7 +1101,7 @@ + + +@@ -1050,7 +1109,7 @@ + + +@@ -1058,7 +1117,7 @@ + + +@@ -1066,7 +1125,7 @@ + + +@@ -1074,7 +1133,7 @@ + + +@@ -1082,7 +1141,7 @@ + + +@@ -1090,7 +1149,7 @@ + + +@@ -1098,7 +1157,7 @@ + + +@@ -1106,7 +1165,7 @@ + + +@@ -1114,7 +1173,7 @@ + + +@@ -1122,7 +1181,7 @@ + + +@@ -1130,15 +1189,23 @@ + + + ++ ++ ++ + + +@@ -1146,7 +1213,7 @@ + + +@@ -1154,31 +1221,79 @@ + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + ++ ++ ++ ++ ++ ++ + + + + + +@@ -1203,7 +1318,7 @@ + + +@@ -1211,7 +1326,7 @@ + + +@@ -1219,7 +1334,7 @@ + + +@@ -1227,7 +1342,7 @@ + + +@@ -1235,7 +1350,7 @@ + + +@@ -1243,7 +1358,7 @@ + + +@@ -1251,7 +1366,7 @@ + + +@@ -1259,7 +1374,7 @@ + + +@@ -1267,7 +1382,7 @@ + + +@@ -1275,7 +1390,7 @@ + + +@@ -1283,7 +1398,7 @@ + + +@@ -1291,15 +1406,23 @@ + + + ++ ++ ++ + + +@@ -1307,7 +1430,7 @@ + + +@@ -1315,15 +1438,63 @@ + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1331,15 +1502,15 @@ + + + + + -- cgit v0.12