bug 97674 and bug 69311

Package-Manager: portage-2.0.51.22-r2

7 files changed, 124 insertions, 22 deletions

diff --git a/media-sound/zinf/ChangeLog b/media-sound/zinf/ChangeLog
index 59d91c11804d..4246c68f0a89 100644
--- a/media-sound/zinf/ChangeLog
+++ b/media-sound/zinf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/zinf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.32 2005/05/27 15:13:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.33 2005/07/31 20:17:22 vanquirius Exp $
+
+*zinf-2.2.5-r2 (31 Jul 2005)
+
+  31 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/zinf-2.2.3-id3.patch.bz2, -files/zinf-2.2.4-pref.patch,
+  +files/zinf-2.2.5-rtp.patch, +zinf-2.2.5-r2.ebuild:
+  Attempting to fix UI plugin bug in bug 97674 and Invalid URL bug in bug
+  69311. Thanks to samx <gentoo@die-genossen.de>, Markus <bugs@rennings.net>
+  and others.
 
   27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> zinf-2.2.5-r1.ebuild:
   added libtoolize call, fixes #94149. also introduced support for the xosd
diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index 7a5d40d63eca..5b0818d6b713 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,8 +1,9 @@
+MD5 cb4e2e411e5db58f796d4eca40b20ad4 zinf-2.2.5-r2.ebuild 2089
 MD5 15c4260b39deda579a3563c58aae5f36 zinf-2.2.5-r1.ebuild 2301
-MD5 7f151bc2b0ae9f3d0b90ae239aca8dbb ChangeLog 4995
+MD5 b4b712b0b7566e8e1013e4ead9bdb9eb ChangeLog 5363
 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 e4ec1ffc5f5099848c9d55df07d85d5a files/digest-zinf-2.2.5-r2 63
+MD5 f759a0b5765809ee26d70a83f6c6185b files/zinf-2.2.5-rtp.patch 582
 MD5 ab18405737d54fde371a5e1ceb8dc3e7 files/zinf-2.2.5-configure.patch 3782
diff --git a/media-sound/zinf/files/digest-zinf-2.2.5-r2 b/media-sound/zinf/files/digest-zinf-2.2.5-r2
new file mode 100644
index 000000000000..5038254d1b93
--- /dev/null
+++ b/media-sound/zinf/files/digest-zinf-2.2.5-r2
@@ -0,0 +1 @@
+MD5 140436516d46b3ef440dc1886810510d zinf-2.2.5.tar.gz 2044561
diff --git a/media-sound/zinf/files/zinf-2.2.3-id3.patch.bz2 b/media-sound/zinf/files/zinf-2.2.3-id3.patch.bz2
deleted file mode 100644
index ff521add3c8d..000000000000
--- a/media-sound/zinf/files/zinf-2.2.3-id3.patch.bz2
+++ /dev/null
diff --git a/media-sound/zinf/files/zinf-2.2.4-pref.patch b/media-sound/zinf/files/zinf-2.2.4-pref.patch
deleted file mode 100644
index 9cb895c7f87d..000000000000
--- a/media-sound/zinf/files/zinf-2.2.4-pref.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- base/unix/src/unixprefs.cpp   2003-03-17 19:24:56.000000000 +0000
-+++ base/unix/src/unixprefs.cpp    2003-08-05 17:51:17.000000000 +0000
-@@ -456,13 +456,13 @@
-         SetPrefString(kWatchThisDirectoryPref, tempdir);
-     }
-
--    // Initialize the library path structures
--    GetLibPath();
--
- #define ZINF_PREF(T,V) setDefault(k##T##Pref,V);
- #include "prefs.def"
- #undef ZINF_PREF
-
-+    // Initialize the library path structures
-+    GetLibPath();
-+
-     return kError_NoErr;
-
diff --git a/media-sound/zinf/files/zinf-2.2.5-rtp.patch b/media-sound/zinf/files/zinf-2.2.5-rtp.patch
new file mode 100644
index 000000000000..45cafcd6cddc
--- /dev/null
+++ b/media-sound/zinf/files/zinf-2.2.5-rtp.patch
@@ -0,0 +1,17 @@
+--- orig/io/obs/obsinput.cpp
++++ mod/io/obs/obsinput.cpp
+@@ -176,13 +176,10 @@
+     int    iReuse=0;
+     char   szAddr[100], szSourceAddr[100];
+     bool   bUseTitleStreaming = false, bUseAltNIC = false;;
+-    char *path2 = new char[PATH_MAX];
+ 
+     ReportStatus(_("Setting up RTP stream..."));
+ 
+-    iRet = sscanf(path2, "rtp://%[^:]:%d", szAddr, &iPort);
+-    m_path = path2;
+-    delete [] path2;
++    iRet = sscanf(m_path.c_str(), "rtp://%[^:]:%d", szAddr, &iPort);
+     if (iRet < 2)
+     {
+         ReportError(_("Invalid URL. URL format: rtp://<multicast addr>[:port]"));
diff --git a/media-sound/zinf/zinf-2.2.5-r2.ebuild b/media-sound/zinf/zinf-2.2.5-r2.ebuild
new file mode 100644
index 000000000000..d7f334346f5b
--- /dev/null
+++ b/media-sound/zinf/zinf-2.2.5-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5-r2.ebuild,v 1.1 2005/07/31 20:17:22 vanquirius Exp $
+
+inherit kde-functions eutils flag-o-matic libtool
+
+DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
+HOMEPAGE="http://www.zinf.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -sparc"
+IUSE="alsa arts debug esd gnome gtk ipv6 nls vorbis xosd X"
+
+RESTRICT="primaryuri"
+
+RDEPEND=">=dev-libs/glib-2.0.0
+	sys-libs/gdbm
+	sys-libs/zlib
+	>=sys-libs/ncurses-5.2
+	>=media-libs/musicbrainz-1.0.1
+	alsa? ( >=media-libs/alsa-lib-0.9.8 )
+	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	gnome? ( =gnome-base/orbit-0* )
+	gtk? ( >=x11-libs/gtk+-2.0.0 )
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )
+	X? ( virtual/x11 )"
+
+# When updating next, check boost to see if the newer versions fix compilation
+DEPEND="${RDEPEND}
+	dev-db/metakit
+	dev-lang/perl
+	dev-libs/boost
+	>=media-libs/id3lib-3.8.0
+	>=sys-devel/automake-1.7
+	nls? ( sys-devel/gettext )
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	epatch ${FILESDIR}/${P}-cdplay.patch
+	epatch ${FILESDIR}/${P}-configure.patch
+	epatch ${FILESDIR}/${P}-rtp.patch
+
+	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOCONF=2.5
+
+	touch aclocal.m4
+
+	ebegin "Running automake (${WANT_AUTOMAKE})"
+	automake
+	eend $?
+
+	ebegin "Running autoconf (${WANT_AUTOCONF})"
+	autoconf
+	eend $?
+
+	# fix #94149
+	elibtoolize
+}
+
+src_compile() {
+	if use amd64; then
+		replace-flags -O? -O
+		append-flags -frerun-cse-after-loop
+	fi
+
+	if use arts; then
+		set-kdedir 3
+		export ARTSCCONFIG="$KDEDIR/bin/artsc-config"
+	fi
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable debug) \
+		$(use_enable esd) \
+		$(use_enable ipv6) \
+		$(use_enable gnome corba) \
+		$(use_enable x86 x86opts) \
+		$(use_enable xosd) \
+		--enable-cmdline || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}