[csw-devel] SF.net SVN: gar:[20128] csw/mgar/pkg/sox/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Jan 14 14:20:17 CET 2013
Revision: 20128
http://gar.svn.sourceforge.net/gar/?rev=20128&view=rev
Author: dmichelsen
Date: 2013-01-14 13:20:17 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
sox/trunk: Update to 14.4.0
Modified Paths:
--------------
csw/mgar/pkg/sox/trunk/Makefile
csw/mgar/pkg/sox/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch
Modified: csw/mgar/pkg/sox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sox/trunk/Makefile 2013-01-14 13:08:50 UTC (rev 20127)
+++ csw/mgar/pkg/sox/trunk/Makefile 2013-01-14 13:20:17 UTC (rev 20128)
@@ -1,5 +1,5 @@
NAME = sox
-VERSION = 14.3.2
+VERSION = 14.4.0
GARTYPE = v2
DESCRIPTION = Swiss Army Knife of sound processing utilities
@@ -10,67 +10,59 @@
endef
MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(DISTNAME).tar.gz
+DISTFILES = $(DISTNAME).tar.bz2
# 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 = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0001-Fix-SunStudio-version-string.patch
VENDOR_URL = http://sox.sourceforge.net/
PACKAGES += CSWsox
CATALOGNAME_CSWsox = sox
SPKG_DESC_CSWsox = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWsox += CSWlibsox1
-RUNTIME_DEP_PKGS_CSWsox += CSWvorbis
-RUNTIME_DEP_PKGS_CSWsox += CSWlibogg
-RUNTIME_DEP_PKGS_CSWsox += CSWlibmad
-RUNTIME_DEP_PKGS_CSWsox += CSWlibid3tag
-RUNTIME_DEP_PKGS_CSWsox += CSWflac
-RUNTIME_DEP_PKGS_CSWsox += CSWlibao
-RUNTIME_DEP_PKGS_CSWsox += CSWlibsndfile
-RUNTIME_DEP_PKGS_CSWsox += CSWpng
-RUNTIME_DEP_PKGS_CSWsox += CSWwavpack
-RUNTIME_DEP_PKGS_CSWsox += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWsox += CSWlibmp3lame0
-RUNTIME_DEP_PKGS_CSWsox += CSWzlib
+RUNTIME_DEP_PKGS_CSWsox += CSWlibsox2
-PACKAGES += CSWlibsox1
-CATALOGNAME_CSWlibsox1 = libsox1
-SPKG_DESC_CSWlibsox1 = SOX Library for Audio Processing
-PKGFILES_CSWlibsox1 += $(PKGFILES_RT)
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWvorbis
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibogg
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmad
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibid3tag
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWflac
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibao
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibsndfile
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWpng
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWwavpack
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWlibsox1 += CSWlibmp3lame0
+PACKAGES += CSWlibsox2
+CATALOGNAME_CSWlibsox2 = libsox2
+SPKG_DESC_CSWlibsox2 = SOX Library for audio processing, libsox.so.2
+PKGFILES_CSWlibsox2 += $(call pkgfiles_lib,libsox.so.2)
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibvorbisenc2
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibvorbisfile3
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmad0
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibflac8
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibao4
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibwavpack1
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibmp3lame0
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibgomp1
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibsndfile
+RUNTIME_DEP_PKGS_CSWlibsox2 += CSWlibid3tag
PACKAGES += CSWlibsox-dev
CATALOGNAME_CSWlibsox-dev = libsox_dev
-SPKG_DESC_CSWlibsox-dev = SOX Library Development Files
+SPKG_DESC_CSWlibsox-dev = SOX library development files, libsox.so.2
PKGFILES_CSWlibsox-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibsox-dev = CSWlibsox1
+RUNTIME_DEP_PKGS_CSWlibsox-dev = CSWlibsox2
OBSOLETED_BY_CSWlibsox-dev = CSWlibsoxdevel
-CATALOGNAME_CSWlibsoxdevel = libsox_devel
+CATALOGNAME_CSWlibsoxdevel = libsox_devel_stub
BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWsox)
BUILD_DEP_PKGS += CSWlibmagic-dev
-BUILD_DEP_PKGS += CSWlame-devel
+BUILD_DEP_PKGS += CSWlibmp3lame-dev
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --without-libltdl
-BUILD64_LIBS_ONLY = 1
+BUILD64 = 1
+ISAEXEC = 1
include gar/category.mk
Modified: csw/mgar/pkg/sox/trunk/checksums
===================================================================
--- csw/mgar/pkg/sox/trunk/checksums 2013-01-14 13:08:50 UTC (rev 20127)
+++ csw/mgar/pkg/sox/trunk/checksums 2013-01-14 13:20:17 UTC (rev 20128)
@@ -1 +1 @@
-e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz
+813807c6d6fcd4b0af5c995e61f46687 sox-14.4.0.tar.bz2
Added: csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch
===================================================================
--- csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch (rev 0)
+++ csw/mgar/pkg/sox/trunk/files/0001-Fix-SunStudio-version-string.patch 2013-01-14 13:20:17 UTC (rev 20128)
@@ -0,0 +1,25 @@
+From 88191a5b58b89721fcc9d047320f87945ef9554b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 1 Jan 2013 21:34:22 +0100
+Subject: [PATCH] Fix SunStudio version string
+
+---
+ src/libsox.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libsox.c b/src/libsox.c
+index 75354e4..75fcd76 100644
+--- a/src/libsox.c
++++ b/src/libsox.c
+@@ -79,7 +79,7 @@ sox_version_info_t const * sox_version_info(void)
+ #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
+--
+1.8.0
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list