[csw-devel] SF.net SVN: gar:[11101] csw/mgar/pkg/libsndfile/branches
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Sep 30 13:21:44 CEST 2010
Revision: 11101
http://gar.svn.sourceforge.net/gar/?rev=11101&view=rev
Author: dmichelsen
Date: 2010-09-30 11:21:43 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
libsndfile: Make branch for 1.0.22preX
Modified Paths:
--------------
csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/Makefile
csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/checksums
Added Paths:
-----------
csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/
csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch
Removed Paths:
-------------
csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/sunpro-extensions.patch
Modified: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/Makefile
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/Makefile 2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/Makefile 2010-09-30 11:21:43 UTC (rev 11101)
@@ -3,7 +3,7 @@
# $Id$
GARNAME = libsndfile
-GARVERSION = 1.0.21
+GARVERSION = 1.0.22pre4
CATEGORIES = lib
@@ -31,12 +31,14 @@
endef
MASTER_SITES = http://www.mega-nerd.com/libsndfile/files/
+MASTER_SITES = http://www.mega-nerd.com/tmp/
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
+# PATCHFILES += 0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch
+PATCHFILES += 0004-Add-branch-for-inttypes.h.patch
# TODO: The __func__ replacement may be enhanced with
# http://mail-index.netbsd.org/pkgsrc-users/2009/05/18/msg009885.html
Modified: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/checksums
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/checksums 2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/checksums 2010-09-30 11:21:43 UTC (rev 11101)
@@ -1,5 +1 @@
-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
-880a40ec636ab2185b97f8927299b292 libsndfile-1.0.21.tar.gz
+e1b317cdebd6afcb225afec0b081c232 libsndfile-1.0.22pre4.tar.gz
Added: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch
===================================================================
--- csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch (rev 0)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Add-branch-for-inttypes.h.patch 2010-09-30 11:21:43 UTC (rev 11101)
@@ -0,0 +1,28 @@
+From 5640cb876215cfdeaa24794ca996f2164b6a5b10 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 30 Sep 2010 11:09:08 +0200
+Subject: [PATCH 4/4] Add branch for inttypes.h
+
+---
+ programs/common.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/programs/common.c b/programs/common.c
+index 75ae602..d7d58b1 100644
+--- a/programs/common.c
++++ b/programs/common.c
+@@ -35,7 +35,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#if HAVE_STDINT_H
+ #include <stdint.h>
++#elif HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
+
+ #include <sndfile.h>
+
+--
+1.7.3
+
Deleted: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/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 2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch 2010-09-30 11:21:43 UTC (rev 11101)
@@ -1,25 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/sunpro-extensions.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/sunpro-extensions.patch 2010-09-30 02:05:13 UTC (rev 11100)
+++ csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/files/sunpro-extensions.patch 2010-09-30 11:21:43 UTC (rev 11101)
@@ -1,27 +0,0 @@
---- 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.
More information about the devel
mailing list