[pkgsrc/trunk]: pkgsrc/audio/xmms-wma Never use malloc.h.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0bf61c9a063
branches:  trunk
changeset: 531301:d0bf61c9a063
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jul 28 00:56:13 2007 +0000

description:
Never use malloc.h.

diffstat:

 audio/xmms-wma/distinfo         |   6 +++---
 audio/xmms-wma/patches/patch-aa |  13 +++++--------
 audio/xmms-wma/patches/patch-ab |  19 ++++++++++---------
 3 files changed, 18 insertions(+), 20 deletions(-)

diffs (71 lines):

diff -r cf476d861500 -r d0bf61c9a063 audio/xmms-wma/distinfo
--- a/audio/xmms-wma/distinfo   Sat Jul 28 00:52:34 2007 +0000
+++ b/audio/xmms-wma/distinfo   Sat Jul 28 00:56:13 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/05/23 08:50:36 rillig Exp $
+$NetBSD: distinfo,v 1.4 2007/07/28 00:56:13 joerg Exp $
 
 SHA1 (xmms-wma-1.0.4.tar.bz2) = b7071c6fc17b22cb861f5071c97f72f876f271f9
 RMD160 (xmms-wma-1.0.4.tar.bz2) = bd79cf369a739000facc00f59d7a0d30dab6f5eb
 Size (xmms-wma-1.0.4.tar.bz2) = 145691 bytes
-SHA1 (patch-aa) = 20bc90e9267a56cb464c66e301939854b84c3869
-SHA1 (patch-ab) = feb6e8a14f515630901a83f6a2cb5d9a81fcf2d2
+SHA1 (patch-aa) = 817d7969c904d46cced1fbd93c753fa3d84f461a
+SHA1 (patch-ab) = 6a7daf57e68ca1bde8c9f9fb14af25843f5ba34e
 SHA1 (patch-ac) = 93e1fd03a950fbd995d492bda07b28ce81e339f4
 SHA1 (patch-ad) = aee4ea1a154f71b2d4d1672bd8226ed76e0f909a
diff -r cf476d861500 -r d0bf61c9a063 audio/xmms-wma/patches/patch-aa
--- a/audio/xmms-wma/patches/patch-aa   Sat Jul 28 00:52:34 2007 +0000
+++ b/audio/xmms-wma/patches/patch-aa   Sat Jul 28 00:56:13 2007 +0000
@@ -1,15 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:29:02 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2007/07/28 00:56:13 joerg Exp $
 
---- xmms-wma.c.orig    Wed Nov 24 00:12:22 2004
-+++ xmms-wma.c Sat Mar 12 00:03:04 2005
-@@ -19,9 +19,12 @@
+--- xmms-wma.c.orig    2004-11-23 23:12:22.000000000 +0000
++++ xmms-wma.c
+@@ -19,9 +19,8 @@
  #ifndef __XMMS_WMA_C__
  #define __XMMS_WMA_C__
  
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
-+
+-#include <malloc.h>
  #include <math.h>
 -#include <stdbool.h>
 +#include <stdlib.h>
diff -r cf476d861500 -r d0bf61c9a063 audio/xmms-wma/patches/patch-ab
--- a/audio/xmms-wma/patches/patch-ab   Sat Jul 28 00:52:34 2007 +0000
+++ b/audio/xmms-wma/patches/patch-ab   Sat Jul 28 00:56:13 2007 +0000
@@ -1,17 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/03/01 01:17:00 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2007/07/28 00:56:14 joerg Exp $
 
---- ffmpeg-strip-wma/mem.c.orig        2005-03-01 01:58:20.000000000 +0100
-+++ ffmpeg-strip-wma/mem.c     2005-03-01 01:59:04.000000000 +0100
-@@ -32,6 +32,12 @@
- #ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
+--- ffmpeg-strip-wma/mem.c.orig        2003-03-06 11:32:02.000000000 +0000
++++ ffmpeg-strip-wma/mem.c
+@@ -29,8 +29,11 @@
+ #undef free
+ #undef realloc
+ 
+-#ifdef HAVE_MALLOC_H
+-#include <malloc.h>
 +#include <stdlib.h>
 +#include <sys/param.h>
 +
 +#ifdef BSD
 +#undef HAVE_MEMALIGN
-+#endif
+ #endif
  
  /* 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