[csw-devel] SF.net SVN: gar:[13537] csw/mgar/pkg/libsndfile
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Mar 2 20:24:28 CET 2011
Revision: 13537
http://gar.svn.sourceforge.net/gar/?rev=13537&view=rev
Author: dmichelsen
Date: 2011-03-02 19:24:28 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
libsndfile: Move stuff from branch to trunk and update to 1.0.23 mainline, split packages
Modified Paths:
--------------
csw/mgar/pkg/libsndfile/trunk/Makefile
csw/mgar/pkg/libsndfile/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch
csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch
Removed Paths:
-------------
csw/mgar/pkg/libsndfile/branches/libsndfile-1.0.22preX/
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 2011-03-02 19:22:25 UTC (rev 13536)
+++ csw/mgar/pkg/libsndfile/trunk/Makefile 2011-03-02 19:24:28 UTC (rev 13537)
@@ -3,11 +3,10 @@
# $Id$
NAME = libsndfile
-VERSION = 1.0.21
-
+VERSION = 1.0.23
CATEGORIES = lib
-DESCRIPTION = a C library for reading and writing files containing sampled sound
+DESCRIPTION = C library for reading and writing files containing sampled sound
define BLURB
Libsndfile is a C library for reading and writing files containing sampled
@@ -36,22 +35,39 @@
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-Add-branch-for-inttypes.h.patch
+PATCHFILES += 0005-Test-for-unsigned-or-test-will-fail.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
+PACKAGES += CSWlibsndfile
+CATALOGNAME_CSWlibsndfile = libsndfile
+SPKG_DESC_CSWlibsndfile = Tools for reading and writing files containing sampled sound
+RUNTIME_DEP_PKGS_CSWlibsndfile += CSWlibogg
+RUNTIME_DEP_PKGS_CSWlibsndfile += CSWflac
+RUNTIME_DEP_PKGS_CSWlibsndfile += CSWvorbis
+RUNTIME_DEP_PKGS_CSWlibsndfile += CSWsqlite3rt
+RUNTIME_DEP_PKGS_CSWlibsndfile += CSWlibsndfile1
-RUNTIME_DEP_PKGS = CSWvorbis CSWflac CSWlibogg CSWsqlite3rt
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
+PACKAGES += CSWlibsndfile1
+CATALOGNAME_CSWlibsndfile1 = libsndfile1
+SPKG_DESC_CSWlibsndfile1 = Library for reading and writing files containing sampled sound, libsndfile.so.1
+PKGFILES_CSWlibsndfile1 = $(call baseisadirs,$(libdir),libsndfile\.so\.1(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWlibogg
+RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWflac
+RUNTIME_DEP_PKGS_CSWlibsndfile1 += CSWvorbis
-SPKG_SOURCEURL = http://www.mega-nerd.com/libsndfile/
+PACKAGES += CSWlibsndfile-dev
+CATALOGNAME_CSWlibsndfile-dev = libsndfile_dev
+SPKG_DESC_CSWlibsndfile-dev = Development files for libsndfile.so.1
+PKGFILES_CSWlibsndfile-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibsndfile-dev += $(docdir)/.*
+RUNTIME_DEP_PKGS_CSWlibsndfile-dev += CSWlibsndfile1
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibsndfile)
+
+VENDOR_URL = http://www.mega-nerd.com/libsndfile/
+
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-# EXTRA_CFLAGS = -features=extensions
-# EXTRA_CXXFLAGS = -features=extensions
-
BUILD64 = 1
NOISAEXEC = 1
CONFIGURE_ARGS = $(DIRPATHS)
@@ -62,6 +78,11 @@
MERGE_DIRS_isa-extra = $(libdir)
# Relocate docs to standard location
-EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(BUILD_PREFIX)/share/doc/$(NAME),'
+EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(prefix)/share/doc/$(NAME),'
+# These are all examples
+CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/FAQ.html
+CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/octave.html
+CHECKPKG_OVERRIDES_CSWlibsndfile-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libsndfile/html/pkgconfig.html
+
include gar/category.mk
Modified: csw/mgar/pkg/libsndfile/trunk/checksums
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/checksums 2011-03-02 19:22:25 UTC (rev 13536)
+++ csw/mgar/pkg/libsndfile/trunk/checksums 2011-03-02 19:24:28 UTC (rev 13537)
@@ -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
+d0e22b5ff2ef945615db33960376d733 libsndfile-1.0.23.tar.gz
Added: csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch (rev 0)
+++ csw/mgar/pkg/libsndfile/trunk/files/0004-Add-branch-for-inttypes.h.patch 2011-03-02 19:24:28 UTC (rev 13537)
@@ -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/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 2011-03-02 19:22:25 UTC (rev 13536)
+++ csw/mgar/pkg/libsndfile/trunk/files/0004-Disable-stop-on-error-until-cpp_test-refcount-error-.patch 2011-03-02 19:24:28 UTC (rev 13537)
@@ -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
-
Added: csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch (rev 0)
+++ csw/mgar/pkg/libsndfile/trunk/files/0005-Test-for-unsigned-or-test-will-fail.patch 2011-03-02 19:24:28 UTC (rev 13537)
@@ -0,0 +1,25 @@
+From 1cc5e8c85d1afa2e814e3dc16280ff79f382e0af Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 2 Mar 2011 19:34:54 +0100
+Subject: [PATCH] Test for unsigned or test will fail
+
+---
+ src/test_strncpy_crlf.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/test_strncpy_crlf.c b/src/test_strncpy_crlf.c
+index dccf1cf..9b3bffd 100644
+--- a/src/test_strncpy_crlf.c
++++ b/src/test_strncpy_crlf.c
+@@ -28,7 +28,7 @@
+ void
+ test_strncpy_crlf (void)
+ { const char *src = "a\nb\nc\n" ;
+- char *dest ;
++ unsigned char *dest ;
+ int dest_len ;
+
+ print_test_name ("Testing psf_strncpy_crlf") ;
+--
+1.7.3.2
+
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