Version bump. Closes bug #104249. Added patch to fix build and segmentation fault.

(Portage version: 2.0.53_rc6)

5 files changed, 152 insertions, 13 deletions

diff --git a/media-plugins/xmms-wma/ChangeLog b/media-plugins/xmms-wma/ChangeLog
index 40875df04c9b..13be8f39935d 100644
--- a/media-plugins/xmms-wma/ChangeLog
+++ b/media-plugins/xmms-wma/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/xmms-wma
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/ChangeLog,v 1.5 2005/03/21 02:57:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/ChangeLog,v 1.6 2005/10/24 00:46:58 metalgod Exp $
+
+*xmms-wma-1.0.5 (24 Oct 2005)
+
+  24 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-wma-1.0.5-ffmpeg.patch, +xmms-wma-1.0.5.ebuild:
+  Version bump. Closes bug #104249. Added patch to fix build and segmentation
+  fault.
 
 *xmms-wma-1.0.4 (21 Mar 2005)
 
diff --git a/media-plugins/xmms-wma/Manifest b/media-plugins/xmms-wma/Manifest
index 02a4981f39c4..08cb43b5b02c 100644
--- a/media-plugins/xmms-wma/Manifest
+++ b/media-plugins/xmms-wma/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c7870e2154e6f56bbbf55418342ccff8 ChangeLog 1418
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 caea6b3a5ee81893119c8f463f019c10 xmms-wma-1.0.4.ebuild 833
 MD5 86c95cfc84bede2f50b92367f025dd4a files/digest-xmms-wma-1.0.4 67
+MD5 2e033b8d9a3a271c4c06c594aceb59e7 files/digest-xmms-wma-1.0.5 67
 MD5 94d9ef7188afd52346e89ec625494085 files/xmms-wma-1.0.4-ffmpeg.patch 3884
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCPjgtArHZZzCEUG0RApBFAJ4/A7zImTPEMz4kcpP5rohaJjT5vACePiSx
-RnM4XldLl3Byg9DxM8d+87k=
-=4bOR
------END PGP SIGNATURE-----
+MD5 150baf260442010c0c272c4280216034 files/xmms-wma-1.0.5-ffmpeg.patch 3188
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 caea6b3a5ee81893119c8f463f019c10 xmms-wma-1.0.4.ebuild 833
+MD5 caea6b3a5ee81893119c8f463f019c10 xmms-wma-1.0.5.ebuild 833
diff --git a/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.5 b/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.5
new file mode 100644
index 000000000000..ef719a6c8b93
--- /dev/null
+++ b/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.5
@@ -0,0 +1 @@
+MD5 5d62a0f969617aeb40096362c7a8a506 xmms-wma-1.0.5.tar.bz2 146687
diff --git a/media-plugins/xmms-wma/files/xmms-wma-1.0.5-ffmpeg.patch b/media-plugins/xmms-wma/files/xmms-wma-1.0.5-ffmpeg.patch
new file mode 100644
index 000000000000..e3acd460e41c
--- /dev/null
+++ b/media-plugins/xmms-wma/files/xmms-wma-1.0.5-ffmpeg.patch
@@ -0,0 +1,101 @@
+--- xmms-wma.c.orig	2005-10-24 01:23:13.218835024 +0000
++++ xmms-wma.c	2005-10-24 01:28:17.917513784 +0000
+@@ -42,8 +42,8 @@
+ #undef HAVE_AV_CONFIG_H
+ #endif
+ 
+-#include "avcodec.h"
+-#include "avformat.h"
++#include "ffmpeg/avcodec.h"
++#include "ffmpeg/avformat.h"
+ #include "iir.h"
+ 
+ #define ABOUT_TXT "Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru).\n \
+@@ -379,7 +379,7 @@
+ 
+ 	if(wma_seekpos != -1)
+ 	{
+-	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL);
++	    av_seek_frame(ic, wma_idx, wma_seekpos * 1000000LL, 0);
+ 	    wma_ip.output->flush(wma_seekpos * 1000);
+ 	    wma_seekpos = -1;
+ 	}
+@@ -431,6 +431,9 @@
+         if(c->codec_type == CODEC_TYPE_AUDIO) break;
+     }
+ 
++    if(!c || c->codec_type != CODEC_TYPE_AUDIO)
++	    return;
++
+     av_find_stream_info(ic);
+ 
+     codec = avcodec_find_decoder(c->codec_id);
+@@ -459,7 +462,8 @@
+ {
+     wma_decode = 0;
+     if(wma_pause) wma_do_pause(0);
+-    pthread_join(wma_decode_thread, NULL);
++    if(wma_decode_thread)
++	    pthread_join(wma_decode_thread, NULL);
+     wma_ip.output->close_audio();
+ }	
+ 
+--- Makefile.orig	2005-10-24 01:34:07.095430672 +0000
++++ Makefile	2005-10-24 01:35:00.225353696 +0000
+@@ -11,7 +11,7 @@
+ export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
+ 
+ all:
+-	@cd ffmpeg-strip-wma; make; cd ..
++	#@cd ffmpeg-strip-wma; make; cd ..
+ 	@$(MAKE) --no-print-directory -f Makefile.inc
+ 	@strip $(PLUGIN_FILE)
+ 	@echo "The plug-in has been compiled. Run one of the following:"
+@@ -40,5 +40,5 @@
+ 	@echo "The plug-in has been uninstalled."
+ 
+ clean:
+-	cd ffmpeg-strip-wma; make clean; cd ..
++	#cd ffmpeg-strip-wma; make clean; cd ..
+ 	rm -f $(OBJECTS) $(DEPS)
+--- Makefile.inc.orig	2005-10-24 01:36:18.429464864 +0000
++++ Makefile.inc	2005-10-24 01:37:25.107328288 +0000
+@@ -1,16 +1,18 @@
+ CC := gcc
+-CFLAGS := -O2 -ffast-math -fomit-frame-pointer -fPIC
+-#CFLAGS := -Wall -g -O3
+-CFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+-CFLAGS += -I ffmpeg-strip-wma
+-CFLAGS += `xmms-config --cflags`
+-LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++MYCFLAGS := $(CFLAGS) -fPIC
++#MYCFLAGS := -Wall -g -O3
++MYCFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC
++#MYCFLAGS += -I ffmpeg-strip-wma
++MYCFLAGS += `xmms-config --cflags`
++MYCFLAGS += -I/usr/include/ffmpeg
++#LIBS := `xmms-config --libs` -L ffmpeg-strip-wma -lffwma
++LIBS := `xmms-config --libs` -lavcodec -lavformat
+ 
+ $(PLUGIN_FILE): $(OBJECTS)
+ 	$(CC) -o $@ $^ $(LIBS) -shared
+ 
+ $(OBJDIR)/%.o: %.c
+-	$(CC) -c -o $@ $(CFLAGS) $<
++	$(CC) -c -o $@ $(MYCFLAGS) $<
+ 
+ $(DEPDIR)/%.d: %.c
+ 	$(CC) -MM $(CFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
+--- wma123_examples/Makefile.orig	2005-10-24 01:38:23.246489792 +0000
++++ wma123_examples/Makefile	2005-10-24 01:38:57.836231352 +0000
+@@ -1,7 +1,7 @@
+-include ../ffmpeg-strip-wma/config.mak
++#include ../ffmpeg-strip-wma/config.mak
+ 
+-INC=-I../ffmpeg-strip-wma
+-LIB=-L../ffmpeg-strip-wma
++#INC=-I../ffmpeg-strip-wma
++#LIB=-L../ffmpeg-strip-wma
+ CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ all: artswma alsawma osswma
diff --git a/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild b/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild
new file mode 100644
index 000000000000..b809fbb02734
--- /dev/null
+++ b/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/xmms-wma-1.0.5.ebuild,v 1.1 2005/10/24 00:46:58 metalgod Exp $
+
+IUSE=""
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="XMMS plugin to play wma"
+HOMEPAGE="http://mcmcc.bat.ru/xmms-wma/"
+SRC_URI="http://mcmcc.bat.ru/xmms-wma/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+#~sparc: 1.0.4: Plays a little staticy, x86/adm64 is clear...
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+	>=media-video/ffmpeg-0.4.9_p20050226-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ffmpeg.patch
+}
+
+src_compile () {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe libwma.so
+	dodoc readme.rus readme.eng
+}