[csw-devel] SF.net SVN: gar:[7889] csw/mgar/pkg/wavpack/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7889
          http://gar.svn.sourceforge.net/gar/?rev=7889&view=rev
Author:   dmichelsen
Date:     2010-01-06 11:39:13 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
wavpack: Update to 4.60.1

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

Removed Paths:
-------------
    csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch

Modified: csw/mgar/pkg/wavpack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wavpack/trunk/Makefile	2010-01-06 11:28:36 UTC (rev 7888)
+++ csw/mgar/pkg/wavpack/trunk/Makefile	2010-01-06 11:39:13 UTC (rev 7889)
@@ -1,5 +1,5 @@
 GARNAME = wavpack
-GARVERSION = 4.60.0
+GARVERSION = 4.60.1
 CATEGORIES = lib
 
 DESCRIPTION = Open audio compression format
@@ -13,13 +13,14 @@
 
 MASTER_SITES = http://www.wavpack.com/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-PATCHFILES += 0001-Add-support-for-Sun-Studio-compiler.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 REQUIRED_PKGS = CSWiconv
 
+LICENSE = license.txt
+
 BUILD64 = 1
 NO_ISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/wavpack/trunk/checksums
===================================================================
--- csw/mgar/pkg/wavpack/trunk/checksums	2010-01-06 11:28:36 UTC (rev 7888)
+++ csw/mgar/pkg/wavpack/trunk/checksums	2010-01-06 11:39:13 UTC (rev 7889)
@@ -1,2 +1 @@
-a8cbb0b205d3865731e359f24341bd7d  0001-Add-support-for-Sun-Studio-compiler.patch
-722f90393b292cd1413e8af8250a3783  wavpack-4.60.0.tar.bz2
+7bb1528f910e4d0003426c02db856063  wavpack-4.60.1.tar.bz2

Deleted: csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch
===================================================================
--- csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch	2010-01-06 11:28:36 UTC (rev 7888)
+++ csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch	2010-01-06 11:39:13 UTC (rev 7889)
@@ -1,48 +0,0 @@
-From e4e9a2384beca0d8be8f2742ec5c9b6607b20f10 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 6 Nov 2009 13:49:55 +0100
-Subject: [PATCH] Add support for Sun Studio compiler
-
----
- cli/utils.c       |    4 ++--
- include/wavpack.h |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cli/utils.c b/cli/utils.c
-index 6094f52..442685b 100644
---- a/cli/utils.c
-+++ b/cli/utils.c
-@@ -16,7 +16,7 @@
- #include <io.h>
- #include <conio.h>
- #include <shlobj.h>
--#elif defined(__GNUC__)
-+#elif defined(__GNUC__) || defined(__sun)
- #include <glob.h>
- #include <unistd.h>
- #endif
-@@ -164,7 +164,7 @@ char *filespec_ext (char *filespec)
- // returned.                                                                //
- //////////////////////////////////////////////////////////////////////////////
- 
--#if defined(__GNUC__) && !defined(WIN32)
-+#if (defined(__GNUC__) || defined(__sun)) && !defined(WIN32)
- 
- char *filespec_path (char *filespec)
- {
-diff --git a/include/wavpack.h b/include/wavpack.h
-index d264bdc..92caa48 100644
---- a/include/wavpack.h
-+++ b/include/wavpack.h
-@@ -33,7 +33,7 @@ typedef float float32_t;
- 
- typedef unsigned char   uchar;
- 
--#if !defined(__GNUC__) || defined(WIN32)
-+#if (!defined(__GNUC__) && !defined(__sun)) || defined(WIN32)
- typedef unsigned short  ushort;
- typedef unsigned int    uint;
- #endif
--- 
-1.6.5.1
-


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