Attachment #41031 for bug #64339

View | Details | Raw Unified | Return to bug 64339
Collapse All | Expand All




# Date created:        26 Feb 2004
# Whom:            Roman Bogorodskiy
#
# $FreeBSD$
#

PORTNAME=      xmms-wma
PORTVERSION=   0.1.3
CATEGORIES=    audio
MASTER_SITES=  http://mcmcc.bat.ru/xmms-wma/

MAINTAINER=    bogorodskiy@inbox.ru
COMMENT=       WMA plugin for xmms

LIB_DEPENDS=   xmms.4:${PORTSDIR}/multimedia/xmms \
	       iconv.3:${PORTSDIR}/converters/libiconv

USE_BZIP2=     yes
USE_GMAKE=     yes
USE_X_PREFIX=  yes

ONLY_FOR_ARCHS= i386

PLIST_FILES=   lib/xmms/Input/libwma.so

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)xmms-wma/distinfo (-2 / +2 lines)
1	MD5 (xmms-wma-0.1.tar.bz2) = 3c90344cd35fcf1ff699a407889cb3e7	1	MD5 (xmms-wma-0.1.3.tar.bz2) = ddb46e38017c905d5cea09beae9941b5
2	SIZE (xmms-wma-0.1.tar.bz2) = 137631	2	SIZE (xmms-wma-0.1.3.tar.bz2) = 140855




--- 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 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,34 +11,17 @@
 export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
 
 all:
-	@cd ffmpeg-strip-wma; make; 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 "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)

Lines 1-11 Link Here

(-)xmms-wma/files/patch-Makefile.inc (-9 / +9 lines)
1	--- Makefile.inc.orig Thu Feb 26 12:27:32 2004	1	--- Makefile.inc Wed Mar 3 23:02:39 2004
2	+++ Makefile.inc Thu Feb 26 11:33:27 2004	2	+++ Makefile.inc Thu Mar 11 18:59:19 2004
3	@@ -6,7 +6,7 @@	3	@@ -10,7 +10,7 @@
4	CFLAGS += `glib-config --cflags` `gtk-config --cflags`	4	$(CC) -o $@ $^ $(LIBS) -shared
5
6	$(PLUGIN_FILE): $(OBJECTS)
7	- $(CC) -o $@ $^ -L ffmpeg-strip-wma -lffwma -lxmms -shared
8	+ $(CC) -o $@ $^ -L ffmpeg-strip-wma -lffwma -shared ` xmms-config --libs`
9		5
10	$(OBJDIR)/%.o: %.c	6	$(OBJDIR)/%.o: %.c
11	$(CC) -c -o $@ $(CFLAGS) $<	7	- $(CC) -c -o $@ $(CFLAGS) $<
		8	+ $(CC) -c -o $@ $(CFLAGS) $<
		9
		10	$(DEPDIR)/%.d: %.c
		11	$(CC) -MM $(CFLAGS) $< \| sed "s/^$\.o:/$(OBJDIR)\/$\.o $(DEPDIR)\/$*\.d:/" > $@




--- 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

Lines 1-11 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-wma-Makefile (-11 lines)
1	--- ffmpeg-strip-wma/Makefile.orig Thu Feb 26 12:24:53 2004
2	+++ ffmpeg-strip-wma/Makefile Thu Feb 26 11:30:18 2004
3	@@ -6,7 +6,7 @@
4	include config.mak
5
6	# NOTE: -I.. is needed to include config.h
7	-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
8	+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -I/usr/local/include
9
10	OBJS= common.o utils.o mem.o allcodecs.o futils.o cutils.o os_support.o allformats.o parser.o \
11	avio.o aviobuf.o file.o simple_idct.o dsputil.o fft.o mdct.o asf.o

Lines 1-11 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-wma-wmadec.c (-11 lines)
1	--- ffmpeg-strip-wma/wmadec.c.orig Thu Feb 26 12:26:00 2004
2	+++ ffmpeg-strip-wma/wmadec.c Thu Feb 26 11:53:40 2004
3	@@ -1155,7 +1155,7 @@
4	iptr = s->frame_out[ch];
5
6	for(i=0;i<n;i++) {
7	- a = lrintf(*iptr++);
8	+ a = rintf(*iptr++);
9	if (a > 32767)
10	a = 32767;
11	else if (a < -32768)

Line 0 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-wma::Makefile (+11 lines)
	1	--- ffmpeg-strip-wma/Makefile Mon Feb 23 03:47:06 2004
	2	+++ ffmpeg-strip-wma/Makefile Thu Mar 11 18:35:10 2004
	3	@@ -6,7 +6,7 @@
	4	include config.mak
	5
	6	# NOTE: -I.. is needed to include config.h
	7	-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
	8	+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I/usr/local/include -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
	9
	10	OBJS= common.o utils.o mem.o allcodecs.o futils.o cutils.o os_support.o allformats.o parser.o \
	11	avio.o aviobuf.o file.o simple_idct.o dsputil.o fft.o mdct.o asf.o

Line 0 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-wma::asf.c (+11 lines)
	1	--- ffmpeg-strip-wma/asf.c Fri Feb 20 03:21:31 2004
	2	+++ ffmpeg-strip-wma/asf.c Thu Mar 11 18:46:59 2004
	3	@@ -847,7 +847,7 @@
	4	{
	5	return;
	6	}
	7	- result = iconv(frt, &ansbptr, &len, &ansaptr, &len1);
	8	+ result = iconv(frt, (const char **)&ansbptr, &len, &ansaptr, &len1);
	9	if (result == (size_t) - 1)
	10	{
	11	return;




--- ffmpeg-strip-wma/config.mak	Thu Feb 19 03:08:40 2004
+++ ffmpeg-strip-wma/config.mak	Thu Mar 11 18:32:21 2004
@@ -7,8 +7,8 @@
 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




--- 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

Line 0 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-wma::wmadec.c (+11 lines)
	1	--- ffmpeg-strip-wma/wmadec.c Mon Feb 23 03:46:59 2004
	2	+++ ffmpeg-strip-wma/wmadec.c Thu Mar 11 18:39:18 2004
	3	@@ -1155,7 +1155,7 @@
	4	iptr = s->frame_out[ch];
	5
	6	for(i=0;i<n;i++) {
	7	- a = lrintf(*iptr++);
	8	+ a = rintf(*iptr++);
	9	if (a > 32767)
	10	a = 32767;
	11	else if (a < -32768)

Lines 1-5 Link Here

(-)xmms-wma/files/patch-xmms-wma.c (-2 / +2 lines)
1	--- xmms-wma.c.orig Thu Feb 26 12:26:21 2004	1	--- xmms-wma.c Wed Mar 3 23:53:43 2004
2	+++ xmms-wma.c Thu Feb 26 11:07:28 2004	2	+++ xmms-wma.c Thu Mar 11 18:27:02 2004
3	@@ -17,7 +17,7 @@	3	@@ -17,7 +17,7 @@
4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.	4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
5	*/	5	*/

Lines 1-6 Link Here

(-)xmms-wma/pkg-descr (-2 / +2 lines)
1	XMMS input plugin supporting WMA format.	1	XMMS input plugin for support WMA format.
2		2
3	WWW: http://mcmcc.bat.ru/xmms-wma/	3	WWW: http://mcmcc.bat.ru/xmms-wma/
4		4
5	- Roman Bogorodskiy	5	-Roman Bogorodskiy
6	<bogorodskiy@inbox.ru>	6	<bogorodskiy@inbox.ru>

Line 1 Link Here

(-)xmms-wma/pkg-plist (-1 lines)
1	lib/xmms/Input/libwma.so

Return to bug 64339

Lines 2-26 Link Here

(-)xmms-wma/Makefile (-13 / +14 lines)
2	# Date created: 26 Feb 2004	2	# Date created: 26 Feb 2004
3	# Whom: Roman Bogorodskiy	3	# Whom: Roman Bogorodskiy
4	#	4	#
5	# $FreeBSD: ports/audio/xmms-wma/Makefile,v 1.3 2004/03/03 10:26:37 pav Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= xmms-wma	8	PORTNAME= xmms-wma
9	PORTVERSION= 0.1	9	PORTVERSION= 0.1.3
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/	11	MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/
12		12
13	MAINTAINER= bogorodskiy@inbox.ru	13	MAINTAINER= bogorodskiy@inbox.ru
14	COMMENT= WMA plugin for xmms	14	COMMENT= WMA plugin for xmms
15		15
16	LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms	16	LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \
		17	iconv.3:${PORTSDIR}/converters/libiconv
17		18
18	USE_BZIP2= yes	19	USE_BZIP2= yes
19	USE_GMAKE= yes	20	USE_GMAKE= yes
20	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
21		22
22	ONLY_FOR_ARCHS= i386	23	ONLY_FOR_ARCHS= i386
23		24
24	PLIST_FILES= lib/xmms/Input/libwma.so	25	PLIST_FILES= lib/xmms/Input/libwma.so
25		26
26	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)xmms-wma/files/patch-Makefile (-6 / +35 lines)
1	--- Makefile.orig Thu Feb 26 12:24:35 2004	1	--- Makefile Wed Mar 3 17:47:58 2004
2	+++ Makefile Thu Feb 26 12:37:12 2004	2	+++ Makefile Thu Mar 11 19:05:38 2004
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	.PHONY: all install install-home uninstall uninstall-home clean	4	-.PHONY: all install install-home uninstall uninstall-home clean
		5	+.PHONY: all install uninstall clean
5		6
6	-INSTALL_DIR := /usr/lib/xmms/Input	7	-INSTALL_DIR := /usr/lib/xmms/Input
7	+INSTALL_DIR := `xmms-config --input-plugin-dir`	8	+INSTALL_DIR := `xmms-config --input-plugin-dir`
8	INSTALL_DIR_HOME := ~/.xmms/Plugins/Input	9	INSTALL_DIR_HOME := ~/.xmms/Plugins/Input
9		10
10	export PLUGIN_FILE := libwma.so	11	export PLUGIN_FILE := libwma.so
11	@@ -11,7 +11,7 @@	12	@@ -11,34 +11,17 @@
12	export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)	13	export DEPS := $(SOURCES:%.c=$(DEPDIR)/%.d)
13		14
14	all:	15	all:
15	- @cd ffmpeg-strip-wma; make; cd ..	16	- @cd ffmpeg-strip-wma; make; cd ..
16	+ @cd ffmpeg-strip-wma/; gmake; cd ..	17	+ @cd ffmpeg-strip-wma; gmake; cd ..
17	@$(MAKE) --no-print-directory -f Makefile.inc	18	@$(MAKE) --no-print-directory -f Makefile.inc
18	@strip $(PLUGIN_FILE)	19	@strip $(PLUGIN_FILE)
19	@echo "The plug-in has been compiled. Run one of the following:"	20	- @echo "The plug-in has been compiled. Run one of the following:"
		21	- @echo "make install - for global (root) installation to $(INSTALL_DIR)"
		22	- @echo "make install-home - for installation to home directory $(INSTALL_DIR_HOME)"
		23
		24	install: all
		25	cp -f $(PLUGIN_FILE) $(INSTALL_DIR)
		26	- @echo "The plug-in has been installed."
		27	- @echo "Enjoy!"
		28	-
		29	-install-home: all
		30	- -mkdir ~/.xmms
		31	- -mkdir ~/.xmms/Plugins
		32	- -mkdir ~/.xmms/Plugins/Input
		33	- cp -f $(PLUGIN_FILE) $(INSTALL_DIR_HOME)
		34	- @echo "The plug-in has been installed."
		35	- @echo "Enjoy!"
		36
		37	uninstall:
		38	rm -f $(INSTALL_DIR)/$(PLUGIN_FILE)
		39	@echo "The plug-in has been uninstalled."
		40
		41	-uninstall-home:
		42	- rm -f $(INSTALL_DIR_HOME)/$(PLUGIN_FILE)
		43	- @echo "The plug-in has been uninstalled."
		44	-
		45	clean:
		46	- cd ffmpeg-strip-wma; make clean; cd ..
		47	+ cd ffmpeg-strip-wma; gmake clean; cd ..
		48	rm -f $(OBJECTS) $(DEPS)

Lines 1-12 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-mem.c (-12 lines)
1	--- ffmpeg-strip-wma/mem.c.orig Thu Feb 26 12:25:16 2004
2	+++ ffmpeg-strip-wma/mem.c Thu Feb 26 11:43:42 2004
3	@@ -29,6 +29,9 @@
4	#undef free
5	#undef realloc
6
7	+#undef HAVE_MEMALIGN
8	+#undef HAVE_MALLOC_H
9	+
10	#ifdef HAVE_MALLOC_H
11	#include <malloc.h>
12	#endif

Line 0 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-wma::config.mak (+13 lines)
	1	--- ffmpeg-strip-wma/config.mak Thu Feb 19 03:08:40 2004
	2	+++ ffmpeg-strip-wma/config.mak Thu Mar 11 18:32:21 2004
	3	@@ -7,8 +7,8 @@
	4	AR=ar
	5	RANLIB=ranlib
	6	STRIP=strip
	7	-OPTFLAGS=-Wall -g -O3
	8	-SHCFLAGS=-Wall -g -O3
	9	+OPTFLAGS=-Wall -O3
	10	+SHCFLAGS=-Wall -O3
	11	LDFLAGS=-Wl,--warn-common -rdynamic
	12	FFSLDFLAGS=-Wl,-E
	13	SHFLAGS=-shared

Line 0 Link Here

(-)xmms-wma/files/patch-ffmpeg-strip-wma::mem.c (+24 lines)
	1	--- ffmpeg-strip-wma/mem.c Thu Mar 6 14:32:02 2003
	2	+++ ffmpeg-strip-wma/mem.c Thu Mar 11 18:36:40 2004
	3	@@ -29,9 +29,9 @@
	4	#undef free
	5	#undef realloc
	6
	7	-#ifdef HAVE_MALLOC_H
	8	-#include <malloc.h>
	9	-#endif
	10	+#include <stdlib.h>
	11	+
	12	+#undef HAVE_MEMALIGN
	13
	14	/* you can redefine av_malloc and av_free in your project to use your
	15	memory allocator. You do not need to suppress this file because the
	16	@@ -47,7 +47,7 @@
	17	void *ptr;
	18
	19	#if defined (HAVE_MEMALIGN)
	20	- ptr = memalign(16,size);
	21	+ ptr = memalign(16, size);
	22	/* Why 64?
	23	Indeed, we should align it:
	24	on 4 for 386