Date: Thu, 25 May 2006 16:14:47 +0200 (CEST) From: Rene Ladan <r.c.ladan@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/97912: [MAINTAINER] audio/xmms-wma: adopt, update to 1.0.5 Message-ID: <200605251414.k4PEEl9g034448@82-168-79-254.dsl.ip.tiscali.nl> Resent-Message-ID: <200605251420.k4PEKG9P052642@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97912 >Category: ports >Synopsis: [MAINTAINER] audio/xmms-wma: adopt, update to 1.0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 25 14:20:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Rene Ladan >Release: FreeBSD 6.1-RELEASE i386 >Organization: >Environment: System: FreeBSD 82-168-79-254.dsl.ip.tiscali.nl 6.1-RELEASE FreeBSD 6.1-RELEASE #2: Sun May 7 11:56:20 CEST >Description: Take maintainership. Update to 1.0.5. Pet portlint: rename patches from *::* to *-* Sanitize files/patch-ffmpeg-strip-wma-mem.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: diff -ruN /usr/ports/audio/xmms-wma.orig/Makefile /usr/ports/audio/xmms-wma/Makefile --- /usr/ports/audio/xmms-wma.orig/Makefile Wed May 3 07:14:34 2006 +++ /usr/ports/audio/xmms-wma/Makefile Thu May 25 12:41:02 2006 @@ -6,12 +6,11 @@ # PORTNAME= xmms-wma -PORTVERSION= 1.0.4.1 -PORTREVISION= 1 +PORTVERSION= 1.0.5 CATEGORIES= audio MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= r.c.ladan@gmail.com COMMENT= WMA plugin for xmms LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms diff -ruN /usr/ports/audio/xmms-wma.orig/distinfo /usr/ports/audio/xmms-wma/distinfo --- /usr/ports/audio/xmms-wma.orig/distinfo Thu Nov 24 00:29:53 2005 +++ /usr/ports/audio/xmms-wma/distinfo Thu May 25 12:44:59 2006 @@ -1,3 +1,3 @@ -MD5 (xmms-wma-1.0.4.1.tar.bz2) = 737ba66d42b6fb1bd95cc509cd51af62 -SHA256 (xmms-wma-1.0.4.1.tar.bz2) = 0288c8fc8f3dc296f25658659993de83cad3e16695faeea5a6f42067fca05456 -SIZE (xmms-wma-1.0.4.1.tar.bz2) = 145399 +MD5 (xmms-wma-1.0.5.tar.bz2) = 5d62a0f969617aeb40096362c7a8a506 +SHA256 (xmms-wma-1.0.5.tar.bz2) = 61ab13363e52707b02b422589bfdbdf49c08ad398c2237c2000c8a4c9181b183 +SIZE (xmms-wma-1.0.5.tar.bz2) = 146687 diff -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-Makefile /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-Makefile --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-Makefile Thu Jan 1 01:00:00 1970 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-Makefile Thu May 25 12:47:40 2006 @@ -0,0 +1,11 @@ +--- 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.. -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 -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-asf.c /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-asf.c --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-asf.c Thu Jan 1 01:00:00 1970 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-asf.c Thu May 25 12:47:40 2006 @@ -0,0 +1,53 @@ +--- 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) diff -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-mem.c /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-mem.c --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-mem.c Thu Jan 1 01:00:00 1970 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-mem.c Thu May 25 15:13:17 2006 @@ -0,0 +1,15 @@ +--- 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 diff -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-wmadec.c /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-wmadec.c --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma-wmadec.c Thu Jan 1 01:00:00 1970 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma-wmadec.c Thu May 25 12:47:40 2006 @@ -0,0 +1,11 @@ +--- 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]; + + for(i=0;i<n;i++) { +- a = lrintf(*iptr++); ++ a = rintf(*iptr++); + if (a > 32767) + a = 32767; + else if (a < -32768) diff -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::Makefile /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::Makefile --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::Makefile Tue Mar 16 15:39:19 2004 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::Makefile Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- 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.. -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 -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::asf.c /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::asf.c Sun Oct 23 06:05:18 2005 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c Thu Jan 1 01:00:00 1970 @@ -1,53 +0,0 @@ ---- 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) diff -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::mem.c /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::mem.c --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::mem.c Tue Mar 16 15:39:19 2004 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::mem.c Thu Jan 1 01:00:00 1970 @@ -1,24 +0,0 @@ ---- 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 -ruN /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::wmadec.c /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::wmadec.c --- /usr/ports/audio/xmms-wma.orig/files/patch-ffmpeg-strip-wma::wmadec.c Tue Mar 16 15:39:19 2004 +++ /usr/ports/audio/xmms-wma/files/patch-ffmpeg-strip-wma::wmadec.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- 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]; - - for(i=0;i<n;i++) { -- a = lrintf(*iptr++); -+ a = rintf(*iptr++); - if (a > 32767) - a = 32767; - else if (a < -32768) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605251414.k4PEEl9g034448>