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

[dmichelsen at users.sourceforge.net]

Revision: 7144
          http://gar.svn.sourceforge.net/gar/?rev=7144&view=rev
Author:   dmichelsen
Date:     2009-11-06 13:18:25 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
wavpack: Add necessary patch

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

Added 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	2009-11-06 12:52:23 UTC (rev 7143)
+++ csw/mgar/pkg/wavpack/trunk/Makefile	2009-11-06 13:18:25 UTC (rev 7144)
@@ -13,12 +13,19 @@
 
 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
+
 BUILD64 = 1
-
+NO_ISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
+TEST_TARGET = check
+
+MERGE_DIRS_isa-extra = $(libdir)
+
 include gar/category.mk

Modified: csw/mgar/pkg/wavpack/trunk/checksums
===================================================================
--- csw/mgar/pkg/wavpack/trunk/checksums	2009-11-06 12:52:23 UTC (rev 7143)
+++ csw/mgar/pkg/wavpack/trunk/checksums	2009-11-06 13:18:25 UTC (rev 7144)
@@ -1 +1,2 @@
+a8cbb0b205d3865731e359f24341bd7d  0001-Add-support-for-Sun-Studio-compiler.patch
 722f90393b292cd1413e8af8250a3783  wavpack-4.60.0.tar.bz2

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/wavpack/trunk/files/0001-Add-support-for-Sun-Studio-compiler.patch	2009-11-06 13:18:25 UTC (rev 7144)
@@ -0,0 +1,48 @@
+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.