[gentoo-commits] proj/vdr/devel:master commit in: media-plugins/vdr-softhddevice/

[Joerg Bornkessel]

commit:     f7386ccc4c82c827ee8015cdf92dcce64f07e6ac
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 11 15:15:33 2015 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 15:15:33 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=f7386ccc

compilefix vdr-2.1.10

Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A

---
 media-plugins/vdr-softhddevice/ChangeLog                       |  4 ++++
 media-plugins/vdr-softhddevice/Manifest                        | 10 +++++-----
 .../vdr-softhddevice/vdr-softhddevice-0.6.0_p20140923.ebuild   | 10 +++++-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/media-plugins/vdr-softhddevice/ChangeLog 
b/media-plugins/vdr-softhddevice/ChangeLog
index 0a96caa..78511bb 100644
--- a/media-plugins/vdr-softhddevice/ChangeLog
+++ b/media-plugins/vdr-softhddevice/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Feb 2015; Joerg Bornkessel <hd_bru...@gentoo.org>
+  vdr-softhddevice-0.6.0_p20140923.ebuild:
+  compilefix vdr-2.1.10
+
   15 Jan 2015; Joerg Bornkessel <hd_bru...@gentoo.org>
   vdr-softhddevice-0.6.0_p20140923.ebuild, vdr-softhddevice-9999.ebuild:
   fixed build param for media-libs/libav

diff --git a/media-plugins/vdr-softhddevice/Manifest 
b/media-plugins/vdr-softhddevice/Manifest
index 9b978a1..d021af7 100644
--- a/media-plugins/vdr-softhddevice/Manifest
+++ b/media-plugins/vdr-softhddevice/Manifest
@@ -14,15 +14,15 @@ DIST vdr-plugin-softhddevice-a3c0052c.tar.bz2 139540 SHA256 
a6b51fc1956c5f6a3e7d
 DIST vdr-softhddevice-0.6.0.tgz 179360 SHA256 
357c80c850d4289c5080a6264f91cc71a333ca118c5999de8911a0284247eeea SHA512 
f2d99d3c5e96364603545118c618a66544af910f821e982c64441972e322ca6bc0a341222b0342a950094cf1e4a2368630fc89f3d0dd37c2878187c8cd0edde8
 WHIRLPOOL 
8f23d1fe844fcf3112b53b5445a15f4607ce55c5ad897181284041689400298da80e658d87b3252ad47af1403259851f41420b595ba7c4f844f8aea84e86ebeb
 EBUILD vdr-softhddevice-0.6.0.ebuild 1343 SHA256 
8758429bdaa1d5cc66f9b1af0e7030e31169fa1a6b5f30f64b756e07b4596a1e SHA512 
9486686e4a742be54e83a9c0b1ecd5182f56b1ec4c2a2ef2ffaf117406fdeb22b9cc7aab7cff87279049b12565d806044745387d310ea00c0a928c0c2b8a8838
 WHIRLPOOL 
147ff88039743d0bd27e539db887c888bf08719fad25ebf708a94a4c49341570987e2ebda7f9a4332a4a3458177117f5aaae32126e59c1e40dc4f9be679b48c4
 EBUILD vdr-softhddevice-0.6.0_p20140108.ebuild 1807 SHA256 
07cefc8bf948e34d3a96d382908789290150e91790a28cf3b6a76e9f17d0bc89 SHA512 
20897886fef274b36d17b4173cdb3d4d219a7ebebd2853d12eb82781786c02db225d8c1dbfab010c5207e29f97431d6d93229e210f9a0644c882812b2b288645
 WHIRLPOOL 
70d1ded6c7bb344aaaac7780fdbe1fb368bd82f44eea7ac2b2c7609a35d36308a417674429e7d06d376ec3ccc774de39a303f24b4e436b7815b159446807d6a5
-EBUILD vdr-softhddevice-0.6.0_p20140923.ebuild 1861 SHA256 
21eacfd86311e528f5f41297763f786a736c8809eb07e858fd9123c74b6bc192 SHA512 
5cf2584cd9bea15688bd8d3fb4ca58fcb5dfd1b0c68efcfc072be04d4fec1843040b4489d27bddb028f6e0a231c3d51a0e5795d6b3ad79f3d53831887b14e7d7
 WHIRLPOOL 
1821454dc9a86f82c8b3f7b746dd637279fb586de633d2bfef2aac28068f427f674b2429c2e265deff2fd8d0e9f8dff67982f9415356fcc177ee7469d6b7b088
+EBUILD vdr-softhddevice-0.6.0_p20140923.ebuild 2000 SHA256 
b8074f0d5365b910d4941bc7bead67ad10e72879a1c398fa4e80bd8ee102c31e SHA512 
29e892ece0d1ffcc0c33ccf679e478eb11f2473b981d3889d75c7f202a747adfd244c09471c26c058cc966d4816fb17adc11feccde1a52d273a7c36a2c03ecc7
 WHIRLPOOL 
670f78724614b3bb23b7a5a629b783544457bcae081e03d2bde1ef8e1841ee1f067f0a5f73ef18a8361ff9ba2acf466bf6c9a32d7caf33373e24e3ce2c2dddce
 EBUILD vdr-softhddevice-9999.ebuild 1715 SHA256 
c43b7708cd699bb8469bd4014bfaac3cb4ac182e6fa271767d4fb1b20e03d848 SHA512 
79f21859974d26a5dac199d12989c12b68591eeb1d490d673b44564806c9593d7bd10bac4cad2807cf7578484ea5523a596b3bb51d79bbafc7882aa1dcb7f60f
 WHIRLPOOL 
392e2f04ca46fbd193fc14f3279b3948160b0c2adc01d4cb9510e7021f604313acee9b2b5c9f1578f6a8013e9cd50b1e80a7e188a65dceeaab37c9a260507b9c
-MISC ChangeLog 2774 SHA256 
22c0dd2be8820416f9ef54afde93b71d4e20d3e373e8a23edc257ee681e7f749 SHA512 
16e853da5f6b37aa3510b30e6ecf22539e40a82627b079c263774ed4e88b42ce40889a5504ad188bfc3e4fab9a63ad089d8eeb1856df7b7d3996333389d10842
 WHIRLPOOL 
64de4e112626c008dc9792a656552ab6d77aeb1059bb347c50fb9403db7fc6e2b384ce84cf460af56edb3b7d271b47e98d627c90a26d3e0511f1ea59c0247135
+MISC ChangeLog 2897 SHA256 
2d63ea6a6a2b28444f9d29ddb567a5a6b0356d5de4a000d155bd93a4c918ed07 SHA512 
cfb5cf8bf4537b1934d572ac0311a05f3aca45b13e9478e6a370ac17d5a05cdbf095fa902393e10f427b8d9f5f7c4ad813c484b6f1d5f9f5ddefcca08d33d25c
 WHIRLPOOL 
2a372938a9e75e84287f6a18017345d9b6a31b1ad164c6f91b7705480a3d03bc745baefc58c6e75da5f86e7b477833eed21b6c05a5ae5e17b5f652b57782b4c0
 MISC metadata.xml 588 SHA256 
7412202ca0a7e2c1984715a40e3e0b09828205cc32a1fb98eb7c0831469b7580 SHA512 
18dc19d2261a6fce90841fbafa15130638e4e20979127a5a9346cd05d17dc5771c76f11c5fa12e4876e6f8a010e01a24883d680f22210fb59da9c7cd6bf769fb
 WHIRLPOOL 
9abc9b6389faea0c0690ea06448c472a9be8e040e637716b8d8111a35dfffe3fb24fe81f7909b3e9d3d61b7a59deea715d37ec98bb5dc0c9efdb09e9a9a365b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_bru...@gentoo.org
 
-iD8DBQFUuBAedn07HTTCgIoRCNNhAKC0oqi7E9oh0ebj+DWF/K/nnCDaHgCfeohT
-Sg9dpQFsQganRy8CD1QbO5M=
-=WR8G
+iD8DBQFU23IUdn07HTTCgIoRCKNMAJ0S2yrdSVZO0XZEjWhkCkjGFHkvTQCdH7ll
+KIr1SPRnY6+2AXXbl9Sk+ls=
+=C7SF
 -----END PGP SIGNATURE-----

diff --git 
a/media-plugins/vdr-softhddevice/vdr-softhddevice-0.6.0_p20140923.ebuild 
b/media-plugins/vdr-softhddevice/vdr-softhddevice-0.6.0_p20140923.ebuild
index ecd52f8..825d959 100644
--- a/media-plugins/vdr-softhddevice/vdr-softhddevice-0.6.0_p20140923.ebuild
+++ b/media-plugins/vdr-softhddevice/vdr-softhddevice-0.6.0_p20140923.ebuild
@@ -68,10 +68,10 @@ src_prepare() {
        if has_version ">=media-video/libav-0.8"; then
                BUILD_PARAMS+=" AVRESAMPLE=1"
        fi
-}
-
-src_install() {
-       vdr-plugin-2_src_install
 
-       dodoc ChangeLog Todo
+       if has_version ">=media-video/vdr-2.1.10"; then
+               sed -e "s:pm = RenderPixmaps():pm = dynamic_cast<cPixmapMemory 
*>(RenderPixmaps()):"\
+                       -e "s:delete pm;:DestroyPixmap(pm);:"\
+                       -i softhddevice.cpp
+       fi
 }