Attachment #66199 for bug #97912

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




#

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

MAINTAINER=	r.c.ladan@gmail.com
COMMENT=	WMA plugin for xmms

LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms

Lines 1-3 Link Here

(-)/usr/ports/audio/xmms-wma/distinfo (-3 / +3 lines)
1	MD5 (xmms-wma-1.0.4.1.tar.bz2) = 737ba66d42b6fb1bd95cc509cd51af62	1	MD5 (xmms-wma-1.0.5.tar.bz2) = 5d62a0f969617aeb40096362c7a8a506
2	SHA256 (xmms-wma-1.0.4.1.tar.bz2) = 0288c8fc8f3dc296f25658659993de83cad3e16695faeea5a6f42067fca05456	2	SHA256 (xmms-wma-1.0.5.tar.bz2) = 61ab13363e52707b02b422589bfdbdf49c08ad398c2237c2000c8a4c9181b183
3	SIZE (xmms-wma-1.0.4.1.tar.bz2) = 145399	3	SIZE (xmms-wma-1.0.5.tar.bz2) = 146687

Line 0 Link Here

(-)/usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-Makefile (+11 lines)
	1	--- ffmpeg-strip-wma/Makefile.orig Mon Feb 23 01:47:06 2004
	2	+++ ffmpeg-strip-wma/Makefile Tue Mar 16 15:29:21 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




--- ffmpeg-strip-wma/asf.c.orig	Sun Oct 23 08:03:33 2005
+++ ffmpeg-strip-wma/asf.c	Sun Oct 23 08:03:37 2005
@@ -16,10 +16,13 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#if defined(USE_ICONV)
+#include <iconv.h>
+#endif /* USE_ICONV */
+
 #include "avformat.h"
 #include "avi.h"
-//#include "mpegaudio.h"
-#include <iconv.h>
 
 #undef NDEBUG
 #include <assert.h>
@@ -830,6 +833,7 @@
     return str;
 }
 
+#if defined(USE_ICONV)
 static void tag_recode(char *before, unsigned int len)
 {
        int result;
@@ -842,7 +846,7 @@
        unsigned int length = len;
 
        memcpy(ansb, before, len);
-       frt = iconv_open(getlocale(), "UNICODE");
+       frt = iconv_open(getlocale(), "UTF-16LE");
        if (frt == (iconv_t) - 1)
        {
            return;
@@ -859,6 +863,7 @@
 		return;
        return;
 }
+#endif /* USE_ICONV */
 
 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
 {
@@ -873,7 +878,9 @@
             *q++ = c;
         len--;
     }
+#if defined(USE_ICONV)
     tag_recode(buf, lenz);
+#endif /* USE_ICONV */
 }
 
 static int asf_probe(AVProbeData *pd)




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

Line 0 Link Here

(-)/usr/ports/audio/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-11 Link Here

(-)/usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::Makefile (-11 lines)
1	--- ffmpeg-strip-wma/Makefile.orig Mon Feb 23 01:47:06 2004
2	+++ ffmpeg-strip-wma/Makefile Tue Mar 16 15:29:21 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




--- ffmpeg-strip-wma/asf.c.orig	Sun Oct 23 08:03:33 2005
+++ ffmpeg-strip-wma/asf.c	Sun Oct 23 08:03:37 2005
@@ -16,10 +16,13 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#if defined(USE_ICONV)
+#include <iconv.h>
+#endif /* USE_ICONV */
+
 #include "avformat.h"
 #include "avi.h"
-//#include "mpegaudio.h"
-#include <iconv.h>
 
 #undef NDEBUG
 #include <assert.h>
@@ -830,6 +833,7 @@
     return str;
 }
 
+#if defined(USE_ICONV)
 static void tag_recode(char *before, unsigned int len)
 {
        int result;
@@ -842,7 +846,7 @@
        unsigned int length = len;
 
        memcpy(ansb, before, len);
-       frt = iconv_open(getlocale(), "UNICODE");
+       frt = iconv_open(getlocale(), "UTF-16LE");
        if (frt == (iconv_t) - 1)
        {
            return;
@@ -859,6 +863,7 @@
 		return;
        return;
 }
+#endif /* USE_ICONV */
 
 static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
 {
@@ -873,7 +878,9 @@
             *q++ = c;
         len--;
     }
+#if defined(USE_ICONV)
     tag_recode(buf, lenz);
+#endif /* USE_ICONV */
 }
 
 static int asf_probe(AVProbeData *pd)




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

Lines 1-11 Link Here

(-)/usr/ports/audio/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)

Return to bug 97912

Lines 6-17 Link Here

(-)/usr/ports/audio/xmms-wma/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= xmms-wma	8	PORTNAME= xmms-wma
9	PORTVERSION= 1.0.4.1	9	PORTVERSION= 1.0.5
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/	11	MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= r.c.ladan@gmail.com
15	COMMENT= WMA plugin for xmms	14	COMMENT= WMA plugin for xmms
16		15
17	LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms	16	LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms

Line 0 Link Here

(-)/usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-asf.c (+53 lines)
	1	--- ffmpeg-strip-wma/asf.c.orig Sun Oct 23 08:03:33 2005
	2	+++ ffmpeg-strip-wma/asf.c Sun Oct 23 08:03:37 2005
	3	@@ -16,10 +16,13 @@
	4	* License along with this library; if not, write to the Free Software
	5	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	6	*/
	7	+
	8	+#if defined(USE_ICONV)
	9	+#include <iconv.h>
	10	+#endif /* USE_ICONV */
	11	+
	12	#include "avformat.h"
	13	#include "avi.h"
	14	-//#include "mpegaudio.h"
	15	-#include <iconv.h>
	16
	17	#undef NDEBUG
	18	#include <assert.h>
	19	@@ -830,6 +833,7 @@
	20	return str;
	21	}
	22
	23	+#if defined(USE_ICONV)
	24	static void tag_recode(char *before, unsigned int len)
	25	{
	26	int result;
	27	@@ -842,7 +846,7 @@
	28	unsigned int length = len;
	29
	30	memcpy(ansb, before, len);
	31	- frt = iconv_open(getlocale(), "UNICODE");
	32	+ frt = iconv_open(getlocale(), "UTF-16LE");
	33	if (frt == (iconv_t) - 1)
	34	{
	35	return;
	36	@@ -859,6 +863,7 @@
	37	return;
	38	return;
	39	}
	40	+#endif /* USE_ICONV */
	41
	42	static void get_str16_nolen(ByteIOContext pb, int len, char buf, int buf_size)
	43	{
	44	@@ -873,7 +878,9 @@
	45	*q++ = c;
	46	len--;
	47	}
	48	+#if defined(USE_ICONV)
	49	tag_recode(buf, lenz);
	50	+#endif /* USE_ICONV */
	51	}
	52
	53	static int asf_probe(AVProbeData *pd)

Line 0 Link Here

(-)/usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-mem.c (+15 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