From bogorodskiy@inbox.ru  Sun Jul 11 03:05:01 2004
Return-Path: <bogorodskiy@inbox.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 27B1416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 11 Jul 2004 03:05:01 +0000 (GMT)
Received: from mx2.mail.ru (mx2.mail.ru [194.67.23.122])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4888343D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 11 Jul 2004 03:05:00 +0000 (GMT)
	(envelope-from bogorodskiy@inbox.ru)
Received: from [194.186.150.91] (port=49372 helo=inbox.ru)
	by mx2.mail.ru with esmtp 
	id 1BjUeA-000E8s-00
	for FreeBSD-gnats-submit@freebsd.org; Sun, 11 Jul 2004 07:04:58 +0400
Message-Id: <E1BjUeA-000E8s-00.bogorodskiy-inbox-ru@mx2.mail.ru>
Date: Sun, 11 Jul 2004 07:04:58 +0400
From: Roman Bogorodskiy <bogorodskiy@inbox.ru>
Reply-To: Roman Bogorodskiy <bogorodskiy@inbox.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ maintainer ] audio/xmms-wma: remove iconv support
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         68907
>Category:       ports
>Synopsis:       [ maintainer ] audio/xmms-wma: remove iconv support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 11 03:10:13 GMT 2004
>Closed-Date:    Mon Jul 12 19:41:23 GMT 2004
>Last-Modified:  Mon Jul 12 19:41:23 GMT 2004
>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:
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Mon Jul 12 19:40:39 GMT 2004 
State-Changed-Why:  
Committed, thanks! 
BTW: I bumped PORTREVISION. You might want to make your port honour CC. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=68907 
>Unformatted:
