diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-03-03 21:15:53 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-03-03 21:15:53 +0000 |
| commit | b0f19edc1b6cf6eb734e8790639c0484cc015113 (patch) | |
| tree | 469302c1c929a88719c2b0ca1612b719772a08e4 /media-plugins/vdr-epgsearch | |
| parent | Version bump #307205 by Christoph Brill, Myckel Habets, and hasufell. (diff) | |
| download | gentoo-2-b0f19edc1b6cf6eb734e8790639c0484cc015113.tar.gz gentoo-2-b0f19edc1b6cf6eb734e8790639c0484cc015113.tar.bz2 gentoo-2-b0f19edc1b6cf6eb734e8790639c0484cc015113.zip | |
diff for >=vdr-1.7.25
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-epgsearch')
| -rw-r--r-- | media-plugins/vdr-epgsearch/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff | 32 | ||||
| -rw-r--r-- | media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild | 6 |
3 files changed, 42 insertions, 2 deletions
diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog index f21634f23640..4cb8d1af5cf2 100644 --- a/media-plugins/vdr-epgsearch/ChangeLog +++ b/media-plugins/vdr-epgsearch/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-epgsearch # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.53 2012/02/16 15:09:16 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.54 2012/03/03 21:15:53 hd_brummy Exp $ + + 03 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-epgsearch-1.0.0.ebuild, +files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff: + diff for >=vdr-1.7.25 16 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-epgsearch-1.0.0.ebuild: diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff new file mode 100644 index 000000000000..3a8babbc16fb --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff @@ -0,0 +1,32 @@ +--- epgsearch/conflictcheck.h.bak 2012-03-03 15:33:15.000000000 +0100 ++++ epgsearch/conflictcheck.h 2012-03-03 15:35:43.000000000 +0100 +@@ -169,12 +169,12 @@ + result = true; + #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE + else +- result = Priority >= Setup.PrimaryLimit; ++ result = Priority >= 0; + #endif + #endif + } + else +- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; ++ result = !IsPrimaryDevice() || Priority >= 0; + } + else + needsDetachReceivers = true; +@@ -259,12 +259,12 @@ + result = true; + #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE + else +- result = Priority >= Setup.PrimaryLimit; ++ result = Priority >= 0; + #endif + #endif + } + else +- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; ++ result = !IsPrimaryDevice() || Priority >= 0; + } + else + needsDetachReceivers = true; diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild index 669e496d143c..60d18e94be39 100644 --- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild +++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild,v 1.2 2012/02/16 15:09:16 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild,v 1.3 2012/03/03 21:15:53 hd_brummy Exp $ EAPI="4" @@ -38,6 +38,10 @@ src_prepare() { fix_vdr_libsi_include conflictcheck.c + if has_version ">=media-video/vdr-1.7.25"; then + epatch "${FILESDIR}/${P}_vdr-1.7.25.diff" + fi + # disable automagic deps sed -i Makefile -e '/^AUTOCONFIG=/s/^/#/' |