+++ /dev/null
-# 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.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)
-
- 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:
- Fixed bug #84583 (xmms-wma compile failure). Adjusted the ffmpeg version
- dependancy to account for this.
-
- 17 Jul 2004; David Holm <dholm@gentoo.org> xmms-wma-1.0.3.ebuild:
- Added to ~ppc.
-
- 10 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xmms-wma-1.0.3.ebuild:
- Fix install dir to be the input plugin dir instead of output ;p. The plugin
- still works properly in the other location, so no bump needed.
-
-*xmms-wma-1.0.3 (09 Jul 2004)
-
- 09 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml,
- +files/xmms-wma-1.0.3-ffmpeg.patch, +xmms-wma-1.0.3.ebuild:
- Initial ebuild submitted in bug #53035 by Makurin Roman <romka@kaluga.ru>. I
- modified it to use the installed ffmpeg libraries rather than the ones
- included.
-
+++ /dev/null
-AUX xmms-wma-1.0.4-ffmpeg.patch 3884 RMD160 b5a4a7c12a2c80acd6369e28865d9262012d8a39 SHA1 4b934a62c0f1dd2c05bbe60dbcf356c767e8e7a5 SHA256 6b6d945d01a2d4308217b1bd9224bb02b377d32c0997d4840fed7fe256f2046e
-MD5 94d9ef7188afd52346e89ec625494085 files/xmms-wma-1.0.4-ffmpeg.patch 3884
-RMD160 b5a4a7c12a2c80acd6369e28865d9262012d8a39 files/xmms-wma-1.0.4-ffmpeg.patch 3884
-SHA256 6b6d945d01a2d4308217b1bd9224bb02b377d32c0997d4840fed7fe256f2046e files/xmms-wma-1.0.4-ffmpeg.patch 3884
-AUX xmms-wma-1.0.5-ffmpeg.patch 3188 RMD160 f9303fba854d40eb0849936424e89e0e77acfcf2 SHA1 831ed502365405cfed363486217299e71b8a2458 SHA256 676ee49184050115149624d8efacac9b3d29c5e558888f59ec781bcbe680a515
-MD5 150baf260442010c0c272c4280216034 files/xmms-wma-1.0.5-ffmpeg.patch 3188
-RMD160 f9303fba854d40eb0849936424e89e0e77acfcf2 files/xmms-wma-1.0.5-ffmpeg.patch 3188
-SHA256 676ee49184050115149624d8efacac9b3d29c5e558888f59ec781bcbe680a515 files/xmms-wma-1.0.5-ffmpeg.patch 3188
-DIST xmms-wma-1.0.4.tar.bz2 145691
-DIST xmms-wma-1.0.5.tar.bz2 146687
-EBUILD xmms-wma-1.0.4.ebuild 833 RMD160 0e22ff3e9b5b9938c350154fb35a050fad9e0ab8 SHA1 080fe43038ae244e9031bdff671b172f338e81a8 SHA256 e3c81a8b17385fe13682653b0329de271987040e22dc7fe8f5afcc805fe51c21
-MD5 caea6b3a5ee81893119c8f463f019c10 xmms-wma-1.0.4.ebuild 833
-RMD160 0e22ff3e9b5b9938c350154fb35a050fad9e0ab8 xmms-wma-1.0.4.ebuild 833
-SHA256 e3c81a8b17385fe13682653b0329de271987040e22dc7fe8f5afcc805fe51c21 xmms-wma-1.0.4.ebuild 833
-EBUILD xmms-wma-1.0.5.ebuild 831 RMD160 9dd1e86dc86312780966507e9c1df05e7891771c SHA1 4a59aa634791a766c6ce0e0a65003658c91ff8e4 SHA256 4a8f5187dc5d3a607a58fb42d69b0827dd2826d24b811687a42187466e0329ee
-MD5 c98d33cd9226799676c625fad1e675a2 xmms-wma-1.0.5.ebuild 831
-RMD160 9dd1e86dc86312780966507e9c1df05e7891771c xmms-wma-1.0.5.ebuild 831
-SHA256 4a8f5187dc5d3a607a58fb42d69b0827dd2826d24b811687a42187466e0329ee xmms-wma-1.0.5.ebuild 831
-MISC ChangeLog 1647 RMD160 3bab18cde67bbb0c406bb1fcb629ba15cf1fc819 SHA1 9ee9f50e6ca21606f84e29433ad0b7dcad2e9793 SHA256 c1e9c0cd0d251bf9954ded86a97b0c26c60a372f5dc7a64ca15e5203ecd6a86e
-MD5 0e243040ed6aecc66a3b2f5b98d91f7f ChangeLog 1647
-RMD160 3bab18cde67bbb0c406bb1fcb629ba15cf1fc819 ChangeLog 1647
-SHA256 c1e9c0cd0d251bf9954ded86a97b0c26c60a372f5dc7a64ca15e5203ecd6a86e ChangeLog 1647
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
-SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 86c95cfc84bede2f50b92367f025dd4a files/digest-xmms-wma-1.0.4 67
-RMD160 7d0ab6714b1b11770a9f8c45173b5455e85b0b80 files/digest-xmms-wma-1.0.4 67
-SHA256 3e2eb9517ea368ec5c776570dfe34d1db257699db2b8fcaff93cad02190f6348 files/digest-xmms-wma-1.0.4 67
-MD5 2e033b8d9a3a271c4c06c594aceb59e7 files/digest-xmms-wma-1.0.5 67
-RMD160 4a2f6e53bcc371efab05718e590e7276ef51d617 files/digest-xmms-wma-1.0.5 67
-SHA256 5a9929146e2cb33bbad1c3b4f1836a036de50000332315efa516cc2c1366ae3f files/digest-xmms-wma-1.0.5 67
+++ /dev/null
-MD5 069cd8197a13047901876b35e91eb82e xmms-wma-1.0.4.tar.bz2 145691
+++ /dev/null
-MD5 5d62a0f969617aeb40096362c7a8a506 xmms-wma-1.0.5.tar.bz2 146687
+++ /dev/null
-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();
- }
-
+++ /dev/null
---- 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
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sound</herd>
-</pkgmetadata>
+++ /dev/null
-# 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.4.ebuild,v 1.1 2005/03/21 02:57:38 eradicator 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
-}
+++ /dev/null
-# 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
-}