aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2004-12-12 22:04:19 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2004-12-12 22:04:19 +0000
commit68e6c5f9dc40363679df40b075ce24ae230793af (patch)
treed50b218549b7c53fbe2b283c6635415e71f322ae /audio
parentd0fa00ffa70a509c4a0ccd4c5c040856371fdffe (diff)
downloadports-68e6c5f9dc40363679df40b075ce24ae230793af.tar.gz
ports-68e6c5f9dc40363679df40b075ce24ae230793af.zip
Notes
Diffstat (limited to 'audio')
-rw-r--r--audio/xmms-wma/Makefile6
-rw-r--r--audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c45
2 files changed, 32 insertions, 19 deletions
diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index f04e07235787..91e41601cc32 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmms-wma
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://mcmcc.bat.ru/xmms-wma/
@@ -24,6 +25,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
@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/ffmpeg-strip-wma/config.mak
diff --git a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
index bd02acd7ca97..c4f81a12972f 100644
--- a/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
+++ b/audio/xmms-wma/files/patch-ffmpeg-strip-wma::asf.c
@@ -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)