Date: Sun, 11 Jul 2004 07:04:58 +0400 From: Roman Bogorodskiy <bogorodskiy@inbox.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/68907: [ maintainer ] audio/xmms-wma: remove iconv support Message-ID: <E1BjUeA-000E8s-00.bogorodskiy-inbox-ru@mx2.mail.ru> Resent-Message-ID: <200407110310.i6B3ADcX040415@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68907
>Category: ports
>Synopsis: [ maintainer ] audio/xmms-wma: remove iconv support
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 11 03:10:13 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Roman Bogorodskiy
>Release: FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #5: Sat Jun 19 22:04:33 MSD 2004 root@lame.novel.ru:/usr/obj/usr/src/sys/NOV i386
>Description:
Removed iconv support since it simply damage headers instead of recoding them.
>How-To-Repeat:
>Fix:
diff -ruN xmms-wma.orig/files/patch-ffmpeg-strip-wma::asf.c xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
--- xmms-wma.orig/files/patch-ffmpeg-strip-wma::asf.c Thu Jan 1 03:00:00 1970
+++ xmms-wma/files/patch-ffmpeg-strip-wma::asf.c Sun Jul 11 06:56:43 2004
@@ -0,0 +1,50 @@
+--- ffmpeg-strip-wma/asf.c.orig Sun Jul 11 06:51:15 2004
++++ ffmpeg-strip-wma/asf.c Sun Jul 11 06:53:34 2004
+@@ -18,8 +18,6 @@
+ */
+ #include "avformat.h"
+ #include "avi.h"
+-//#include "mpegaudio.h"
+-#include <iconv.h>
+
+ #undef NDEBUG
+ #include <assert.h>
+@@ -830,6 +828,7 @@
+ return str;
+ }
+
++/*
+ static void tag_recode(char *before, int len)
+ {
+ int result;
+@@ -859,21 +858,22 @@
+ return;
+ return;
+ }
++*/
+
+ static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
+ {
+- int c, lenz;
++ int c;
+ char *q;
+
+ q = buf;
+- lenz = len;
+ while (len > 0) {
+- c = get_byte(pb);
+- if ((q - buf) < buf_size-1)
+- *q++ = c;
+- len--;
+- }
+- tag_recode(buf, lenz);
++ c = get_le16(pb);
++ if ((q - buf) < buf_size - 1)
++ *q++ = c;
++ len-=2;
++ }
++
++ *q = '\0';
+ }
+
+ static int asf_probe(AVProbeData *pd)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BjUeA-000E8s-00.bogorodskiy-inbox-ru>