Bump to include cdplaying bugfix reported by Anatoly <aanatoly@users.sf.net> in bug #47808.

5 files changed, 49 insertions, 5 deletions

diff --git a/media-sound/zinf/ChangeLog b/media-sound/zinf/ChangeLog
index 3a256ac9f91d..0295cbcdfb7b 100644
--- a/media-sound/zinf/ChangeLog
+++ b/media-sound/zinf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/zinf
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.24 2004/03/31 17:04:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.25 2004/04/16 10:00:34 eradicator Exp $
+
+*zinf-2.2.5-r1 (16 Apr 2004)
+
+  16 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5-r1.ebuild,
+  zinf-2.2.5.ebuild, files/zinf-2.2.5-cdplay.patch:
+  Bump to include cdplaying bugfix reported by Anatoly <aanatoly@users.sf.net>
+  in bug #47808.
 
   31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5.ebuild:
   Stable x86.
diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index 064ae620051a..6f98efad547c 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,10 +1,11 @@
 MD5 f7dcaa880f6c587167c265943347aa7a zinf-2.2.3.ebuild 1935
-MD5 9c1ef0c7148f6e77d2f2e3fd674e6ce7 zinf-2.2.5.ebuild 1835
+MD5 3024a21b50e3c0e10a703cb44f3ffdc0 zinf-2.2.5-r1.ebuild 1917
 MD5 fbe38d5f389cdac420890bf3ed72731c zinf-2.2.4.ebuild 1932
-MD5 c75908d050097a9d27748c1880dffa9c ChangeLog 3919
+MD5 af3f4813da96ca2734460b309415ce57 ChangeLog 4177
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5f73b5d7a0fb9346d25c7f59e71509b8 files/zinf-2.2.5-cdplay.patch 1042
+MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r1 63
 MD5 2a5b9b0fb8d24a260c166417a2b2fd95 files/zinf-2.2.4-pref.patch 483
 MD5 fe732feaa32b4d6a4f23daa309056288 files/zinf-2.2.3-id3.patch.bz2 12466
 MD5 789bfd8c9959727ea1bd1176b15f8104 files/digest-zinf-2.2.3 63
 MD5 be366a51d3b8fec4068ae8a3f932dcae files/digest-zinf-2.2.4 63
-MD5 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5 63
diff --git a/media-sound/zinf/files/digest-zinf-2.2.5 b/media-sound/zinf/files/digest-zinf-2.2.5-r1
index 5038254d1b93..5038254d1b93 100644
--- a/media-sound/zinf/files/digest-zinf-2.2.5
+++ b/media-sound/zinf/files/digest-zinf-2.2.5-r1
diff --git a/media-sound/zinf/files/zinf-2.2.5-cdplay.patch b/media-sound/zinf/files/zinf-2.2.5-cdplay.patch
new file mode 100644
index 000000000000..9d50f48f4b00
--- /dev/null
+++ b/media-sound/zinf/files/zinf-2.2.5-cdplay.patch
@@ -0,0 +1,29 @@
+diff -uNr zinf-2.2.5-r1/io/cd/unix/include/cdpmo.h zinf-2.2.5/io/cd/unix/include/cdpmo.h
+--- zinf-2.2.5/io/cd/unix/include/cdpmo.h	2004-04-14 17:42:17.000000000 +0300
++++ zinf-2.2.5-r1/io/cd/unix/include/cdpmo.h	2004-04-14 17:43:43.000000000 +0300
+@@ -59,7 +59,7 @@
+    virtual void  Pause(void);
+    virtual void  Resume(void);
+    virtual Error ChangePosition(int32_t);
+-   virtual Error SetTo(const char *url); 
++   virtual Error SetUrl(const std::string& track_url);
+ 
+    struct disc_info *GetDiscInfo();
+    uint32_t  GetCDDBDiscID();
+diff -uNr zinf-2.2.5-r1/io/cd/unix/src/cdpmo.cpp zinf-2.2.5/io/cd/unix/src/cdpmo.cpp
+--- zinf-2.2.5/io/cd/unix/src/cdpmo.cpp	2004-04-14 17:42:17.000000000 +0300
++++ zinf-2.2.5-r1/io/cd/unix/src/cdpmo.cpp	2004-04-14 17:44:43.000000000 +0300
+@@ -106,10 +106,12 @@
+     }
+ } 
+ 
+-Error CDPMO::SetTo(const char *url)
++Error CDPMO::SetUrl(const std::string& track_url)
+ {
+    OutputInfo blah;
+ 
++   const char* url = track_url.c_str();
++
+    if (IsError(Init(&blah))) 
+        return kError_CDInitFailed;
+ 
diff --git a/media-sound/zinf/zinf-2.2.5.ebuild b/media-sound/zinf/zinf-2.2.5-r1.ebuild
index 3d5aaf40bf53..ec8f529c99cc 100644
--- a/media-sound/zinf/zinf-2.2.5.ebuild
+++ b/media-sound/zinf/zinf-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5.ebuild,v 1.6 2004/03/31 17:04:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r1.ebuild,v 1.1 2004/04/16 10:00:34 eradicator Exp $
 
 inherit kde-functions eutils flag-o-matic
 
@@ -34,6 +34,13 @@ DEPEND="${RDEPEND}
 	dev-db/metakit
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-cdplay.patch
+}
+
 src_compile() {
 	local myconf="--enable-cmdline"