added new patch; included fix problems on cStatus, reported, fixed by L.Muresan

(Portage version: 2.0.54)

6 files changed, 56 insertions, 48 deletions

diff --git a/media-plugins/vdr-cdda/ChangeLog b/media-plugins/vdr-cdda/ChangeLog
index 3d14c141651f..10e414eb077d 100644
--- a/media-plugins/vdr-cdda/ChangeLog
+++ b/media-plugins/vdr-cdda/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-cdda
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.3 2006/03/09 17:50:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.4 2006/03/21 14:22:04 hd_brummy Exp $
+
+  21 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-cdda-0.1.0-fix-segv.diff, +files/vdr-cdda-0.1.0.patch,
+  vdr-cdda-0.1.0.ebuild:
+  added new patch; included fix problems on cStatus, reported, fixed by L.Muresan
 
   09 Mar 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-cdda-0.1.0-fix-segv.diff, vdr-cdda-0.1.0.ebuild:
diff --git a/media-plugins/vdr-cdda/Manifest b/media-plugins/vdr-cdda/Manifest
index 7a7fef4f145b..209f71c37fcb 100644
--- a/media-plugins/vdr-cdda/Manifest
+++ b/media-plugins/vdr-cdda/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0417b2c82e13bb89844303cbb01975b2 ChangeLog 619
-RMD160 dffb98a552a6b3b6eea3710f11b6041ceac19cbe ChangeLog 619
-SHA256 2dd2dc59dbbcd64cad225190383237be557f500caff0b42ad215662a4d6cd310 ChangeLog 619
-MD5 9d84e655a6b25d923fa6e6d4669ee116 files/digest-vdr-cdda-0.1.0 461
-RMD160 767aa86abcf7ca46b1703f1a66b3ad197dd30f56 files/digest-vdr-cdda-0.1.0 461
-SHA256 05e00486dca89fc67365b738eb520d1bf363bbcbdc3a57852ec4fc186bb19091 files/digest-vdr-cdda-0.1.0 461
-MD5 00d4e2977886dcb8a5b52f4234dd4f1c files/vdr-cdda-0.1.0-fix-segv.diff 354
-RMD160 9a90784af84769c251b698613532c430de4fd0d8 files/vdr-cdda-0.1.0-fix-segv.diff 354
-SHA256 e582992178b0d44dc5b86a9470739fe76c9383a51499e7da50599d79cb8d1697 files/vdr-cdda-0.1.0-fix-segv.diff 354
+MD5 7a723a079564c3e97231c2f5b0be1e38 files/digest-vdr-cdda-0.1.0 65
+MD5 e3c20761b800512efc35c78a61d0f91e files/vdr-cdda-0.1.0.patch 1222
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
-RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
-SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300
-MD5 73ca7e0a09a23f7336eed1821c753e60 vdr-cdda-0.1.0.ebuild 652
-RMD160 051f6c84156ee3e07c6b1dca0f906b3b296a045f vdr-cdda-0.1.0.ebuild 652
-SHA256 3e0379c5a14cbd643d5f57ab6eb207c30f85ba003adaeb9ba84c745b3b26316f vdr-cdda-0.1.0.ebuild 652
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEEGs+ZfSl1Kp5KmoRApBBAJ9SZEm0BGYAQ9Sehm0FFatHxav9JACggRyU
-uhqw0N9vyE9cpyWTPZDuNL8=
-=/Lf8
------END PGP SIGNATURE-----
+MD5 237e5bced1838b68d3658d158eb80691 vdr-cdda-0.1.0.ebuild 557
diff --git a/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0 b/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
index 7800bdeda2da..fd15e09bbeeb 100644
--- a/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
+++ b/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
@@ -1,6 +1 @@
-MD5 654b9e6b0fa5e509c9d623cd1ddc9abe cdda-0.1.0.patch 782
-RMD160 4d6baf996a951af583f01ac8d3e9553461053d7b cdda-0.1.0.patch 782
-SHA256 56cdfaaf1c2444859a959e4d798599976d1bf7d5b90f100ef7a03d10219d15a9 cdda-0.1.0.patch 782
 MD5 fc49e48dd7d3f68d3451ad5f589f74cf vdr-cdda-0.1.0.tar.gz 43589
-RMD160 8bb2210252134b7bd4940e36c56f70cae3be00a9 vdr-cdda-0.1.0.tar.gz 43589
-SHA256 c68a9ff70bc8c794e582fd8702ffc30bf6c308209c0b0f4ca0136b7fac43c24c vdr-cdda-0.1.0.tar.gz 43589
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-fix-segv.diff b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-fix-segv.diff
deleted file mode 100644
index 16e0926918eb..000000000000
--- a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-fix-segv.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdda-0.1.0/cdda_menu.h-orig	2006-03-09 18:46:52.657736750 +0100
-+++ cdda-0.1.0/cdda_menu.h	2006-03-09 18:48:37.752304750 +0100
-@@ -60,7 +60,7 @@
-     char *mp_newCddbServerFqdn;
-     int m_newCddbServerPort;
-     int m_newInfoView;
--    const char *m_cddbPrioTxt[3];
-+    const char *m_cddbPrioTxt[4];
-   protected:
-     void Store(void);
-   public:
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch
new file mode 100644
index 000000000000..e8bac559f12d
--- /dev/null
+++ b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch
@@ -0,0 +1,41 @@
+Lucian Muresan <lucianm@users.sourceforge.net> ( 21 Mar 2006 )
+modified in cStatus::MsgReplaying
+diff -u cdda-0.1.0.org/audio_player.c cdda-0.1.0/audio_player.c
+--- cdda-0.1.0.org/audio_player.c	2006-03-09 09:26:16.000000000 +0100
++++ cdda-0.1.0/audio_player.c	2006-03-09 09:26:35.000000000 +0100
+@@ -368,7 +368,11 @@
+ }
+ 
+ cAudioControl::~cAudioControl() {
++#if VDRVERSNUM >= 10338
++  cStatus::MsgReplaying(this, "cdda", NULL, false);
++#else
+   cStatus::MsgReplaying(this, NULL);
++#endif
+   free(mp_replayDescription);
+ 
+   delete player;
+@@ -469,7 +473,11 @@
+     mp_replayDescription = p_str;
+     p_str = NULL;
+ 
++#if VDRVERSNUM >= 10338
++    cStatus::MsgReplaying(this, mp_replayDescription, NULL, true);
++#else
+     cStatus::MsgReplaying(this, mp_replayDescription);
++#endif
+   } else
+     free(p_str);
+ 
+diff -u cdda-0.1.0.org/cdda_menu.h cdda-0.1.0/cdda_menu.h
+--- cdda-0.1.0.org/cdda_menu.h	2006-03-09 09:26:16.000000000 +0100
++++ cdda-0.1.0/cdda_menu.h	2006-03-09 09:27:43.000000000 +0100
+@@ -60,7 +60,7 @@
+     char *mp_newCddbServerFqdn;
+     int m_newCddbServerPort;
+     int m_newInfoView;
+-    const char *m_cddbPrioTxt[3];
++    const char *m_cddbPrioTxt[4];
+   protected:
+     void Store(void);
+   public:
diff --git a/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild b/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild
index fb29a782552e..0c3a07a7f164 100644
--- a/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild
+++ b/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild,v 1.3 2006/03/09 17:50:54 zzam Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild,v 1.4 2006/03/21 14:22:04 hd_brummy Exp $
 
 inherit vdr-plugin
 
 DESCRIPTION="Video Disk Recorder - CD Digital Audio"
 HOMEPAGE="http://www.wahnadium.org/vdr-cdda"
-SRC_URI="ftp://ftp.wahnadium.org/pub/vdr-cdda/${P}.tar.gz
-	mirror://vdrfiles/${PN}/${VDRPLUGIN}-${PV}.patch"
+SRC_URI="ftp://ftp.wahnadium.org/pub/vdr-cdda/${P}.tar.gz"
 
-KEYWORDS="~x86 ~amd64"
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.22
 	>=dev-libs/libcdio-0.75
 	"
 
-PATCHES="${DISTDIR}/${VDRPLUGIN}-${PV}.patch
-	${FILESDIR}/${P}-fix-segv.diff"
+PATCHES="${FILESDIR}/${P}.patch"
+