--- a/components/sox/Makefile Tue Oct 30 06:55:04 2012 -0700
+++ b/components/sox/Makefile Wed Oct 31 04:43:31 2012 -0700
@@ -26,12 +26,12 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= sox
-COMPONENT_VERSION= 14.3.2
+COMPONENT_VERSION= 14.4.0
COMPONENT_PROJECT_URL= http://sox.sourceforge.net/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f
+ sha256:3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3
COMPONENT_ARCHIVE_URL= http://downloads.sourceforge.net/project/$(COMPONENT_NAME)/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
include ../../make-rules/prep.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sox/patches/8.libsox.c.patch Wed Oct 31 04:43:31 2012 -0700
@@ -0,0 +1,11 @@
+--- sox-14.4.0/src/libsox.c.~1~ Mon Jan 16 16:58:41 2012
++++ sox-14.4.0/src/libsox.c Fri Sep 21 11:52:13 2012
+@@ -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
--- a/components/sox/sox.license Tue Oct 30 06:55:04 2012 -0700
+++ b/components/sox/sox.license Wed Oct 31 04:43:31 2012 -0700
@@ -1,3 +1,7 @@
+--------------
+- sox 14.4.0 -
+--------------
+
Oracle elects to use only the GNU Lesser General Public License version
2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
where a choice of LGPL/GPL license versions are made available with the
--- a/components/sox/sox.p5m Tue Oct 30 06:55:04 2012 -0700
+++ b/components/sox/sox.p5m Wed Oct 31 04:43:31 2012 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -37,6 +37,7 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
dir path=usr
dir path=usr/bin
+dir path=usr/bin/$(MACH64)
dir path=usr/include
dir path=usr/lib
dir path=usr/lib/$(MACH64)
@@ -50,25 +51,28 @@
dir path=usr/share/man/man3
dir path=usr/share/man/man4
dir path=usr/share/man/man5
+file path=usr/bin/$(MACH64)/sox
file path=usr/bin/sox
file path=usr/include/sox.h
-file path=usr/include/soxstdint.h
-file path=usr/lib/$(MACH64)/libsox.so.1.0.0
+file path=usr/lib/$(MACH64)/libsox.so.2.0.0
file path=usr/lib/$(MACH64)/pkgconfig/sox.pc
-file path=usr/lib/libsox.so.1.0.0
+file path=usr/lib/libsox.so.2.0.0
file path=usr/lib/pkgconfig/sox.pc
file path=usr/share/man/man1/sox.1
file path=usr/share/man/man1/soxi.1
file path=usr/share/man/man3/libsox.3
file soxformat.7 path=usr/share/man/man4/soxformat.4
license sox.license license="GPLv2, LGPLv2.1"
+link path=usr/bin/$(MACH64)/play target=sox
+link path=usr/bin/$(MACH64)/rec target=sox
+link path=usr/bin/$(MACH64)/soxi target=sox
link path=usr/bin/play target=sox
link path=usr/bin/rec target=sox
link path=usr/bin/soxi target=sox
-link path=usr/lib/$(MACH64)/libsox.so target=libsox.so.1.0.0
-link path=usr/lib/$(MACH64)/libsox.so.1 target=libsox.so.1.0.0
-link path=usr/lib/libsox.so target=libsox.so.1.0.0
-link path=usr/lib/libsox.so.1 target=libsox.so.1.0.0
+link path=usr/lib/$(MACH64)/libsox.so target=libsox.so.2.0.0
+link path=usr/lib/$(MACH64)/libsox.so.2 target=libsox.so.2.0.0
+link path=usr/lib/libsox.so target=libsox.so.2.0.0
+link path=usr/lib/libsox.so.2 target=libsox.so.2.0.0
link path=usr/share/man/man1/play.1 target=sox.1
link path=usr/share/man/man1/rec.1 target=sox.1
link path=usr/share/man/man5/soxeffect.5 target=../man1/sox.1