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

[lblume at users.sourceforge.net]

Revision: 21958
          http://gar.svn.sourceforge.net/gar/?rev=21958&view=rev
Author:   lblume
Date:     2013-09-17 11:57:49 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
sox/trunk: Bump to 14.4.1; switch compiler to GCC; disable seeking on a pipe completely, that was ugly in the first place

Modified Paths:
--------------
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/sox/trunk/checksums
    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	2013-09-17 09:26:56 UTC (rev 21957)
+++ csw/mgar/pkg/sox/trunk/Makefile	2013-09-17 11:57:49 UTC (rev 21958)
@@ -1,5 +1,5 @@
 NAME = sox
-VERSION = 14.4.0
+VERSION = 14.4.1
 GARTYPE = v2
 
 DESCRIPTION = Swiss Army Knife of sound processing utilities
@@ -12,13 +12,14 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES = $(DISTNAME).tar.bz2
 
+GARCOMPILER = GCC4
+
 # 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.
+# As the FILE struct is opaque in 64 bit we must disable this:
+# I believe the behaviour should be consistent in both 32 and 64, and
+# anyway, rewinding a *pipe*?!
 PATCHFILES = 0001-Disable-stdio-hack-to-rewind-pipes.patch
 
-PATCHFILES += 0001-Fix-SunStudio-version-string.patch
-
 VENDOR_URL = http://sox.sourceforge.net/
 
 BUILD_DEP_PKGS += CSWlibvorbis-dev
@@ -31,7 +32,7 @@
 BUILD_DEP_PKGS += CSWlibz-dev
 BUILD_DEP_PKGS += CSWlibmagic-dev
 BUILD_DEP_PKGS += CSWlibmp3lame-dev
-BUILD_DEP_PKGS += CSWlibsndfile
+BUILD_DEP_PKGS += CSWlibsndfile-dev
 BUILD_DEP_PKGS += CSWlibid3tag
 
 PACKAGES += CSWsox

Modified: csw/mgar/pkg/sox/trunk/checksums
===================================================================
--- csw/mgar/pkg/sox/trunk/checksums	2013-09-17 09:26:56 UTC (rev 21957)
+++ csw/mgar/pkg/sox/trunk/checksums	2013-09-17 11:57:49 UTC (rev 21958)
@@ -1 +1 @@
-813807c6d6fcd4b0af5c995e61f46687  sox-14.4.0.tar.bz2
+ff9ca6aca972549de0e80e8e30ed379c  sox-14.4.1.tar.bz2

Modified: 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	2013-09-17 09:26:56 UTC (rev 21957)
+++ csw/mgar/pkg/sox/trunk/files/0001-Disable-stdio-hack-to-rewind-pipes.patch	2013-09-17 11:57:49 UTC (rev 21958)
@@ -1,31 +1,17 @@
-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
+index 785eca7..62dd19b 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;
+@@ -411,8 +411,12 @@ static void UNUSED rewind_pipe(FILE * fp)
+   fp->_r += PIPE_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)
+-#elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H
++#elif (defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H) && ! defined sun  
    fp->_ptr = fp->_base;
++#elif defined sun
++  /* Solaris will not allow to seek on pipe */
++  #define NO_REWIND_PIPE
++  (void)fp;
  #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.