Add nptl patch. Closes #26172. If not "smooth" this rev. will get nuked. Quickly.

5 files changed, 244 insertions, 3 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index c9e6da9b036c..56aed74a2b25 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.61 2003/08/10 03:09:28 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.62 2003/08/16 09:27:34 jje Exp $
+
+*xmms-1.2.7-r25 (16 Aug 2003)
+
+  16 Aug 2003; jje <jje@gentoo.org> xmms-1.2.7-r25.ebuild,
+  files/xmms-nptl.patch:
+  Added nptl patch. See bug #26172.
 
   10 Aug 2003; jje <jje@gentoo.org> xmms-1.2.7-r24.ebuild:
   Fixed typo in SRC_URI fix. Moral? Don't change anything after you've tested...
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 343d2d844b69..6a168d59fb7a 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,10 +1,10 @@
-MD5 932435b3ab9789946f588c03c87495ac ChangeLog 11479
+MD5 6df41faaa80f1fd5fc8775512e622a43 ChangeLog 11631
 MD5 9babb98a35c1c40729cdede9bd3588a3 xmms-1.2.7-r20.ebuild 4960
 MD5 5618f4d14fd98b813b7be2b4df0087e7 xmms-1.2.7-r21.ebuild 4830
 MD5 90740c69a0e1cdd3a65b037af5fe8a5a xmms-1.2.7-r22.ebuild 4989
 MD5 38f3c86b97d6c40051d4964d1994bcff xmms-1.2.7-r23.ebuild 5233
 MD5 01e09a0cac7a81e82ad7c6a61d889e50 xmms-1.2.7-r24.ebuild 5482
-MD5 acc5b6a94363a8464d1554a98dfecfb7 xmms-1.2.7-r25.ebuild 5566
+MD5 68c8ddf8d314059d08bf84546fbca30d xmms-1.2.7-r25.ebuild 5566
 MD5 66549f879e2d904a11e8e139b7dc0447 files/xmms-nptl.patch 1163
 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r20 130
 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r21 130
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r25 b/media-sound/xmms/files/digest-xmms-1.2.7-r25
new file mode 100644
index 000000000000..89cc7eba5fd4
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.7-r25
@@ -0,0 +1,2 @@
+MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
+MD5 daea40648c3ae296597dcd3e78500279 xmms-1.2.7-mmx.patch.gz 14990
diff --git a/media-sound/xmms/files/xmms-nptl.patch b/media-sound/xmms/files/xmms-nptl.patch
new file mode 100644
index 000000000000..32a54675b337
--- /dev/null
+++ b/media-sound/xmms/files/xmms-nptl.patch
@@ -0,0 +1,43 @@
+Index: Input/mpg123/common.c
+===================================================================
+RCS file: /cvs/xmms/Input/mpg123/common.c,v
+retrieving revision 1.17
+diff -u -r1.17 common.c
+--- xmms/Input/mpg123/common.c	19 Feb 2002 23:24:05 -0000	1.17
++++ xmms/Input/mpg123/common.c	4 Feb 2003 12:39:44 -0000
+@@ -278,10 +278,9 @@
+ 
+ void mpg123_stream_close(void)
+ {
+-/*    if (flags & READER_FD_OPENED) */
+ 	if (filept)
+ 		fclose(filept);
+-	else
++	else if (mpg123_info->network_stream)
+ 		mpg123_http_close();
+ }
+ 
+@@ -659,6 +658,7 @@
+ 		filept = NULL;
+ 		mpg123_http_open(bs_filenam);
+ 		mpg123_info->filesize = 0;
++		mpg123_info->network_stream = TRUE;
+ 	}
+ 	else
+ 	{
+Index: Input/mpg123/mpg123.h
+===================================================================
+RCS file: /cvs/xmms/Input/mpg123/mpg123.h,v
+retrieving revision 1.17
+diff -u -r1.17 mpg123.h
+--- xmms/Input/mpg123/mpg123.h	19 Feb 2002 23:24:05 -0000	1.17
++++ xmms/Input/mpg123/mpg123.h	4 Feb 2003 12:39:44 -0000
+@@ -76,6 +76,7 @@
+ 	gfloat eq_mul[576];
+ 	gboolean output_audio;
+ 	gboolean first_frame;
++	gboolean network_stream;
+ 	guint32 filesize;	/* Filesize without junk */
+ }
+ PlayerInfo;
+
diff --git a/media-sound/xmms/xmms-1.2.7-r25.ebuild b/media-sound/xmms/xmms-1.2.7-r25.ebuild
new file mode 100644
index 000000000000..37cd51611496
--- /dev/null
+++ b/media-sound/xmms/xmms-1.2.7-r25.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r25.ebuild,v 1.1 2003/08/16 09:27:34 jje Exp $
+
+IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
+
+inherit libtool flag-o-matic eutils
+filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+DESCRIPTION="X MultiMedia System"
+SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.gz
+	 ( mmx?||3dnow? ) ( http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz )"
+HOMEPAGE="http://www.xmms.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+
+DEPEND="app-arch/unzip
+	=x11-libs/gtk+-1.2*
+	mikmod? ( >=media-libs/libmikmod-3.1.6 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	xml? ( >=dev-libs/libxml-1.8.15 )
+	gnome? ( <gnome-base/gnome-panel-1.5.0 )
+	opengl? ( virtual/opengl )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+RDEPEND="${DEPEND}
+	directfb? ( dev-libs/DirectFB )
+	nls? ( dev-util/intltool )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	# Patch to allow external programmes to have the "jump to" dialog box
+	epatch ${FILESDIR}/xmms-jump.patch
+
+	# Save playlist, etc on SIGTERM and SIGINT, bug #13604.
+	epatch ${FILESDIR}/xmms-sigterm.patch
+
+	# Patch to stop crashing with nptl bug #26172
+	epatch ${FILESDIR}/xmms-nptl.patch
+
+	# The following optimisations are ONLY for x86 platform
+	if [ `use x86` ] ; then
+		# For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations
+		#
+		# ( use mmx || use 3dnow ) && \
+		# 	cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die
+		#
+		# For you guys who favour this kind of USE flag checking ... this
+		# is exactly why I do NOT like it, because the actual
+		# "cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die"
+		# was not in a subshell, it would ALWAYS fail to build if "mmx" or
+		# "3dnow" was not in USE, because of the || die at the end.  So
+		# PLEASE, PLEASE test things with all possible USE flags if you use
+		# this style!!!!  Then, if in a subshell, it do not detect if the
+		# command fails :/
+		#
+		# Azarah - 30 Jun 2002
+		#
+		if use mmx || use 3dnow
+		then
+			epatch ${DISTDIR}/${P}-mmx.patch.gz
+			use ipv6 && epatch ${FILESDIR}/xmms-ipv6-20020408-mmx.patch
+		else
+			use ipv6 && epatch ${FILESDIR}/xmms-ipv6-20020408-nommx.patch
+		fi
+	else
+		use ipv6 && epatch ${FILESDIR}/xmms-ipv6-20020408-nommx.patch
+	fi
+
+	# Patch for mpg123 to convert Japanese character code of MP3 tag info
+	# the Japanese patch and the Russian one overlap, so its one or the other
+	if use cjk; then
+		epatch ${FILESDIR}/${P}-mpg123j.patch
+	else
+		# add russian charset support
+		epatch ${FILESDIR}/xmms-russian-charset.patch
+	fi
+
+	if [ ! -f ${S}/config.rpath ] ; then
+		touch ${S}/config.rpath
+		chmod +x ${S}/config.rpath
+	fi
+
+	# Add /usr/local/share/xmms/Skins to the search path for skins
+	epatch ${FILESDIR}/${PN}-fhs-skinsdir.patch
+
+	# We run automake and autoconf here else we get a lot of warning/errors.
+	# I have tested this with gcc-2.95.3 and gcc-3.1.
+	elibtoolize
+
+	if use nls; then
+		if has_version '>=sys-devel/gettext-0.12'; then
+			epatch ${FILESDIR}/${PN}-gettext-fix.patch
+		fi
+	fi
+
+	# This patch passes audio output through the output plugin 
+	# before recording via the diskwriter plugin
+	# http://forum.xmms.org/viewtopic.php?t=500&sid=c286e1c01fb924a2f81f519969f33764
+	epatch ${FILESDIR}/xmms-diskwriter-audio.patch
+
+	echo ">>> Reconfiguring..."
+	for x in ${S} ${S}/libxmms
+	do
+		cd ${x}
+		aclocal
+		export WANT_AUTOCONF_2_5=1
+		automake --gnu --add-missing --include-deps Makefile || die
+		autoconf || die
+	done
+}
+
+src_compile() {
+	local myconf=""
+
+	use 3dnow || use mmx \
+		&& myconf="${myconf} --enable-simd" \
+		|| myconf="${myconf} --disable-simd"
+
+	use xml \
+		|| myconf="${myconf} --disable-cdindex"
+
+	econf \
+		--with-dev-dsp=/dev/sound/dsp \
+		--with-dev-mixer=/dev/sound/mixer \
+		`use_with gnome` \
+		`use_enable oggvorbis vorbis` \
+		`use_enable oggvorbis oggtest` \
+		`use_enable oggvorbis vorbistest` \
+		`use_with oggvorbis ogg` \
+		`use_enable esd` \
+		`use_enable esd esdtest` \
+		`use_enable mikmod` \
+		`use_enable mikmod mikmodtest` \
+		`use_with mikmod libmikmod` \
+		`use_enable opengl` \
+		`use_enable nls` \
+		`use_enable ipv6` \
+		${myconf} || die
+
+	### emake seems to break some compiles, please keep @ make
+	make || die
+}
+
+src_install() {
+	make prefix=${D}/usr \
+		datadir=${D}/usr/share \
+		incdir=${D}/usr/include \
+		infodir=${D}/usr/share/info \
+		localstatedir=${D}/var/lib \
+		mandir=${D}/usr/share/man \
+		sysconfdir=${D}/etc \
+		sysdir=${D}/usr/share/applets/Multimedia \
+		GNOME_SYSCONFDIR=${D}/etc install || die "FOO"
+
+	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
+	
+	keepdir /usr/share/xmms/Skins
+	insinto /usr/share/pixmaps/
+	donewins gnomexmms/gnomexmms.xpm xmms.xpm
+	doins xmms/xmms_logo.xpm
+	insinto /usr/share/pixmaps/mini
+	doins xmms/xmms_mini.xpm
+
+	insinto /etc/X11/wmconfig
+	donewins xmms/xmms.wmconfig xmms
+
+	if [ `use gnome` ] ; then
+		insinto /usr/share/gnome/apps/Multimedia
+		doins xmms/xmms.desktop
+		dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
+			/usr/share/gnome/apps/Multimedia/xmms.desktop
+	else
+		rm ${D}/usr/share/man/man1/gnomexmms*
+	fi
+
+	# causes segfaults for ppc users #10309 and after talking
+	# to xmms dev's, they've punted this from the src tree anyways ...
+	rm -rf ${D}/usr/lib/xmms/Input/libidcin.so
+}
+
+pkg_postrm() {
+	if [ -x ${ROOT}/usr/bin/xmms ] && [ ! -d ${ROOT}/usr/share/xmms/Skins ]
+	then
+		mkdir -p ${ROOT}/usr/share/xmms/Skins
+	fi
+}