Version bump and more fixes to use proper (system) ffmpeg headers. Also fixes possible segfaults. Closes bug #85426.

(Portage version: 2.0.51.19)

7 files changed, 126 insertions, 76 deletions

diff --git a/media-plugins/xmms-wma/ChangeLog b/media-plugins/xmms-wma/ChangeLog
index b86e4ab67dd6..40875df04c9b 100644
--- a/media-plugins/xmms-wma/ChangeLog
+++ b/media-plugins/xmms-wma/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2005/03/15 22:50:33 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/ChangeLog,v 1.5 2005/03/21 02:57:38 eradicator Exp $
+
+*xmms-wma-1.0.4 (21 Mar 2005)
+
+  21 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/xmms-wma-1.0.3-ffmpeg.patch, +files/xmms-wma-1.0.4-ffmpeg.patch,
+  -xmms-wma-1.0.3.ebuild, +xmms-wma-1.0.4.ebuild:
+  Version bump and more fixes to use proper (system) ffmpeg headers. Also
+  fixes possible segfaults. Closes bug #85426.
 
   16 Mar 2005; Chris White <chriswhite@gentoo.org>
   files/xmms-wma-1.0.3-ffmpeg.patch, xmms-wma-1.0.3.ebuild:
diff --git a/media-plugins/xmms-wma/Manifest b/media-plugins/xmms-wma/Manifest
index 4d93f3a43d72..d12b4794f77b 100644
--- a/media-plugins/xmms-wma/Manifest
+++ b/media-plugins/xmms-wma/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3609fd41fe6bd215eb02d2265849201b ChangeLog 1084
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 aeb0ce4a35657d5d5931f96b5dbdce96 xmms-wma-1.0.3.ebuild 851
+MD5 aeb0ce4a35657d5d5931f96b5dbdce96 xmms-wma-1.0.4.ebuild 851
 MD5 5112ee033af33bd3c309514fe4c880da files/digest-xmms-wma-1.0.3 67
 MD5 c55cdec364f35f901c8a417c75687f56 files/xmms-wma-1.0.3-ffmpeg.patch 2347
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCN17dFdQwWVoAgN4RApP0AKC4Kd2ppf1JJelEjuKVSv4yPjdcOACgzJP3
-Fyy3PxDZ3uyMOZYaItIFg/k=
-=UsL1
------END PGP SIGNATURE-----
+MD5 86c95cfc84bede2f50b92367f025dd4a files/digest-xmms-wma-1.0.4 67
diff --git a/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.3 b/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.3
deleted file mode 100644
index d9ca682c2875..000000000000
--- a/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 25cfcfb7deed581dea3aae3b153cc291 xmms-wma-1.0.3.tar.bz2 145752
diff --git a/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.4 b/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.4
new file mode 100644
index 000000000000..55233a544253
--- /dev/null
+++ b/media-plugins/xmms-wma/files/digest-xmms-wma-1.0.4
@@ -0,0 +1 @@
+MD5 069cd8197a13047901876b35e91eb82e xmms-wma-1.0.4.tar.bz2 145691
diff --git a/media-plugins/xmms-wma/files/xmms-wma-1.0.3-ffmpeg.patch b/media-plugins/xmms-wma/files/xmms-wma-1.0.3-ffmpeg.patch
deleted file mode 100644
index 006b388c8a8d..000000000000
--- a/media-plugins/xmms-wma/files/xmms-wma-1.0.3-ffmpeg.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur xmms-wma-1.0.3.orig/Makefile xmms-wma-1.0.3/Makefile
---- xmms-wma-1.0.3.orig/Makefile	2004-03-03 06:47:58.000000000 -0800
-+++ xmms-wma-1.0.3/Makefile	2004-07-09 16:24:31.276059000 -0700
-@@ -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:"
-diff -Naur xmms-wma-1.0.3.orig/Makefile.inc xmms-wma-1.0.3/Makefile.inc
---- xmms-wma-1.0.3.orig/Makefile.inc	2004-03-03 12:02:39.000000000 -0800
-+++ xmms-wma-1.0.3/Makefile.inc	2004-07-09 16:31:44.366257000 -0700
-@@ -1,18 +1,20 @@
- CC := gcc
--CFLAGS := -O2 -ffast-math -fomit-frame-pointer
--#CFLAGS := -Wall -g -O3
--CFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DX86
--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:/" > $@
-+	$(CC) -MM $(MYCFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
- 
- -include $(DEPS)
-diff -Naur xmms-wma-1.0.3.orig/wma123_examples/Makefile xmms-wma-1.0.3/wma123_examples/Makefile
---- xmms-wma-1.0.3.orig/wma123_examples/Makefile	2004-03-26 09:01:39.000000000 -0800
-+++ xmms-wma-1.0.3/wma123_examples/Makefile	2004-07-09 16:25:08.197936000 -0700
-@@ -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/files/xmms-wma-1.0.4-ffmpeg.patch b/media-plugins/xmms-wma/files/xmms-wma-1.0.4-ffmpeg.patch
new file mode 100644
index 000000000000..9846af5f3aa3
--- /dev/null
+++ b/media-plugins/xmms-wma/files/xmms-wma-1.0.4-ffmpeg.patch
@@ -0,0 +1,109 @@
+diff -Naurp xmms-wma-1.0.4.orig/Makefile xmms-wma-1.0.4/Makefile
+--- xmms-wma-1.0.4.orig/Makefile	2004-03-03 06:47:58.000000000 -0800
++++ xmms-wma-1.0.4/Makefile	2005-03-20 18:46:48.000000000 -0800
+@@ -11,7 +11,7 @@ export OBJECTS := $(SOURCES:%.c=$(OBJDIR
+ 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 @@ uninstall-home:
+ 	@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)
+diff -Naurp xmms-wma-1.0.4.orig/Makefile.inc xmms-wma-1.0.4/Makefile.inc
+--- xmms-wma-1.0.4.orig/Makefile.inc	2004-03-03 12:02:39.000000000 -0800
++++ xmms-wma-1.0.4/Makefile.inc	2005-03-20 18:46:30.000000000 -0800
+@@ -1,18 +1,20 @@
+ CC := gcc
+-CFLAGS := -O2 -ffast-math -fomit-frame-pointer
+-#CFLAGS := -Wall -g -O3
+-CFLAGS += -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DX86
+-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:/" > $@
++	$(CC) -MM $(MYCFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
+ 
+ -include $(DEPS)
+diff -Naurp xmms-wma-1.0.4.orig/wma123_examples/Makefile xmms-wma-1.0.4/wma123_examples/Makefile
+--- xmms-wma-1.0.4.orig/wma123_examples/Makefile	2004-03-26 09:01:39.000000000 -0800
++++ xmms-wma-1.0.4/wma123_examples/Makefile	2005-03-20 18:42:00.000000000 -0800
+@@ -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 -Naurp xmms-wma-1.0.4.orig/xmms-wma.c xmms-wma-1.0.4/xmms-wma.c
+--- xmms-wma-1.0.4.orig/xmms-wma.c	2004-11-23 15:12:22.000000000 -0800
++++ xmms-wma-1.0.4/xmms-wma.c	2005-03-20 18:45:58.000000000 -0800
+@@ -35,8 +35,9 @@
+ #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, Mokrushin I.V. aka McMCC (mcmcc@mail.ru).\n \
+@@ -331,7 +333,7 @@ static void *wma_play_loop(void *arg)
+ 
+ 	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;
+ 	}
+@@ -379,6 +381,9 @@ static void wma_play_file(char *filename
+         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);
+@@ -407,7 +412,8 @@ static void wma_stop(void) 
+ {
+     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();
+ }	
+ 
diff --git a/media-plugins/xmms-wma/xmms-wma-1.0.3.ebuild b/media-plugins/xmms-wma/xmms-wma-1.0.4.ebuild
index 842c482d647c..87117f44bdd1 100644
--- a/media-plugins/xmms-wma/xmms-wma-1.0.3.ebuild
+++ b/media-plugins/xmms-wma/xmms-wma-1.0.4.ebuild
@@ -1,10 +1,10 @@
 # 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.3.ebuild,v 1.6 2005/03/15 22:50:33 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-wma/xmms-wma-1.0.4.ebuild,v 1.1 2005/03/21 02:57:38 eradicator Exp $
 
 IUSE=""
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="XMMS plugin to play wma"
 HOMEPAGE="http://mcmcc.bat.ru/xmms-wma/"
@@ -13,10 +13,9 @@ SRC_URI="http://mcmcc.bat.ru/xmms-wma/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 
-#~amd64: 1.0.3: Plays a little staticy, x86 is clear... both with 
-#               media-video/ffmpeg-0.4.8.20040322-r1
+#~sparc: 1.0.4: Plays a little staticy, x86/adm64 is clear...
 
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="media-sound/xmms
 	>=media-video/ffmpeg-0.4.9_p20050226-r1"
@@ -28,7 +27,7 @@ src_unpack() {
 }
 
 src_compile () {
-	emake || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install () {