diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-10-26 13:01:20 +0000 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2013-10-26 13:01:20 +0000 |
| commit | 8309cd6f52d8e76e98502ef9bdb136efc8aae23b (patch) | |
| tree | 0f535428f6f149e217860e7be493266a170d31c5 /media-plugins | |
| parent | Adapt upstream patch from master to let terminal plugin work again (diff) | |
| download | historical-8309cd6f52d8e76e98502ef9bdb136efc8aae23b.tar.gz historical-8309cd6f52d8e76e98502ef9bdb136efc8aae23b.tar.bz2 historical-8309cd6f52d8e76e98502ef9bdb136efc8aae23b.zip | |
compile fix >=vdr-2.1.2
Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A
Diffstat (limited to 'media-plugins')
4 files changed, 47 insertions, 4 deletions
diff --git a/media-plugins/vdr-vdrmanager/ChangeLog b/media-plugins/vdr-vdrmanager/ChangeLog index d41e4b035a8c..cacfcd6768a3 100644 --- a/media-plugins/vdr-vdrmanager/ChangeLog +++ b/media-plugins/vdr-vdrmanager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-vdrmanager # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/ChangeLog,v 1.8 2013/03/31 16:25:38 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/ChangeLog,v 1.9 2013/10/26 13:01:10 hd_brummy Exp $ + + 26 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-vdrmanager-0.9.ebuild, +files/vdr-vdrmanager-0.9_vdr-2.1.2.diff: + compile fix >=vdr-2.1.2 *vdr-vdrmanager-0.9 (31 Mar 2013) diff --git a/media-plugins/vdr-vdrmanager/Manifest b/media-plugins/vdr-vdrmanager/Manifest index 804519d7fdec..4626a0659f88 100644 --- a/media-plugins/vdr-vdrmanager/Manifest +++ b/media-plugins/vdr-vdrmanager/Manifest @@ -1,8 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX confd 718 SHA256 fee20b480faa68d59c35e2d26bcdd582ca464f29465eab6d8009262d5859ac5c SHA512 5afdd3064651971a1abaf36712cb4477feaf54cd7a5d732d7c7b65a51274a5759d6e4c2dc469f2bc2a8aa505703c3e7235315b84ba9ff891647520fa3ff9fae5 WHIRLPOOL f8af1431214116d837c04bdb8141c4e676ed5cb188d667fd9100de8108f4a793f0bd193d9c7342e892d4dd2fc1759bbd4292a665e4580911480628ca4e1cc40e AUX rc-addon.sh 546 SHA256 591b4ffa6f86b813e084a3dba38df0cac88480b3e0d801361cb6b8ceb99b18d9 SHA512 591d549975807d416dd19449299590b979b1cf17082726c3d754aac3afccc51e254e935c63e1cc5e595a99698660cf1115f0a7cf3c69ca046ea632c4de13363c WHIRLPOOL 8483eced499e6f4a057c4351c657c0189ae68979f8e2e1a8c3936b916872be90bc15af520196b54fe4ecf87245b246ae0675dadf6821c25416905ec9aa60827a +AUX vdr-vdrmanager-0.9_vdr-2.1.2.diff 1084 SHA256 53df16c52608ef27a0aa81b9b9d1d9a8177c0bad252a0b9cfe15c177e6a095b3 SHA512 92a6f8e6c0fe20f3de10ec33c192afe00dc8bbc6879b12a0fc44546f1e5d5d68d344691829f5610f3178b068b8d7786a7a026ba506205015b6e4cda8b27b02ff WHIRLPOOL cb72d5491e7c91c097aaef40ca3058e11dc5457f306ab8564869fe73577b36ffd86cc1f9d7ea555962afa07a6002018c258dc269893940bb14930d557726288a DIST vdr-vdrmanager-0.8.tar.gz 33535 SHA256 3ab87199e1e931851e85ad3fa23f7f9faccffe529055bd845abd2999f34d4204 SHA512 a185a283e6f1bfd8917223d783eb7399e477bc572fe5a33cf51774498902a3a220f587190c345724585dee9c3fb9f0ffc709c48a8506979dc2739f89771bc091 WHIRLPOOL beeee169e4db8e1bdddfc02202df9af71717179a8b6bafd01c46b5db7286f5a3ff80df69133d1e62d392f9f7b1dcbc45010bfac0c05f9206eb8e4d657f3cb03a DIST vdr-vdrmanager-0.9.tar.gz 25201 SHA256 67a27059d6a92e75a78225189dc0bbdc7fd0fa75846293657f59f0ac70022e0b SHA512 6deaafeb63f820eaeb418b37ad66c69588f46c5bdb76191c60ce5d320ea230a1cf0e0c6b18463974b54d5ffe5206ecdce61ca23350c7df716b8016b34dc52238 WHIRLPOOL ed1e8f78d1706a76ca911d94235f299df238e89ce687e5da158f42a6a51b35f62e2df3802061846d666dfc42d766bca5954d49a9b930a1385d788881d63f16fa EBUILD vdr-vdrmanager-0.8.ebuild 824 SHA256 c44e121e5736f93b92637ec00f1cc85b980551be008add4f5f111d26249ea86d SHA512 87b2deaf5156299a0f6f129478739bc3113051e2b4283beede4816bb83660d521b2376d80573b7e3003ab9f9b35194aa692ca6815f41f575e81ed0b4ab8dec0d WHIRLPOOL 53027e3d732c1c0fee962e27f2eaab65f71da16d865d52e089fedea71545dcd9e88edb70b3ca464b26f923d836b5d070e45616136298afb94025bb9e42cb4edd -EBUILD vdr-vdrmanager-0.9.ebuild 825 SHA256 c7b775ea6310265e2499feb6798dbcffd8dc9295f98a6b36b9182daf4ea48c6d SHA512 f12961f85177cabe298c2b1a3b9815fad602742be6e61a488535573758c801439c0f87600d13e53cf48f38bbe69bad5c32bdab3e6ddc84b53d90a30ec63dd6c4 WHIRLPOOL ed9622c0c29b83129334f92b42b645bcf00054af1a9eaac01a6d7e88ee5dd71b37a6c04e05387437dfcfed8098bdb03fd135bceb8a0ca7ab837ece081b008c5c -MISC ChangeLog 1979 SHA256 d455ad6ef58cd0e4d213d757110153f83003e0c31be28d99c3f10fcdb0466a4a SHA512 a89ac8f1e9ceac9ee1b9af4e878594fec7bacd2034d8f8a1a815daab76ae0ec1e77c449b0887d8803bff56d6649e37be17beb91da1f8953838d9c289b861e0b2 WHIRLPOOL b64666530c5981f3d83417133e67bf827fec33d8225f54e7f11f2008552a4f330a6767b90461dd0a20b65cf0408fde1f660b201d18546a1b4f5beda03350f925 +EBUILD vdr-vdrmanager-0.9.ebuild 872 SHA256 23e6732db8be71885aa004be063fa79d0da3d587f56492b80ab20dc5882617e4 SHA512 28bac4455bda721bef31808906141983107ad63c999c3a2377f33aa683803171307f1254ec086c312874f4aa4f010c06de4457921a2ea1b1db1b1e905e25ed23 WHIRLPOOL 6fab40fb375ef42e08d7dcae9d9067b3c5fa05dd2b4182144c5c756a4015a4468870fbd30d10d86a0f35693a7f1b301a042af937228d5248432201576d9a4afb +MISC ChangeLog 2132 SHA256 604607b329604d43d3670bb7e65c07c214b8e8f2d99b53f825a06e44a3c048d8 SHA512 4961bdb690417222fd52a470073daa57e20f0ab0e29ad7acde1679a4c3dfa361fac5d407dedc64c20432062868fd47f104deac8c88fbfd90b4812ce46f89e7dd WHIRLPOOL c03cd27d888ebaa23747ca2fc51624578fe8a859fd3f2acc38f08463c01c2c608b871db941566cc6de795fbbfbb76d9a6f829e46f17fbd9c040301b344bfb974 MISC metadata.xml 352 SHA256 612bcc6151d03134e6c1259c77c8223b8e3503985089e6eddf8f9d28d4d7f092 SHA512 3efae187632d0d1913c7de149e53e7da0e725131204bf204295287b9b57b369aaafff27ee4c5462b67b5c85a329134d511ea60e6cd0a01ab449d200812a26622 WHIRLPOOL 2d18c55f7ae2807168ee1699e3aa592369b6c47f360ab7132340484a8bf9f114184a603ccc5dfcd426f11e36b310c060368cd7389286dbc2fc9daea4d015defc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: signed/commited by hd_brummy@gentoo.org + +iD8DBQFSa70ddn07HTTCgIoRCAydAJwOTe2DpWvAcGHRLOTZXheZo4pMAgCfUSrM +JaPG3GxxDp4Qd8Koi3kBaxE= +=a1mo +-----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff b/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff new file mode 100644 index 000000000000..86af18e108b8 --- /dev/null +++ b/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff @@ -0,0 +1,25 @@ +diff -Naur vdr-vdrmanager-0.9.orig/helpers.cpp vdr-vdrmanager-0.9/helpers.cpp +--- vdr-vdrmanager-0.9.orig/helpers.cpp 2013-10-26 11:11:37.000000000 +0200 ++++ vdr-vdrmanager-0.9/helpers.cpp 2013-10-26 11:20:59.000000000 +0200 +@@ -272,12 +272,21 @@ + + cString FileName = recording->FileName(); + ++#if VDRVERSNUM > 20101 ++ if (RecordingsHandler.GetUsage(FileName)) { ++ RecordingsHandler.Del(FileName); ++ recording = Recordings.GetByName(FileName); // RecordingsHandler.Del() might have deleted it if it was the edited version ++ // we continue with the code below even if recording is NULL, ++ // in order to have the menu updated etc. ++ } ++#else + if (cCutter::Active(recording->FileName())) { + cCutter::Stop(); + recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version + // we continue with the code below even if recording is NULL, + // in order to have the menu updated etc. + } ++#endif + + if (cReplayControl::NowReplaying() + && strcmp(cReplayControl::NowReplaying(), FileName) == 0) { diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild index 8526ac3fab34..7e9205b66b9f 100644 --- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild +++ b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild,v 1.1 2013/03/31 16:25:38 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.9.ebuild,v 1.2 2013/10/26 13:01:10 hd_brummy Exp $ EAPI="5" @@ -22,6 +22,8 @@ RDEPEND="stream? ( media-plugins/vdr-streamdev[server] )" S="${WORKDIR}/${P}" +PATCHES=( "${FILESDIR}/${P}_vdr-2.1.2.diff" ) + pkg_postinst() { vdr-plugin-2_pkg_postinst |