Added a patch to work together with older vdr header files, Bug #132134

Package-Manager: portage-2.1_pre10-r2

4 files changed, 59 insertions, 14 deletions

diff --git a/media-plugins/vdr-streamdev-server/ChangeLog b/media-plugins/vdr-streamdev-server/ChangeLog
index 75a8bc1936ed..664e5b506b27 100644
--- a/media-plugins/vdr-streamdev-server/ChangeLog
+++ b/media-plugins/vdr-streamdev-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-streamdev-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.6 2006/05/02 15:56:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/ChangeLog,v 1.7 2006/05/05 07:28:21 zzam Exp $
+
+  05 May 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-streamdev-server-20060502-old-vdr-headers.diff,
+  vdr-streamdev-server-0.3.3_pre20060502.ebuild:
+  Added a patch to work together with older vdr header files, Bug #132134
 
 *vdr-streamdev-server-0.3.3_pre20060502 (02 May 2006)
 
diff --git a/media-plugins/vdr-streamdev-server/Manifest b/media-plugins/vdr-streamdev-server/Manifest
index 000d6c009380..65f5dfb5de79 100644
--- a/media-plugins/vdr-streamdev-server/Manifest
+++ b/media-plugins/vdr-streamdev-server/Manifest
@@ -5,6 +5,10 @@ AUX vdr-streamdev-server-20051219-fix-http-errors.diff 667 RMD160 50b836f0bbbb49
 MD5 81967abf65308ae3901ee4e1a401ac90 files/vdr-streamdev-server-20051219-fix-http-errors.diff 667
 RMD160 50b836f0bbbb49487179cfdeb74f5c13b03265f6 files/vdr-streamdev-server-20051219-fix-http-errors.diff 667
 SHA256 a0390f8c99d5363e3835e5f17e9820e3bcb11358d5d4780bf1ed58870e396f9a files/vdr-streamdev-server-20051219-fix-http-errors.diff 667
+AUX vdr-streamdev-server-20060502-old-vdr-headers.diff 1183 RMD160 c98e70689cf0fb83484bd2f2bf0e6f1dc7c15b0d SHA1 7c48fa4fa9f583a3269086c6a9297cffd34f97cc SHA256 6608d265a9c96d48856b84a6573234da4e8c26d7f3dd1655292ef77577fb9a60 size 1183
+MD5 76eeb01cf75ac90c3599d77be0da63a7 files/vdr-streamdev-server-20060502-old-vdr-headers.diff 1183
+RMD160 c98e70689cf0fb83484bd2f2bf0e6f1dc7c15b0d files/vdr-streamdev-server-20060502-old-vdr-headers.diff 1183
+SHA256 6608d265a9c96d48856b84a6573234da4e8c26d7f3dd1655292ef77577fb9a60 files/vdr-streamdev-server-20060502-old-vdr-headers.diff 1183
 DIST vdr-streamdev-20051219.tar.bz2 118761 RMD160 e9a251892fe8be59cc3bebfe1cf57690b8c33ec4 SHA256 efe78266e77c5b1c89a3692d6d328c7de85849aefcb50912b17409afbe9dbd96 size 118761
 DIST vdr-streamdev-20060502.tar.bz2 120496 RMD160 9675d94b5db1fa82fda822ddd7e83d22e0104121 SHA256 02da5f405db7145912397310e78be0a325b040f2f0d1f5171bdd3d0a3ab3ccfa size 120496
 EBUILD vdr-streamdev-server-0.3.3_pre20051219-r1.ebuild 1135 RMD160 fd1f97c548f77a163d6777b6fbbfde7f8e1af383 SHA1 0be5d1985c6df0b4bcf0fd77d29a82c41e7b39b3 SHA256 44f5313c8bc8d3fe846c236ff9aa24f08e64eb5fcefda07e650298c03bc485a7 size 1135
@@ -15,14 +19,14 @@ EBUILD vdr-streamdev-server-0.3.3_pre20051219.ebuild 1057 RMD160 d10a7b3ba5c23d5
 MD5 033cd53e9d56279c18ecbf0081aab3d7 vdr-streamdev-server-0.3.3_pre20051219.ebuild 1057
 RMD160 d10a7b3ba5c23d564dd42c50e227e33ecda06297 vdr-streamdev-server-0.3.3_pre20051219.ebuild 1057
 SHA256 9adcaf597ebbc6a305ba76ec467d85d6b29689dab92e82e5766e552a537a76d4 vdr-streamdev-server-0.3.3_pre20051219.ebuild 1057
-EBUILD vdr-streamdev-server-0.3.3_pre20060502.ebuild 1068 RMD160 2e998d0350674226bcec1aee047d1ebb3a78b980 SHA1 128923d527d65b1b87fe2e4142f781d5dc55f7f9 SHA256 8001c4390089ab3da986e48a31d3356e3cc1a9ab8666c2498fde5e81445b989d size 1068
-MD5 e529a624a91e4b6798b43c8ed2635e76 vdr-streamdev-server-0.3.3_pre20060502.ebuild 1068
-RMD160 2e998d0350674226bcec1aee047d1ebb3a78b980 vdr-streamdev-server-0.3.3_pre20060502.ebuild 1068
-SHA256 8001c4390089ab3da986e48a31d3356e3cc1a9ab8666c2498fde5e81445b989d vdr-streamdev-server-0.3.3_pre20060502.ebuild 1068
-MISC ChangeLog 1438 RMD160 3b693ca8fd18075045e6c4376839da3e59495325 SHA1 0d6932c2ec7825d9e1d4ece00e2ab3b21590f4d1 SHA256 1ba7ee0b84deaa4afb49d3417ccef3e0a8931500896b32866d8e715491c8f302 size 1438
-MD5 b5f57707f6e01bf688cc6577ae92be63 ChangeLog 1438
-RMD160 3b693ca8fd18075045e6c4376839da3e59495325 ChangeLog 1438
-SHA256 1ba7ee0b84deaa4afb49d3417ccef3e0a8931500896b32866d8e715491c8f302 ChangeLog 1438
+EBUILD vdr-streamdev-server-0.3.3_pre20060502.ebuild 1218 RMD160 844fa13be38bd9b6cd7a5f1c7907418f18a6a560 SHA1 2ec3766f9529fda333433707d8d848abf88964b8 SHA256 2981fab2489dc733a031ea0021a5d19f5b10b16473aa674c74bc753a09417180 size 1218
+MD5 055558887408687433228de9322dc8be vdr-streamdev-server-0.3.3_pre20060502.ebuild 1218
+RMD160 844fa13be38bd9b6cd7a5f1c7907418f18a6a560 vdr-streamdev-server-0.3.3_pre20060502.ebuild 1218
+SHA256 2981fab2489dc733a031ea0021a5d19f5b10b16473aa674c74bc753a09417180 vdr-streamdev-server-0.3.3_pre20060502.ebuild 1218
+MISC ChangeLog 1676 RMD160 90713dd6ecf9569ec1fd5d48270f48e9772b0680 SHA1 56a28ed1b63d7c9032c5970dd623a3a0217d374e SHA256 77fa57f75c46998ca06ebedc1a04052c9b1e126725870e30e7059062c49992bf size 1676
+MD5 b59a4d79142a3451dbd00f3ea6e8f676 ChangeLog 1676
+RMD160 90713dd6ecf9569ec1fd5d48270f48e9772b0680 ChangeLog 1676
+SHA256 77fa57f75c46998ca06ebedc1a04052c9b1e126725870e30e7059062c49992bf ChangeLog 1676
 MISC metadata.xml 259 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 SHA1 71c8f0604523f99ac8b7849a01d861d721a191fd SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe size 259
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
@@ -39,7 +43,7 @@ SHA256 2aca51667932d7a482c7395c790da58cc8bef426a934b4a9a14566f78d7418bc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV4FXZfSl1Kp5KmoRAgcCAJ974nJ87RWq4p6svfmf5D1sr52G2ACeOmZ0
-HPPDdcSBAyj6LZuMU/As0AY=
-=xG0O
+iD8DBQFEWv6zZfSl1Kp5KmoRAjCxAKCGgz47CM4LdXOx5rIVJU+6Wlr8HwCglLBr
+9aKAeehh7lOCMi/H+ly+rcg=
+=98Xx
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-20060502-old-vdr-headers.diff b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-20060502-old-vdr-headers.diff
new file mode 100644
index 000000000000..95a6d3728cda
--- /dev/null
+++ b/media-plugins/vdr-streamdev-server/files/vdr-streamdev-server-20060502-old-vdr-headers.diff
@@ -0,0 +1,31 @@
+diff -ru streamdev-20060502/streamdev-server.c streamdev-20060502-old-Headers/streamdev-server.c
+--- streamdev-20060502/streamdev-server.c	2006-04-30 10:15:19.000000000 +0200
++++ streamdev-20060502-old-Headers/streamdev-server.c	2006-05-04 22:50:42.000000000 +0200
+@@ -87,13 +87,9 @@
+ 	cStreamdevServer::Destruct();
+ }
+ 
+-cString cPluginStreamdevServer::Active(void) 
++bool cPluginStreamdevServer::Active(void) 
+ {
+-	if(cStreamdevServer::Active())
+-    {
+-		return tr("Streaming TV");
+-    }
+-    return NULL;
++    return cStreamdevServer::Active();
+ }
+ 
+ const char *cPluginStreamdevServer::MainMenuEntry(void) 
+diff -ru streamdev-20060502/streamdev-server.h streamdev-20060502-old-Headers/streamdev-server.h
+--- streamdev-20060502/streamdev-server.h	2006-04-30 10:15:19.000000000 +0200
++++ streamdev-20060502-old-Headers/streamdev-server.h	2006-05-04 22:49:29.000000000 +0200
+@@ -21,7 +21,7 @@
+ 	virtual const char *Description(void);
+ 	virtual bool Start(void);
+ 	virtual void Stop(void);
+-	virtual cString Active(void);
++	virtual bool Active(void);
+ 	virtual const char *MainMenuEntry(void);
+ 	virtual cOsdObject *MainMenuAction(void);
+ 	virtual cMenuSetupPage *SetupMenu(void);
diff --git a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild
index 74837910e6d3..7856ad651617 100644
--- a/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild
+++ b/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild,v 1.1 2006/05/02 15:56:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev-server/vdr-streamdev-server-0.3.3_pre20060502.ebuild,v 1.2 2006/05/05 07:28:21 zzam Exp $
 
 inherit vdr-plugin eutils
 
 VDRPLUGIN_BASE=${VDRPLUGIN//-*/}
-MY_P=${VDRPLUGIN_BASE}-${PV/*_pre/}
+MY_PV=${PV/*_pre/}
+MY_P=${VDRPLUGIN_BASE}-${MY_PV}
 
 DESCRIPTION="Video Disk Recorder Client/Server streaming plugin"
 HOMEPAGE="http://www.magoa.net/linux/"
@@ -26,6 +27,10 @@ src_unpack() {
 	vdr-plugin_src_unpack
 	cd ${S}
 
+	if grep -q "virtual bool Active" ${ROOT}/usr/include/vdr/plugin.h; then
+		epatch ${FILESDIR}/${PN}-${MY_PV}-old-vdr-headers.diff
+	fi
+
 	# make subdir libdvbmpeg respect CXXFLAGS
 	sed -i Makefile \
 		-e 's:\(CXXFLAGS.*=\):#\1:'