Added vdr-1.5.0 patch.

Package-Manager: portage-2.1.3_rc5

5 files changed, 88 insertions, 8 deletions

diff --git a/media-plugins/vdr-vompserver/ChangeLog b/media-plugins/vdr-vompserver/ChangeLog
index a695877955ff..a400dd8152da 100644
--- a/media-plugins/vdr-vompserver/ChangeLog
+++ b/media-plugins/vdr-vompserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-vompserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.7 2007/06/08 10:28:58 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.8 2007/06/24 12:37:51 zzam Exp $
+
+*vdr-vompserver-0.2.6-r1 (24 Jun 2007)
+
+  24 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-vompserver-0.2.6-vdr-1.5.0.diff,
+  +vdr-vompserver-0.2.6-r1.ebuild:
+  Added vdr-1.5.0 patch.
 
   08 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-vompserver-0.2.6.ebuild:
diff --git a/media-plugins/vdr-vompserver/Manifest b/media-plugins/vdr-vompserver/Manifest
index 3d7921ab19eb..53d5d2c054c1 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -5,20 +5,28 @@ AUX vdr-vompserver-0.2.6-gentoo.diff 597 RMD160 74a61259c067c32a7bb6d8e443d61e9a
 MD5 126bd7042d12860ec15439d20ddce9d0 files/vdr-vompserver-0.2.6-gentoo.diff 597
 RMD160 74a61259c067c32a7bb6d8e443d61e9ae62f854c files/vdr-vompserver-0.2.6-gentoo.diff 597
 SHA256 ccb700b83708c6452845bc408e245ead9d1cbf1092a8f012f2efa7e89bf1d035 files/vdr-vompserver-0.2.6-gentoo.diff 597
+AUX vdr-vompserver-0.2.6-vdr-1.5.0.diff 779 RMD160 2f3d8d2a7daea06097dce5d2e23150c56470b323 SHA1 fbd059a5a61e31fa7069209eb0d9d1f613385d46 SHA256 187e990dece222bf4e8784ca6e6684e8d332e493b567a2cd759b3d639eb5feea
+MD5 de24e8e17533d2400a6b6f4c842b4880 files/vdr-vompserver-0.2.6-vdr-1.5.0.diff 779
+RMD160 2f3d8d2a7daea06097dce5d2e23150c56470b323 files/vdr-vompserver-0.2.6-vdr-1.5.0.diff 779
+SHA256 187e990dece222bf4e8784ca6e6684e8d332e493b567a2cd759b3d639eb5feea files/vdr-vompserver-0.2.6-vdr-1.5.0.diff 779
 DIST vdr-vompserver-0.2.5.tgz 93335 RMD160 35c10ce32396136ee23f62b5aa5d3af35dcc4a38 SHA1 28f2a1fa29268df0ba3f104dfc488edafd8146da SHA256 f28fefb5b95e565b93e45d72c5f9ddbae911633ec6a9f94b285eba099dd0910f
 DIST vdr-vompserver-0.2.6.tgz 41918 RMD160 35bf39cb6288fcf46246915d8a2d6e5ebd0dfd24 SHA1 416cc3679802412346058c6bd66545c32d371c94 SHA256 2650d44b76290d6a973ee4ce4088d4ca82e3e36f67c56dbf7785284dc111515d
 EBUILD vdr-vompserver-0.2.5.ebuild 1080 RMD160 5efb604f7c0e8c0380e8ce113b20112536a88e65 SHA1 1d65bf2e54266da4145b09e94c03e9c11974a5db SHA256 c1b0ce04d22f4ee38ef9a881366f9eb98b75c7c9668d690ca7b1aa19c79a3e17
 MD5 e58c6a66862bcad89f742aa19f0dd1f6 vdr-vompserver-0.2.5.ebuild 1080
 RMD160 5efb604f7c0e8c0380e8ce113b20112536a88e65 vdr-vompserver-0.2.5.ebuild 1080
 SHA256 c1b0ce04d22f4ee38ef9a881366f9eb98b75c7c9668d690ca7b1aa19c79a3e17 vdr-vompserver-0.2.5.ebuild 1080
+EBUILD vdr-vompserver-0.2.6-r1.ebuild 1134 RMD160 acddbfc67201b99dcad1a29c2dd69f9e9e2d278d SHA1 b9ed21dbb0372ed01a8ea3e913141a2ec5108a6b SHA256 678b95220f165f6013198e2ec300c7642a638c9668d980823f25a12fa0238ad0
+MD5 e46ff3feefbbc02ad113d6cbf32ab711 vdr-vompserver-0.2.6-r1.ebuild 1134
+RMD160 acddbfc67201b99dcad1a29c2dd69f9e9e2d278d vdr-vompserver-0.2.6-r1.ebuild 1134
+SHA256 678b95220f165f6013198e2ec300c7642a638c9668d980823f25a12fa0238ad0 vdr-vompserver-0.2.6-r1.ebuild 1134
 EBUILD vdr-vompserver-0.2.6.ebuild 1097 RMD160 3bcc08c7870a1862126e8fd196710224f09db060 SHA1 de36ef69655c48b6c3cd79cca269b8d2f83328bf SHA256 fab7556692f96222fb3935f2817410a17b18dfe645bfd96214402e5c35f3dc4b
 MD5 90a720f6544ca53e3170b8784cd93b39 vdr-vompserver-0.2.6.ebuild 1097
 RMD160 3bcc08c7870a1862126e8fd196710224f09db060 vdr-vompserver-0.2.6.ebuild 1097
 SHA256 fab7556692f96222fb3935f2817410a17b18dfe645bfd96214402e5c35f3dc4b vdr-vompserver-0.2.6.ebuild 1097
-MISC ChangeLog 1275 RMD160 2d569bd441f592ee08801288a15c399977bd263b SHA1 08e1cc569839837019e377677a28aa3c1c523e87 SHA256 f74681fac761e458f2fd997503336f90f076db9704f36eb473e45f5fac6ae360
-MD5 55f9ecb827fcd501d97eb4f26f94a1c9 ChangeLog 1275
-RMD160 2d569bd441f592ee08801288a15c399977bd263b ChangeLog 1275
-SHA256 f74681fac761e458f2fd997503336f90f076db9704f36eb473e45f5fac6ae360 ChangeLog 1275
+MISC ChangeLog 1475 RMD160 1fc546bf0132fa36810015e1c2bd57dd6924cb04 SHA1 a0b7a7fe704dfb6855e2a2fd2682de5aad4d8699 SHA256 0fb3aaf46fde6006c5de5d995ce11df88ad5ebebeb34cf24f64a0cf56ce1f58c
+MD5 5cffc32274b64c15844b63321182b443 ChangeLog 1475
+RMD160 1fc546bf0132fa36810015e1c2bd57dd6924cb04 ChangeLog 1475
+SHA256 0fb3aaf46fde6006c5de5d995ce11df88ad5ebebeb34cf24f64a0cf56ce1f58c ChangeLog 1475
 MISC metadata.xml 535 RMD160 b26274618c1b5685adfc1e7b4704fc28cb04873e SHA1 d61aa6fc15a1a8a7d3fe07936990354449d51993 SHA256 85d5dba319863605021ca12cd31b3607b16b6d86897a0b0d129c5895ef3e0452
 MD5 2d506c90ccb30de9bc00ebb34fa7e194 metadata.xml 535
 RMD160 b26274618c1b5685adfc1e7b4704fc28cb04873e metadata.xml 535
@@ -29,10 +37,13 @@ SHA256 de2fd08af3c809ae5af01ad5f28ec523410cc016581dd89c01fbfb91b88a73be files/di
 MD5 325f1e1b6f045a5dc8dd72ba42360580 files/digest-vdr-vompserver-0.2.6 250
 RMD160 6b39b4d0ed00f59498202acc6164202f5e3cfda0 files/digest-vdr-vompserver-0.2.6 250
 SHA256 4c5fc41edeed122c97e09cf1a40060049e2b55ba21a8cd5db8da07673d159863 files/digest-vdr-vompserver-0.2.6 250
+MD5 325f1e1b6f045a5dc8dd72ba42360580 files/digest-vdr-vompserver-0.2.6-r1 250
+RMD160 6b39b4d0ed00f59498202acc6164202f5e3cfda0 files/digest-vdr-vompserver-0.2.6-r1 250
+SHA256 4c5fc41edeed122c97e09cf1a40060049e2b55ba21a8cd5db8da07673d159863 files/digest-vdr-vompserver-0.2.6-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGaS9wt2vP6XvVdOcRAn14AJ4l5UOuvwXKNxVxmdfIuzXCYrrHHwCfUXWT
-JW2TmekfiAPFw9Ojloncey0=
-=VTvG
+iD8DBQFGfmWmt2vP6XvVdOcRAjCiAKC2/sr/comJuefG7q5zuDN3gqv/JwCgqBHW
+0k90m3qv2OQ5M/purAaPWM8=
+=yX0v
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.6-r1 b/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.6-r1
new file mode 100644
index 000000000000..b0168f7caa51
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/digest-vdr-vompserver-0.2.6-r1
@@ -0,0 +1,3 @@
+MD5 6971a843ad7b92c296b0a60de9af589a vdr-vompserver-0.2.6.tgz 41918
+RMD160 35bf39cb6288fcf46246915d8a2d6e5ebd0dfd24 vdr-vompserver-0.2.6.tgz 41918
+SHA256 2650d44b76290d6a973ee4ce4088d4ca82e3e36f67c56dbf7785284dc111515d vdr-vompserver-0.2.6.tgz 41918
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-vdr-1.5.0.diff b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-vdr-1.5.0.diff
new file mode 100644
index 000000000000..9417bc327f2b
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.2.6-vdr-1.5.0.diff
@@ -0,0 +1,15 @@
+diff -ruN vompserver-1.4/mvpreceiver.c vompserver-1.5/mvpreceiver.c
+--- vompserver-1.4/mvpreceiver.c        2006-03-01 22:29:01.000000000 +0000
++++ vompserver-1.5/mvpreceiver.c        2007-01-16 18:53:27.000000000 +0000
+@@ -25,8 +25,10 @@
+ MVPReceiver::MVPReceiver(cChannel* channel, cDevice* device)
+ #if VDRVERSNUM < 10300
+ : cReceiver(channel->Ca(), 0, 7, channel->Vpid(), channel->Ppid(), channel->Apid1(), channel->Apid2(), channel->Dpid1(), channel->Dpid2(), channel->Tpid())
+-#else
++#elif VDRVERSNUM < 10500
+ : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids())
++#else
++: cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), channel->Spids())
+ #endif
+ {
+   logger = Log::getInstance();
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild
new file mode 100644
index 000000000000..33d864093adf
--- /dev/null
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.2.6-r1.ebuild,v 1.1 2007/06/24 12:37:51 zzam Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR Plugin: server part for MediaMVP device"
+HOMEPAGE="http://www.loggytronic.com/vomp.php"
+SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.6"
+
+PATCHES="${FILESDIR}/${P}-gentoo.diff
+	${FILESDIR}/${P}-vdr-1.5.0.diff"
+
+src_install() {
+	vdr-plugin_src_install
+
+	dodoc README HISTORY
+
+	insinto /etc/vdr/plugins/vomp
+	newins vomp.conf.sample vomp.conf
+	newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	echo
+	elog "Have a look to the VOMP sample files in /etc/vdr/plugins."
+	echo
+	elog "You have to download the dongle file (i.e. firmware) and adapt"
+	elog "the vomp configuration files accordingly."
+	echo
+
+	elog "Please edit up from version ${PN}-0.2.6"
+	elog "all config files in /etc/vdr/plugins/vomp/"
+}
+