diff for >=vdr-1.7.25

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 48 insertions, 7 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/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 942a706891e1..a7886fc377e5 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-epgsearch-1.0.0_vdr-1.7.25.diff 909 RMD160 781df521dc6d0a291362e3d69d684c1710c64ff2 SHA1 3fc9bdaacb35f1565513b2064cdfc3783f39028d SHA256 718e65bed9067b0f4780aa953a2471d563d621464cb582ab84c6b478fa09446d
 DIST vdr-epgsearch-0.9.25.beta17.tgz 780599 RMD160 5c54efd9fdbdf179717bfacfc7b89df18de28531 SHA1 7f9da736d71cc8ff5ebc896421253be13daf2522 SHA256 856f2a2c8ccaa60ddad04587464f08d7b7e673ff3b307a1b3e1f7aa53e09e0ba
 DIST vdr-epgsearch-1.0.0.tgz 667633 RMD160 481f23a659a1a8275feb351af660b28a6034d8c7 SHA1 0fb78ef195c6b41a17c31f0859143167e363d8c8 SHA256 989c3ce611ad2b591783dcd7e52a4b462b3352a7657c478e7a3b3c38164b4a12
 EBUILD vdr-epgsearch-0.9.25_beta17.ebuild 2136 RMD160 b628915f2eb725da13951bff2cfd3d56cbffdcdb SHA1 215c93e1e10c1d04f28f585bb6da819ea27b521a SHA256 168a2170c3842eb7f1e8ec5ab28b31d6fb3e688429eb70b5150e465ce1165dbd
-EBUILD vdr-epgsearch-1.0.0.ebuild 2177 RMD160 7d1724ad15bba557812a76153532432a14a59ce4 SHA1 0998fc6c2795865d2025341b042b1731b9cab88c SHA256 3931927d5ebc35b80bfc1f11727dc3fbe1c4d5df815b162b0699cb76e881bb72
-MISC ChangeLog 10315 RMD160 55cffe8497bc10eadf44548fa5435ff079e4ce66 SHA1 fb4c6d37acea1e912fba70d3221586c74a0ffd87 SHA256 7ea7b63a12a6865d8eadeeebab41bc0c5376e71c06e65f9d4e0ed40e0e201c90
+EBUILD vdr-epgsearch-1.0.0.ebuild 2275 RMD160 b8536ae80b085d8a4b689a5234c8c7dc70f0e7d7 SHA1 08d8ff1b233771b1c0387de0b83ba475440538df SHA256 fc6e800f77f7369ddd8c120490d05a99f9afae29ae233324ccc005a1c9d977c9
+MISC ChangeLog 10469 RMD160 36e9ade91edaaa6e3cc58367612c1a35250b53c2 SHA1 2c939ad25c51339518ea0f962588f885c4dc39ae SHA256 544407e1ce0d0764124677d0888755d6b39e8c2355d1f622d4d94367af489a60
 MISC metadata.xml 423 RMD160 ffbb30742555fbcd39919829b7ce199e68072664 SHA1 7d35aca3ae43a0f0897f506a486c371727c44d91 SHA256 4306b9a475db49970298cb67b2870255ab3906c778c9275c3ae2c345dfc433b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPPRwldn07HTTCgIoRAt+oAKC1iE1ctQZKmsppWgsy00JtjNJ4yACfS5mE
-HIQRQTAFGn3tPtGFSiHfcgE=
-=b/V0
+iD8DBQFPUopXdn07HTTCgIoRAn/1AJ9uvUqNAjEjZYeiomjNjtDjXwx1DgCfaajh
+pL0JTWli4mg/uMcBZlInjsY=
+=k9s7
 -----END PGP SIGNATURE-----
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/^/#/'