diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2006-02-28 20:06:44 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2006-02-28 20:06:44 +0000 |
| commit | 3d6b77c8077d5faeeb72f665ad1a85af0ee7d5d8 (patch) | |
| tree | 48892cecda46640056a782c3f5a97971f928c30a /media-plugins/vdr-graphlcd | |
| parent | Added ~alpha, bug #124450. Tested by Thomas Cort <tcort@cs.ubishops.ca> (diff) | |
| download | gentoo-2-3d6b77c8077d5faeeb72f665ad1a85af0ee7d5d8.tar.gz gentoo-2-3d6b77c8077d5faeeb72f665ad1a85af0ee7d5d8.tar.bz2 gentoo-2-3d6b77c8077d5faeeb72f665ad1a85af0ee7d5d8.zip | |
fixed locking in .diff
(Portage version: 2.0.54)
Diffstat (limited to 'media-plugins/vdr-graphlcd')
| -rw-r--r-- | media-plugins/vdr-graphlcd/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-graphlcd/Manifest | 15 | ||||
| -rw-r--r-- | media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff | 21 |
3 files changed, 17 insertions, 25 deletions
diff --git a/media-plugins/vdr-graphlcd/ChangeLog b/media-plugins/vdr-graphlcd/ChangeLog index 8f27e961a366..bd7bd2cb6786 100644 --- a/media-plugins/vdr-graphlcd/ChangeLog +++ b/media-plugins/vdr-graphlcd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-graphlcd # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.4 2006/02/28 00:27:45 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.5 2006/02/28 20:06:44 hd_brummy Exp $ + + 28 Feb 2006; Joerg Bornkessel <hd_brummy@gentoo.org> + files/0.1.2/radiotext-lcr-service.diff: + fixed locking in .diff 28 Feb 2006; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-graphlcd-0.1.2_pre6-r1.ebuild: diff --git a/media-plugins/vdr-graphlcd/Manifest b/media-plugins/vdr-graphlcd/Manifest index 5b4fce61b189..7f7b84759ff6 100644 --- a/media-plugins/vdr-graphlcd/Manifest +++ b/media-plugins/vdr-graphlcd/Manifest @@ -1,18 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 56a04a17f4e71612c94b055c8c2e62f5 ChangeLog 978 -MD5 1b06ba652dc14eb1a4884d49cdd4e3df files/0.1.2/radiotext-lcr-service.diff 3469 +MD5 57f746cb00e81691e753ec609263f464 ChangeLog 1101 +MD5 9edde30be18467eead751bd619a887bd files/0.1.2/radiotext-lcr-service.diff 3429 MD5 b52e340ed185e77044523dcee028aae6 files/confd 681 MD5 c06ef00216c435d94502bd44c0cf7e51 files/digest-vdr-graphlcd-0.1.2_pre6-r1 72 MD5 517fd6e47ab25170f56df5a2a07510e6 files/rc-addon.sh 453 MD5 363fe851c7edc1284983ea5393b8c2a9 metadata.xml 403 MD5 697cc942cd5927ccc84fbf7025f5219a vdr-graphlcd-0.1.2_pre6-r1.ebuild 2527 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.1 (GNU/Linux) -Comment: no further Information - -iD8DBQFEA5kTdn07HTTCgIoRAonTAKCaM9/AITqKQtHmkccqOjPjhOShgACaA4fa -DL9+k1iU3qzlJMjzYokApjM= -=Rt4a ------END PGP SIGNATURE----- diff --git a/media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff b/media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff index 45c7d46fc2e7..ef9737dfef9d 100644 --- a/media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff +++ b/media-plugins/vdr-graphlcd/files/0.1.2/radiotext-lcr-service.diff @@ -3,7 +3,7 @@ @@ -120,4 +120,22 @@ tVolumeState GetVolumeState(); }; - + +// Radiotext +struct RadioTextService_v1_0 { + int rds_info; @@ -25,17 +25,17 @@ + --- state.c.orig 2005-05-07 11:23:42.000000000 +0200 -+++ state.c 2006-02-27 18:55:41.000000000 +0100 ++++ state.c 2006-02-28 17:28:31.000000000 +0100 @@ -15,6 +15,7 @@ #include "strfct.h" - + #include <vdr/i18n.h> +#include <vdr/plugin.h> - + #include "compat.h" - + @@ -568,6 +569,8 @@ - + void cGraphLCDState::GetProgramme() { + bool ptitle = false; @@ -67,10 +67,10 @@ event.presentSubtitle = ""; if (!isempty(present->ShortText())) event.presentSubtitle = present->ShortText(); -@@ -639,6 +646,55 @@ +@@ -638,6 +645,54 @@ + } } #endif - mutex.Unlock(); + +#if VDRVERSNUM >= 10330 + { // get&display Radiotext @@ -96,7 +96,6 @@ + } +#endif + -+ +#if VDRVERSNUM >= 10330 + { // get&display LcrData + cPlugin *p; @@ -120,6 +119,6 @@ + } + } +#endif + mutex.Unlock(); } - - tChannelState cGraphLCDState::GetChannelState() + |