ports/74959: [ maintainer ] audio/xmms-wma: turn on iconv support again

[Roman Bogorodskiy]

>Number:         74959
>Category:       ports
>Synopsis:       [ maintainer ] audio/xmms-wma: turn on iconv support again
>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:   Sat Dec 11 19:00:37 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.3-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-RELEASE-p1 FreeBSD 5.3-RELEASE-p1 #2: Sun Nov 21 16:35:38 MSK 2004 root at lame.novel.ru:/usr/obj/usr/src/sys/MIRRORBOX i386


>Description:
	Recently I had a chance to speak with xmms-wma author on some 
	internet forum and figured out that he thinks of disabling 
	iconv as my sin. So, I've enabled it again, but it is optional now.
>How-To-Repeat:
>Fix:

--- port.xmms-wma.update begins here ---
diff -ruN xmms-wma.orig/Makefile xmms-wma/Makefile
--- xmms-wma.orig/Makefile	Sat Dec 11 21:03:39 2004
+++ xmms-wma/Makefile	Sat Dec 11 21:50:25 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmms-wma
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
 
@@ -23,6 +24,11 @@
 ONLY_FOR_ARCHS=	i386
 
 PLIST_FILES=	lib/xmms/Input/libwma.so
+
+.if defined(ICONV)
+CFLAGS+=	-DICONV
+USE_ICONV=	yes
+.endif
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/Makefile.inc
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	Sat Dec 11 21:03:39 2004
+++ xmms-wma/files/patch-ffmpeg-strip-wma::asf.c	Sat Dec 11 21:33:39 2004
@@ -1,7 +1,14 @@
---- 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 @@
+--- ffmpeg-strip-wma/asf.c.orig	Wed May 26 19:16:39 2004
++++ ffmpeg-strip-wma/asf.c	Sat Dec 11 21:32:58 2004
+@@ -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
   */
++
++#ifdef USE_ICONV
++#include <iconv.h>
++#endif
++
  #include "avformat.h"
  #include "avi.h"
 -//#include "mpegaudio.h"
@@ -9,42 +16,42 @@
  
  #undef NDEBUG
  #include <assert.h>
-@@ -830,6 +828,7 @@
+@@ -830,6 +833,7 @@
      return str;
  }
  
-+/*
++#ifdef USE_ICONV
  static void tag_recode(char *before, int len)
  {
         int result;
-@@ -859,21 +858,22 @@
+@@ -859,6 +863,7 @@
  		return;
         return;
  }
-+*/
++#endif
  
  static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
  {
--    int c, lenz;
-+    int c;
-     char *q;
- 
+@@ -868,12 +873,17 @@
      q = buf;
--    lenz = len;
+     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);
++    	c = get_byte(pb);
 +	if ((q - buf) < buf_size - 1)
 +		*q++ = c;
-+	len-=2;
-+    	}
-+	
-+    *q = '\0';				   
++	len--;
+     }
+-    tag_recode(buf, lenz);
++
++#ifdef USE_ICONV
++	tag_recode(buf, lenz);
++#else	
++    *q = '\0';			  
++#endif
  }
  
  static int asf_probe(AVProbeData *pd)
--- port.xmms-wma.update ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: