Bug 65695

Summary: [patch] update audio/xmms-wma to 0.2
Product: Ports & Packages Reporter: edwin
Component: Individual Port(s)Assignee: Pav Lucistnik <pav>
Status: Closed FIXED    
Severity: Affects Only Me CC: bogorodskiy
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description edwin 2004-04-18 08:00:37 UTC 
    Update audio/xmms-wma to version 0.2
    Still does crash on the WMA files I have.
Comment 1 Pav Lucistnik freebsd_committer freebsd_triage 2004-04-18 15:47:36 UTC 
Dear maintainer of FreeBSD port audio/xmms-wma, please take a look at

http://www.freebsd.org/cgi/query-pr.cgi?q=65695

Do you approve this update?

-- 
Pav Lucistnik <pav@oook.cz>
              <pav@FreeBSD.org>

Orfax's hip flask contained Old Janx Spirit, a mixture of potions of
stupidity, paralysis, naivery, ruination, lose memories, confusion,
and slime mold juice, with a twist of lemon.
    - from a post on Angband Community Forum
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2004-04-18 15:47:39 UTC 
State Changed
From-To: open->feedback

Asked maintainer for approval.
Comment 3 Pav Lucistnik freebsd_committer freebsd_triage 2004-04-18 15:47:39 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pav

Handle.
Comment 4 Roman Bogorodskiy 2004-04-19 06:09:48 UTC 
 Pav wrote:

> Dear maintainer of FreeBSD port audio/xmms-wma, please take a look at
> 
> http://www.freebsd.org/cgi/query-pr.cgi?q=65695
> 
> Do you approve this update?

Here is a patch:

diff -ruN xmms-wma/Makefile /usr/ports/audio/xmms-wma/Makefile
--- xmms-wma/Makefile	Tue Mar 16 17:39:19 2004
+++ /usr/ports/audio/xmms-wma/Makefile	Mon Apr 19 08:31:45 2004
@@ -2,25 +2,26 @@
 # Date created:        26 Feb 2004
 # Whom:            Roman Bogorodskiy
 #
-# $FreeBSD: ports/audio/xmms-wma/Makefile,v 1.4 2004/03/16 14:39:19 krion Exp $
+# $FreeBSD$
 #
 
-PORTNAME=	xmms-wma
-PORTVERSION=	0.1.3
-CATEGORIES=	audio
-MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
+PORTNAME=      xmms-wma
+PORTVERSION=   0.2
+CATEGORIES=    audio
+MASTER_SITES=  http://mcmcc.bat.ru/xmms-wma/
 
-MAINTAINER=	bogorodskiy@inbox.ru
-COMMENT=	WMA plugin for xmms
+MAINTAINER=    bogorodskiy@inbox.ru
+COMMENT=       WMA plugin for xmms
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=   xmms.4:${PORTSDIR}/multimedia/xmms \
+	       iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_BZIP2=     yes
+USE_GMAKE=     yes
+USE_X_PREFIX=  yes
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS= i386
 
-PLIST_FILES=	lib/xmms/Input/libwma.so
+PLIST_FILES=   lib/xmms/Input/libwma.so
 
 .include <bsd.port.mk>
diff -ruN xmms-wma/distinfo /usr/ports/audio/xmms-wma/distinfo
--- xmms-wma/distinfo	Tue Mar 16 17:39:19 2004
+++ /usr/ports/audio/xmms-wma/distinfo	Mon Apr 19 08:39:23 2004
@@ -1,2 +1,2 @@
-MD5 (xmms-wma-0.1.3.tar.bz2) = ddb46e38017c905d5cea09beae9941b5
-SIZE (xmms-wma-0.1.3.tar.bz2) = 140855
+MD5 (xmms-wma-0.2.tar.bz2) = f73b6e78fe6811a1db0e6b804b2ee4f5
+SIZE (xmms-wma-0.2.tar.bz2) = 144704
diff -ruN xmms-wma/files/patch-Makefile /usr/ports/audio/xmms-wma/files/patch-Makefile
--- xmms-wma/files/patch-Makefile	Tue Mar 16 17:39:19 2004
+++ /usr/ports/audio/xmms-wma/files/patch-Makefile	Mon Apr 19 08:55:25 2004
@@ -1,20 +1,19 @@
---- Makefile	Wed Mar  3 17:47:58 2004
-+++ Makefile	Thu Mar 11 19:05:38 2004
+--- Makefile.orig	Mon Apr 19 08:42:08 2004
++++ Makefile	Mon Apr 19 08:55:24 2004
 @@ -1,6 +1,6 @@
--.PHONY: all install install-home uninstall uninstall-home clean
-+.PHONY: all install uninstall clean
+ .PHONY: all install install-home uninstall uninstall-home clean
  
 -INSTALL_DIR := /usr/lib/xmms/Input
 +INSTALL_DIR := `xmms-config --input-plugin-dir`
  INSTALL_DIR_HOME := ~/.xmms/Plugins/Input
  
  export PLUGIN_FILE := libwma.so
-@@ -11,34 +11,17 @@
+@@ -11,12 +11,9 @@
  export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
  
  all:
 -	@cd ffmpeg-strip-wma; make; cd ..
-+	@cd ffmpeg-strip-wma; gmake; 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:"
@@ -23,26 +22,10 @@
  
  install: all
  	cp -f $(PLUGIN_FILE) $(INSTALL_DIR)
--	@echo "The plug-in has been installed."
--	@echo "Enjoy!"
--
--install-home: all
--	-mkdir ~/.xmms
--	-mkdir ~/.xmms/Plugins
--	-mkdir ~/.xmms/Plugins/Input
--	cp -f $(PLUGIN_FILE) $(INSTALL_DIR_HOME)
--	@echo "The plug-in has been installed."
--	@echo "Enjoy!"
- 
- uninstall:
- 	rm -f $(INSTALL_DIR)/$(PLUGIN_FILE)
+@@ -40,5 +37,5 @@
  	@echo "The plug-in has been uninstalled."
  
--uninstall-home:
--	rm -f $(INSTALL_DIR_HOME)/$(PLUGIN_FILE)
--	@echo "The plug-in has been uninstalled."
--
  clean:
 -	cd ffmpeg-strip-wma; make clean; cd ..
-+	cd ffmpeg-strip-wma; gmake clean; cd ..
++	cd ffmpeg-strip-wma; $(MAKE) clean; cd ..
  	rm -f $(OBJECTS) $(DEPS)
diff -ruN xmms-wma/files/patch-Makefile.inc /usr/ports/audio/xmms-wma/files/patch-Makefile.inc
--- xmms-wma/files/patch-Makefile.inc	Tue Mar 16 17:39:19 2004
+++ /usr/ports/audio/xmms-wma/files/patch-Makefile.inc	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.inc	Wed Mar  3 23:02:39 2004
-+++ Makefile.inc	Thu Mar 11 18:59:19 2004
-@@ -10,7 +10,7 @@
- 	$(CC) -o $@ $^ $(LIBS) -shared
- 
- $(OBJDIR)/%.o: %.c
--	$(CC) -c -o $@ $(CFLAGS) $<
-+	$(CC) -c -o $@ $(CFLAGS) $< 
- 
- $(DEPDIR)/%.d: %.c
- 	$(CC) -MM $(CFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
diff -ruN xmms-wma/files/patch-ffmpeg-strip-wma::asf.c /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
--- xmms-wma/files/patch-ffmpeg-strip-wma::asf.c	Tue Mar 16 17:39:19 2004
+++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- ffmpeg-strip-wma/asf.c	Fri Feb 20 03:21:31 2004
-+++ ffmpeg-strip-wma/asf.c	Thu Mar 11 18:46:59 2004
-@@ -847,7 +847,7 @@
-        {
-            return;
-        }
--       result = iconv(frt, &ansbptr, &len, &ansaptr, &len1);
-+       result = iconv(frt, (const char **)&ansbptr, &len, &ansaptr, &len1);
-        if (result == (size_t) - 1)
-        {
-            return;
diff -ruN xmms-wma/files/patch-ffmpeg-strip-wma::config.mak /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak
--- xmms-wma/files/patch-ffmpeg-strip-wma::config.mak	Tue Mar 16 17:39:19 2004
+++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak	Thu Jan  1 03:00:00 1970
@@ -1,18 +0,0 @@
---- ffmpeg-strip-wma/config.mak.orig	Thu Feb 19 01:08:40 2004
-+++ ffmpeg-strip-wma/config.mak	Tue Mar 16 15:30:59 2004
-@@ -3,12 +3,12 @@
- bindir=/usr/bin
- mandir=/usr/share/man
- MAKE=make
--CC=gcc
-+CC?=gcc
- AR=ar
- RANLIB=ranlib
- STRIP=strip
--OPTFLAGS=-Wall  -g -O3
--SHCFLAGS=-Wall  -g -O3
-+OPTFLAGS=-Wall -O3
-+SHCFLAGS=-Wall -O3
- LDFLAGS=-Wl,--warn-common -rdynamic
- FFSLDFLAGS=-Wl,-E
- SHFLAGS=-shared
diff -ruN xmms-wma/pkg-descr /usr/ports/audio/xmms-wma/pkg-descr
--- xmms-wma/pkg-descr	Tue Mar 16 17:39:19 2004
+++ /usr/ports/audio/xmms-wma/pkg-descr	Tue Mar 16 15:58:38 2004
@@ -1,4 +1,4 @@
-XMMS input plugin to support WMA format.
+XMMS input plugin for support WMA format.
 
 WWW: http://mcmcc.bat.ru/xmms-wma/
 

-Roman Bogorodskiy
Comment 5 Pav Lucistnik freebsd_committer freebsd_triage 2004-04-19 08:53:20 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!