[csw-devel] SF.net SVN: gar:[7149] csw/mgar/pkg/sox/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7149
          http://gar.svn.sourceforge.net/gar/?rev=7149&view=rev
Author:   dmichelsen
Date:     2009-11-06 15:10:15 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
sox: Add patch to allow 64 bit compilation

Modified Paths:
--------------
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/sox/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/sox/trunk/files/
    csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch

Modified: csw/mgar/pkg/sox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sox/trunk/Makefile	2009-11-06 14:40:06 UTC (rev 7148)
+++ csw/mgar/pkg/sox/trunk/Makefile	2009-11-06 15:10:15 UTC (rev 7149)
@@ -9,6 +9,11 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES = $(DISTNAME).tar.gz
 
+# There is a hack in there to rewind pipes when detecting file formats.
+# As the FILE struct is opaque in 64 bit we must disable this for 64 bit.
+# But as we only need the library in 64 bit anyway this shouldn't hurt.
+PATCHFILES = 0001-Disable-stdio-hack-to-rewind-pipes.patch
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 SPKG_SOURCEURL = http://sox.sourceforge.net/
@@ -18,9 +23,12 @@
 PREREQUISITE_PKGS = $(REQUIRED_PKGS)
 
 CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS +=  --without-libltdl
 
 BUILD64 = 1
-
+NO_ISAEXEC = 1
 TEST_TARGET = check
 
+MERGE_DIRS_isa-extra = $(libdir)
+
 include gar/category.mk

Modified: csw/mgar/pkg/sox/trunk/checksums
===================================================================
--- csw/mgar/pkg/sox/trunk/checksums	2009-11-06 14:40:06 UTC (rev 7148)
+++ csw/mgar/pkg/sox/trunk/checksums	2009-11-06 15:10:15 UTC (rev 7149)
@@ -1 +1,2 @@
+ce1fa27946b99c023d2b37bb0d5800c4  0001-Disable-stdio-hack-to-rewind-pipes.patch
 8e3509804e6227273ef84092e1a2fea7  sox-14.3.0.tar.gz

Added: csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch
===================================================================
--- csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch	                        (rev 0)
+++ csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch	2009-11-06 15:10:15 UTC (rev 7149)
@@ -0,0 +1,31 @@
+From 91792a0837969dd584dd469c06874111d80cfcec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 6 Nov 2009 16:05:59 +0100
+Subject: [PATCH] Disable stdio hack to rewind pipes
+
+---
+ src/formats.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/formats.c b/src/formats.c
+index 556f611..f238929 100644
+--- a/src/formats.c
++++ b/src/formats.c
+@@ -397,13 +397,12 @@ static void UNUSED rewind_pipe(FILE * fp)
+   fp->_r += AUTO_DETECT_SIZE;
+ #elif defined __GLIBC__
+   fp->_IO_read_ptr = fp->_IO_read_base;
+-#elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H
++#elif !defined _LP64 && (defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H)
+   fp->_ptr = fp->_base;
+ #else
+   /* To fix this #error, either simply remove the #error line and live without
+    * file-type detection with pipes, or add support for your compiler in the
+    * lines above.  Test with cat monkey.au | ./sox --info - */
+-  #error FIX NEEDED HERE
+   #define NO_REWIND_PIPE
+   (void)fp;
+ #endif
+-- 
+1.6.5.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.