- Update to version 0.1.3

PR:		ports/64339
Submitted by:	maintainer

12 files changed, 109 insertions, 39 deletions

diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index 250884ebc3a4..f34973d2b890 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmms-wma
-PORTVERSION=	0.1
+PORTVERSION=	0.1.3
 CATEGORIES=	audio
 MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
 
diff --git a/audio/xmms-wma/distinfo b/audio/xmms-wma/distinfo
index 0a8be210c6b1..f5b8fa0ca6f0 100644
--- a/audio/xmms-wma/distinfo
+++ b/audio/xmms-wma/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmms-wma-0.1.tar.bz2) = 3c90344cd35fcf1ff699a407889cb3e7
-SIZE (xmms-wma-0.1.tar.bz2) = 137631
+MD5 (xmms-wma-0.1.3.tar.bz2) = ddb46e38017c905d5cea09beae9941b5
+SIZE (xmms-wma-0.1.3.tar.bz2) = 140855
diff --git a/audio/xmms-wma/files/patch-Makefile b/audio/xmms-wma/files/patch-Makefile
index 829a33696301..db2d9490a733 100644
--- a/audio/xmms-wma/files/patch-Makefile
+++ b/audio/xmms-wma/files/patch-Makefile
@@ -1,19 +1,48 @@
---- Makefile.orig	Thu Feb 26 12:24:35 2004
-+++ Makefile	Thu Feb 26 12:37:12 2004
+--- Makefile	Wed Mar  3 17:47:58 2004
++++ Makefile	Thu Mar 11 19:05:38 2004
 @@ -1,6 +1,6 @@
- .PHONY: all install install-home uninstall uninstall-home clean
+-.PHONY: all install install-home uninstall uninstall-home clean
++.PHONY: all install uninstall 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,7 +11,7 @@
+@@ -11,34 +11,17 @@
  export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
  
  all:
 -	@cd ffmpeg-strip-wma; make; cd ..
-+	@cd ffmpeg-strip-wma/; gmake; cd ..
++	@cd ffmpeg-strip-wma; gmake; cd ..
  	@$(MAKE) --no-print-directory -f Makefile.inc
  	@strip $(PLUGIN_FILE)
- 	@echo "The plug-in has been compiled. Run one of the following:"
+-	@echo "The plug-in has been compiled. Run one of the following:"
+-	@echo "make install      - for global (root) installation to $(INSTALL_DIR)"
+-	@echo "make install-home - for installation to home directory $(INSTALL_DIR_HOME)"
+ 
+ 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)
+ 	@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 ..
+ 	rm -f $(OBJECTS) $(DEPS)
diff --git a/audio/xmms-wma/files/patch-Makefile.inc b/audio/xmms-wma/files/patch-Makefile.inc
index 206d834ff823..4679f248ec79 100644
--- a/audio/xmms-wma/files/patch-Makefile.inc
+++ b/audio/xmms-wma/files/patch-Makefile.inc
@@ -1,11 +1,11 @@
---- Makefile.inc.orig	Thu Feb 26 12:27:32 2004
-+++ Makefile.inc	Thu Feb 26 11:33:27 2004
-@@ -6,7 +6,7 @@
- CFLAGS += `glib-config --cflags` `gtk-config --cflags`
- 
- $(PLUGIN_FILE): $(OBJECTS)
--	$(CC) -o $@ $^ -L ffmpeg-strip-wma -lffwma -lxmms -shared
-+	$(CC) -o $@ $^ -L ffmpeg-strip-wma -lffwma -shared ` xmms-config --libs`
+--- 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) $<
++	$(CC) -c -o $@ $(CFLAGS) $< 
+ 
+ $(DEPDIR)/%.d: %.c
+ 	$(CC) -MM $(CFLAGS) $< | sed "s/^$*\.o:/$(OBJDIR)\/$*\.o $(DEPDIR)\/$*\.d:/" > $@
diff --git a/audio/xmms-wma/files/patch-ffmpeg-strip-mem.c b/audio/xmms-wma/files/patch-ffmpeg-strip-mem.c
deleted file mode 100644
index 110ff147ee82..000000000000
--- a/audio/xmms-wma/files/patch-ffmpeg-strip-mem.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ffmpeg-strip-wma/mem.c.orig	Thu Feb 26 12:25:16 2004
-+++ ffmpeg-strip-wma/mem.c	Thu Feb 26 11:43:42 2004
-@@ -29,6 +29,9 @@
- #undef free
- #undef realloc
- 
-+#undef HAVE_MEMALIGN
-+#undef HAVE_MALLOC_H
-+
- #ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
diff --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma-Makefile b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::Makefile
index 9b6413ba3d7a..ae626c8014f4 100644
--- a/audio/xmms-wma/files/patch-ffmpeg-strip-wma-Makefile
+++ b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::Makefile
@@ -1,11 +1,11 @@
---- ffmpeg-strip-wma/Makefile.orig	Thu Feb 26 12:24:53 2004
-+++ ffmpeg-strip-wma/Makefile	Thu Feb 26 11:30:18 2004
+--- ffmpeg-strip-wma/Makefile.orig	Mon Feb 23 01:47:06 2004
++++ ffmpeg-strip-wma/Makefile	Tue Mar 16 15:29:21 2004
 @@ -6,7 +6,7 @@
  include config.mak
  
  # NOTE: -I.. is needed to include config.h
 -CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -I/usr/local/include
++CFLAGS+=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I/usr/local/include  -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
  
  OBJS= common.o utils.o mem.o allcodecs.o futils.o cutils.o os_support.o allformats.o parser.o \
        avio.o aviobuf.o file.o simple_idct.o dsputil.o fft.o mdct.o asf.o
diff --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
new file mode 100644
index 000000000000..5f4d7ef98951
--- /dev/null
+++ b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
@@ -0,0 +1,11 @@
+--- 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 --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak
new file mode 100644
index 000000000000..ea47033c399f
--- /dev/null
+++ b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::config.mak
@@ -0,0 +1,18 @@
+--- 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 --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::mem.c b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::mem.c
new file mode 100644
index 000000000000..a0b3a7962d31
--- /dev/null
+++ b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::mem.c
@@ -0,0 +1,24 @@
+--- ffmpeg-strip-wma/mem.c	Thu Mar  6 14:32:02 2003
++++ ffmpeg-strip-wma/mem.c	Thu Mar 11 18:36:40 2004
+@@ -29,9 +29,9 @@
+ #undef free
+ #undef realloc
+ 
+-#ifdef HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
++
++#undef HAVE_MEMALIGN
+ 
+ /* you can redefine av_malloc and av_free in your project to use your
+    memory allocator. You do not need to suppress this file because the
+@@ -47,7 +47,7 @@
+     void *ptr;
+     
+ #if defined (HAVE_MEMALIGN)
+-    ptr = memalign(16,size);
++    ptr = memalign(16, size);
+     /* Why 64? 
+        Indeed, we should align it:
+          on 4 for 386
diff --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma-wmadec.c b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::wmadec.c
index e1f5b1731d69..83b1c85e7b54 100644
--- a/audio/xmms-wma/files/patch-ffmpeg-strip-wma-wmadec.c
+++ b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::wmadec.c
@@ -1,5 +1,5 @@
---- ffmpeg-strip-wma/wmadec.c.orig	Thu Feb 26 12:26:00 2004
-+++ ffmpeg-strip-wma/wmadec.c	Thu Feb 26 11:53:40 2004
+--- ffmpeg-strip-wma/wmadec.c	Mon Feb 23 03:46:59 2004
++++ ffmpeg-strip-wma/wmadec.c	Thu Mar 11 18:39:18 2004
 @@ -1155,7 +1155,7 @@
          iptr = s->frame_out[ch];
  
diff --git a/audio/xmms-wma/files/patch-xmms-wma.c b/audio/xmms-wma/files/patch-xmms-wma.c
index 08c722e1af94..4487ed55bacd 100644
--- a/audio/xmms-wma/files/patch-xmms-wma.c
+++ b/audio/xmms-wma/files/patch-xmms-wma.c
@@ -1,5 +1,5 @@
---- xmms-wma.c.orig	Thu Feb 26 12:26:21 2004
-+++ xmms-wma.c	Thu Feb 26 11:07:28 2004
+--- xmms-wma.c	Wed Mar  3 23:53:43 2004
++++ xmms-wma.c	Thu Mar 11 18:27:02 2004
 @@ -17,7 +17,7 @@
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
diff --git a/audio/xmms-wma/pkg-descr b/audio/xmms-wma/pkg-descr
index 383f72fce09a..01c649fe8972 100644
--- a/audio/xmms-wma/pkg-descr
+++ b/audio/xmms-wma/pkg-descr
@@ -1,6 +1,6 @@
-XMMS input plugin supporting WMA format.
+XMMS input plugin to support WMA format.
 
 WWW: http://mcmcc.bat.ru/xmms-wma/
 
-- Roman Bogorodskiy
+-Roman Bogorodskiy
 <bogorodskiy@inbox.ru>