summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/sox/distinfo3
-rw-r--r--audio/sox/patches/patch-ak21
2 files changed, 23 insertions, 1 deletions
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index c7addaa1901..434b33654ec 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.19 2010/07/23 07:55:12 adam Exp $
+$NetBSD: distinfo,v 1.20 2010/12/27 05:32:49 obache Exp $
SHA1 (sox-14.3.1.tar.gz) = ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384
RMD160 (sox-14.3.1.tar.gz) = d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7
Size (sox-14.3.1.tar.gz) = 1044595 bytes
SHA1 (patch-aa) = e6f3d06450862795648622a017b2c696328872f5
+SHA1 (patch-ak) = 806771b7f7f3e46c28036f9414f8e27b893813c2
diff --git a/audio/sox/patches/patch-ak b/audio/sox/patches/patch-ak
new file mode 100644
index 00000000000..76dc6fadaaf
--- /dev/null
+++ b/audio/sox/patches/patch-ak
@@ -0,0 +1,21 @@
+$NetBSD: patch-ak,v 1.1 2010/12/27 05:32:49 obache Exp $
+
+* On DragonFly, FILE is hidden, only allowed to modify in __FILE_public.
+
+--- src/formats.c.orig 2010-01-02 00:07:28.000000000 +0000
++++ src/formats.c
+@@ -397,8 +397,14 @@ static void UNUSED rewind_pipe(FILE * fp
+ /* _FSTDIO is for Torek stdio (i.e. most BSD-derived libc's)
+ * In theory, we no longer need to check _NEWLIB_VERSION or __APPLE__ */
+ #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__
++# ifdef __DragonFly__
++ struct __FILE_public *fpp = (struct __FILE_public *)fp;
++ fpp->_p -= AUTO_DETECT_SIZE;
++ fpp->_r += AUTO_DETECT_SIZE;
++# else
+ fp->_p -= AUTO_DETECT_SIZE;
+ fp->_r += AUTO_DETECT_SIZE;
++# endif
+ #elif defined __GLIBC__
+ fp->_IO_read_ptr = fp->_IO_read_base;
+ #elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H