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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Oct 29 14:39:34 CET 2009


Revision: 7013
          http://gar.svn.sourceforge.net/gar/?rev=7013&view=rev
Author:   dmichelsen
Date:     2009-10-29 13:39:34 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
libsndfile: Add a bunch of patches and fixes

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

Added Paths:
-----------
    csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch
    csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch
    csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch
    csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch

Modified: csw/mgar/pkg/libsndfile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/Makefile	2009-10-29 13:32:44 UTC (rev 7012)
+++ csw/mgar/pkg/libsndfile/trunk/Makefile	2009-10-29 13:39:34 UTC (rev 7013)
@@ -33,18 +33,31 @@
 MASTER_SITES = http://www.mega-nerd.com/libsndfile/
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-Add-lrintf-workaround-to-regtest.patch
+PATCHFILES += 0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch
+PATCHFILES += 0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch
+PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
 
-REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg
+REQUIRED_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt
 PREREQUISITE_PKGS = $(REQUIRED_PKGS)
 
 SPKG_SOURCEURL = http://www.mega-nerd.com/libsndfile/
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-TEST_SCRIPTS =
+# EXTRA_CFLAGS = -features=extensions
+# EXTRA_CXXFLAGS = -features=extensions
+
+BUILD64 = 1
+NO_ISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-EXTRA_CFLAGS = -features=extensions
-EXTRA_CXXFLAGS = -features=extensions
+TEST_TARGET = check
 
+# We want only 64 bit libs, no 64 bit executables
+MERGE_DIRS_isa-extra = $(libdir)
+
+# Relocate docs to standard location
+EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(BUILD_PREFIX)/share/doc/$(GARNAME),'
+
 include gar/category.mk

Modified: csw/mgar/pkg/libsndfile/trunk/checksums
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/checksums	2009-10-29 13:32:44 UTC (rev 7012)
+++ csw/mgar/pkg/libsndfile/trunk/checksums	2009-10-29 13:39:34 UTC (rev 7013)
@@ -1 +1,5 @@
-e0553e12c7a467af44693e95e2eac668  download/libsndfile-1.0.20.tar.gz
+5a1c6c4bfb8b8426d8ebc8d67814a7c8  0001-Add-lrintf-workaround-to-regtest.patch
+ab0c6ea20d4bda60f6f6dd4fa4c26871  0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch
+599bd5f64872bbddf993ce0815d28417  0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch
+732c648739e94cb5fd2e70d983390318  0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
+e0553e12c7a467af44693e95e2eac668  libsndfile-1.0.20.tar.gz

Added: csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch	                        (rev 0)
+++ csw/mgar/pkg/libsndfile/trunk/files/0001-Add-lrintf-workaround-to-regtest.patch	2009-10-29 13:39:34 UTC (rev 7013)
@@ -0,0 +1,25 @@
+From 5c8520d2cf626fbdc8aecbf20e2e97eeb4bc56ee Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 29 Oct 2009 13:09:13 +0100
+Subject: [PATCH 1/3] Add lrintf workaround to regtest
+
+---
+ regtest/checksum.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/regtest/checksum.c b/regtest/checksum.c
+index 863fbed..9e638d1 100644
+--- a/regtest/checksum.c
++++ b/regtest/checksum.c
+@@ -35,6 +35,8 @@
+ 
+ #define	ARRAY_LEN(x)	((int) (sizeof (x)) / (sizeof ((x) [0])))
+ 
++#define lrintf(f)               ((int32_t)rint(f))
++
+ static int short_checksum (SNDFILE * file, int start) ;
+ static int int_checksum (SNDFILE * file, int start) ;
+ static int float_checksum (SNDFILE * file, int start) ;
+-- 
+1.6.5
+

Added: csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch	                        (rev 0)
+++ csw/mgar/pkg/libsndfile/trunk/files/0002-Add-workaround-for-missing-libm-function-lrint-and-l.patch	2009-10-29 13:39:34 UTC (rev 7013)
@@ -0,0 +1,28 @@
+From 4f81962de709e59c180ed95e3a7ed4e49af38b95 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 29 Oct 2009 12:41:49 +0100
+Subject: [PATCH] Add workaround for missing libm function lrint and lrintf
+
+---
+ src/common.h |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/common.h b/src/common.h
+index f41f96a..f4ba69a 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -839,5 +839,11 @@ int sf_dither_float		(const SF_DITHER_INFO *dither, const float *in, float *out,
+ int sf_dither_double	(const SF_DITHER_INFO *dither, const double *in, double *out, int count) ;
+ #endif
+ 
++/* Taken from http://www.mail-archive.com/qemu-devel@nongnu.org/msg00314.html */
++#define lrint(d)                ((int32_t)rint(d))
++#define llrint(d)               ((int64_t)rint(d))
++#define lrintf(f)               ((int32_t)rint(f))
++#define llrintf(f)              ((int64_t)rint(f))
++
+ #endif /* SNDFILE_COMMON_H */
+ 
+-- 
+1.6.5
+

Added: csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch	                        (rev 0)
+++ csw/mgar/pkg/libsndfile/trunk/files/0003-Workaround-mising-stdint.h-and-Sun-Studio-shortcomin.patch	2009-10-29 13:39:34 UTC (rev 7013)
@@ -0,0 +1,35 @@
+From a21ce86ac37888255ad9a4018c27f866e3ff1ebf Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 29 Oct 2009 13:22:02 +0100
+Subject: [PATCH 2/3] Workaround mising stdint.h and Sun Studio shortcoming
+
+---
+ tests/utils.h |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/tests/utils.h b/tests/utils.h
+index ee70e2c..9a108cd 100644
+--- a/tests/utils.h
++++ b/tests/utils.h
+@@ -29,7 +29,17 @@
+ extern "C" {
+ #endif	/* __cplusplus */
+ 
+-#include <stdint.h>
++#include <sys/types.h>
++#define lrint(d)                ((int32_t)rint(d))
++#define lrintf(f)               ((int32_t)rint(f))
++
++#  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
++    (defined(__SUNPRO_C) && defined(__C99FEATURES__))
++#   define __func__ __func__
++#  else
++#   define __func__ "<unknown>"
++#  endif
++
+ #include <stdarg.h>
+ 
+ #define SF_COUNT_TO_LONG(x)	((long) (x))
+-- 
+1.6.5
+

Added: csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch	                        (rev 0)
+++ csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch	2009-10-29 13:39:34 UTC (rev 7013)
@@ -0,0 +1,25 @@
+From a1350cd6d86051e18b4513f1e7babce8fd5d00e0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 29 Oct 2009 14:00:09 +0100
+Subject: [PATCH 3/3] Disable stop-on-error until cpp_test refcount error is fixed
+
+---
+ tests/test_wrapper.sh.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tests/test_wrapper.sh.in b/tests/test_wrapper.sh.in
+index 7fb2d8e..8a0557d 100755
+--- a/tests/test_wrapper.sh.in
++++ b/tests/test_wrapper.sh.in
+@@ -12,7 +12,7 @@ if [ ! -f sfversion ]; then
+ sfversion=`./sfversion`
+ 
+ # Force exit on errors.
+-set -e
++# set -e
+ 
+ # generic-tests
+ uname -a
+-- 
+1.6.5
+


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