commit: 5fae3438ab90b864e5d7c1d0361be15e8e0dfb95 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Sun Jan 18 13:02:40 2015 +0000 Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Sun Jan 18 13:02:40 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=5fae3438
bump Package-Manager: portage-2.2.15 Manifest-Sign-Key: 34C2808A --- media-video/vdr/ChangeLog | 6 + media-video/vdr/Manifest | 12 +- media-video/vdr/files/vdr-2.1.7_C++11.patch | 86 ++++++++ media-video/vdr/files/vdr-2.1.7_gentoo.patch | 70 ++++++ media-video/vdr/vdr-2.1.7.ebuild | 307 +++++++++++++++++++++++++++ 5 files changed, 477 insertions(+), 4 deletions(-) diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index d6481d4..ad83044 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*vdr-2.1.7 (18 Jan 2015) + + 18 Jan 2015; Joerg Bornkessel <[email protected]> +vdr-2.1.7.ebuild, + +files/vdr-2.1.7_C++11.patch, +files/vdr-2.1.7_gentoo.patch: + bump + 04 Jan 2015; Joerg Bornkessel <[email protected]> vdr-2.1.1.ebuild, vdr-2.1.2-r1.ebuild, vdr-2.1.3.ebuild, vdr-2.1.4.ebuild, vdr-2.1.5.ebuild, vdr-2.1.6.ebuild, vdr-2.1.6-r1.ebuild, vdr-2.1.6-r2.ebuild: diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index 995c2a5..99f2e0d 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -4,6 +4,8 @@ Hash: SHA256 AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677 AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5 AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e +AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68 +AUX vdr-2.1.7_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8 DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5 DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4 DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1 WHIRLPOOL b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e @@ -16,6 +18,7 @@ DIST vdr-2.1.3.tar.bz2 862445 SHA256 959c3243672ffd8b67da7072e7201f2b483b684fb18 DIST vdr-2.1.4.tar.bz2 862733 SHA256 a3208d6229622b089d19c238c5b78b80e7d82e0220710e8044ea8729c6931202 SHA512 269c145d8547b66ba5782aadfa9b479d2237cae674af080701d50b42c4a29872f187dea4b8c47f7326dec4958c8671fb5286131f5169b9ffa6e8ca56366a1b14 WHIRLPOOL d97ff9e91719492306ab115a484113793f34324bd5626ebdd105f2d94287465fd921eb8d92f4c35594c5145ed9bd3346164efa2fd247cbe7c83cae55de053457 DIST vdr-2.1.5.tar.bz2 869767 SHA256 e642dcaaa1a5edc3683e33c5b154c6439a1427c24dc8685f36a0bb919774a890 SHA512 3bb6192ac7d7db024838c0d4f07797f70ee4da02b14ae0effa24f3b079fea8f42be089754cbffad013dbf9d87829d20b3dee66eed390b061088487f2784c8c75 WHIRLPOOL b2a6e5742fa6212f453713dad574dc51102ccfa2b9aaa036ea53249d220404157ced8e9c20d9550184741edb5211de9286a9c3e6249c07949fab54a0b727acff DIST vdr-2.1.6.tar.bz2 872380 SHA256 232a326f9a4a609746da42a9c7ee632f394496b7e8215d71dfdcff3fcde4e145 SHA512 ce98ff6167e340ec7cd8d23012e2632f5a41fe20979359c2684771ba86458bb6b48736b34b9474f6ccb7492951c69a3849c086848c2870e8c7476941f64022df WHIRLPOOL df9159648464682841b5ed9c14a584c53e154f74084c432e6e5e94bf2b0e095c72b23e25329f582fd1e18b34c93717f1d91f7ff6c3a29887ad870021eaecc2a3 +DIST vdr-2.1.7.tar.bz2 880225 SHA256 86fcf656bc121e4cb8b92a2c06dbeda7b22dfd033ba74b9940f368e82fdbcafc SHA512 32d1a14fbbafd28870f5c30009fa9ae38ff34933ae3b6eb00029284f3c4ddc039bae563ed8381792c47006d26d6a33a19b67e29a227eac6f0ff36a7bbe9faa30 WHIRLPOOL 7a49a332f508ff2ec3597ccf4c944249f3380a5559bb5e225083376e1813280fbf2e56356d1345c2f7383ddbf81e94d1d9fe4c4604b3addb5e276a9060255f55 EBUILD vdr-2.1.1.ebuild 8500 SHA256 dd4e4100a0db15897ade0cf0b34348052dba6dcb531bce73096126a4684f159f SHA512 fee916284d4252180bdf1ee099eb0bd6d577eecb7f3a39607ae50b3f7e977393edf9b0aa4b65f9d7c7a711f61145f2cc8e44a6faa6d19812c40f8bca19f1d6c6 WHIRLPOOL ffa40b3f63ad2d697cf9297e733eb7047b6a20c39ecb7649a216dc615d090e3a13962b63231c58ea4c17b63b65e15a8e37aecb4e95261ccf2e44d2041bd5824b EBUILD vdr-2.1.2-r1.ebuild 8311 SHA256 9bb5f5f02624f885bffb29f4703d9f8fc73dfd5c1b2dbbfee510fa0e88bf0e0d SHA512 6e5cb3e1e554bb159ae693c023208a52547549e943a959c747d32a957b031c72848717556a7b99e0d3efc6c6d305b257d448d7144dac6fe544d4cbf336622b84 WHIRLPOOL ebf0a876e87b376bc81af8e8f9af05b603e873f789f5ca135977aa7feeb8e529cdbd1caf0c931218e296baccc4ebbef1dbf4bdd38ffa176657166da14ab4924b EBUILD vdr-2.1.3.ebuild 7570 SHA256 f9a7b23ec5d6d7f671dd5180ba32a3858223a0778f25f78d03a190553fbfb020 SHA512 086312ab9572b64342cc56c33178cfd2e7aa0ea961dde3c942758d9f7a821da2c03a495ec7aa8cc8a83016324f7fee0d6863aede6c5f34b104880066bc680ccc WHIRLPOOL ba1427d2e9d9539ba1791f1e381f8383bf116ac16887d8a67f3be70ecadeb29bb053a74f18be3233a415f0cd443f7885ca9348b0c0cb65cf36456f1769f07761 @@ -24,13 +27,14 @@ EBUILD vdr-2.1.5.ebuild 7616 SHA256 1ba2350f5a43fb520ab8c0bad29b59c42431b2219637 EBUILD vdr-2.1.6-r1.ebuild 7588 SHA256 aab0a8b51860d6e99bffe5490ca7ce8ed218a4368f257cd938aca70b7e78fa1a SHA512 43f8a20f215b62f27013c8b4961c1f6446fa0d42b125c54e5f60a5d903273d7328d8cc20d2c221d9ca5fa12fe745e8e867a543b2a36254ec6b1ad001353db2de WHIRLPOOL 380d1368d680b0db24a487f25e1080c67a3b9e133c700672be8a2b38b469288291abfd86735b31b1c6f99e5de346bf399bfc13e14c9ba5e11695fd55505081f1 EBUILD vdr-2.1.6-r2.ebuild 7648 SHA256 9949037814fa0636037325e94067838e6df6dce8a0dc77fd20c8abaa08ee3e5a SHA512 2f44e6d552b5da3589ca3a6144d4d2ff76a822f955023855690ea386f98cb7ff6f43a3faa470a1659338e8c43d8e2b3ccee0e915ed41738bfd8b191ea372ee58 WHIRLPOOL 5b2775f70851b4bd94e9382e8b3709e08b53c63a9fae0f64fa7f7b0038c9d4d6ba5d2a60a6e41ce34d48ef9475c56bc7eaa80fabaeb356a335c8fe57edeb50ea EBUILD vdr-2.1.6.ebuild 7616 SHA256 ca9c89b9db90646cfe89964f8f5094af9c8be19404ea3d05ba75d2283af40f6a SHA512 0ea0d208c8140cb158a98cdc8ffd0711d0bf5b2fc635f3724ee7273e735371d232ce7bd7086805b0c38bd9c3f8e04b438d28b81b76c4f6f2c6f1d2acd0cc8b33 WHIRLPOOL 5580d45a8d145e481cfb04ef338868b94398f434ff2daed0f77d347b471b1ce8ec4e35a9ef48c3f1d2368dca57074201456be22f4236bc41bf7f0442eaea38b3 -MISC ChangeLog 26231 SHA256 fb22ed04f5a84e6c07a176e1152f49e313e0d708d08b97855923290166a10c65 SHA512 3a3e0d9e565a01c5cf0aba484719c14fba9660f30fde7ec11d41d437d8b283e57e6da9d3e4b51bc4a7f8911670ce6aa932e24041d9204275222078ef67633cec WHIRLPOOL cf80d8b66e792127d094362a067263c069fc4c62abda5792c4f2d21e6c825a3acde7fe1aa264820abf26e990bb8de016813a29a5d5e24e3d09739f838db5752f +EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc WHIRLPOOL dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f +MISC ChangeLog 26402 SHA256 c75f7c5aa9bcf6c553a87e747a23ce25bac72f90f8f6a2e8281cc7c6fc59113c SHA512 45159c5e8a605a6456b1efa08bb0fb2e6e17f3a7c9cadbfdf2150cceae62540c5ec41a0ca2288089f6d92bebbc67cb9c43d354ccc6ea040c61d167d6c9905565 WHIRLPOOL 8a77b2548e5af3dd2c4ec400565dc7697b38e663f0ee5de6899adcc5c6e006c5d0bdda5e679378d72081406733a8eaf1372b17518386a565c4db4d2494511b72 MISC metadata.xml 2071 SHA256 d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56 WHIRLPOOL e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: added by [email protected] -iD8DBQFUqJYGdn07HTTCgIoRCNNJAKCoiQ6xVE9Ihi4jcIH8U66KZoUWjwCfQnQU -omvfJ8eIm/KOjeCxX9ADc5M= -=1nz/ +iD8DBQFUu67wdn07HTTCgIoRCF9bAKC9C3C0GwTNLucBMXq8f+m3xqNFTQCfZDiM +MRgsJAAEi90v6lEweE1tMLc= +=N2bC -----END PGP SIGNATURE----- diff --git a/media-video/vdr/files/vdr-2.1.7_C++11.patch b/media-video/vdr/files/vdr-2.1.7_C++11.patch new file mode 100644 index 0000000..6746968 --- /dev/null +++ b/media-video/vdr/files/vdr-2.1.7_C++11.patch @@ -0,0 +1,86 @@ +Invalid suffix on Literal with GCC 4.8 and C++11 +warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] + +Signed-of-by: Joerg Bornkessel <[email protected]> Jan/18/2015 + +diff -Naur vdr-2.1.7.orig/dvbsubtitle.c vdr-2.1.7/dvbsubtitle.c +--- vdr-2.1.7.orig/dvbsubtitle.c 2015-01-18 12:52:48.949414301 +0100 ++++ vdr-2.1.7/dvbsubtitle.c 2015-01-18 13:04:01.889448784 +0100 +@@ -1042,7 +1042,7 @@ + default: dbgpages("unknown page state: %d<br>\n", pageState); + } + bs.SkipBits(2); // reserved +- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState); ++ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState); + regionRefs.Clear(); + while (!bs.IsEOF()) + regionRefs.Add(new cSubtitleRegionRef(bs)); +@@ -1073,7 +1073,7 @@ + default: dbgpages("unknown page state: %d<br>\n", pageState); + } + bs.SkipBits(6); +- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState); ++ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState); + regionRefs.Clear(); + pending = true; + } +@@ -1384,7 +1384,7 @@ + if (Length > PayloadOffset + SubstreamHeaderLength) { + int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1; + if (pts >= 0) +- dbgconverter("converter PTS: %"PRId64"<br>\n", pts); ++ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts); + const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header + int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header + if (ResetSubtitleAssembler) +@@ -1420,7 +1420,7 @@ + if (Length > PayloadOffset) { + int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1; + if (pts >= 0) +- dbgconverter("converter PTS: %"PRId64"<br>\n", pts); ++ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts); + const uchar *data = Data + PayloadOffset; + int length = Length - PayloadOffset; + if (length > 0) { +@@ -1488,7 +1488,7 @@ + dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count()); + sb->Draw(osd); + Timeout.Set(sb->Timeout() * 1000); +- dbgconverter("PTS: %"PRId64" STC: %"PRId64" (%"PRId64") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout()); ++ dbgconverter("PTS: %" PRId64 " STC: %" PRId64 " (%" PRId64 ") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout()); + } + } + else +diff -Naur vdr-2.1.7.orig/recording.c vdr-2.1.7/recording.c +--- vdr-2.1.7.orig/recording.c 2015-01-18 12:52:48.956080968 +0100 ++++ vdr-2.1.7/recording.c 2015-01-18 13:05:42.346120598 +0100 +@@ -1749,7 +1749,7 @@ + off_t FileSizeSrc = FileSize(FileNameSrc); + off_t FileSizeDst = FileSize(FileNameDst); + if (FileSizeSrc != FileSizeDst) { +- esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst); ++ esyslog("ERROR: file size discrepancy: %" PRId64 " != %" PRId64, FileSizeSrc, FileSizeDst); + break; + } + } +@@ -2476,7 +2476,7 @@ + delta = int(buf.st_size % sizeof(tIndexTs)); + if (delta) { + delta = sizeof(tIndexTs) - delta; +- esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, *fileName); ++ esyslog("ERROR: invalid file size (%" PRId64 ") in '%s'", buf.st_size, *fileName); + } + last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1); + if ((!Record || Update) && last >= 0) { +diff -Naur vdr-2.1.7.orig/remote.c vdr-2.1.7/remote.c +--- vdr-2.1.7.orig/remote.c 2015-01-18 12:52:48.949414301 +0100 ++++ vdr-2.1.7/remote.c 2015-01-18 13:06:40.752790258 +0100 +@@ -124,7 +124,7 @@ + bool cRemote::Put(uint64_t Code, bool Repeat, bool Release) + { + char buffer[32]; +- snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code); ++ snprintf(buffer, sizeof(buffer), "%016" PRIX64, Code); + return Put(buffer, Repeat, Release); + } + diff --git a/media-video/vdr/files/vdr-2.1.7_gentoo.patch b/media-video/vdr/files/vdr-2.1.7_gentoo.patch new file mode 100644 index 0000000..37ffd3c --- /dev/null +++ b/media-video/vdr/files/vdr-2.1.7_gentoo.patch @@ -0,0 +1,70 @@ +diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile +--- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100 ++++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100 +@@ -116,7 +116,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: + +@@ -170,7 +170,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 +@@ -193,7 +193,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): + +@@ -255,7 +255,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: + +@@ -267,12 +267,13 @@ + + install-dirs: + @mkdir -p $(DESTDIR)$(VIDEODIR) +- @mkdir -p $(DESTDIR)$(CONFDIR) +- @mkdir -p $(DESTDIR)$(ARGSDIR) +- @mkdir -p $(DESTDIR)$(CACHEDIR) ++# @mkdir -p $(DESTDIR)$(CONFDIR) ++# @mkdir -p $(DESTDIR)$(ARGSDIR) ++# @mkdir -p $(DESTDIR)$(CACHEDIR) + @mkdir -p $(DESTDIR)$(RESDIR) + + install-conf: ++ @mkdir -p $(DESTDIR)$(CONFDIR) + @cp -pn *.conf $(DESTDIR)$(CONFDIR) + + # Documentation: +@@ -299,8 +300,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/vdr-2.1.7.ebuild b/media-video/vdr/vdr-2.1.7.ebuild new file mode 100644 index 0000000..8ddd95a --- /dev/null +++ b/media-video/vdr/vdr-2.1.7.ebuild @@ -0,0 +1,307 @@ +# 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.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $ + +EAPI=5 + +inherit eutils flag-o-matic multilib toolchain-funcs + +# Switches supported by extensions-patch +EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift + permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg" +# ddepgentry + +# 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-${PN}-2.1.6-gentoo-edition-v2" + +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=" + 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_rc1 + 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 + BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)" + + epatch "${FILESDIR}/${P}_gentoo.patch" + epatch "${FILESDIR}/${P}_C++11.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 + + 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" + + 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 + emake \ + VIDEODIR="/" \ + DESTDIR="${D}" install || die "emake install failed" + + keepdir "${PLUGIN_LIBDIR}" + + keepdir "${CONF_DIR}"/plugins + keepdir "${CONF_DIR}"/themes + keepdir "${CONF_DIR}"/conf.d + + 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_preinst() { + +# example syntax... +# 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." + + # 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 + +# example syntax +# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then + #elog "bla foo" +# fi + + 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"; +}
