Bump SoX to 14.4.0 oi_151a
authorJon Tibble <meths@btinternet.com>
Wed, 08 Aug 2012 07:57:49 +0100
branchoi_151a
changeset 165 386546224210
parent 164 2bff5bcc0c1a
child 166 aec7f3bd1a21
Bump SoX to 14.4.0
usr/src/cmd/sox/METADATA
usr/src/cmd/sox/Makefile.sfw
usr/src/cmd/sox/libsox.c.diff
usr/src/cmd/sox/sox-14.3.0.tar.gz
usr/src/cmd/sox/sox-14.4.0.tar.gz
usr/src/cmd/sox/soxformat.7.diff
usr/src/pkgdefs/SUNWsound-exchange/pkginfo.tmpl
usr/src/pkgdefs/SUNWsound-exchange/prototype_com
--- a/usr/src/cmd/sox/METADATA	Tue Aug 07 13:16:19 2012 +0100
+++ b/usr/src/cmd/sox/METADATA	Wed Aug 08 07:57:49 2012 +0100
@@ -1,10 +1,10 @@
 NAME:             sox
-VERSION:          14.3.0
+VERSION:          14.4.0
 DESCRIPTION:      Sound eXchange, the Swiss Army knife of audio manipulation
 LICENSE:          GPLv2, LGPLv2.1
 PACKAGE:          SUNWsound-exchange
 PROJECT_URL:      http://sox.sourceforge.net
-SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/project/sox/sox/14.3.0/sox-14.3.0.tar.gz
+SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/project/sox/sox/14.4.0/sox-14.4.0.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/audio/sox
 OSR:              9512
--- a/usr/src/cmd/sox/Makefile.sfw	Tue Aug 07 13:16:19 2012 +0100
+++ b/usr/src/cmd/sox/Makefile.sfw	Wed Aug 08 07:57:49 2012 +0100
@@ -89,6 +89,7 @@
 	patch $(VER)/soxformat.7 < soxformat.7.diff
 	patch $(VER)/src/oss.c < oss.c.diff
 	patch $(VER)/src/formats.c < formats.c.diff
+	patch $(VER)/src/libsox.c < libsox.c.diff
 	patch $(VER)/src/sunaudio.c < sunaudio.c.diff
 	touch $(VER)/configure
 	find $(VER) -type d -exec /usr/bin/chmod 755 "{}" \;
@@ -101,6 +102,7 @@
 	mv tmp/$(VER) $(VER64); rmdir tmp
 	patch $(VER64)/src/oss.c < oss.c.diff
 	patch $(VER64)/src/formats.c < formats.c.diff
+	patch $(VER64)/src/libsox.c < libsox.c.diff
 	patch $(VER64)/src/sunaudio.c < sunaudio.c.diff
 	touch $(VER64)/configure
 	find $(VER64) -type d -exec /usr/bin/chmod 755 "{}" \;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/sox/libsox.c.diff	Wed Aug 08 07:57:49 2012 +0100
@@ -0,0 +1,11 @@
+--- libsox.c.orig	2012-08-07 17:38:32.106823038 +0100
++++ libsox.c	2012-08-07 17:39:02.354614978 +0100
+@@ -79,7 +79,7 @@
+ #elif defined _MSC_VER
+         "msvc " STRINGIZE(_MSC_FULL_VER),
+ #elif defined __SUNPRO_C
+-    fprintf(file, "sun c " STRINGIZE(__SUNPRO_C),
++        "sun c " STRINGIZE(__SUNPRO_C),
+ #else
+         NULL,
+ #endif
Binary file usr/src/cmd/sox/sox-14.3.0.tar.gz has changed
Binary file usr/src/cmd/sox/sox-14.4.0.tar.gz has changed
--- a/usr/src/cmd/sox/soxformat.7.diff	Tue Aug 07 13:16:19 2012 +0100
+++ b/usr/src/cmd/sox/soxformat.7.diff	Wed Aug 08 07:57:49 2012 +0100
@@ -4,8 +4,8 @@
  .SP
  .fi
  ..
--.TH SoX 7 "June 14, 2009" "soxformat" "Sound eXchange"
-+.TH SoX 4 "June 14, 2009" "soxformat" "Sound eXchange"
+-.TH SoX 7 "February 19, 2011" "soxformat" "Sound eXchange"
++.TH SoX 4 "February 19, 2011" "soxformat" "Sound eXchange"
  .SH NAME
  SoX \- Sound eXchange, the Swiss Army knife of audio manipulation
  .SH DESCRIPTION
--- a/usr/src/pkgdefs/SUNWsound-exchange/pkginfo.tmpl	Tue Aug 07 13:16:19 2012 +0100
+++ b/usr/src/pkgdefs/SUNWsound-exchange/pkginfo.tmpl	Wed Aug 08 07:57:49 2012 +0100
@@ -38,7 +38,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Sound eXchange, the Swiss Army knife of audio manipulation. (14.3.0)"
+DESC="Sound eXchange, the Swiss Army knife of audio manipulation. (14.4.0)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWsound-exchange/prototype_com	Tue Aug 07 13:16:19 2012 +0100
+++ b/usr/src/pkgdefs/SUNWsound-exchange/prototype_com	Wed Aug 08 07:57:49 2012 +0100
@@ -53,7 +53,6 @@
 s none usr/bin/play=sox
 d none usr/include 755 root bin
 f none usr/include/sox.h 644 root bin
-f none usr/include/soxstdint.h 644 root bin
 d none usr/lib 755 root bin
 f none usr/lib/libsox.so.1.0.0 555 root bin
 s none usr/lib/libsox.so=libsox.so.1.0.0