diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2007-07-05 07:02:10 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-07-05 07:02:10 +0000 |
commit | e3e2e48d3d76317a54f569dcbfdf7efec195488d (patch) | |
tree | fd451c87d7e6f9a7c2a3186c77549de1389bd0c4 | |
parent | Change setup.py to use setuptools setup (diff) | |
download | historical-e3e2e48d3d76317a54f569dcbfdf7efec195488d.tar.gz historical-e3e2e48d3d76317a54f569dcbfdf7efec195488d.tar.bz2 historical-e3e2e48d3d76317a54f569dcbfdf7efec195488d.zip |
Added vdr-1.5 patch from Thomas Günther.
Package-Manager: portage-2.1.3_rc6
5 files changed, 133 insertions, 10 deletions
diff --git a/media-plugins/vdr-prefermenu/ChangeLog b/media-plugins/vdr-prefermenu/ChangeLog index ae93d3bde4bb..9df65d18a4b1 100644 --- a/media-plugins/vdr-prefermenu/ChangeLog +++ b/media-plugins/vdr-prefermenu/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-prefermenu -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.5 2006/10/30 15:17:52 zzam Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.6 2007/07/05 07:02:10 zzam Exp $ + +*vdr-prefermenu-0.6.6-r1 (05 Jul 2007) + + 05 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/vdr-prefermenu-0.6.6-no-static-getfont.diff, + +vdr-prefermenu-0.6.6-r1.ebuild: + Added vdr-1.5 patch from Thomas Günther. 30 Oct 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-prefermenu-0.6.6.ebuild: diff --git a/media-plugins/vdr-prefermenu/Manifest b/media-plugins/vdr-prefermenu/Manifest index 9257bcc03208..cfea2b0cc8fa 100644 --- a/media-plugins/vdr-prefermenu/Manifest +++ b/media-plugins/vdr-prefermenu/Manifest @@ -5,20 +5,28 @@ AUX vdr-prefermenu-0.6.4-includes.diff 1178 RMD160 8cf84f8c59beb6690877264a36c83 MD5 d07cdd1e1b75bac442cdde0d738e28e8 files/vdr-prefermenu-0.6.4-includes.diff 1178 RMD160 8cf84f8c59beb6690877264a36c833fbccc60814 files/vdr-prefermenu-0.6.4-includes.diff 1178 SHA256 5f5d0d9a7a6b13fe51f7eb05b1f7dc0a856627ebc51ea95b8650434dc83c8a77 files/vdr-prefermenu-0.6.4-includes.diff 1178 +AUX vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 RMD160 8629f146f049229355828c2ae97a74d2aa64b94a SHA1 5da28fc1cc82592cb0ae6b914dcc163ab56f3c09 SHA256 80b931797c7f967beb713661d958748d376b7271b306756a06c066abfe2bd8b2 +MD5 c72c2132670d73a0a61e867e81ecfbdd files/vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 +RMD160 8629f146f049229355828c2ae97a74d2aa64b94a files/vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 +SHA256 80b931797c7f967beb713661d958748d376b7271b306756a06c066abfe2bd8b2 files/vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 DIST vdr-prefermenu-0.6.4.tgz 19642 RMD160 7eef5b4e4e5d6f49f5551e0dfdb462e7e0026aeb SHA1 189f9b39c00c2edde81bcb144a78d222d629fae2 SHA256 83b212684c24e3be5f5555baad2ec081a42e02f801c842d56d99e736de6324ae DIST vdr-prefermenu-0.6.6.tgz 19617 RMD160 48d3153e8898cdebf21d74f936e833cc233dcc94 SHA1 5cb46329a57503f6ccb20cc6258842dbd71bb9c2 SHA256 0b9338d1fff19e5ccf1f4e9f352e7bdf5b4f5e129007aa147d7ee4ab1034a6e8 EBUILD vdr-prefermenu-0.6.4.ebuild 781 RMD160 0c174a04875b273903b6f743328e839ae3941015 SHA1 e597bbf360e48a62a39d0003a416db0951c89a7f SHA256 90d613a019b2c81c7b2714082fa189102ea6a710254858c9ebb8636d43bcff50 MD5 ba9cd8fdcc76c5737101e19e5ef6532c vdr-prefermenu-0.6.4.ebuild 781 RMD160 0c174a04875b273903b6f743328e839ae3941015 vdr-prefermenu-0.6.4.ebuild 781 SHA256 90d613a019b2c81c7b2714082fa189102ea6a710254858c9ebb8636d43bcff50 vdr-prefermenu-0.6.4.ebuild 781 +EBUILD vdr-prefermenu-0.6.6-r1.ebuild 794 RMD160 d7d758152f7a2bd0baf9a078361720971f8c37f4 SHA1 8f2d5a8e645918752023e0c8d928909ae05bd8c1 SHA256 1fbd5d4772637fa001dfcfcf6c78fecf6ce669bcb3e1fc0e40a80162194c4a1e +MD5 82fb34c1f8c05c7c25e871235b279cf9 vdr-prefermenu-0.6.6-r1.ebuild 794 +RMD160 d7d758152f7a2bd0baf9a078361720971f8c37f4 vdr-prefermenu-0.6.6-r1.ebuild 794 +SHA256 1fbd5d4772637fa001dfcfcf6c78fecf6ce669bcb3e1fc0e40a80162194c4a1e vdr-prefermenu-0.6.6-r1.ebuild 794 EBUILD vdr-prefermenu-0.6.6.ebuild 740 RMD160 66c44b2606fbdf3d5a46707d88b54bbdc56f5ad7 SHA1 cdf9be7a65e10fa415d1c9ffec6b0079903fc465 SHA256 1f3a4528331557c8bba5aa5e78408f71cebe0a9d09ca1861ebeee7b15488c8a3 MD5 e82831683e9046d70452731bc8eda094 vdr-prefermenu-0.6.6.ebuild 740 RMD160 66c44b2606fbdf3d5a46707d88b54bbdc56f5ad7 vdr-prefermenu-0.6.6.ebuild 740 SHA256 1f3a4528331557c8bba5aa5e78408f71cebe0a9d09ca1861ebeee7b15488c8a3 vdr-prefermenu-0.6.6.ebuild 740 -MISC ChangeLog 903 RMD160 9404ebfb7eab29610afebfbc575cba51d55d0a53 SHA1 bb254faf0624927c5046223c4de3326404a6d321 SHA256 24c86313c66d427dffb1a7783f423e59b7c6d7e8be6841d369f65da6dc73678e -MD5 a46f4282166165e564be2d76496700c0 ChangeLog 903 -RMD160 9404ebfb7eab29610afebfbc575cba51d55d0a53 ChangeLog 903 -SHA256 24c86313c66d427dffb1a7783f423e59b7c6d7e8be6841d369f65da6dc73678e ChangeLog 903 +MISC ChangeLog 1130 RMD160 82712bde797408b0a0970df342a855cade90960d SHA1 a389e692d452ca56c1bce1a45a1f5c438e7f7c66 SHA256 6e417fa9984ac8155bc55926dec8288cd0106afc74a52161cdacc3e94b7cffe5 +MD5 bc925ea93447a3859bed92e4a79d6037 ChangeLog 1130 +RMD160 82712bde797408b0a0970df342a855cade90960d ChangeLog 1130 +SHA256 6e417fa9984ac8155bc55926dec8288cd0106afc74a52161cdacc3e94b7cffe5 ChangeLog 1130 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298 @@ -29,10 +37,13 @@ SHA256 c5f8f5e69ccbad27d16d0985c02c7fc8a794613ddd86b5e5297bfa61b73f9b98 files/di MD5 78158ed2f669c65c4b737967b7de7a32 files/digest-vdr-prefermenu-0.6.6 250 RMD160 1f697e07ec85b55884221ec7a2305ef946586756 files/digest-vdr-prefermenu-0.6.6 250 SHA256 2c0ed084a3857e6fb6e3ef6f2bf272a07dbd944adaeb4ef309d4078cb1eac493 files/digest-vdr-prefermenu-0.6.6 250 +MD5 78158ed2f669c65c4b737967b7de7a32 files/digest-vdr-prefermenu-0.6.6-r1 250 +RMD160 1f697e07ec85b55884221ec7a2305ef946586756 files/digest-vdr-prefermenu-0.6.6-r1 250 +SHA256 2c0ed084a3857e6fb6e3ef6f2bf272a07dbd944adaeb4ef309d4078cb1eac493 files/digest-vdr-prefermenu-0.6.6-r1 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFFRhent2vP6XvVdOcRApZqAKC9fda7rx16xdIza7VzZsP7cOaI1QCgmzmQ -JUl2LpZmi4YAYRTWLvzdVME= -=KlGB +iD8DBQFGjJd+t2vP6XvVdOcRAjp8AKC8Q4FRMZiUldJT7aRNGe3yi8G/XwCcChpz +zmAWdoTlBe2NZHjtdmCvVok= +=Jb3D -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-prefermenu/files/digest-vdr-prefermenu-0.6.6-r1 b/media-plugins/vdr-prefermenu/files/digest-vdr-prefermenu-0.6.6-r1 new file mode 100644 index 000000000000..84a772aa114e --- /dev/null +++ b/media-plugins/vdr-prefermenu/files/digest-vdr-prefermenu-0.6.6-r1 @@ -0,0 +1,3 @@ +MD5 fee6d1b3c08488bb2f63da85aa264aae vdr-prefermenu-0.6.6.tgz 19617 +RMD160 48d3153e8898cdebf21d74f936e833cc233dcc94 vdr-prefermenu-0.6.6.tgz 19617 +SHA256 0b9338d1fff19e5ccf1f4e9f352e7bdf5b4f5e129007aa147d7ee4ab1034a6e8 vdr-prefermenu-0.6.6.tgz 19617 diff --git a/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff b/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff new file mode 100644 index 000000000000..0c0239d2ac48 --- /dev/null +++ b/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff @@ -0,0 +1,73 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 90_prefermenu-0.6.6-1.5.3.dpatch by Thomas G�nther <tom@toms-cafe.de> +## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3.diff +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.5.3. + +@DPATCH@ +--- prefermenu-0.6.6/prefermenu.c ++++ prefermenu-0.6.6/prefermenu.c +@@ -75,6 +75,7 @@ + } + // Clean up the file with current VDR channels.conf + PreferedChannelsList.Save(); ++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); + config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE; + return new cPreferOsd; + } +--- prefermenu-0.6.6/preferosd.c ++++ prefermenu-0.6.6/preferosd.c +@@ -60,6 +60,7 @@ + } + osd=cOsdProvider::NewOsd(config.originx, config.originy); + if (osd) { ++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); + tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4}; + osd->SetAreas(&Area, 1); + DrawPreferMenu(0,0); +@@ -168,6 +169,7 @@ + { + if (current > 1) { + current -= 1; ++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); + DrawPreferMenu(-LINEHEIGHT,1); + DisplayPreferMenu(); + //DrawPreferMneu(-10,1); +@@ -181,6 +183,7 @@ + { + if (current < number) { + current += 1; ++ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); + DrawPreferMenu(+LINEHEIGHT,-1); + DisplayPreferMenu(); + //DrawPreferMenu(+10,-1); +@@ -315,6 +318,8 @@ + + void cPreferOsd::DrawPreferMenu(int delta, int highlight) + { ++ const cFont *font = cFont::GetFont(fontOsd); ++ const int LINEHEIGHT = font->Height(); + + int middle = int(config.height/2) + config.height%2; + +@@ -390,6 +395,8 @@ + + void cPreferOsd::DrawChannelsNames(int delta) + { ++ const cFont *font = cFont::GetFont(fontOsd); ++ const int LINEHEIGHT = font->Height(); + + // XXX The margin is hardcoded for now + // TODO: make it more flexible +--- prefermenu-0.6.6/preferosd.h ++++ prefermenu-0.6.6/preferosd.h +@@ -4,8 +4,6 @@ + #include <vdr/plugin.h> + + static const int BORDERSIZE = 2; +-static const cFont *font = cFont::GetFont(fontOsd); +-static const int LINEHEIGHT = font->Height(); + + + class cPreferOsd : public cOsdObject { diff --git a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild new file mode 100644 index 000000000000..97bc87729bd7 --- /dev/null +++ b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 2003-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r1.ebuild,v 1.1 2007/07/05 07:02:10 zzam Exp $ + + +inherit vdr-plugin + +DESCRIPTION="Video Disk Recorder Prefermenu Plugin" +HOMEPAGE="http://www.olivierjacques.com/vdr/prefermenu/" +SRC_URI="http://famillejacques.free.fr/vdr/prefermenu/vdr-${VDRPLUGIN}-${PV}.tgz + mirror://vdrfiles/${PN}/vdr-${VDRPLUGIN}-${PV}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86 ~amd64" +IUSE="" + +DEPEND=">=media-video/vdr-1.3.45" + +PATCHES="${FILESDIR}/${P}-no-static-getfont.diff" + +src_install() { + vdr-plugin_src_install + + touch prefermenu.conf + insinto /etc/vdr/plugins + doins prefermenu.conf + chown vdr:vdr -R ${D}/etc/vdr +} |