diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-03-12 20:02:37 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-03-12 20:02:37 +0000 |
commit | b1fcaf5d539d1298b231c31b84aabb939bc39bcc (patch) | |
tree | 7a5f6768db81e73afb8761855ef6c7b75ce8e83b /media-video | |
parent | bump (diff) | |
download | devel-b1fcaf5d539d1298b231c31b84aabb939bc39bcc.tar.gz devel-b1fcaf5d539d1298b231c31b84aabb939bc39bcc.tar.bz2 devel-b1fcaf5d539d1298b231c31b84aabb939bc39bcc.zip |
bump; disabled deprecated use-flag volctrl
(Portage version: 2.1.11.50/svn/Linux i686, unsigned Manifest commit)
svn path=/vdr-devel/; revision=1164
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/vdr/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/vdr/Manifest | 8 | ||||
-rw-r--r-- | media-video/vdr/files/extpng-vdr-1.7.40-gentoo-edition-v1_001-plugin-permashift.patch | 298 | ||||
-rw-r--r-- | media-video/vdr/files/vdr-1.7.40_gentoo.patch | 67 | ||||
-rw-r--r-- | media-video/vdr/metadata.xml | 1 | ||||
-rw-r--r-- | media-video/vdr/vdr-1.7.40.ebuild | 408 |
6 files changed, 787 insertions, 2 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index 7a52705..ea05c13 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*vdr-1.7.40 (12 Mar 2013) + + 12 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-1.7.40.ebuild, + +files/extpng-vdr-1.7.40-gentoo-edition-v1_001-plugin-permashift.patch, + +files/vdr-1.7.40_gentoo.patch, metadata.xml: + bump; disabled deprecated use-flag volctrl + *vdr-1.7.39 (05 Mar 2013) 05 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-1.7.39.ebuild, diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index 98708c9..18f50e0 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -1,6 +1,7 @@ AUX 1.7.24-time_shift.patch 405 SHA256 99256af917d877b8e4e5cf23246c4c7fca6ba78aa3b9b30111f36f3915813409 SHA512 7c9ad6213eb0b8097a3b27cf00b6895bd8459710e2b271e95fa462e538f60e69b44e14c10618b7a11a8fdcc1a070fde16c609dd887ca6a7e6219b144da5f0029 WHIRLPOOL 94ddbad12c290a3724cee41bb7f0d3278546a3ef3089d074afe0258ba76fd2d7528875fc9d88f40ca02a3a964fae665fe3848d183a5e3edcc6c53929a9ff1ba6 AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677 AUX extpng-vdr-1.7.38-gentoo-edition-v3_001-addon-permashift.patch 10064 SHA256 8c0c161a4920e187a90786baa5bf9d9ade6b95fa7f3648d859e6c50c5f31266e SHA512 0bd76fc07fc9e06019256ccdb19c158d16c8791d3a15996a37ca0b0e6cc60d7a817e96fe98a331b716363ec0c693111c509e69ec9bfb6cd2bf2107510ec262e0 WHIRLPOOL a7dbdcbde24b2e357d27f023361576409f367f6fb0b7bb70bc9af5af41c2099762f12d2044f3d2f9feaf8fb9e7bbb5171dbd0b93f6d0a59ffdda74753690c4b2 +AUX extpng-vdr-1.7.40-gentoo-edition-v1_001-plugin-permashift.patch 10064 SHA256 8c0c161a4920e187a90786baa5bf9d9ade6b95fa7f3648d859e6c50c5f31266e SHA512 0bd76fc07fc9e06019256ccdb19c158d16c8791d3a15996a37ca0b0e6cc60d7a817e96fe98a331b716363ec0c693111c509e69ec9bfb6cd2bf2107510ec262e0 WHIRLPOOL a7dbdcbde24b2e357d27f023361576409f367f6fb0b7bb70bc9af5af41c2099762f12d2044f3d2f9feaf8fb9e7bbb5171dbd0b93f6d0a59ffdda74753690c4b2 AUX vdr-1.7.22-makefile-install-header.diff 547 SHA256 64268af26ce43d0e3708969b67d82a6c230ec44942cb953b1b1af7bf8db30a98 SHA512 e775c2f32412ebe0de8d5d06dc5e31a60375a396d905b89caa08245212db40d4fad6af22d78c8ef94ce1a178020dbf4b67770cbfb79085689c6a78807c17a20f WHIRLPOOL 8a81443a863c211a76cc769f9a54618a6d200182d512c89a5bee4293e81e7b2f7547e3905cbff9ed7b8e5932c1ab8cfebe12f1bcfc81fbca526a4ab6748353fd AUX vdr-1.7.22-shared-tinyxml.diff 1228 SHA256 a7b02f113633520e61cf5389ae2e61ef06a071d7814c6770979d5b4835c57f6a SHA512 9c9f787b3a21ef3607a91d599ffa208d9a1fc98187daf104b716712d22f1a89d4c187a5f4282ba14a6f505c7be2b191b8d6984daffd693b52e3880db8c0ee2fa WHIRLPOOL 570b53ed545188b8048bec65349060ebbacdd1e203ebd60549e1fe072827ea7f8e103c867411affdaafa45fb1596a7716f9912534e3cd3703d1b439a4d2e2864 AUX vdr-1.7.27-fix_channel_names.patch 729 SHA256 5cad879662ba7961bd5ec518b6ab690fb10ff9c096c28940f0f6779a02f62a0a SHA512 781f916a069f518a808a205cb20e0cdc23f96127664f8ee91d4394cb472b8ba3f5307c0b1ea4c3a0f3b3aa6352cc92cc2a55ad416fa3029385292c6c6dc95d16 WHIRLPOOL 0eec9154abd9dad7d08f1cf012961eb5c05a2a34f15a5ebdb0bceb340af312be28b996baa47937cb3d4a19f8eab2ac931251faa9af7a3bc2ab90be33cde04882 @@ -13,6 +14,7 @@ AUX vdr-1.7.36_gentoo.patch 2245 SHA256 be1484e09147d621bc850f0c8bcd0dba1937b236 AUX vdr-1.7.38_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec AUX vdr-1.7.39-fixutf8.diff 431 SHA256 74c33c81db03788171fae1d5a05edfb0b2d3acc0a86f0d60e328f078db8c0939 SHA512 deb5f0fc44bbb33139bbe428b960ec749451349ed0d5e4ca7bce8cab41dd300ea6c9b06d86f5db39d946099652ab27636d5696cfe49cd26aaaba1e6f5893658e WHIRLPOOL f3228e3c3c184186902be4eef7b12b2efdc4498623a2665c25f27ff4313d505b4026132100873830588d8d355e44efa8efcc582ea423abfa12403bf211c1bb1e AUX vdr-1.7.39_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec +AUX vdr-1.7.40_gentoo.patch 2251 SHA256 f0a5e29fd5144b64ca08cc73108c171601ca6e7dd611582d2927ffd38ebe5e10 SHA512 4a02c78f8f537c36ddc01eed24a04e36a61a77a1ea7b0f551723cfbad593f34689f75f442dac6a233614a3692edbd6b618b42d2ee4f972beee079cf8654b55d6 WHIRLPOOL 5785d2a5760b42f694d00943451cbc5f573ccb27ea77600a18eb118389a3576f0afae60448c428a28380382e7cbe80345784f086629d831840f30f1550dcfaec DIST extpng-vdr-1.7.23v1-gentoo-edition.patch 572319 SHA256 ea8347fe4bf07e2b4924febb28018df9b3ebfa0ff73564c7dae8d32d35162a7e SHA512 8c0d636fa9e0c205a34631f6f7eaa3ff2a3ab3c9d612d4cde244c61e8c5eecdf978e63aabb870a5c3e03752279ee26ea73047dc021e2422d5e4a75a646a12a75 WHIRLPOOL e62c52f63ba8d29e3c26ac64c9f2a70b2fa881c716969cd6d61d21c54021663ff47f1706fc870d52789e95aebf1d9ae9a42cdebacd32e343b5d99bff4d7b3460 DIST extpng-vdr-1.7.24v2-gentoo-edition.patch 445832 SHA256 a5646c64530ebc9068a95f51e61803f49b248b97605a09466e027c97d75730a5 SHA512 d65987d4eda1dce6da0f9f161b8cc46e66678925023171a6d1651dbf834c0e1c3205a5252f93722ff17ea0eb2d73b17bfa338f67b29252c8567007220d1abb2e WHIRLPOOL e6c8a19221f4866e486ecdcf844a63c47491946c85691b8024efaf023bffd8de58f671445e3fa63b3207e53e4da02210aea7f141d6a12dcf02cd768ef799b721 DIST extpng-vdr-1.7.25-gentoo-edition.patch.bz2 73764 SHA256 022e5c793f806164f9f1ae4da253db6a1dbcd997241d7523ce489040bbab8fb7 SHA512 103a6a5c8583fc7d77b4b1a3932c7b6b8f70a334384e8798ec8ea946b344610b21aa042eceeacdf5b7ebcec0e720fb124b0c0d8558fa2ec618b1299d56206fbd WHIRLPOOL d7648f5bbab307a97d4d94ba6404e05e6039a9a7f44bcbe5bbac9ff1867ada17401189323cc310fdc289154802e3d6e3e21516b35361140628487cee257ce927 @@ -34,6 +36,7 @@ DIST vdr-1.7.33.tar.bz2 808222 SHA256 1ec953059f9408db9230c814c4eaf565aa85f7f75e DIST vdr-1.7.36.tar.bz2 810216 SHA256 aa4dd42fe66670ee72725c666a82e96faa44148226c84380090b3964c630c74a SHA512 5eeaaf4632e94a5fa8a751fb6eb380c2b8e116b4ba989c27d34050cdb505ef0b4cc5a80a902e14982d4f6e3172bff9364820d75f9a9bacd7a4486b19f31d7fab WHIRLPOOL c7a6976c470613a34bfbb1bcf983500d8974df1d0737b396d796c0d14ec6d8eeddb0e8acf51ce227a1fe124b20022eec07c1a0e3650f6dfa600aecd98e25a8d6 DIST vdr-1.7.38.tar.bz2 826458 SHA256 bb37ff764b208dd3eee3a66df6e3225490d9ab9dfd4e2a99961fc94375dd5ff7 SHA512 100b3e9f75dde11c1cbda454899608259596ba2a657e04cfdf30c17b5cd676687d78d47bdbcd6da5fb912ab8066d8732238af788b5d04a23c8b59142a3d20d4b WHIRLPOOL abe1b03317437deebc719275b0506e6f616feb0dfcf4120ebe4d63e3454fe2dffd53decf2da3ae12ea70015f68ead0eb47ad2fb3c7cebd129af59d6a8a684616 DIST vdr-1.7.39.tar.bz2 832445 SHA256 22d9036048fa1beed19db9218057304807b0d02d3cf1e3825901560afec05be9 SHA512 f050e726cad096dd48eb73010f6a24db87ea5aaff4e20f5184670ed13c824cbe2ba9ada756e418fe9a5a801f0b10c20158f0ad8e33cfee1216c8b9d97e85bba4 WHIRLPOOL 6fa8e3dc73bacbc944b7de6a0160843ea8f245041ee3d98d9a89e0fa7aabaf092452efe5ce0e0a26b79d1f475d29f106d6c2c5f374848c849c9cf84196262714 +DIST vdr-1.7.40.tar.bz2 835552 SHA256 295f4b2df6791d9001b9fa63a8076dfee68490f23d204c9295c4d89e6f50c165 SHA512 fc02b8d4605c88f0b031a1d0b77e337d28516d826cf133e45065c1dfc237b6042bbb9172c31914dea021a9f6752563daea350db038e84f30772a24e5f289fdff WHIRLPOOL f550ab4a9581e155fe7904a0952bbe222c9c235ed27152c561cd047451308230a653615fdc8458d1f83862724f59316f8b9c2918c7a1a5196fed30035c1a498e EBUILD vdr-1.7.23.ebuild 11086 SHA256 8159dd9cb2115e96eb24bf18a1aa95e3cd17fd11ea1df2bd1b021cf36defe0e5 SHA512 67b294bdf481f8f67794679347c1262cc6234bd7e219c52b3b5ffce5db7a387246bc617d098cb1e30881eef1e440a9ec5d624388e79816b61c232f27465b76ee WHIRLPOOL 955b29eec06c34b2a0dc248bb1b7b8ef73a00c9b5b076b103e75badce172e2429119b8ae4a7f17abbf9088cfb63fac5dddacadbe33cbfd55156305bda2b1fe24 EBUILD vdr-1.7.24-r1.ebuild 10006 SHA256 f45133c1aaed00ec40ac734c9b4e8bb489b697211716875cd7e74e8ace88a91c SHA512 b645147ec6721d43d22891d604e39d4c1f6db2f8c76d69690c9cf72ca1aa1744f894107d7bb8ca6c5688977b06e6a38a76bafcfeeea133ed487754423f321f32 WHIRLPOOL a6df9b007268253946cadcccb979fcc76348dbc8a215e76e3e089056ff49317581a5a69d258832e35dfb2f0d347fcf57983aa6c27a2906dd305ebcbaba8d3e2d EBUILD vdr-1.7.25.ebuild 9961 SHA256 3817f91da7c40a246f48d14cefefcd4c029364da3da835616f16a2faeb4d155b SHA512 7806049d2d92be599d0ce103e1e2c5233f8411a389e345f291a8205bd7a4b7984d5e9c81a93cf2bb3db834fae4b4ea16cf0f458a09481579ad7e6e5eb83a8d39 WHIRLPOOL cc8cef1065e4f0c87bb53f75df6cc8c792e09734b094b9b38645a5f66da3b757ead2c86d638bd6fd8a201c7563921de46072ed66015834617def33c54eda4deb @@ -46,5 +49,6 @@ EBUILD vdr-1.7.36-r1.ebuild 11566 SHA256 697e80e5c371d061ea6dd3d381d9e288a1972d3 EBUILD vdr-1.7.36.ebuild 11014 SHA256 16df3019cb460a70ea1119ee616530be895fd0f4ce9630595b2e2444cbc64fe7 SHA512 3a8ff3700d2d5a011115d89ada30d346f83c899cbe5edf61a14a8f9a28195047bc8bf03f17316f045eb6e89f91494d1e18f585d69575c9c37122fb0890aba0e9 WHIRLPOOL 5784447a57b29c7f680d02318d2e10d25f6d69581582afaf07f35fa6d5b8428a3cf5123625649fb150c052599ee8381ff1d9aadb6cf3f3048c49807222559a76 EBUILD vdr-1.7.38.ebuild 11982 SHA256 c72615a993a26afa0c8c13882edd72abb565b54b08c1f2accc09dac04d4cf1a9 SHA512 420f3ceeae5d5c72682b57f8d6a7845b471f2d924809226f6bf320a9fea3d79736c6bb7c69e522bee42332b58a5ebcd833cd521eb44f6a862fb4b84bd036daa5 WHIRLPOOL 5b8a48aa7e06a67c5897f94d3bebdec47345646fed6504fbe782273552a1f28e282d035d83f17266e7fbbc78ffd705d797ad9fba04b915107148c0aba9115c09 EBUILD vdr-1.7.39.ebuild 12028 SHA256 33a6413ea715be0b9e529e22023217b0876b7ae94f4db18ca0b645d6504f8a29 SHA512 c5791bfcad9acc36eb801e49af8d67a0a3b3b4b4e5f102be1eab987c25306a9cb6a753b13759ab1c54a55834d601f2a8f494eb32826cc7be1eada0d3149019ea WHIRLPOOL e363377349ea35c6dde5f5bad4ba8792c00a6aedde0f20dea4725fc4b2bb8cc458876c1fb5f719ffe5efe83b6d8e688644ffb8afb34ab6f80d09129f6a98303b -MISC ChangeLog 22810 SHA256 7785632a2c06af388fe2451e93f2c8c9ab59c389c39f6f8f28f99b8782dbe1f0 SHA512 4651e8e65357e80abfb63bc2e284cbb69b1c988039ac7444ae0e204b89a4c7f6f46a2faaa51ffd2a9a9a49321aa7e740cecf0a0c9698d5bfa8e01b549d65dca8 WHIRLPOOL c011d4dfad1201955fa4df5dd4c73300b6c4fb88f9ae6e2f23cce0b64013a266a0b1c4d0cec7b2f5e7c857a6f9270bdd482ee21743aa0932164291587f823370 -MISC metadata.xml 2476 SHA256 3ead968eae8c89a70acdabf70dca55574f301b71453acab1ea2c13e8171750e7 SHA512 ed8221a6a904019ebf49f5f33b2cd31d305d7d6520fc85cabda69508c2e3ec4fcdf3078fba2f33278a249d743a1ad46809877506da79e1846e9af552240819ee WHIRLPOOL 39cdf9da9dd33865e51f6a42bbe7bf09fb03573e5b1b719d017937b0ddda36b6fb0eb921214058120bd0310661c87b87b34e8b3f848ee3e1d56fbb002fa45eb6 +EBUILD vdr-1.7.40.ebuild 11641 SHA256 3e17c3fe0fa6989cba49448bf2a36a8a89702c7adc9a28dc6cb023b899372521 SHA512 81b63e0d71661885d5a1f1543c2f2b317173e018f09d06cf02b221b79ae6a3df54818bdc900cd072cd698b4c91dfa86caedc35e0015cf268e921ac327af746d8 WHIRLPOOL dd3e5637d3ddb0eec9f08e64a58fc0eaf642bf3ebc220ebd4154d0531c84f7b208f3cc2ea3c349b5a8eb67ed1c0f3ba5010bed716304730d80afcca3993c0767 +MISC ChangeLog 23080 SHA256 da772171afe78a95e637e3c99e86615e2f9816f9f048bf408fc815d87403eaca SHA512 7c8772d28e0f2219bfdfde9157eb420c414a0d392aeb5edad0c18ab4afec922886f96656bab5265a41cb493698f5f058f3a2a28108682efc4be7fc50e262b296 WHIRLPOOL d2d1dbc53bba014340ad654da24831e40f9932a9e74298f35afc7ef5031babd8e2db9ee10e111f43dd48614ba3ea4418fbe14e37d4cb24f3d23a33dcc4c42ea6 +MISC metadata.xml 2515 SHA256 0d1b116cad16c232a26efa5625f5bfc0ba3f07cd32094a3cef923ec2dfc1afd4 SHA512 9f23733a73575a7998abaae511dd6aed575a23ff2c9026599f85a7f0d00e5dd242bb3404078c4a9ae4d7a98e2ac9a88d055decf4f4a16c320937a15bdff9182c WHIRLPOOL c4c6ef51aa50e3b21a2b929d04a400b7ecccbf508ebc5bd24e006222aceabcf7b03bb7b1ef76fd6866953845fba5519b5e31c04aafe15c70196db1f7be56b953 diff --git a/media-video/vdr/files/extpng-vdr-1.7.40-gentoo-edition-v1_001-plugin-permashift.patch b/media-video/vdr/files/extpng-vdr-1.7.40-gentoo-edition-v1_001-plugin-permashift.patch new file mode 100644 index 0000000..16cfc07 --- /dev/null +++ b/media-video/vdr/files/extpng-vdr-1.7.40-gentoo-edition-v1_001-plugin-permashift.patch @@ -0,0 +1,298 @@ +diff -Naur vdr-1.7.38.orig/dvbplayer.c vdr-1.7.38/dvbplayer.c +--- vdr-1.7.38.orig/dvbplayer.c 2013-02-18 14:45:02.363002713 +0100 ++++ vdr-1.7.38/dvbplayer.c 2013-02-18 14:45:35.681583841 +0100 +@@ -213,6 +213,9 @@ + double framesPerSecond; + bool isPesRecording; + bool pauseLive; ++#ifdef USE_PERMASHIFT ++ bool reusedPauseLive; ++#endif /* PERMASHIFT */ + bool eof; + bool firstPacket; + ePlayModes playMode; +@@ -232,7 +235,11 @@ + virtual void Activate(bool On); + virtual void Action(void); + public: ++#ifdef USE_PERMASHIFT ++ cDvbPlayer(const char *FileName, bool PauseLive, bool ReusedPauseLive = false); ++#else + cDvbPlayer(const char *FileName, bool PauseLive); ++#endif /* PERMASHIFT */ + virtual ~cDvbPlayer(); + bool Active(void) { return cThread::Running(); } + void Pause(void); +@@ -253,7 +260,11 @@ + #define SPEED_MULT 12 // the speed multiplier + int cDvbPlayer::Speeds[] = { 0, -2, -4, -8, 1, 2, 4, 12, 0 }; + ++#ifdef USE_PERMASHIFT ++cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive, bool ReusedPauseLive) ++#else + cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive) ++#endif /* PERMASHIFT */ + :cThread("dvbplayer") + { + nonBlockingFileReader = NULL; +@@ -263,6 +274,9 @@ + framesPerSecond = Recording.FramesPerSecond(); + isPesRecording = Recording.IsPesRecording(); + pauseLive = PauseLive; ++#ifdef USE_PERMASHIFT ++ reusedPauseLive = ReusedPauseLive; ++#endif /* PERMASHIFT */ + eof = false; + firstPacket = true; + playMode = pmPlay; +@@ -449,8 +463,22 @@ + int LastReadIFrame = -1; + int SwitchToPlayFrame = 0; + ++#ifdef USE_PERMASHIFT ++ if (reusedPauseLive) { ++ int Current, Total; ++ GetIndex(Current, Total, false); ++ readIndex = max(Total - 1, 0); ++ Goto(readIndex, true); ++ playMode = pmStill; ++ } ++ else if (pauseLive) { ++ Goto(0, true); ++ } ++ ++#else + if (pauseLive) + Goto(0, true); ++#endif /* PERMASHIFT */ + while (Running()) { + if (WaitingForData) + WaitingForData = !nonBlockingFileReader->WaitForDataMs(3); // this keeps the CPU load low, but reacts immediately on new data +@@ -937,8 +965,13 @@ + + // --- cDvbPlayerControl ----------------------------------------------------- + ++#ifdef USE_PERMASHIFT ++cDvbPlayerControl::cDvbPlayerControl(const char *FileName, bool PauseLive, bool ReusedPauseLive) ++:cControl(player = new cDvbPlayer(FileName, PauseLive, ReusedPauseLive)) ++#else + cDvbPlayerControl::cDvbPlayerControl(const char *FileName, bool PauseLive) + :cControl(player = new cDvbPlayer(FileName, PauseLive)) ++#endif /* PERMASHIFT */ + { + } + +diff -Naur vdr-1.7.38.orig/dvbplayer.h vdr-1.7.38/dvbplayer.h +--- vdr-1.7.38.orig/dvbplayer.h 2013-02-18 14:45:02.343002964 +0100 ++++ vdr-1.7.38/dvbplayer.h 2013-02-18 14:45:35.682583829 +0100 +@@ -19,7 +19,11 @@ + private: + cDvbPlayer *player; + public: ++#ifdef USE_PERMASHIFT ++ cDvbPlayerControl(const char *FileName, bool PauseLive = false, bool ReusedPauseLive = false); ++#else + cDvbPlayerControl(const char *FileName, bool PauseLive = false); ++#endif /* PERMASHIFT */ + // Sets up a player for the given file. + // If PauseLive is true, special care is taken to make sure the index + // file of the recording is long enough to allow the player to display +diff -Naur vdr-1.7.38.orig/Make.config.template vdr-1.7.38/Make.config.template +--- vdr-1.7.38.orig/Make.config.template 2013-02-18 14:45:02.406002172 +0100 ++++ vdr-1.7.38/Make.config.template 2013-02-18 14:45:35.683583816 +0100 +@@ -90,6 +90,7 @@ + #MAINMENUHOOKS = 1 + #MENUORG = 1 + #NALUDUMP = 1 ++#PERMASHIFT = 1 + #PINPLUGIN = 1 + #PLUGINMISSING = 1 + #ROTOR = 1 +@@ -177,3 +178,7 @@ + DEFINES += -DUSE_YAEPG + //VDR_XINE_SET_VIDEO_WINDOW = 1 + endif ++ ++ifdef PERMASHIFT ++DEFINES += -DUSE_PERMASHIFT ++endif +\ Kein Zeilenumbruch am Dateiende. +diff -Naur vdr-1.7.38.orig/menu.c vdr-1.7.38/menu.c +--- vdr-1.7.38.orig/menu.c 2013-02-18 14:45:02.357002788 +0100 ++++ vdr-1.7.38/menu.c 2013-02-18 14:45:35.685583791 +0100 +@@ -5168,7 +5168,11 @@ + cRecordControl *cRecordControls::RecordControls[MAXRECORDCONTROLS] = { NULL }; + int cRecordControls::state = 0; + ++#ifdef USE_PERMASHIFT ++bool cRecordControls::Start(cTimer *Timer, bool Pause, bool* reused) ++#else + bool cRecordControls::Start(cTimer *Timer, bool Pause) ++#endif /* PERMASHIFT */ + { + static time_t LastNoDiskSpaceMessage = 0; + int FreeMB = 0; +@@ -5187,6 +5191,15 @@ + } + LastNoDiskSpaceMessage = 0; + ++#ifdef USE_PERMASHIFT ++ if (Timer == NULL) { ++ if (TryReuseRecording(Pause)) { ++ if (reused != NULL) *reused = true; ++ return true; ++ } ++ } ++ ++#endif /* PERMASHIFT */ + ChangeState(); + int ch = Timer ? Timer->Channel()->Number() : cDevice::CurrentChannel(); + cChannel *channel = Channels.GetByNumber(ch); +@@ -5257,12 +5270,62 @@ + } + } + ++#ifdef USE_PERMASHIFT ++bool cRecordControls::TryReuseRecording(bool Pause) ++{ ++ cRecordControl* runningRecording = cRecordControls::GetRecordControl(cDevice::CurrentChannel()); ++ if (runningRecording != NULL && runningRecording->Timer() != NULL) { ++ cTimer *reuseTimer = runningRecording->Timer(); ++ // calculate length from current time ++ time_t t = time(NULL); ++ struct tm *tmNow = localtime(&t); ++ int now = tmNow->tm_hour * 60 + tmNow->tm_min; ++ int stop = reuseTimer->Stop(); ++ stop = stop / 100 * 60 + stop % 100; ++ int lengthFromNow = stop - now; ++ if (lengthFromNow < 0) ++ lengthFromNow += SECSINDAY; ++ // Only use low priority recordings or, for pause, recordings which are long enough. ++ if (runningRecording->Timer()->Priority() <= LIVEPRIORITY || (Pause && lengthFromNow >= Setup.InstantRecordTime)) { ++ // possibly raise stop time ++ if (lengthFromNow < Setup.InstantRecordTime) { ++ int stop = now + Setup.InstantRecordTime; ++ stop = (stop / 60) * 100 + (stop % 60); ++ if (stop >= 2400) stop -= 2400; ++ reuseTimer->SetStop(stop); ++ } ++ ChangeState(); ++ // for pause, set replay to the recording ++ if (Pause) { ++ cReplayControl::SetRecording(runningRecording->FileName()); ++ } ++ // for instant recording, raise priority and lifetime ++ else { ++ reuseTimer->SetPriority(max(Setup.DefaultPriority, reuseTimer->Priority())); ++ reuseTimer->SetLifetime(max(Setup.DefaultLifetime, reuseTimer->Lifetime())); ++ } ++ // We found a usable recording, don't create a new one. ++ return true; ++ } ++ } ++ return false; ++} ++ ++#endif /* PERMASHIFT */ + bool cRecordControls::PauseLiveVideo(void) + { + Skins.Message(mtStatus, tr("Pausing live video...")); ++#ifdef USE_PERMASHIFT ++ bool reused = false; ++#endif /* PERMASHIFT */ + cReplayControl::SetRecording(NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed() ++#ifdef USE_PERMASHIFT ++ if (Start(NULL, true, &reused)) { ++ cReplayControl *rc = new cReplayControl(true, reused); ++#else + if (Start(NULL, true)) { + cReplayControl *rc = new cReplayControl(true); ++#endif /* PERMASHIFT */ + cControl::Launch(rc); + cControl::Attach(); + Skins.Message(mtStatus, NULL); +@@ -5305,6 +5368,25 @@ + return NULL; + } + ++#ifdef USE_PERMASHIFT ++cRecordControl *cRecordControls::GetRecordControl(int channelNo) ++{ ++ for (int i = 0; i < MAXRECORDCONTROLS; i++) { ++ if (RecordControls[i] != NULL) { ++ cTimer* existentTimer = RecordControls[i]->Timer(); ++ if (existentTimer != NULL && existentTimer->Channel() != NULL) { ++ if (RecordControls[i]->Timer()->Channel()->Number() == channelNo) { ++ if (existentTimer->Recording()) { ++ return RecordControls[i]; ++ } ++ } ++ } ++ } ++ } ++ return NULL; ++} ++ ++#endif /* PERMASHIFT */ + void cRecordControls::Process(time_t t) + { + for (int i = 0; i < MAXRECORDCONTROLS; i++) { +@@ -5369,8 +5451,13 @@ + cReplayControl *cReplayControl::currentReplayControl = NULL; + cString cReplayControl::fileName; + ++#ifdef USE_PERMASHIFT ++cReplayControl::cReplayControl(bool PauseLive, bool ReusedPauseLive) ++:cDvbPlayerControl(fileName, PauseLive, ReusedPauseLive) ++#else + cReplayControl::cReplayControl(bool PauseLive) + :cDvbPlayerControl(fileName, PauseLive) ++#endif /* PERMASHIFT */ + { + cDevice::PrimaryDevice()->SetKeepTracks(PauseLive); + currentReplayControl = this; +diff -Naur vdr-1.7.38.orig/menu.h vdr-1.7.38/menu.h +--- vdr-1.7.38.orig/menu.h 2013-02-18 14:45:02.358002775 +0100 ++++ vdr-1.7.38/menu.h 2013-02-18 14:47:50.186892881 +0100 +@@ -272,8 +272,17 @@ + private: + static cRecordControl *RecordControls[]; + static int state; ++#ifdef USE_PERMASHIFT ++ static bool TryReuseRecording(bool Pause); ++ ///< Tries to reuse an existing recording instead of creating a second one in parallel ++ ///< Returns true if successful ++#endif /* PERMASHIFT */ + public: ++#ifdef USE_PERMASHIFT ++ static bool Start(cTimer *Timer = NULL, bool Pause = false, bool* reused = NULL); ++#else + static bool Start(cTimer *Timer = NULL, bool Pause = false); ++#endif /* PERMASHIFT */ + static void Stop(const char *InstantId); + static bool PauseLiveVideo(void); + static const char *GetInstantId(const char *LastInstantId); +@@ -281,6 +290,11 @@ + static cRecordControl *GetRecordControl(const cTimer *Timer); + ///< Returns the cRecordControl for the given Timer. + ///< If there is no cRecordControl for Timer, NULL is returned. ++#ifdef USE_PERMASHIFT ++ static cRecordControl *GetRecordControl(int channelNo); ++ ///< Returns the cRecordControl for the given channel number. ++ ///< If there is no cRecordControl, NULL is returned. ++#endif /* PERMASHIFT */ + static void Process(time_t t); + static void ChannelDataModified(cChannel *Channel); + static bool Active(void); +@@ -320,7 +334,11 @@ + void EditCut(void); + void EditTest(void); + public: ++#ifdef USE_PERMASHIFT ++ cReplayControl(bool PauseLive = false, bool ReusedPauseLive = false); ++#else + cReplayControl(bool PauseLive = false); ++#endif /*PERMASHIFT */ + virtual ~cReplayControl(); + void Stop(void); + virtual cOsdObject *GetInfo(void); diff --git a/media-video/vdr/files/vdr-1.7.40_gentoo.patch b/media-video/vdr/files/vdr-1.7.40_gentoo.patch new file mode 100644 index 0000000..df67334 --- /dev/null +++ b/media-video/vdr/files/vdr-1.7.40_gentoo.patch @@ -0,0 +1,67 @@ +disabled compile from included plugins, we dont support this way on gentoo +support for linguas handling +fixed install an multicore cpu + +changed path to install header files in own dir vdr, libsi +need fixing, need some adaption in vdr-plugin-2.eclass and depended plugins, later... + +Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2013/02/18) + +diff -Naur vdr-1.7.38.orig/Makefile vdr-1.7.38/Makefile +--- vdr-1.7.38.orig/Makefile 2013-02-18 10:55:46.315939644 +0100 ++++ vdr-1.7.38/Makefile 2013-02-18 10:59:15.047315535 +0100 +@@ -109,7 +109,7 @@ + VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) + APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) + +-all: vdr i18n plugins ++all: vdr i18n + + # Implicit rules: + +@@ -162,7 +162,7 @@ + + PODIR = po + LOCALEDIR = locale +-I18Npo = $(wildcard $(PODIR)/*.po) ++I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po)) + I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) + I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) + I18Npot = $(PODIR)/vdr.pot +@@ -185,7 +185,7 @@ + + install-i18n: i18n + @mkdir -p $(DESTDIR)$(LOCDIR) +- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR) ++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done) + + # The 'include' directory (for plugins): + +@@ -259,11 +259,12 @@ + + install-dirs: + @mkdir -p $(DESTDIR)$(VIDEODIR) +- @mkdir -p $(DESTDIR)$(CONFDIR) ++# @mkdir -p $(DESTDIR)$(CONFDIR) + @mkdir -p $(DESTDIR)$(CACHEDIR) + @mkdir -p $(DESTDIR)$(RESDIR) + + install-conf: ++ @mkdir -p $(DESTDIR)$(CONFDIR) + @cp -pn *.conf $(DESTDIR)$(CONFDIR) + + # Documentation: +@@ -289,8 +290,11 @@ + # Includes: + + install-includes: include-dir +- @mkdir -p $(DESTDIR)$(INCDIR) +- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) ++# @mkdir -p $(DESTDIR)$(INCDIR) ++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) ++ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi ++ @cp -pLR include/vdr $(DESTDIR)$(INCDIR) ++ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr + + # pkg-config file: + diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml index 63c4e34..fef8bff 100644 --- a/media-video/vdr/metadata.xml +++ b/media-video/vdr/metadata.xml @@ -16,6 +16,7 @@ <flag name="graphtft">support for grapftft plugin up from vdr-graphtft-0.1.7</flag> <flag name="hardlinkcutter">Speed up cutting by hardlinking unchanged files</flag> <flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag> + <flag name="jumpingseconds"> </flag> <flag name="liemikuutio">Formerly known as AIO (all-in-one) patch, adds some nice must haves</flag> <flag name="lircsettings">Allows to change lirc settings delay, freq and timeout values in OSD</flag> <flag name="livebuffer">does timeshifting/background recording all the time, allows to rewind live TV</flag> diff --git a/media-video/vdr/vdr-1.7.40.ebuild b/media-video/vdr/vdr-1.7.40.ebuild new file mode 100644 index 0000000..58cc83b --- /dev/null +++ b/media-video/vdr/vdr-1.7.40.ebuild @@ -0,0 +1,408 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $ + +EAPI="5" + +inherit eutils flag-o-matic multilib toolchain-funcs + +# Switches supported by extensions-patch +EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft + jumpplay jumpingseconds + mainmenuhooks menuorg naludump permashift pinplugin + rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg" +# plugin vdr-permashift, need testing + +# names of the use-flags +EXT_PATCH_FLAGS_RENAMED="" + +# names ext-patch uses internally, here only used for maintainer checks +EXT_PATCH_FLAGS_RENAMED_EXT_NAME="volcrtl" + +IUSE="debug html vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" + +MY_PV="${PV%_p*}" +MY_P="${PN}-${MY_PV}" +S="${WORKDIR}/${MY_P}" + +EXT_P="extpng-${PN}-1.7.39-gentoo-edition-v4" + +DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" +HOMEPAGE="http://www.tvdr.de/" +SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2 + http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2" + +KEYWORDS="~arm ~amd64 ~ppc ~x86" +SLOT="0" +LICENSE="GPL-2" + +REQUIRED_USE="setup? ( !menuorg ) + menuorg? ( !setup )" + +COMMON_DEPEND="virtual/jpeg + sys-libs/libcap + >=media-libs/fontconfig-2.4.2 + >=media-libs/freetype-2 + setup? ( >=dev-libs/tinyxml-2.6.1[stl] )" + +DEPEND="${COMMON_DEPEND} + >=virtual/linuxtv-dvb-headers-5.3 + sys-devel/gettext" + +RDEPEND="${COMMON_DEPEND} + dev-lang/perl + >=media-tv/gentoo-vdr-scripts-0.2.0_rc1 + media-fonts/corefonts" + +# pull in vdr-setup to get the xml files, else menu will not work +PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 ) + dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )" + +CONF_DIR=/etc/vdr +CAP_FILE=${S}/capabilities.sh +CAPS="# Capabilities of the vdr-executable for use by startscript etc." + +pkg_setup() { + if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then + eerror "Using VDR_LOCAL_PATCHES_DIR is obsolet!" + eerror "Please move all your patches into" + eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}" + eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable." + die + fi + + use debug && append-flags -g + + PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" + + tc-export CC CXX +} + +add_cap() { + local arg + for arg; do + CAPS="${CAPS}\n${arg}=1" + done +} + +enable_patch() { + local arg ARG_UPPER + for arg; do + ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]') + echo "${ARG_UPPER} = 1" >> Make.config + + # codesnipe to bring the extpng defines in the vdr.pc CXXFLAGS CFLAGS + echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp + cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE + export DEFINES_IUSE=$( cat ${T}/defines.IUSE ) + done +} + +extensions_add_make_conf() +{ + # copy all ifdef for extensions-patch to Make.config + sed -e '1,/need to touch the following:/d' \ + -e '/need to touch the following/,/^$/d' \ + Make.config.template >> Make.config +} + +extensions_all_defines() { + # extract all possible settings for extensions-patch + sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \ + Make.config.template \ + | sort \ + | tr '[:upper:]' '[:lower:]' +} + +lang_po() { + LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) +} + +src_prepare() { + #applying maintainace-patches + + ebegin "Changing pathes for gentoo" + + sed \ + -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \ + -i vdr.c + + local DVBDIR=/usr/include + local i + for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do + [[ -d ${i} ]] || continue + if [[ -f ${i}/linux/dvb/dmx.h ]]; then + einfo "Found DVB header files in ${i}" + DVBDIR=${i} + break + fi + done + + # checking for s2api headers + local api_version + api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h) + api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h) + + if [[ ${api_version:-0} -lt 5*3 ]]; then + eerror "DVB header files do not contain s2api support or to old for ${P}" + eerror "You cannot compile VDR against old dvb-headers" + die "DVB headers too old" + fi + + cat > Make.config <<-EOT + # + # Generated by ebuild ${PF} + # + PREFIX = /usr + DVBDIR = ${DVBDIR} + PLUGINLIBDIR = ${PLUGIN_LIBDIR} + CONFDIR = ${CONF_DIR} + VIDEODIR = /var/vdr/video + LOCDIR = \$(PREFIX)/share/locale + INCDIR = \$(PREFIX)/include + + DEFINES += -DCONFDIR=\"\$(CONFDIR)\" + INCLUDES += -I\$(DVBDIR) + + # >=vdr-1.7.36-r1; param only used for compiletime on vdr + # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new) + LIBDIR = ${PLUGIN_LIBDIR} + PCDIR = /usr/$(get_libdir)/pkgconfig + EOT + eend 0 + +# epatch "${FILESDIR}/${P}-fixutf8.diff" + epatch "${FILESDIR}/${P}_gentoo.patch" + + # Do not compile/install plugins from vdr source + sed -i Makefile \ + -e 's/ install-plugins//' + + if ! use vanilla; then + + # patches, they will be removed from extpatchng in next versions + use vasarajanauloja && eerror "\npatch vasarajanauloja marked for removal, use the plugin vdr-extrecmenu\n" +# use volctrl && eerror "\npatch volctrl marked for removal, fix your RemoteControl setup!\n" + + # Now apply extensions patch + epatch "${WORKDIR}/${EXT_P}.patch" + + # support plugin vdr-permashift ( NEED PLUGIN TESTING ) + epatch "${FILESDIR}/extpng-${P}-gentoo-edition-v1_001-plugin-permashift.patch" + + # This allows us to start even if some plugin does not exist + # or is not loadable. + enable_patch PLUGINMISSING + enable_patch CHANNELBIND + + if [[ -n ${VDR_MAINTAINER_MODE} ]]; then + einfo "Doing maintainer checks:" + + # these patches we do not support + # (or have them already hard enabled) + local IGNORE_PATCHES="pluginmissing channelbind" + + extensions_all_defines > "${T}"/new.IUSE + echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \ + $IGNORE_PATCHES | \ + tr ' ' '\n' |sort > "${T}"/old.IUSE + local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]') + if [[ -z ${DIFFS} ]]; then + einfo "EXT_PATCH_FLAGS is up to date." + else + ewarn "IUSE differences!" + local diff + for diff in $DIFFS; do + ewarn "$diff" + done + fi + fi + + ebegin "Enabling selected patches" + local flag + for flag in $EXT_PATCH_FLAGS; do + use $flag && enable_patch ${flag} + done + + # patches that got renamed +# use vasarajanauloja && enable_patch jumpingseconds + + eend 0 + + extensions_add_make_conf + + # add defined use-flags compile options to vdr.pc + sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \ + -i Makefile + + ebegin "Make depend" + emake .dependencies >/dev/null + eend $? "make depend failed" + fi + + epatch_user + + if [[ -n "${VDRSOURCE_DIR}" ]]; then + cp -r "${S}" "${T}"/source-tree + fi + + add_cap CAP_UTF8 + + add_cap CAP_IRCTRL_RUNTIME_PARAM \ + CAP_VFAT_RUNTIME_PARAM \ + CAP_CHUID \ + CAP_SHUTDOWN_AUTO_RETRY + + echo -e ${CAPS} > "${CAP_FILE}" + + # LINGUAS support + einfo "\n \t VDR supports the LINGUAS values" + + lang_po + + einfo "\t Please set one of this values in your sytem make.conf" + einfo "\t LINGUAS=\"${LING_PO}\"\n" + + if [[ -z ${LINGUAS} ]]; then + einfo "\n \t No values in LINGUAS=" + einfo "\t you will get only english text on OSD \n" + fi + + strip-linguas ${LING_PO} en +} + +src_install() { + # trick makefile not to create a videodir by supplying it with an existing + # directory + einstall \ + VIDEODIR="/" \ + DESTDIR="${D}" \ + || die "emake install failed" + + keepdir "${CONF_DIR}"/plugins + keepdir "${CONF_DIR}"/themes + + keepdir "${PLUGIN_LIBDIR}" + + keepdir /var/cache/vdr + + if use html; then + dohtml *.html + fi + + dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS + + insinto /usr/share/vdr + doins "${CAP_FILE}" + + if use alternatechannel; then + insinto /etc/vdr + doins "${FILESDIR}"/channel_alternative.conf + fi + + if use setup; then + insinto /usr/share/vdr/setup + doins "${S}"/menu.c + fi + chown -R vdr:vdr "${D}/${CONF_DIR}" +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8" + previous_less_than_1_6_0_p2_r8=$? + + has_version "<${CATEGORY}/${PN}-1.7.27" + previous_less_than_1_7_27=$? + + has_version "<${CATEGORY}/${PN}-1.7.36" + previous_less_than_1_7_36=$? +} + +pkg_postinst() { + elog "This is a *developer* version." + elog "We strongly recommend that you only use it under controlled" + elog "conditions and for testing and debugging." + + if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then + elog " Upgrade Info:" + + elog " The recording format is now Transport Stream. Existing recordings in PES format" + elog " can still be replayed and edited, but new recordings are done in TS." + + elog " The support for full featured DVB cards of the TT/FuSi design has been moved" + elog " into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their" + elog " primary device, this plugin now needs to be loaded when running VDR in order" + elog " to view live or recorded video. If the plugin is not loaded, the card will" + elog " be treated like a budget DVB card, and there will be no OSD or viewing" + elog " capability." + + elog " The index file for TS recordings is now regenerated on-the-fly if a" + elog " recording is replayed that has no index. This can also be used to" + elog " re-create a broken index file by manually deleting the index file and then" + elog " replaying the recording." + + elog " The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of" + elog " commands. See man vdr.5 for information about the new file format." + + elog " The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital" + elog " tracks appear in the 'Audio' menu. Dolby Digital is always recorded" + + elog " The default SVDRP port is now 6419" + fi + + if [[ previous_less_than_1_7_27=$? = 0 ]] ; then + elog "In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed" + elog "This results now in a lot of not working plugins on compile process" + elog "Please visit for more infos:" + elog "https://bugs.gentoo.org/show_bug.cgi?id=414177" + elog "and depended bugs" + fi + + if [[ previous_less_than_1_7_36=$? = 0 ]] ; then + elog "By default VDR is now built according to the FHS" + elog "Gentoo VDR still use the standard from" + elog "Filesystem Hirarchy Standard" + elog "It is supported thins beginning of VDR support" + elog "on Gentoo" + elog "Finaly, for the user are minimal changes now" + fi + + elog "It is a good idea to run vdrplugin-rebuild now." + + if use setup; then + if ! has_version media-plugins/vdr-setup || \ + ! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then + + echo + ewarn "You have compiled media-video/vdr with USE=\"setup\"" + ewarn "It is very important to emerge media-plugins/vdr-setup now!" + ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins" + fi + fi + + local keysfound=0 + local key + local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow" + local remote_file="${ROOT}"/etc/vdr/remote.conf + + if [[ -e ${remote_file} ]]; then + for key in ${warn_keys}; do + if grep -q -i "\.${key} " "${remote_file}"; then + keysfound=1 + break + fi + done + if [[ ${keysfound} == 1 ]]; then + ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable" + ewarn "Please remove these keys or vdr will not start:" + ewarn "# ${warn_keys}" + fi + fi + + elog "To get nice symbols in OSD we recommend to install" + elog "\t1. emerge media-fonts/vdrsymbols-ttf" + elog "\t2. select font VDRSymbolsSans in Setup" + elog "" + elog "To get an idea how to proceed now, have a look at our vdr-guide:" + elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml" +} |