diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2015-02-20 09:53:56 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2015-02-20 09:53:56 +0000 |
commit | 1bd7ad6db7a42459afca3a925c8eb02665571208 (patch) | |
tree | 58b3b7ebf931a368410f49c3befee90b02ebdfaa /media-video/vdr | |
parent | Fix typo in ChangeLog. (diff) | |
download | historical-1bd7ad6db7a42459afca3a925c8eb02665571208.tar.gz historical-1bd7ad6db7a42459afca3a925c8eb02665571208.tar.bz2 historical-1bd7ad6db7a42459afca3a925c8eb02665571208.zip |
big cleanup old
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A
Diffstat (limited to 'media-video/vdr')
-rw-r--r-- | media-video/vdr/ChangeLog | 9 | ||||
-rw-r--r-- | media-video/vdr/Manifest | 20 | ||||
-rw-r--r-- | media-video/vdr/files/vdr-2.0.0-fixkeeptracksinit.diff | 17 | ||||
-rw-r--r-- | media-video/vdr/files/vdr-2.0.0_gentoo.patch | 75 | ||||
-rw-r--r-- | media-video/vdr/files/vdr-2.0.6_systemd_argsdir.patch | 441 | ||||
-rw-r--r-- | media-video/vdr/files/vdr-2.0.6_systemd_argsdir_vanilla.patch | 439 | ||||
-rw-r--r-- | media-video/vdr/vdr-2.0.4.ebuild | 364 | ||||
-rw-r--r-- | media-video/vdr/vdr-2.0.5.ebuild | 372 | ||||
-rw-r--r-- | media-video/vdr/vdr-2.0.6-r2.ebuild | 289 | ||||
-rw-r--r-- | media-video/vdr/vdr-2.2.0.ebuild | 16 |
10 files changed, 17 insertions, 2025 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index 98f098664cf7..cde4bae6da02 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/vdr # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.191 2015/02/19 20:04:40 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.192 2015/02/20 09:53:47 hd_brummy Exp $ + + 20 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.0.4.ebuild, + -vdr-2.0.5.ebuild, -vdr-2.0.6-r2.ebuild, vdr-2.2.0.ebuild, + -files/vdr-2.0.0-fixkeeptracksinit.diff, -files/vdr-2.0.0_gentoo.patch, + -files/vdr-2.0.6_systemd_argsdir.patch, + -files/vdr-2.0.6_systemd_argsdir_vanilla.patch: + big cleanup old 19 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-2.2.0.ebuild: fixed upstream owner name diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index ae1c230b3624..c344d10387b5 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -2,36 +2,26 @@ Hash: SHA256 AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677 -AUX vdr-2.0.0-fixkeeptracksinit.diff 518 SHA256 5d93c9fbf4fe6cfe0087f78e4cdf945a5307d5e03045cc34705be14a9b3db63e SHA512 31097b29c11bc2fc3246de44030a050bdeb195d40680b29a6aeaf072362687709d65e02c9676d08d1817b57ac5fde84fbf59261514a7ccb7d8c62eb27ff92310 WHIRLPOOL fca0e756ec4ef2b99c064385fda2b96165559d47901955bd3f7ba6b09e7e529dfbd25ec6a04d96807401c12f914f067c7ce3905f864ed3c5e03cd4c4040a7796 -AUX vdr-2.0.0_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5 AUX vdr-2.0.6-r2_gentoo.patch 2518 SHA256 02f20c8bcf0c0d686fbaad19a76025db6e5bed00ee0f191c2096533d42554d38 SHA512 01416b5825595d5a8c813297dd1791978f0d4ffe1b06d2254772c3dc2d76d0c09720ada64dc332df156196d73b8500ae1dcdb08d95502a8c940baf4590ece545 WHIRLPOOL 1fdeb47b5919d96f729a79185c020b8d0a49866a6b28c0296859eb671da30f49085c62c803853209f98b405466c0cc684e9d673c5f7713cadfd2c1d96e32802b AUX vdr-2.0.6_gentoo.patch 2255 SHA256 486b513f8ab723685e72b041b546d1cda799f743ef8020f5742aefee7a1b1660 SHA512 7bb087d2f362e28700a6f22b2649bd61742a7967344f0132abaaa2ae30d4aef3e9a7afd06d80d2a4a97248abfa273cb5d7e20e419c8409a5a83744fd043fb7e9 WHIRLPOOL 20f1b870305e55d4c2cfc2fad0968b6232b22585218a60378aa95bb420228e0704a2b42699daff84a36f92d4b2937a1ada9db5514a0789f5c47b66001a9ed1ed -AUX vdr-2.0.6_systemd_argsdir.patch 15150 SHA256 acb1fd7513701e6aeded9a31486ca727921c3028d1ecff5f66ad15f3974433be SHA512 b8ae2e76476665a4a747677c5a34508da565373d5064b69ba9136fb59d0f2c4d7f213e441b03b09081e2ece9aa20feae1db78b304968717d9f88fea2a0c57c18 WHIRLPOOL 7b107e85cb5cb747eb1d3546d4cec83ccc6c0f58cb850d022453ea2a838461bbf1fe69a9fdbcf682bd0bab3dbb44f7d20bc6475ab9b3b4807d60766ffc2216c3 -AUX vdr-2.0.6_systemd_argsdir_vanilla.patch 15043 SHA256 7809d04f7653ae880a4d5313ae404ed1ac46742fff86c2a91b3a843503e6d7c5 SHA512 ca478ab0a69791aeb99965f85623e9efd19ee918d8dd3cf4b627855c7f3a01d55a655cf1306c3552b044153ebfc0c2615a6eeab6a72943386c666aae88c7d02d WHIRLPOOL c79b67b8bb60cdf58e6919092b4149b62c998971f9ade6734b35a1706ad18039d1876f92e99d5d4b1ffdc23d48a58c854df46ca17e152138f1cdf4504490529c AUX vdr-2.0.7_systemd_argsdir.patch 14975 SHA256 40e0918a6f81a3f68f4e0a2f3079f298ba7783fa12c8b1707eb6651894c1a8e1 SHA512 3ce221335148595027be5fc45de1632336fd8b801f9dea2bbfd43e2f537adf938ad75f7d49b827696bbc2b24c0120ac519b05eeab20d004789c2c56a79380adc WHIRLPOOL fddd4f0ff499b98eebcd818d2dc9ade6fac288ee1a9c2e86b0505fb1c6fa3d67296ae1eb7b41446f0186f9bf47a426090555084eebb90144cf4c11c9ccfbed1d AUX vdr-2.0.7_systemd_argsdir_vanilla.patch 14989 SHA256 a0b8d7446bf932fd4c043c883d4edf3eb7d0fd0af1c0ba88e0bcce371bb7651b SHA512 bfcec239ed9c7dc3eded5a5accc8d7aed91b062f6255b89346536e8fddd28188bd032ef98db3417a618a3da1cab0b07d4e8b128dd9e755a78875711da7300b5e WHIRLPOOL c1370e3b9239646a0f9fa04ac4b3f97419fdb81e6d741de4ad660c11986bd5a789fe961303a091e772329e5a4ffd103bf335e38e9704215a1ca68b651c8d45dc AUX vdr-2.2.0_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8 -DIST extpng-vdr-2.0.4-gentoo-edition-v1.patch.bz2 66092 SHA256 4da8573ee8ad6d5524563e805591407774c4cc7aa10d92ccbff3efa90473b795 SHA512 42c4f488f7cc28491e0652a923fd2e49cad9e749261c0907f1911d5e377009e9ff0adbb1f9385a6a00151ec6934d1e6fd38fc8356d2811abc827df775171469c WHIRLPOOL 012f63ce69a949aedba091f88cc8bce04352d45ba962c55522849003c020072295405cef9813af41bb15af0d30b006eb1b9b1fb149b3b948e89b40d4f32b710e DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 SHA256 f2ea1371b88898acfde5fa390f5b13a5c23065a877bbba5658a194e64d6553e5 SHA512 f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c WHIRLPOOL 13bb3697afa4b2665d9de3de8892a0baf877991642a94d3305e15d98cbcba73aa743f80bdd76f9a3297653c92e99ec6ae629ed7919c26c730cef2fa2fd608ef1 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 SHA256 eebc812b160f5f44d665efa7bacd5abc57b27815deb28eb3d83ea3129d43b2b5 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e WHIRLPOOL 702ec541dcdb075ba9e9df450312c7a5ca3b34e9520edaf85a89426734d184b3cc8138a2ed8ad0c34fb7599d99d48c7538842c7f8126751f3b3ebeb6702cac4d -DIST vdr-2.0.4.tar.bz2 836834 SHA256 4c1ab2e7fa01c95ff83feec7601ad7241a256f05f7d15ef1d79b5b84b84f9ea3 SHA512 b64bbb61eb049b5f34c351b1ca0d77a93830dd8ca6fdec81becbc3be01f833512852c59e7e5290708d9f7b9bfb46d573d269300ffd025cc791263ff7323a632b WHIRLPOOL 113542272970fa1413b8ec296445eb198e319bba5dfa0c24a0e193afffff3cdcca563ae98c2b2bc4d49d779f401ba93c1e3aa0268f2a10d2b495e3e5d4be9c00 -DIST vdr-2.0.5.tar.bz2 837135 SHA256 04490e31241c3ba1e26cdc1bf7ab119fa08b2a0ebe07a9082b4a48e30a3b25ea SHA512 4a6d6f86648891c474a1af948ecc14c8f2c7b7e44356f4237fc96f962a3a778fdba4b30c26966e97dbaa17c1c809898de4e50583c8c950dd9cb27409a4b401df WHIRLPOOL b79a26c522feb062021080b8888158e8ca0ccc43759841a8b59e6ca94c7b6004e3445edab2e34c760338518510e169ea1214371ceb8736470defab0662d2cb7c DIST vdr-2.0.6.tar.bz2 839575 SHA256 c33c6431726378d5af575d8cfcacd34a50d17334e091dc4a095b6b75bc99b972 SHA512 070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d WHIRLPOOL c9d1cf47473299617d1eeca7b5445450448c558b17a20193260bf3a01030eb81e29f210dc349e9b3a51137acd6d866201d07860a79954ae2da2b87159db3e511 DIST vdr-2.0.7.tar.bz2 841511 SHA256 5c81418dc97d70ae965af5bdf641057cb64a7e76ecf9c94f72e417cc6c73fb13 SHA512 cba35f62162cd681179872915023890f492e95cc94d65aadd3cb4d03d7e3c7e2f197e7f35149cdf872169af35c2b841e1042e054f28164860b7cea8367793ce0 WHIRLPOOL 262e8e96d399c34ae492d92491720346c29c3d84bfb1c8b4a1e992f3586514f698d9f33f5a3b8e8204a054ee41767547ad4510a6a7637c1b27e917655481ab5a DIST vdr-2.2.0.tar.bz2 922708 SHA256 7c259e1ed1f39d93d23df1d5d0f85dd2a1fa9ec1dadff79e5833e2ff3ebf6c4e SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d WHIRLPOOL 2ce98f242e7ae3e7969005fde7214a2707749ab06622e78d56764c50c9a3f1e6e06a693091f19d45dc537b1702d365d3f9cfa4af24fb61aa8a0c64c5385fa19e -EBUILD vdr-2.0.4.ebuild 10147 SHA256 726df709331f4684acc51d01ab70f6a52729e218c88f23cf21c36015d7934181 SHA512 2ef9427f5a3dcfe4f46a5576e30c5ccd72c55c2b821af03e832498b3840e8f0e2a065feb9abade8aebe959ce93fb71ee181b7ca1d6a76d9dd34e8dc920df2a00 WHIRLPOOL aff0994f28e5b51c6384c69e0a978ba77323f6a70f3c10d0db4723c142bba00e8a590723ff690dcbdbc0aca1f47a6a7aa24c9180619f3c4c0cd5e57c9d44b6c7 -EBUILD vdr-2.0.5.ebuild 10419 SHA256 34648ad5ad5532309e62cc8a3c201169a6b35f5650e2f0674fb3fe99f0e5ed88 SHA512 cc95aac1f74675c673ced5c0bb26670cf7d57e7ee42f1615c0f62706bdab7a93f9c164ff846848553d0ceee5a7a8bd37053c0bc4fae182291bc82d77d49ca7fc WHIRLPOOL 7071233f2fefb1b36721bf6b13531f811544221d16327cede702160e8d8cc17ca36e878ce0a3237ab79e3f0b454c5d168253456c606416847aa85b5e3123b453 EBUILD vdr-2.0.6-r1.ebuild 7033 SHA256 9dfbf755819c07af93ebd3463aecc15345d5c8680c32d3d38c51f201d3479b06 SHA512 f45535ff9d6d44e6cc54205ac986a96110b048887ae7feac900d42205bbed3d28a4980c0d25505f7d8954f8ba45d9332cbc0915a2c1c077f829a2a74af1a735c WHIRLPOOL 13868505b8234ef5da4d9158f8061f2cd3d0863b1be02ff29c2d6bcdedefa5e3f9b628f40c8df1c9ec65e97f5c452e5a5023ba5f40c8d24c1165219a09c934a8 -EBUILD vdr-2.0.6-r2.ebuild 7373 SHA256 8c663a589492e82cb9bb1ff51dd94614969fd1a49342d8721edf878b30959615 SHA512 0bb0caf7444ecba0c3dc0fb836f5d08bad1263b0fd2d5344c9ad91b44719e0a9d547e466b38510a8d70cdeac567a42b4e5e222c7c37b9db9ec53eab36957041c WHIRLPOOL cda2d9adcd37db8470db7f35cabea68d89fe9608e52d9e4928427cc5c699e20aa1a5ec90bc42b656a8226a2b419e4d279c157f946dc160e9c4af106d7230d681 EBUILD vdr-2.0.7.ebuild 7384 SHA256 e2bd7acd4e9e120ee52757366238e7ebc14ea08c975c6fb0842f4245e39cceb8 SHA512 44dda5de31e53ef319abfbacb86e4bb450de24c26bda698e99285bfa35af59eec5e93f53e13039c6c311e7d1ae32a6168580967cb498d8fa985dd6c304a55807 WHIRLPOOL f244e90dfd4eb9628724540d6ccd92a710a1d6c927cefcbf86148a87ab92ceb41ee049d24e92050047bb5273b44fde556fe5c57e35704fec384f1624b5ebf01a -EBUILD vdr-2.2.0.ebuild 7559 SHA256 86aa2803255b934ceb7c3bdc82f5460faff590cb949822981e56c18c2b199e95 SHA512 bef4f97f961ce3a3f6567fb6d197e24a1b8bb31f04d628bf3214d6b482a33918079ad4be7793015cf166037db98107f2ef572182f299d2778895d2c076b3b647 WHIRLPOOL a4fac512d5020eb0a375b5db09eb5364fca13451ce814651cf81f249156183461a0c49a814445349ad39b61b27572372d5131e0b1cb74ad6bd28169fc9cd5295 -MISC ChangeLog 34999 SHA256 20202a09bcdcac038894d19b1bb763e9d7a6925372f5bff0ca06a0d5cf6faf96 SHA512 ed47cc8b1833ee6bf2934e9d2480295a8ded47b0644599bf960194199d785f5e79bed5262983211b23577fa8018c2683318e888b10408a446f808ccc234b57f4 WHIRLPOOL 4d6a773828eab3428202a8ec28787f5480fc684a070686e3add75ecb6a9efa0fc7cad5b256ea182ad2b1b98b1fe32c1e0e121f54703e0ad0644c67f8178b3a96 +EBUILD vdr-2.2.0.ebuild 7414 SHA256 da6c2ee73dafcc50fdc861d72d4dac52ee21d8b0f761d9258fa50a8561b88ff0 SHA512 113a87b09a13712a4266c990e9f0b090f64f06a18a3b31d27185f2d16be3d2aa6224517e65825e277e58d93c0bef98e709eb71aee43664670124da1b4ccc5248 WHIRLPOOL a2537f48e1c0a29e46cd2d945038a44e5c0ba995a33150d7c7961a556bf47322d74d716c01f4a0283bf33f70553812ff18393033d2d2b5f9bc6816ce19aaaafe +MISC ChangeLog 35319 SHA256 09efaaf44d03103995eb916f024c251ee9be6450c6be1c7f4cb61c2c75412e9c SHA512 b073767534a83ab2dcf124b7c8352d5ba9adac793b3160999be83879c9807fd12a0182743e8716058169b87d5a9df093961095b1532156ed1c24ee2acd4cda47 WHIRLPOOL 4199e9f59e2ff696812621a8e380b4e5f03dee05e72635986c42257a419bf34f1148cd96f54bfdf5c46cc1fc337e5c36d673aa09df447cd24a077857ead96b50 MISC metadata.xml 2108 SHA256 6da78765ced8330ec535e65cda7c79d95919b88cc46053e2ff68f56e48cca179 SHA512 e18013dfa8d07c5d6bb0c9e4b3ec50211506ba5da4e7c9aa7c96132498e2a89b97f774df7bc8dd6c29a0e3c53cbb4d7be598c154584bc3963b07aa97d4d55dcc WHIRLPOOL 6aba0fcc25878b446f1573aaf74aead4066ef6ddffb266825235aafdc1fa4f0abba6d386898c4d4a4db8b78dfee644eeef64da7fb1aa949f061fda874de97ccd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: added by hd_brummy@gentoo.org -iD8DBQFU5kHcdn07HTTCgIoRCPxNAKCLNMRGhKUxkaphjUrnQnnbw85MZACfWhWW -EMx6G9f31OQdZShPZ3DQbNo= -=c2Rz +iD8DBQFU5wQxdn07HTTCgIoRCMxiAKCrnmM0omCSAIP11QeymJ926seWRQCeLz8U +UGdqnSVH/GD//XSZ95AlZbs= +=MSr0 -----END PGP SIGNATURE----- diff --git a/media-video/vdr/files/vdr-2.0.0-fixkeeptracksinit.diff b/media-video/vdr/files/vdr-2.0.0-fixkeeptracksinit.diff deleted file mode 100644 index 1739ae1eac60..000000000000 --- a/media-video/vdr/files/vdr-2.0.0-fixkeeptracksinit.diff +++ /dev/null @@ -1,17 +0,0 @@ -the member variable keepTracks is initialized too late in the cDevice - ---- device.c 2013/03/07 13:18:35 3.0 -+++ device.c 2013/04/05 10:05:33 -@@ -94,11 +94,11 @@ - - player = NULL; - isPlayingVideo = false; -+ keepTracks = false; // used in ClrAvailableTracks()! - ClrAvailableTracks(); - currentAudioTrack = ttNone; - currentAudioTrackMissingCount = 0; - currentSubtitleTrack = ttNone; -- keepTracks = false; - liveSubtitle = NULL; - dvbSubtitleConverter = NULL; - autoSelectPreferredSubtitleLanguage = true; diff --git a/media-video/vdr/files/vdr-2.0.0_gentoo.patch b/media-video/vdr/files/vdr-2.0.0_gentoo.patch deleted file mode 100644 index f263c8a4c311..000000000000 --- a/media-video/vdr/files/vdr-2.0.0_gentoo.patch +++ /dev/null @@ -1,75 +0,0 @@ -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 - -Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2013/03/30) - -diff -Naur vdr-1.7.42.orig/Makefile vdr-1.7.42/Makefile ---- vdr-1.7.42.orig/Makefile 2013-03-30 21:19:19.000000000 +0100 -+++ vdr-1.7.42/Makefile 2013-03-30 21:24:47.000000000 +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): - -@@ -247,7 +247,7 @@ - - # Install the files (note that 'install-pc' must be first!): - --install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes -+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes - - # VDR binary: - -@@ -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: -@@ -290,8 +291,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/files/vdr-2.0.6_systemd_argsdir.patch b/media-video/vdr/files/vdr-2.0.6_systemd_argsdir.patch deleted file mode 100644 index 39e7ec24f96d..000000000000 --- a/media-video/vdr/files/vdr-2.0.6_systemd_argsdir.patch +++ /dev/null @@ -1,441 +0,0 @@ -packport from vdr-2.1.7 -systemd support -argsdir support -diff -Naur vdr-2.0.6.orig/HISTORY vdr-2.0.6/HISTORY ---- vdr-2.0.6.orig/HISTORY 2015-01-20 03:24:14.000000000 +0100 -+++ vdr-2.0.6/HISTORY 2015-01-20 03:26:04.000000000 +0100 -@@ -7915,3 +7915,13 @@ - on a system with a large number of recordings. - - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and - the functional modification to cFont::CreateFont(). -+ -+2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7 -+ -+- Added support for systemd (thanks to Christopher Reimer). To activate this you -+ need to add "SDNOTIFY=1" to the 'make' call. -+ -+2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1.7 -+ -+- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks -+ to Lars Hanisch). See vdr.1 and vdr.5 for details. -diff -Naur vdr-2.0.6.orig/Make.config.template vdr-2.0.6/Make.config.template ---- vdr-2.0.6.orig/Make.config.template 2015-01-20 03:24:14.000000000 +0100 -+++ vdr-2.0.6/Make.config.template 2015-01-20 03:26:04.000000000 +0100 -@@ -38,6 +38,7 @@ - - #VIDEODIR = /srv/vdr/video - #CONFDIR = /var/lib/vdr -+#ARGSDIR = /etc/vdr/conf.d - #CACHEDIR = /var/cache/vdr - - # Overrides for preset/legacy configurations: -diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile ---- vdr-2.0.6.orig/Makefile 2015-01-20 03:24:14.000000000 +0100 -+++ vdr-2.0.6/Makefile 2015-01-20 03:26:04.000000000 +0100 -@@ -31,6 +31,7 @@ - DESTDIR ?= - VIDEODIR ?= /srv/vdr/video - CONFDIR ?= /var/lib/vdr -+ARGSDIR ?= /etc/vdr/conf.d - CACHEDIR ?= /var/cache/vdr - - PREFIX ?= /usr/local -@@ -66,7 +67,7 @@ - - SILIB = $(LSIDIR)/libsi.a - --OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ -+OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ - dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\ - lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\ - receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\ -@@ -111,12 +112,18 @@ - DEFINES += -DBIDI - LIBS += $(shell pkg-config --libs fribidi) - endif -+ifdef SDNOTIFY -+INCLUDES += $(shell pkg-config --cflags libsystemd-daemon) -+DEFINES += -DSDNOTIFY -+LIBS += $(shell pkg-config --libs libsystemd-daemon) -+endif - - LIRC_DEVICE ?= /var/run/lirc/lircd - - DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" - DEFINES += -DVIDEODIR=\"$(VIDEODIR)\" - DEFINES += -DCONFDIR=\"$(CONFDIR)\" -+DEFINES += -DARGSDIR=\"$(ARGSDIR)\" - DEFINES += -DCACHEDIR=\"$(CACHEDIR)\" - DEFINES += -DRESDIR=\"$(RESDIR)\" - DEFINES += -DPLUGINDIR=\"$(LIBDIR)\" -@@ -161,6 +168,8 @@ - @echo "mandir=$(MANDIR)" >> $@ - @echo "configdir=$(CONFDIR)" >> $@ - @echo "videodir=$(VIDEODIR)" >> $@ -+# @echo "configdir=$(CONFDIR)" >> $@ -+ @echo "argsdir=$(ARGSDIR)" >> $@ - @echo "cachedir=$(CACHEDIR)" >> $@ - @echo "resdir=$(RESDIR)" >> $@ - @echo "libdir=$(LIBDIR)" >> $@ -@@ -278,6 +287,7 @@ - install-dirs: - @mkdir -p $(DESTDIR)$(VIDEODIR) - # @mkdir -p $(DESTDIR)$(CONFDIR) -+ @mkdir -p $(DESTDIR)$(ARGSDIR) - # @mkdir -p $(DESTDIR)$(CACHEDIR) - @mkdir -p $(DESTDIR)$(RESDIR) - -diff -Naur vdr-2.0.6.orig/Makefile.orig vdr-2.0.6/Makefile.orig -diff -Naur vdr-2.0.6.orig/args.c vdr-2.0.6/args.c ---- vdr-2.0.6.orig/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.6/args.c 2015-01-20 03:26:04.000000000 +0100 -@@ -0,0 +1,129 @@ -+/* -+ * args.c: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch <dvb@flensrocker.de>. -+ * -+ * $Id: vdr-2.0.6_systemd_argsdir.patch,v 1.1 2015/01/20 03:19:46 hd_brummy Exp $ -+ */ -+ -+#include "args.h" -+#include <unistd.h> -+ -+cArgs::cArgs(const char *Argv0) -+{ -+ argv0 = Argv0; -+ argc = 0; -+ argv = NULL; -+} -+ -+cArgs::~cArgs(void) -+{ -+ if (argv != NULL) -+ delete [] argv; -+} -+ -+bool cArgs::AddArg(const char *s) -+{ -+ if (inVdrSection) -+ args.Append(strdup(s)); -+ else if (*lastArg == NULL) -+ return false; -+ else -+ lastArg = cString::sprintf("%s %s", *lastArg, s); -+ return true; -+} -+ -+bool cArgs::ReadDirectory(const char *Directory) -+{ -+ if (argv != NULL) -+ delete [] argv; -+ argc = 0; -+ argv = NULL; -+ args.Clear(); -+ lastArg = NULL; -+ inVdrSection = false; -+ cFileNameList files(Directory, false); -+ if (files.Size() == 0) -+ return false; -+ for (int i = 0; i < files.Size(); i++) { -+ const char *fileName = files.At(i); -+ if (startswith(fileName, ".") || !endswith(fileName, ".conf")) -+ continue; -+ cString fullFileName = AddDirectory(Directory, fileName); -+ struct stat fs; -+ if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode)) -+ continue; -+ bool ok = true; -+ int line = 0; -+ FILE *f = fopen(*fullFileName, "r"); -+ if (f) { -+ char *s; -+ cReadLine ReadLine; -+ while ((s = ReadLine.Read(f)) != NULL) { -+ line++; -+ s = stripspace(skipspace(s)); -+ if (!isempty(s) && (s[0] != '#')) { -+ if (startswith(s, "[") && endswith(s, "]")) { -+ s[strlen(s) - 1] = 0; -+ s++; -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ if (strcmp(s, "vdr") == 0) -+ inVdrSection = true; -+ else { -+ inVdrSection = false; -+ lastArg = cString::sprintf("--plugin=%s", s); -+ } -+ } -+ else { -+ if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space -+ char *p = strchr(s, ' '); -+ if (p == NULL) { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ else { -+ *p = 0; -+ p++; -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ ok = AddArg(p); -+ if (!ok) -+ break; -+ } -+ } -+ else { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ } -+ } -+ } -+ fclose(f); -+ } -+ if (!ok) { -+ esyslog("ERROR: args file %s, line %d", *fullFileName, line); -+ return false; -+ } -+ } -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ argv = new char*[args.Size() + 1]; -+ argv[0] = strdup(*argv0); -+ argc = 1; -+ for (int i = 0; i < args.Size(); i++) { -+ argv[argc] = args.At(i); -+ argc++; -+ } -+ return true; -+} -diff -Naur vdr-2.0.6.orig/args.h vdr-2.0.6/args.h ---- vdr-2.0.6.orig/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.6/args.h 2015-01-20 03:26:04.000000000 +0100 -@@ -0,0 +1,34 @@ -+/* -+ * args.h: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch <dvb@flensrocker.de>. -+ * -+ * $Id: vdr-2.0.6_systemd_argsdir.patch,v 1.1 2015/01/20 03:19:46 hd_brummy Exp $ -+ */ -+ -+#ifndef __ARGS_H -+#define __ARGS_H -+ -+#include "tools.h" -+ -+class cArgs { -+private: -+ cString argv0; -+ cStringList args; -+ cString lastArg; -+ bool inVdrSection; -+ int argc; -+ char **argv; -+ bool AddArg(const char *s); -+public: -+ cArgs(const char *Argv0); -+ ~cArgs(void); -+ bool ReadDirectory(const char *Directory); -+ int GetArgc(void) const { return argc; }; -+ char **GetArgv(void) const { return argv; }; -+ }; -+ -+#endif //__ARGS_H -diff -Naur vdr-2.0.6.orig/interface.c vdr-2.0.6/interface.c ---- vdr-2.0.6.orig/interface.c 2015-01-20 03:24:14.000000000 +0100 -+++ vdr-2.0.6/interface.c 2015-01-20 03:25:53.000000000 +0100 -@@ -10,6 +10,9 @@ - #include "interface.h" - #include <ctype.h> - #include <stdlib.h> -+#ifdef SDNOTIFY -+#include <systemd/sd-daemon.h> -+#endif - #include <unistd.h> - #include "i18n.h" - #include "status.h" -@@ -159,6 +162,9 @@ - bool known = Keys.KnowsRemote(Remote->Name()); - dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys"); - if (!known) { -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Learning keys..."); -+#endif - cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu(); - DisplayMenu->SetMenuCategory(mcUnknown); - char Headline[256]; -diff -Naur vdr-2.0.6.orig/vdr.1 vdr-2.0.6/vdr.1 ---- vdr-2.0.6.orig/vdr.1 2015-01-20 03:24:14.000000000 +0100 -+++ vdr-2.0.6/vdr.1 2015-01-20 03:26:04.000000000 +0100 -@@ -178,6 +178,10 @@ - Read resource files from \fIdir\fR - (default is to read them from the config directory). - .TP -+.BI \-\-showargs[= dir ] -+Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR), -+display them to the console and exit. -+.TP - .BI \-s\ cmd ,\ \-\-shutdown= cmd - Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more - information. -@@ -213,6 +217,10 @@ - .BI \-w\ sec ,\ \-\-watchdog= sec - Activate the watchdog timer with a timeout of \fIsec\fR seconds. - A value of \fB0\fR (default) disables the watchdog. -+.P -+If started without any options, vdr tries to read command line options -+from files named '*.conf' in the directory /etc/vdr/conf.d. Files are -+read in alphabetical order. See vdr(5) for details. - .SH SIGNALS - .TP - .B SIGINT, SIGTERM -diff -Naur vdr-2.0.6.orig/vdr.5 vdr-2.0.6/vdr.5 ---- vdr-2.0.6.orig/vdr.5 2015-01-20 03:24:14.000000000 +0100 -+++ vdr-2.0.6/vdr.5 2015-01-20 03:26:04.000000000 +0100 -@@ -895,6 +895,33 @@ - just 16 bit wide. The internal representation in VDR allows for 32 bit to - be used, so that external tools can generate EPG data that is guaranteed - not to collide with the ids of existing data. -+.SS COMMANDLINE OPTIONS -+If started without any options, vdr tries to read any files in the directory -+/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'. -+These files are read in alphabetical order. The format of these files is -+ -+# comment -+.br -+[name] -+.br -+-a -+.br -+-b 123 -+.br -+--long -+.br -+--longarg=123 -+.br -+ -+Any lines that begin with '#' as the first non-whitespace character are considered -+comments and are ignored. -+A command line option file consists of one or more sections, indicated by '[name]', -+where 'name' is either the fixed word 'vdr' (if this section contains options for -+the main VDR program) or the name of the plugin this section applies to. -+Each option must be written on a separate line, including the leading '-' (for -+a short option) or '--' (for a long option). If the option has additional arguments, -+they have to be written on the same line as the option itself, separated from the -+option with a blank (short option) or equal sign (long option). - .SH SEE ALSO - .BR vdr (1) - .SH AUTHOR -diff -Naur vdr-2.0.6.orig/vdr.c vdr-2.0.6/vdr.c ---- vdr-2.0.6.orig/vdr.c 2015-01-20 03:24:14.000000000 +0100 -+++ vdr-2.0.6/vdr.c 2015-01-20 03:26:04.000000000 +0100 -@@ -34,8 +34,12 @@ - #include <stdlib.h> - #include <sys/capability.h> - #include <sys/prctl.h> -+#ifdef SDNOTIFY -+#include <systemd/sd-daemon.h> -+#endif - #include <termios.h> - #include <unistd.h> -+#include "args.h" - #include "audio.h" - #include "channels.h" - #include "config.h" -@@ -192,6 +196,7 @@ - #define DEFAULTWATCHDOG 0 // seconds - #define DEFAULTVIDEODIR VIDEODIR - #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory) -+#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d") - #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory) - #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory) - #define DEFAULTPLUGINDIR PLUGINDIR -@@ -229,6 +234,15 @@ - VdrUser = VDR_USER; - #endif - -+ cArgs *Args = NULL; -+ if (argc == 1) { -+ Args = new cArgs(argv[0]); -+ if (Args->ReadDirectory(DEFAULTARGSDIR)) { -+ argc = Args->GetArgc(); -+ argv = Args->GetArgv(); -+ } -+ } -+ - SetVideoDirectory(VideoDirectory); - cPluginManager PluginManager(DEFAULTPLUGINDIR); - -@@ -256,6 +270,7 @@ - { "port", required_argument, NULL, 'p' }, - { "record", required_argument, NULL, 'r' }, - { "resdir", required_argument, NULL, 'r' | 0x100 }, -+ { "showargs", optional_argument, NULL, 's' | 0x200 }, - { "shutdown", required_argument, NULL, 's' }, - { "split", no_argument, NULL, 's' | 0x100 }, - { "terminal", required_argument, NULL, 't' }, -@@ -428,6 +443,19 @@ - case 's' | 0x100: - Setup.SplitEditedFiles = 1; - break; -+ case 's' | 0x200: { -+ const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR; -+ cArgs Args(argv[0]); -+ if (!Args.ReadDirectory(ArgsDir)) { -+ fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir); -+ return 2; -+ } -+ int c = Args.GetArgc(); -+ char **v = Args.GetArgv(); -+ for (int i = 1; i < c; i++) -+ printf("%s\n", v[i]); -+ return 0; -+ } - case 't': Terminal = optarg; - if (access(Terminal, R_OK | W_OK) < 0) { - fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal); -@@ -541,6 +569,8 @@ - " -s CMD, --shutdown=CMD call CMD to shutdown the computer\n" - " --split split edited files at the editing marks (only\n" - " useful in conjunction with --edit)\n" -+ " --showargs[=DIR] print the arguments read from DIR and exit\n" -+ " (default: %s)\n" - " -t TTY, --terminal=TTY controlling tty\n" - " -u USER, --user=USER run as user USER; only applicable if started as\n" - " root\n" -@@ -563,6 +593,7 @@ - DEFAULTLOCDIR, - DEFAULTSVDRPPORT, - DEFAULTRESDIR, -+ DEFAULTARGSDIR, - DEFAULTVIDEODIR, - DEFAULTWATCHDOG - ); -@@ -848,6 +879,10 @@ - alarm(WatchdogTimeout); // Initial watchdog timer start - } - -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Ready"); -+#endif -+ - // Main program loop: - - #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL) -diff -Naur vdr-2.0.6.orig/vdr.c.orig vdr-2.0.6/vdr.c.orig diff --git a/media-video/vdr/files/vdr-2.0.6_systemd_argsdir_vanilla.patch b/media-video/vdr/files/vdr-2.0.6_systemd_argsdir_vanilla.patch deleted file mode 100644 index 81ce17b779e0..000000000000 --- a/media-video/vdr/files/vdr-2.0.6_systemd_argsdir_vanilla.patch +++ /dev/null @@ -1,439 +0,0 @@ -backported from vdr-2.1.7 -systemd support -argsdir support -diff -Naur vdr-2.0.6.orig/HISTORY vdr-2.0.6/HISTORY ---- vdr-2.0.6.orig/HISTORY 2014-10-01 16:30:32.000000000 +0200 -+++ vdr-2.0.6/HISTORY 2015-01-20 03:06:42.000000000 +0100 -@@ -7915,3 +7915,13 @@ - on a system with a large number of recordings. - - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and - the functional modification to cFont::CreateFont(). -+ -+2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7 -+ -+- Added support for systemd (thanks to Christopher Reimer). To activate this you -+ need to add "SDNOTIFY=1" to the 'make' call. -+ -+2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1.7 -+ -+- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks -+ to Lars Hanisch). See vdr.1 and vdr.5 for details. -diff -Naur vdr-2.0.6.orig/Make.config.template vdr-2.0.6/Make.config.template ---- vdr-2.0.6.orig/Make.config.template 2014-10-01 16:30:32.000000000 +0200 -+++ vdr-2.0.6/Make.config.template 2015-01-20 03:06:42.000000000 +0100 -@@ -38,6 +38,7 @@ - - #VIDEODIR = /srv/vdr/video - #CONFDIR = /var/lib/vdr -+#ARGSDIR = /etc/vdr/conf.d - #CACHEDIR = /var/cache/vdr - - # Overrides for preset/legacy configurations: -diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile ---- vdr-2.0.6.orig/Makefile 2015-01-20 02:55:00.000000000 +0100 -+++ vdr-2.0.6/Makefile 2015-01-20 03:12:57.000000000 +0100 -@@ -31,6 +31,7 @@ - DESTDIR ?= - VIDEODIR ?= /srv/vdr/video - CONFDIR ?= /var/lib/vdr -+ARGSDIR ?= /etc/vdr/conf.d - CACHEDIR ?= /var/cache/vdr - - PREFIX ?= /usr/local -@@ -66,7 +67,7 @@ - - SILIB = $(LSIDIR)/libsi.a - --OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ -+OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ - dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\ - lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\ - receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\ -@@ -93,12 +94,18 @@ - DEFINES += -DBIDI - LIBS += $(shell pkg-config --libs fribidi) - endif -+ifdef SDNOTIFY -+INCLUDES += $(shell pkg-config --cflags libsystemd-daemon) -+DEFINES += -DSDNOTIFY -+LIBS += $(shell pkg-config --libs libsystemd-daemon) -+endif - - LIRC_DEVICE ?= /var/run/lirc/lircd - - DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" - DEFINES += -DVIDEODIR=\"$(VIDEODIR)\" - DEFINES += -DCONFDIR=\"$(CONFDIR)\" -+DEFINES += -DARGSDIR=\"$(ARGSDIR)\" - DEFINES += -DCACHEDIR=\"$(CACHEDIR)\" - DEFINES += -DRESDIR=\"$(RESDIR)\" - DEFINES += -DPLUGINDIR=\"$(LIBDIR)\" -@@ -143,6 +150,8 @@ - @echo "mandir=$(MANDIR)" >> $@ - @echo "configdir=$(CONFDIR)" >> $@ - @echo "videodir=$(VIDEODIR)" >> $@ -+# @echo "configdir=$(CONFDIR)" >> $@ -+ @echo "argsdir=$(ARGSDIR)" >> $@ - @echo "cachedir=$(CACHEDIR)" >> $@ - @echo "resdir=$(RESDIR)" >> $@ - @echo "libdir=$(LIBDIR)" >> $@ -@@ -260,6 +269,7 @@ - install-dirs: - @mkdir -p $(DESTDIR)$(VIDEODIR) - # @mkdir -p $(DESTDIR)$(CONFDIR) -+ @mkdir -p $(DESTDIR)$(ARGSDIR) - # @mkdir -p $(DESTDIR)$(CACHEDIR) - @mkdir -p $(DESTDIR)$(RESDIR) - -diff -Naur vdr-2.0.6.orig/args.c vdr-2.0.6/args.c ---- vdr-2.0.6.orig/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.6/args.c 2015-01-20 03:06:42.000000000 +0100 -@@ -0,0 +1,129 @@ -+/* -+ * args.c: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch <dvb@flensrocker.de>. -+ * -+ * $Id: vdr-2.0.6_systemd_argsdir_vanilla.patch,v 1.1 2015/01/20 03:19:46 hd_brummy Exp $ -+ */ -+ -+#include "args.h" -+#include <unistd.h> -+ -+cArgs::cArgs(const char *Argv0) -+{ -+ argv0 = Argv0; -+ argc = 0; -+ argv = NULL; -+} -+ -+cArgs::~cArgs(void) -+{ -+ if (argv != NULL) -+ delete [] argv; -+} -+ -+bool cArgs::AddArg(const char *s) -+{ -+ if (inVdrSection) -+ args.Append(strdup(s)); -+ else if (*lastArg == NULL) -+ return false; -+ else -+ lastArg = cString::sprintf("%s %s", *lastArg, s); -+ return true; -+} -+ -+bool cArgs::ReadDirectory(const char *Directory) -+{ -+ if (argv != NULL) -+ delete [] argv; -+ argc = 0; -+ argv = NULL; -+ args.Clear(); -+ lastArg = NULL; -+ inVdrSection = false; -+ cFileNameList files(Directory, false); -+ if (files.Size() == 0) -+ return false; -+ for (int i = 0; i < files.Size(); i++) { -+ const char *fileName = files.At(i); -+ if (startswith(fileName, ".") || !endswith(fileName, ".conf")) -+ continue; -+ cString fullFileName = AddDirectory(Directory, fileName); -+ struct stat fs; -+ if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode)) -+ continue; -+ bool ok = true; -+ int line = 0; -+ FILE *f = fopen(*fullFileName, "r"); -+ if (f) { -+ char *s; -+ cReadLine ReadLine; -+ while ((s = ReadLine.Read(f)) != NULL) { -+ line++; -+ s = stripspace(skipspace(s)); -+ if (!isempty(s) && (s[0] != '#')) { -+ if (startswith(s, "[") && endswith(s, "]")) { -+ s[strlen(s) - 1] = 0; -+ s++; -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ if (strcmp(s, "vdr") == 0) -+ inVdrSection = true; -+ else { -+ inVdrSection = false; -+ lastArg = cString::sprintf("--plugin=%s", s); -+ } -+ } -+ else { -+ if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space -+ char *p = strchr(s, ' '); -+ if (p == NULL) { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ else { -+ *p = 0; -+ p++; -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ ok = AddArg(p); -+ if (!ok) -+ break; -+ } -+ } -+ else { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ } -+ } -+ } -+ fclose(f); -+ } -+ if (!ok) { -+ esyslog("ERROR: args file %s, line %d", *fullFileName, line); -+ return false; -+ } -+ } -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ argv = new char*[args.Size() + 1]; -+ argv[0] = strdup(*argv0); -+ argc = 1; -+ for (int i = 0; i < args.Size(); i++) { -+ argv[argc] = args.At(i); -+ argc++; -+ } -+ return true; -+} -diff -Naur vdr-2.0.6.orig/args.h vdr-2.0.6/args.h ---- vdr-2.0.6.orig/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.6/args.h 2015-01-20 03:06:42.000000000 +0100 -@@ -0,0 +1,34 @@ -+/* -+ * args.h: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch <dvb@flensrocker.de>. -+ * -+ * $Id: vdr-2.0.6_systemd_argsdir_vanilla.patch,v 1.1 2015/01/20 03:19:46 hd_brummy Exp $ -+ */ -+ -+#ifndef __ARGS_H -+#define __ARGS_H -+ -+#include "tools.h" -+ -+class cArgs { -+private: -+ cString argv0; -+ cStringList args; -+ cString lastArg; -+ bool inVdrSection; -+ int argc; -+ char **argv; -+ bool AddArg(const char *s); -+public: -+ cArgs(const char *Argv0); -+ ~cArgs(void); -+ bool ReadDirectory(const char *Directory); -+ int GetArgc(void) const { return argc; }; -+ char **GetArgv(void) const { return argv; }; -+ }; -+ -+#endif //__ARGS_H -diff -Naur vdr-2.0.6.orig/interface.c vdr-2.0.6/interface.c ---- vdr-2.0.6.orig/interface.c 2014-10-01 16:30:32.000000000 +0200 -+++ vdr-2.0.6/interface.c 2015-01-20 03:03:40.000000000 +0100 -@@ -10,6 +10,9 @@ - #include "interface.h" - #include <ctype.h> - #include <stdlib.h> -+#ifdef SDNOTIFY -+#include <systemd/sd-daemon.h> -+#endif - #include <unistd.h> - #include "i18n.h" - #include "status.h" -@@ -159,6 +162,9 @@ - bool known = Keys.KnowsRemote(Remote->Name()); - dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys"); - if (!known) { -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Learning keys..."); -+#endif - cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu(); - DisplayMenu->SetMenuCategory(mcUnknown); - char Headline[256]; -diff -Naur vdr-2.0.6.orig/vdr.1 vdr-2.0.6/vdr.1 ---- vdr-2.0.6.orig/vdr.1 2014-10-01 16:30:32.000000000 +0200 -+++ vdr-2.0.6/vdr.1 2015-01-20 03:06:42.000000000 +0100 -@@ -178,6 +178,10 @@ - Read resource files from \fIdir\fR - (default is to read them from the config directory). - .TP -+.BI \-\-showargs[= dir ] -+Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR), -+display them to the console and exit. -+.TP - .BI \-s\ cmd ,\ \-\-shutdown= cmd - Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more - information. -@@ -213,6 +217,10 @@ - .BI \-w\ sec ,\ \-\-watchdog= sec - Activate the watchdog timer with a timeout of \fIsec\fR seconds. - A value of \fB0\fR (default) disables the watchdog. -+.P -+If started without any options, vdr tries to read command line options -+from files named '*.conf' in the directory /etc/vdr/conf.d. Files are -+read in alphabetical order. See vdr(5) for details. - .SH SIGNALS - .TP - .B SIGINT, SIGTERM -diff -Naur vdr-2.0.6.orig/vdr.5 vdr-2.0.6/vdr.5 ---- vdr-2.0.6.orig/vdr.5 2014-10-01 16:30:32.000000000 +0200 -+++ vdr-2.0.6/vdr.5 2015-01-20 03:06:42.000000000 +0100 -@@ -889,6 +889,33 @@ - just 16 bit wide. The internal representation in VDR allows for 32 bit to - be used, so that external tools can generate EPG data that is guaranteed - not to collide with the ids of existing data. -+.SS COMMANDLINE OPTIONS -+If started without any options, vdr tries to read any files in the directory -+/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'. -+These files are read in alphabetical order. The format of these files is -+ -+# comment -+.br -+[name] -+.br -+-a -+.br -+-b 123 -+.br -+--long -+.br -+--longarg=123 -+.br -+ -+Any lines that begin with '#' as the first non-whitespace character are considered -+comments and are ignored. -+A command line option file consists of one or more sections, indicated by '[name]', -+where 'name' is either the fixed word 'vdr' (if this section contains options for -+the main VDR program) or the name of the plugin this section applies to. -+Each option must be written on a separate line, including the leading '-' (for -+a short option) or '--' (for a long option). If the option has additional arguments, -+they have to be written on the same line as the option itself, separated from the -+option with a blank (short option) or equal sign (long option). - .SH SEE ALSO - .BR vdr (1) - .SH AUTHOR -diff -Naur vdr-2.0.6.orig/vdr.c vdr-2.0.6/vdr.c ---- vdr-2.0.6.orig/vdr.c 2014-10-01 16:30:32.000000000 +0200 -+++ vdr-2.0.6/vdr.c 2015-01-20 03:06:42.000000000 +0100 -@@ -34,8 +34,12 @@ - #include <stdlib.h> - #include <sys/capability.h> - #include <sys/prctl.h> -+#ifdef SDNOTIFY -+#include <systemd/sd-daemon.h> -+#endif - #include <termios.h> - #include <unistd.h> -+#include "args.h" - #include "audio.h" - #include "channels.h" - #include "config.h" -@@ -186,6 +190,7 @@ - #define DEFAULTWATCHDOG 0 // seconds - #define DEFAULTVIDEODIR VIDEODIR - #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory) -+#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d") - #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory) - #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory) - #define DEFAULTPLUGINDIR PLUGINDIR -@@ -223,6 +228,15 @@ - VdrUser = VDR_USER; - #endif - -+ cArgs *Args = NULL; -+ if (argc == 1) { -+ Args = new cArgs(argv[0]); -+ if (Args->ReadDirectory(DEFAULTARGSDIR)) { -+ argc = Args->GetArgc(); -+ argv = Args->GetArgv(); -+ } -+ } -+ - SetVideoDirectory(VideoDirectory); - cPluginManager PluginManager(DEFAULTPLUGINDIR); - -@@ -250,6 +264,7 @@ - { "port", required_argument, NULL, 'p' }, - { "record", required_argument, NULL, 'r' }, - { "resdir", required_argument, NULL, 'r' | 0x100 }, -+ { "showargs", optional_argument, NULL, 's' | 0x200 }, - { "shutdown", required_argument, NULL, 's' }, - { "split", no_argument, NULL, 's' | 0x100 }, - { "terminal", required_argument, NULL, 't' }, -@@ -422,6 +437,19 @@ - case 's' | 0x100: - Setup.SplitEditedFiles = 1; - break; -+ case 's' | 0x200: { -+ const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR; -+ cArgs Args(argv[0]); -+ if (!Args.ReadDirectory(ArgsDir)) { -+ fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir); -+ return 2; -+ } -+ int c = Args.GetArgc(); -+ char **v = Args.GetArgv(); -+ for (int i = 1; i < c; i++) -+ printf("%s\n", v[i]); -+ return 0; -+ } - case 't': Terminal = optarg; - if (access(Terminal, R_OK | W_OK) < 0) { - fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal); -@@ -535,6 +563,8 @@ - " -s CMD, --shutdown=CMD call CMD to shutdown the computer\n" - " --split split edited files at the editing marks (only\n" - " useful in conjunction with --edit)\n" -+ " --showargs[=DIR] print the arguments read from DIR and exit\n" -+ " (default: %s)\n" - " -t TTY, --terminal=TTY controlling tty\n" - " -u USER, --user=USER run as user USER; only applicable if started as\n" - " root\n" -@@ -557,6 +587,7 @@ - DEFAULTLOCDIR, - DEFAULTSVDRPPORT, - DEFAULTRESDIR, -+ DEFAULTARGSDIR, - DEFAULTVIDEODIR, - DEFAULTWATCHDOG - ); -@@ -837,6 +868,10 @@ - alarm(WatchdogTimeout); // Initial watchdog timer start - } - -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Ready"); -+#endif -+ - // Main program loop: - - #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL) diff --git a/media-video/vdr/vdr-2.0.4.ebuild b/media-video/vdr/vdr-2.0.4.ebuild deleted file mode 100644 index 7f2c16addef2..000000000000 --- a/media-video/vdr/vdr-2.0.4.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild,v 1.4 2015/02/19 19:38:49 hd_brummy 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" - -# 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="" - -IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" - -MY_PV="${PV%_p*}" -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -EXT_P="extpng-${P}-gentoo-edition-v1" - -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/${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 - media-fonts/corefonts - bidi? ( dev-libs/fribidi )" - -# pull in vdr-setup to get the xml files, else menu will not work -PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )" - -CONF_DIR=/etc/vdr -CAP_FILE=${S}/capabilities.sh -CAPS="# Capabilities of the vdr-executable for use by startscript etc." - -pkg_setup() { - use debug && append-flags -g - - PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" - - tc-export CC CXX AR -} - -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 - - # codesnippet to bring the extpng defines into 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() { - # apply maintainace-patches - - ebegin "Changing paths for gentoo" - - 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 too old for ${P}" - eerror "You cannot compile VDR against old dvb-header" - 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; parameter 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 - - # support languages, written from right to left - BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)" - - epatch "${FILESDIR}/${PN}-2.0.0_gentoo.patch" - - if ! use vanilla; then - - # Now apply extensions patch - epatch "${WORKDIR}/${EXT_P}.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:" - - # we do not support these patches - # (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 - - 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 - - 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 "einstall failed" - - keepdir "${PLUGIN_LIBDIR}" - - keepdir "${CONF_DIR}"/plugins - keepdir "${CONF_DIR}"/themes - - diropts -m0755 -ovdr -gvdr - 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() { - - # correct wrong permission from earlier install - CACHEOWNER="$(stat -c %U /var/cache/vdr)" - if [ ! ${CACHEOWNER} == vdr ]; then - chown -R vdr:vdr "${ROOT}/var/cache/vdr" - fi - - 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, one of 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 plugins which do on compile any more." - 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 build according to the FHS." - elog " Gentoo VDR still uses the standard from" - elog " Filesystem Hierarchy Standard" - elog " It is supported since beginning of VDR support" - elog " on Gentoo" - elog " Finally, there are minimal changes for the user." - 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 - - 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 "\thttps://wiki.gentoo.org/wiki/VDR" -} diff --git a/media-video/vdr/vdr-2.0.5.ebuild b/media-video/vdr/vdr-2.0.5.ebuild deleted file mode 100644 index a8c716bf9870..000000000000 --- a/media-video/vdr/vdr-2.0.5.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild,v 1.3 2015/02/19 19:38:49 hd_brummy 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" - -# 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="" - -IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" - -MY_PV="${PV%_p*}" -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -EXT_P="extpng-${PN}-2.0.4-gentoo-edition-v1" - -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/${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 - media-fonts/corefonts - bidi? ( dev-libs/fribidi )" - -# pull in vdr-setup to get the xml files, else menu will not work -#PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )" - -CONF_DIR=/etc/vdr -CAP_FILE=${S}/capabilities.sh -CAPS="# Capabilities of the vdr-executable for use by startscript etc." - -pkg_setup() { - use debug && append-flags -g - - PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" - - tc-export CC CXX AR -} - -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 - - # codesnippet to bring the extpng defines into 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() { - # apply maintainace-patches - - if use setup; then - eerror "media-plugins/vdr-setup" - eerror "is not supported by Upstream anymore" - eerror "we will remove this plugin in the future from gentoo portage" - eerror "please use as equivalent media-plugins/vdr-menuorg" - die - fi - - ebegin "Changing paths for gentoo" - - 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 too old for ${P}" - eerror "You cannot compile VDR against old dvb-header" - 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; parameter 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 - - # support languages, written from right to left - BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)" - - epatch "${FILESDIR}/${PN}-2.0.0_gentoo.patch" - - if ! use vanilla; then - - # Now apply extensions patch - epatch "${WORKDIR}/${EXT_P}.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:" - - # we do not support these patches - # (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 - - 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 - - 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 "einstall failed" - - keepdir "${PLUGIN_LIBDIR}" - - keepdir "${CONF_DIR}"/plugins - keepdir "${CONF_DIR}"/themes - - diropts -m0755 -ovdr -gvdr - 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() { - - # correct wrong permission from earlier install - CACHEOWNER="$(stat -c %U /var/cache/vdr)" - if [ ! ${CACHEOWNER} == vdr ]; then - chown -R vdr:vdr "${ROOT}/var/cache/vdr" - fi - - 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, one of 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 plugins which do on compile any more." - 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 build according to the FHS." - elog " Gentoo VDR still uses the standard from" - elog " Filesystem Hierarchy Standard" - elog " It is supported since beginning of VDR support" - elog " on Gentoo" - elog " Finally, there are minimal changes for the user." - 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 - - 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 "\thttps://wiki.gentoo.org/wiki/VDR" -} diff --git a/media-video/vdr/vdr-2.0.6-r2.ebuild b/media-video/vdr/vdr-2.0.6-r2.ebuild deleted file mode 100644 index 512b8eb5bce0..000000000000 --- a/media-video/vdr/vdr-2.0.6-r2.ebuild +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.6-r2.ebuild,v 1.2 2015/02/19 19:38:49 hd_brummy 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 permashift_v1 - pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg" - -# 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="" - -IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" - -MY_PV="${PV%_p*}" -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -EXT_P="extpng-${P}-gentoo-edition-v6" - -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/${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=" - permashift? ( !permashift_v1 ) - permashift_v1? ( !permashift )" - -COMMON_DEPEND="virtual/jpeg:* - sys-libs/libcap - >=media-libs/fontconfig-2.4.2 - >=media-libs/freetype-2" - -DEPEND="${COMMON_DEPEND} - >=virtual/linuxtv-dvb-headers-5.3 - sys-devel/gettext" - -RDEPEND="${COMMON_DEPEND} - dev-lang/perl - >=media-tv/gentoo-vdr-scripts-2.5 - media-fonts/corefonts - bidi? ( dev-libs/fribidi ) - systemd? ( sys-apps/systemd )" - -CONF_DIR=/etc/vdr -CAP_FILE=${S}/capabilities.sh -CAPS="# Capabilities of the vdr-executable for use by startscript etc." - -pkg_setup() { - use debug && append-flags -g - - PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" - - tc-export CC CXX AR -} - -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 - - # codesnippet to bring the extpng defines into 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() { - # apply maintainace-patches - ebegin "Changing paths for gentoo" - - 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 too old for ${P}" - eerror "You cannot compile VDR against old dvb-header" - 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; parameter 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 - - # support languages, written from right to left - BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)" - - # systemd support - use systemd && BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)" - - if ! use vanilla; then - - # Now apply extensions patch - epatch "${WORKDIR}/${EXT_P}.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:" - - # we do not support these patches - # (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 - - 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 "${FILESDIR}/${P}-r2_gentoo.patch" - - # backport from vdr-2.1.7 for better systemd support - if use vanilla; then - epatch "${FILESDIR}/${P}_systemd_argsdir_vanilla.patch" - else - epatch "${FILESDIR}/${P}_systemd_argsdir.patch" - fi - - epatch_user - - 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 - emake \ - VIDEODIR="/" \ - DESTDIR="${D}" install || die "emake install failed" - - keepdir "${PLUGIN_LIBDIR}" - - # backup for plugins they don't be able to create this dir - keepdir "${CONF_DIR}"/plugins - - 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 - - chown -R vdr:vdr "${D}/${CONF_DIR}" -} - -pkg_postinst() { - elog "It is a good idea to run vdrplugin-rebuild now." - - 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 "\thttps://wiki.gentoo.org/wiki/VDR" -} diff --git a/media-video/vdr/vdr-2.2.0.ebuild b/media-video/vdr/vdr-2.2.0.ebuild index c1fdaddd5a13..0c6dca23501d 100644 --- a/media-video/vdr/vdr-2.2.0.ebuild +++ b/media-video/vdr/vdr-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.2.0.ebuild,v 1.3 2015/02/19 20:04:40 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.2.0.ebuild,v 1.4 2015/02/20 09:53:47 hd_brummy Exp $ EAPI=5 @@ -275,19 +275,11 @@ src_install() { chown -R vdr:vdr "${D}/${CONF_DIR}" } -pkg_preinstall() { - - has_version "<${CATEGORY}/${PN}-2.2.0" - previous_less_than_2_2_0=$ -} - pkg_postinst() { - if [[ $previous_less_than_2_2_0 = 0 ]] ; then - elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n" - elog "\tA lot of thanks to Klaus Schmidinger" - elog "\tfor this nice piece of Software...\n" - fi + elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n" + elog "\tA lot of thanks to Klaus Schmidinger" + elog "\tfor this nice piece of Software...\n" elog "It is a good idea to run vdrplugin-rebuild now." |