[xiph-commits] r3723 - in libsydneyaudio/trunk: . doc include src

Fri Sep 19 22:39:46 PDT 2008

Author: silvia
Date: 2008-09-19 22:39:45 -0700 (Fri, 19 Sep 2008)
New Revision: 3723

Added:
   libsydneyaudio/trunk/AUTHORS
   libsydneyaudio/trunk/doc/
   libsydneyaudio/trunk/doc/libsydneyaudio.txt
Modified:
   libsydneyaudio/trunk/Makefile.am
   libsydneyaudio/trunk/configure.ac
   libsydneyaudio/trunk/include/Makefile.am
   libsydneyaudio/trunk/src/Makefile.am
Log:
Corrected license; added AUTHORS file; made 'make dist' and 'make distcheck' work

Added: libsydneyaudio/trunk/AUTHORS
===================================================================

--- libsydneyaudio/trunk/AUTHORS	                        (rev 0)
+++ libsydneyaudio/trunk/AUTHORS	2008-09-20 05:39:45 UTC (rev 3723)
@@ -0,0 +1,34 @@
+Jean-Marc Valin (jmspeex) <jean-marc.valin at usherbrooke.ca>
+        - Design
+
+Lennart Poettering  <lennart at poettering.net>
+		- Design
+
+Shane Stephens (shans) <shans at annodex.net>
+        - First Implementation
+
+Chris Double (doublec) <chris.double at double.co.nz>
+		- ALSA support
+		- OSS support
+
+Brian Lu <brian.lu at sun.com>
+		- Sun Audio support
+
+Jeremy D. Lea (reg at openpave.org)
+		- OSS support
+
+Marcin Lubonski <marcin at it.uts.edu.au>
+        - Port to windows
+
+Michael Martin (tahn) <myk.martin at gmail.com>
+        - Port to Max OS X
+		- OSS support
+		- ALSA support
+
+Jan Gerber (j^) <jan.gerber at gmail.com>
+		- Library creation
+
+Silvia Pfeiffer (ginger) <silvia at annodex.net>
+        - general maintenance
+
+

Modified: libsydneyaudio/trunk/Makefile.am
===================================================================
--- libsydneyaudio/trunk/Makefile.am	2008-09-20 04:36:13 UTC (rev 3722)
+++ libsydneyaudio/trunk/Makefile.am	2008-09-20 05:39:45 UTC (rev 3723)
@@ -1,36 +1,44 @@
-# Copyright (C) 2003 Annodex Association 
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
 #
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# 
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# - Neither the name of CSIRO Australia nor the names of its
-#   contributors may be used to endorse or promote products derived from
-#   this software without specific prior written permission.
+# The Initial Developer of the Original Code is
+# Annodex Association
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Contributor(s): Jan Gerber
+#                 Silvia Pfeiffer
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** *
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = src
+SUBDIRS = src include
+DIST_SUBDIRS = $(SUBDIRS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = sydneyaudio.pc
 
+EXTRA_DIST = doc/libsydneyaudio.txt
\ No newline at end of file

Modified: libsydneyaudio/trunk/configure.ac
===================================================================
--- libsydneyaudio/trunk/configure.ac	2008-09-20 04:36:13 UTC (rev 3722)
+++ libsydneyaudio/trunk/configure.ac	2008-09-20 05:39:45 UTC (rev 3723)
@@ -1,5 +1,40 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Annodex Association
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Jan Gerber
+#                 Silvia Pfeiffer
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** *
+
 # Process this file with autoconf to produce a configure script.
-AC_INIT(libsydneyaudio, 0.0.1.svn)
+AC_INIT(libsydneyaudio, 0.0.1)
 AC_CONFIG_SRCDIR([src/sydney_audio_alsa.c])
 
 AC_PREREQ(2.53)

Added: libsydneyaudio/trunk/doc/libsydneyaudio.txt
===================================================================
--- libsydneyaudio/trunk/doc/libsydneyaudio.txt	                        (rev 0)
+++ libsydneyaudio/trunk/doc/libsydneyaudio.txt	2008-09-20 05:39:45 UTC (rev 3723)
@@ -0,0 +1,5 @@
+What is libsydneyaudio designed to do?
+--------------------------------------
+
+The idea is to have a powerful, but easy to use cross-platform API for PCM audio capture and playback. So it would sit right on top of ALSA, pulseaudio, OSS, ... and abstract away all hardware-related complexity (e.g. having to check whether a card supports XYZ on ALSA before using it).
+

Modified: libsydneyaudio/trunk/include/Makefile.am
===================================================================
--- libsydneyaudio/trunk/include/Makefile.am	2008-09-20 04:36:13 UTC (rev 3722)
+++ libsydneyaudio/trunk/include/Makefile.am	2008-09-20 05:39:45 UTC (rev 3723)
@@ -1,34 +1,38 @@
-# Copyright (C) 2003 Annodex Association 
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
 #
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# 
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# - Neither the name of CSIRO Australia nor the names of its
-#   contributors may be used to endorse or promote products derived from
-#   this software without specific prior written permission.
+# The Initial Developer of the Original Code is
+# Annodex Association
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Contributor(s): Jan Gerber
+#                 Silvia Pfeiffer
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** *
 
-## Process this file with automake to produce Makefile.in
-
 includedir = $(prefix)/include
 include_HEADERS = \
         sydney_audio.h

Modified: libsydneyaudio/trunk/src/Makefile.am
===================================================================
--- libsydneyaudio/trunk/src/Makefile.am	2008-09-20 04:36:13 UTC (rev 3722)
+++ libsydneyaudio/trunk/src/Makefile.am	2008-09-20 05:39:45 UTC (rev 3723)
@@ -1,32 +1,39 @@
-# Copyright (C) 2003 Annodex Association 
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
 #
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# 
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
 #
-# - Neither the name of CSIRO Australia nor the names of its
-#   contributors may be used to endorse or promote products derived from
-#   this software without specific prior written permission.
+# The Initial Developer of the Original Code is
+# Annodex Association
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Contributor(s): Jan Gerber
+#                 Silvia Pfeiffer
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** *
 
+
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_srcdir)/include

