[csw-devel] SF.net SVN: gar:[7121] csw/mgar/pkg/libsndfile/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7121
          http://gar.svn.sourceforge.net/gar/?rev=7121&view=rev
Author:   dmichelsen
Date:     2009-11-05 13:20:24 +0000 (Thu, 05 Nov 2009)

Log Message:
-----------
libsndfile: Add possible enhancement

Modified Paths:
--------------
    csw/mgar/pkg/libsndfile/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch

Modified: csw/mgar/pkg/libsndfile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/Makefile	2009-11-05 12:57:31 UTC (rev 7120)
+++ csw/mgar/pkg/libsndfile/trunk/Makefile	2009-11-05 13:20:24 UTC (rev 7121)
@@ -38,6 +38,10 @@
 PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch
 PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
 
+# TODO: The __func__ replacement may be enhanced with
+#   http://mail-index.netbsd.org/pkgsrc-users/2009/05/18/msg009885.html
+# PATCHFILES += sunpro-extensions.patch
+
 REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt
 PREREQUISITE_PKGS = $(REQUIRED_PKGS)
 

Added: csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch	                        (rev 0)
+++ csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch	2009-11-05 13:20:24 UTC (rev 7121)
@@ -0,0 +1,27 @@
+--- Makefile.orig       2009-05-18 13:08:50.608183737 +0200
++++ Makefile
+@@ -36,6 +36,11 @@ CONFIGURE_ENV+=              ac_cv_c_struct_hack=yes
+ BUILDLINK_PASSTHRU_DIRS+=      /Developer
+ .endif
+ 
++# Needed for sun studio having __func__ defined
++.if ${PKGSRC_COMPILER} == "sunpro"
++CFLAGS+=        -features=extensions
++.endif
++
+ .include "../../audio/flac/buildlink3.mk"
+ #BUILDLINK_API_DEPENDS.libvorbis+=     libvorbis>=1.2.1
+ .include "../../audio/libvorbis/buildlink3.mk"
+$NetBSD$
+
+--- src/common.h.orig   2009-02-13 22:24:08.000000000 +0100
++++ src/common.h
+@@ -39,7 +39,7 @@
+ 
+ #if (SIZEOF_LONG == 8)
+ #      define  SF_PLATFORM_S64(x)              x##l
+-#elif COMPILER_IS_GCC
++#elif COMPILER_IS_GCC || __SUNPRO_C
+ #      define  SF_PLATFORM_S64(x)              x##ll
+ #elif OS_IS_WIN32
+ #      define  SF_PLATFORM_S64(x)              x##I64


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