Projects
Multimedia
ecasound
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 8
View file
ecasound.changes
Changed
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 21 21:21:21 UTC 2023 - olaf@aepfle.de + +- update to 2.9.3 + +------------------------------------------------------------------- Thu Jul 9 08:02:28 UTC 2020 - Fridrich Strba <fridrich.strba@bluewin.ch> - Build using python3
View file
ecasound.spec
Changed
@@ -11,18 +11,18 @@ %{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: ecasound -Version: 2.9.2 +Version: 2.9.3 Release: 0 Summary: Multitrack audio processing tool License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Editors and Convertors URL: https://ecasound.seul.org/ Source: ecasound-%{version}.tar.xz +Patch0: ecasound.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: python3 BuildRequires: readline-devel BuildRequires: ruby BuildRequires: pkgconfig(alsa) @@ -32,14 +32,10 @@ BuildRequires: pkgconfig(liboil-0.3) BuildRequires: pkgconfig(lilv-0) BuildRequires: pkgconfig(ncursesw) -BuildRequires: pkgconfig(python2) +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sndfile) -%if 0%{?suse_version} >= 1550 BuildRequires: pkgconfig(lv2) -%else -BuildRequires: pkgconfig(lv2core) -%endif %description Ecasound is a software package designed for multitrack audio @@ -61,11 +57,11 @@ Summary: Library header files for ecasound Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: alsa-devel -Requires: jack-devel -Requires: libsndfile-devel -Provides: ecasound-devel = 2.4.5 -Obsoletes: ecasound-devel < 2.4.5 +Requires: pkgconfig(alsa) +Requires: pkgconfig(jack) +Requires: pkgconfig(sndfile) +Provides: ecasound-devel = %{version}-%{release} +Obsoletes: ecasound-devel < %{version}-%{release} %description -n libecasound-devel Headers files needed for compiling other programs against ecasound @@ -75,9 +71,8 @@ Summary: Python Bindings to the Ecasound Control Interface Group: Development/Libraries/Python Requires: %{name} = %{version} -Requires: python >= %{py_ver} -Provides: pyecasound = 2.4.5 -Obsoletes: pyecasound < 2.4.5 +Provides: pyecasound = %{version}-%{release} +Obsoletes: pyecasound < %{version}-%{release} %description -n python-ecasound Python bindings to the Ecasound control interface. @@ -103,6 +98,8 @@ %autosetup -p1 %build +export PYTHONPATH='%_bindir/python3' +sed -i '1s@^.*@#!%_bindir/python3@' ecatools/ecamonitor examples/*.py autoreconf -fi %configure \ --enable-shared \ @@ -115,7 +112,7 @@ --enable-liboil \ --enable-liblo \ --with-python-modules=%{_libdir}/python%{py3_ver} \ - --with-python-includes=%{_includedir}/python%{py3_ver} + %nil %make_build @@ -136,7 +133,7 @@ %files %doc AUTHORS BUGS NEWS README %license COPYING COPYING.GPL COPYING.LGPL -%doc examples +%doc examples/*.{c,cpp,py} %{_bindir}/ecasound %{_bindir}/ecaconvert %{_bindir}/ecafixdc
View file
ecasound.patch
Added
@@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -584,7 +584,7 @@ if test x$PYTHONPATH = xnone; then + pyecasound_support=none + python_install_prefix="" + else +- python_install_prefix=`python -c "import sys; print (sys.prefix)"` ++ python_install_prefix=`$PYTHONPATH -c "import sys; print (sys.prefix)"` + fi + + dnl --
View file
ecasound-2.9.2.tar.xz/pyecasound/pyecasound.c
Deleted
@@ -1,211 +0,0 @@ -/** - * @file pyecasound.c Python interface to the ecasound control interface - */ - -// ------------------------------------------------------------------------ -// pyecasound.cpp: Python interface to the ecasound control interface -// Copyright (C) 2000-2002,2008 Kai Vehmanen -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// ------------------------------------------------------------------------ - -#include <Python.h> -#include <ecasoundc.h> -#include "pyecasound.h" - -typedef struct { - PyObject_HEAD - eci_handle_t eci; -} pyeca_control_t; - -// staticforward PyTypeObject pyeca_control_type; - -static void pyeca_control_del(PyObject *self, PyObject *args); -static PyObject* pyeca_getattr(PyObject *self, char *name); - -// ********************************************************************/ - -static PyObject * pyeca_command(PyObject* self, PyObject *args) -{ - char *str; - pyeca_control_t *selfp; - - if (!PyArg_ParseTuple(args, "s", &str)) return NULL; - selfp = (pyeca_control_t*) self; - eci_command_r(selfp->eci, str); - - return Py_BuildValue(""); -} - -static PyObject * pyeca_command_float_arg(PyObject* self, PyObject *args) -{ - char *str; - double v; - pyeca_control_t *selfp; - - if (!PyArg_ParseTuple(args, "sd", &str, &v)) return NULL; - selfp = (pyeca_control_t*) self; - - eci_command_float_arg_r(selfp->eci, str, v); - - return Py_BuildValue(""); -} - -static PyObject * pyeca_last_string_list(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - int count = eci_last_string_list_count_r(selfp->eci); - int n; - - PyObject *list = Py_BuildValue(""); - for(n = 0; n < count; n++) { - PyList_Append(list, Py_BuildValue("s", eci_last_string_list_item_r(selfp->eci, n))); - } - - return(list); -} - -static PyObject * pyeca_last_string(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - return Py_BuildValue("s", eci_last_string_r(selfp->eci)); -} - -static PyObject * pyeca_last_float(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - return Py_BuildValue("d", eci_last_float_r(selfp->eci)); -} - -static PyObject * pyeca_last_integer(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - return Py_BuildValue("i", eci_last_integer_r(selfp->eci)); -} - -static PyObject * pyeca_last_long_integer(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - return Py_BuildValue("l", eci_last_long_integer_r(selfp->eci)); -} - -static PyObject * pyeca_last_error(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - return Py_BuildValue("s", eci_last_error_r(selfp->eci)); -} - -static PyObject * pyeca_error(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - int i = eci_error_r(selfp->eci); - return Py_BuildValue("i", i); -} - -static PyObject * pyeca_last_type(PyObject* self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - return Py_BuildValue("s", eci_last_type_r(selfp->eci)); -} - -static PyObject * pyeca_events_available(PyObject* self, PyObject *args) -{ - return Py_BuildValue("i", 0); -} - -static PyObject * pyeca_next_event(PyObject* self, PyObject *args) -{ - return Py_BuildValue(""); -} - -static PyObject * pyeca_current_event(PyObject* self, PyObject *args) -{ - return Py_BuildValue(""); -} - -static struct PyMethodDef pyeca_control_methods = { - { "command", pyeca_command, METH_VARARGS}, - { "command_float_arg", pyeca_command_float_arg, METH_VARARGS}, - { "last_string_list", pyeca_last_string_list, METH_VARARGS}, - { "last_string", pyeca_last_string, METH_VARARGS}, - { "last_float", pyeca_last_float, METH_VARARGS}, - { "last_integer", pyeca_last_integer, METH_VARARGS}, - { "last_long_integer", pyeca_last_long_integer, METH_VARARGS}, - { "last_error", pyeca_last_error, METH_VARARGS}, - { "last_type", pyeca_last_type, METH_VARARGS}, - { "error", pyeca_error, METH_VARARGS}, - { "events_available", pyeca_events_available, METH_VARARGS}, - { "next_event", pyeca_next_event, METH_VARARGS}, - { "current_event", pyeca_current_event, METH_VARARGS}, - { NULL, NULL } -}; - -// ********************************************************************/ - -static PyTypeObject pyeca_control_type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, - "ECA_CONTROL_INTERFACE", - sizeof (pyeca_control_t), - 0, - (destructor) pyeca_control_del, - 0, - (getattrfunc) pyeca_getattr, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, -}; - -// ********************************************************************/ - -static PyObject *pyeca_control_new(PyObject *self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) PyObject_New(pyeca_control_t, &pyeca_control_type); - - selfp->eci = eci_init_r(); - self = (PyObject *) selfp; - - return(self); -} - -static PyObject* pyeca_getattr(PyObject *self, char *name) -{ - return Py_FindMethod(pyeca_control_methods, (PyObject*) self, name); -} - -static void pyeca_control_del(PyObject *self, PyObject *args) -{ - pyeca_control_t *selfp = (pyeca_control_t*) self; - - eci_cleanup_r(selfp->eci); -
View file
ecasound-2.9.2.tar.xz/pyecasound/pyecasound.h
Deleted
@@ -1,14 +0,0 @@ -#ifndef INCLUDED_PYECASOUND_H -#define INCLUDED_PYECASOUND_H - -#ifdef __cplusplus -extern "C" { -#endif - -void initpyecasound(void); - -#ifdef __cplusplus -} -#endif - -#endif
View file
ecasound-2.9.2.tar.xz/AUTHORS -> ecasound-2.9.3.tar.xz/AUTHORS
Changed
@@ -110,6 +110,8 @@ Updated RPM spec-file for x86_64 platforms. Groffen, Fabian grobian (grobian -at- gentoo -dot- org) OS X build fixes. +Runge, David dvzrv + fix to lv2 build checks Head, Chris hawk777 Patches fixing ecasignalview build errors. Heller, Aaron aheller @@ -118,8 +120,8 @@ gcc 2.96 (RH7.0) testing and fixes. Hughes, Jeremy jedahu Bugfix for JACK port muting -Lavallée, Marc - Rpm-spec for Mandrake. +Lavallée, Marc marclava + Rpm-spec for Mandrake. Updates to Python3 support Merino, Pedro Antonio Fructuoso pfructuoso Various bugfix patches. Morris, Steve smorris
View file
ecasound-2.9.2.tar.xz/Documentation/Makefile.in -> ecasound-2.9.3.tar.xz/Documentation/Makefile.in
Changed
@@ -134,7 +134,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -170,6 +169,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -241,6 +241,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/Documentation/programmers_guide/Makefile.in -> ecasound-2.9.3.tar.xz/Documentation/programmers_guide/Makefile.in
Changed
@@ -125,7 +125,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -161,6 +160,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -232,6 +232,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/Documentation/users_guide/Makefile.in -> ecasound-2.9.3.tar.xz/Documentation/users_guide/Makefile.in
Changed
@@ -128,7 +128,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -164,6 +163,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -235,6 +235,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/Makefile.in -> ecasound-2.9.3.tar.xz/Makefile.in
Changed
@@ -150,7 +150,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -186,6 +185,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -257,6 +257,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/NEWS -> ecasound-2.9.3.tar.xz/NEWS
Changed
@@ -8,7 +8,7 @@ X = major version - incremented after major redesigns and/or major new features Y = minor version - incremented when new features are added and/or - changes in core code that impact many yse-cases + changes in core code that impact many use-cases Z = micro version - incremented if major.minor version is not modified (optional) R = revision - urgent fixes to planned releases (optional) @@ -26,7 +26,7 @@ as the release announcement mail. - For notes of previous releases: http://nosignal.fi/ecasound/relnotes/ - Version control history. Describes all changes in implementation. - - http://ecasound.git.sourceforge.net/git/gitweb.cgi?p=ecasound + - https://sourceforge.net/p/ecasound/code/ci/master/tree/ - Library interface changes are documented in ChangeLog files (these are distributed along with the source code). @@ -40,6 +40,20 @@ *********************************************************************** +11012020 (v2.9.3) -** stable release **- + - changed: python3 support to all ecasound python modules, + including ECI (pyecasound) and ecamonitor + - changed: the C python module implementation of ECI + was removed (it was deprecated in 2.9.0 in + 2012) -- python apps can use ECI using + the pyeca.py module as before + - changed: python3 support to ecamonitor, python2.7 new + minimum requirement + - fixed: configure check for LV2 updated to use "lv2" instead + of deprecated "lv2core" + - fixed: bugfix to LADSPA plugin port capability parsing + - fixed: rubyecasound - silence continuous warnings about + use of deprecated Object#timeout interface 16062019 (v2.9.2) -** stable release **- - changed: compiler hygiene -- C++ builds now pass "-std=c++98" by default as ecasound codebase does not use any
View file
ecasound-2.9.2.tar.xz/README -> ecasound-2.9.3.tar.xz/README
Changed
@@ -77,7 +77,7 @@ To run Ecasound, you need...: - Operating system that provides standard POSIX/SUS interfaces. Ecasound - has been reported to run succefully on various combinations of GNU/Linux + has been reported to run successfully on various combinations of GNU/Linux (starting from Linux 2.2+ and glibc 2.1+), FreeBSD 4.x+, Solaris 2.6+, Mac OS X 10.3+ and Win32/Cygwin 1.3.20+. @@ -117,7 +117,7 @@ - libaudiofile (SGI audio file library) runtime, and/or - libsndfile - for higher quality resampling: libsamplerate -- for pyecasound, the Python 2.4+ runtime +- for pyecasound, the Python 2.7+ runtime - for curses support, the ncurses devel package - for LADSPA support, the LADSPA SDK package - for LV2 support, liblilv devel package newer than 0.5.0 @@ -201,9 +201,6 @@ list home page at http://www.linuxdj.com/audio/lad/subscribelaa.php for more information. -You can also subscribe to Ecasound releases at http://freshmeat.net . -All Ecasound releases will be announced at Freshmeat. - ----------------------------------------------------------------------- Reporting bugs ----------------------------------------------------------------------- @@ -238,7 +235,7 @@ greatly from closed commercial development. Active participation, both from developers and users, is what pushes a FOSS project forward. -Every succesful FOSS project has an active userbase behind it. This +Every successful FOSS project has an active userbase behind it. This means that your comments, ideas and bug reports are extremely important. If something does not work, or some feature is missing, be active. Either try to fix the problem yourself, or report it @@ -307,7 +304,7 @@ Licensing/distribution policy ----------------------------------------------------------------------- -Copyright (C) 1997-2019 Kai Vehmanen and others (see the file +Copyright (C) 1997-2020 Kai Vehmanen and others (see the file 'AUTHORS' for full list of copyright holders). Ecasound is freely distributable according to the terms of the
View file
ecasound-2.9.2.tar.xz/RELNOTES -> ecasound-2.9.3.tar.xz/RELNOTES
Changed
@@ -1,12 +1,13 @@ -subject: Ecasound 2.9.2 released +subject: Ecasound 2.9.3 released 1. Summary of changes in this release ------------------------------------- -Bug fixed with glitches related to cop-set/ctrlp-set/c-bypass/c-mute when -in TCP server mode. A few minor fixes to ALSA, mp3 and LV2 support. -Five years since last stable release (2.9.1), 20 years since first public -release (v1.1.4)! +Update pyecasound and ecamonitor to work with Python3. Python2.7 or +newer is now required. The old C based implementation of ECI for +Python is dropped completely. It has been deprecated since 2.9.0 +(2012). A few minor fixes to compiler warnings, LADSPA plugin +capability parsing and rubyecasound. 2. What is Ecasound? -------------------- @@ -26,35 +27,31 @@ licensed under the GPL. The Ecasound Control Interface (ECI) is licensed under the LGPL. -3. Changes in 2.9.2 release +3. Changes in this release --------------------------- Full list of changes is available at: - http://nosignal.fi/ecasound/history.php -4. Interface and configuration file changes in 2.9.2 series +4. Interface and configuration file changes in this release ----------------------------------------------------------- -None. +- build: '--enable-python=iwantc' removed -5. Contributors to 2.9.2 series +5. Contributors to this release ------------------------------- Patches - Accepted code, documentation and build system changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Extracted with 'git-shortlog -s': - -v2.9.2: - Alessandro Ghedini (3) - Kai Vehmanen (19) +<replace with 'git-shortlog' output in emailed release notes> Bug Hunting - Reports that led to bugfixes (items closed) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -v2.9.2 - * Raphaël Mouneyres (1) - nasty bug with TCP mode and cop-set/ctrlp-set and others +v2.10 + * David O'Toole (1) + compile error on Cygwin Feature suggestions - Ideas that led to new features (items) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -71,8 +68,8 @@ Source package: http://nosignal.fi/ecasound/download.php - ecasound-2.9.2.tar.gz, sha256sum: - (TBD, see published release notes at: + ecasound-2.10.0.tar.gz, sha256sum: + (PLACEHOLDER, digest in published release notes at: http://nosignal.fi/ecasound/relnotes/) List of distributions with maintained Ecasound support:
View file
ecasound-2.9.2.tar.xz/aclocal.m4 -> ecasound-2.9.3.tar.xz/aclocal.m4
Changed
@@ -13,9 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -23,36 +21,30 @@ # modifications, as long as this notice is preserved. m4_define(_LT_COPYING, dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. ) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -80,7 +72,7 @@ # LT_INIT(OPTIONS) # ------------------ AC_DEFUN(LT_INIT, -AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT +AC_PREREQ(2.62)dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl AC_BEFORE($0, LT_LANG)dnl AC_BEFORE($0, LT_OUTPUT)dnl @@ -104,7 +96,7 @@ _LT_SET_OPTIONS($0, $1) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -124,26 +116,43 @@ dnl AC_DEFUN(AM_PROG_LIBTOOL, ) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun(_LT_PREPARE_CC_BASENAME, +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *\\/compile | ccache | *\\/ccache ) ;; + distcc | *\\/distcc | purify | *\\/purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +)# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun(_LT_CC_BASENAME, -for cc_temp in $1""; do - case $cc_temp in - compile | *\\/compile | ccache | *\\/ccache ) ;; - distcc | *\\/distcc | purify | *\\/purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +m4_require(_LT_PREPARE_CC_BASENAME)dnl +AC_REQUIRE(_LT_DECL_SED)dnl +AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require(_LT_FILEUTILS_DEFAULTS)'. +# sensibly after 'm4_require(_LT_FILEUTILS_DEFAULTS)'. m4_defun(_LT_FILEUTILS_DEFAULTS, : ${CP="cp -f"} : ${MV="mv -f"} @@ -190,15 +199,16 @@ m4_require(_LT_CMD_OLD_ARCHIVE)dnl m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl m4_require(_LT_WITH_SYSROOT)dnl +m4_require(_LT_CMD_TRUNCATE)dnl _LT_CONFIG_LIBTOOL_INIT( -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -211,7 +221,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -222,14 +232,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -282,21 +292,21 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun(_LT_PROG_LTMAIN, m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(ltmain.sh))dnl _LT_CONFIG_LIBTOOL_INIT(ac_aux_dir='$ac_aux_dir') -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh
View file
ecasound-2.9.2.tar.xz/compile -> ecasound-2.9.3.tar.xz/compile
Changed
@@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | */\\cl | cl.exe | */\\cl.exe ) + cl | */\\cl | cl.exe | */\\cl.exe | \ + icl | */\\icl | icl.exe | */\\icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End:
View file
ecasound-2.9.2.tar.xz/config.guess -> ecasound-2.9.3.tar.xz/config.guess
Changed
@@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, see <https://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. me=`echo "$0" | sed -e 's,.*/,,'` @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -107,9 +107,9 @@ dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu - eval $set_cc_for_build - cat <<-EOF > $dummy.c + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include <features.h> #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -168,21 +175,31 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ + echo unknown)` + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv0-9\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown + ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in + # to ELF recently (or will in the future) and ABI. + case "$UNAME_MACHINE_ARCH" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -197,44 +214,67 @@ os=netbsd ;; esac + # Determine ABI tags. + case "$UNAME_MACHINE_ARCH" in + earm*) + expr='s/^earmv0-9/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/-_.*/\./'` + release=`echo "$UNAME_RELEASE" | sed -e 's/-_.*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*)
View file
ecasound-2.9.2.tar.xz/config.h.in -> ecasound-2.9.3.tar.xz/config.h.in
Changed
@@ -244,8 +244,7 @@ /* libkvutils interface age */ #undef LIBKVUTILS_VERSION_AGE -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */
View file
ecasound-2.9.2.tar.xz/config.sub -> ecasound-2.9.3.tar.xz/config.sub
Changed
@@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2014-09-11' +timestamp='2018-02-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, see <https://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,12 +53,11 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 OPTION CPU-MFR-OPSYS - $0 OPTION ALIAS +Usage: $0 OPTION CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -95,7 +94,7 @@ *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -113,24 +112,24 @@ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\(^-*-^-*\)$/\2/'` +maybe_os=`echo "$1" | sed 's/^\(.*\)-\(^-*-^-*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\(^-*-^-*\)$/\1/'` + basic_machine=`echo "$1" | sed 's/^\(.*\)-\(^-*-^-*\)$/\1/'` ;; android-linux) os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\(^-*-^-*\)$/\1/'`-unknown + basic_machine=`echo "$1" | sed 's/^\(.*\)-\(^-*-^-*\)$/\1/'`-unknown ;; *) - basic_machine=`echo $1 | sed 's/-^-*$//'` - if $basic_machine != $1 - then os=`echo $1 | sed 's/.*-/-/'` + basic_machine=`echo "$1" | sed 's/-^-*$//'` + if "$basic_machine" != "$1" + then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac @@ -179,44 +178,44 @@ ;; -sco6) os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.4-9*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v4-9*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -lynx*178) os=-lynxos178 @@ -228,10 +227,7 @@ os=-lynxos ;; -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos @@ -255,15 +251,16 @@ | arc | arceb \ | arm | armble | armelb | armv2-8 | armv3-8lb | armv7arm \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -299,13 +296,14 @@ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ + | pdp10 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \
View file
ecasound-2.9.2.tar.xz/configure -> ecasound-2.9.3.tar.xz/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ecasound 2.9.2. +# Generated by GNU Autoconf 2.69 for ecasound 2.9.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='ecasound' PACKAGE_TARNAME='ecasound' -PACKAGE_VERSION='2.9.2' -PACKAGE_STRING='ecasound 2.9.2' +PACKAGE_VERSION='2.9.3' +PACKAGE_STRING='ecasound 2.9.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -665,6 +665,7 @@ ECA_AM_USE_TERMCAP_TRUE ECA_AM_USE_NCURSES_FALSE ECA_AM_USE_NCURSES_TRUE +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -694,7 +695,6 @@ ECA_AM_PYECASOUND_CEXT_TRUE ECA_S_PYTHON_DLMODULES ECA_S_PYTHON_MODULES -ECA_S_PYTHON_INCLUDES PYTHONPATH ECA_AM_COMPILE_SAMPLERATE_FALSE ECA_AM_COMPILE_SAMPLERATE_TRUE @@ -794,6 +794,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -831,7 +832,6 @@ with_libsamplerate enable_libsamplerate enable_pyecasound -with_python_includes with_python_modules enable_python_force_site_packages enable_rubyecasound @@ -839,6 +839,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -867,6 +868,7 @@ CCC CPP CXXCPP +LT_SYS_LIBRARY_PATH PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -914,6 +916,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1166,6 +1169,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1303,7 +1315,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1416,7 +1428,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ecasound 2.9.2 to adapt to many kinds of systems. +\`configure' configures ecasound 2.9.3 to adapt to many kinds of systems. Usage: $0 OPTION... VAR=VALUE... @@ -1456,6 +1468,7 @@ --sysconfdir=DIR read-only single-machine data PREFIX/etc --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com --localstatedir=DIR modifiable single-machine data PREFIX/var + --runstatedir=DIR modifiable per-process data LOCALSTATEDIR/run --libdir=DIR object code libraries EPREFIX/lib --includedir=DIR C header files PREFIX/include --oldincludedir=DIR C header files for non-gcc /usr/include @@ -1486,7 +1499,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ecasound 2.9.2:";; + short | recursive ) echo "Configuration of ecasound 2.9.3:";; esac cat <<\_ACEOF @@ -1531,13 +1544,15 @@ --with-extra-libs=FLAGS pass extra flags to linker --with-largefile deprecated option, now used by default --with-libsamplerate=DIR Compile against libsamplerate installed in DIR - --with-python-includes=DIR Python include files are in DIR --with-python-modules=DIR install Python modules in DIR --with-pic=PKGS try to use only PIC/non-PIC objects default=use both + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, default=aix. --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot=DIR Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-jack=DIR Compile against JACK installed in DIR Some influential environment variables: @@ -1552,6 +1567,8 @@ CXXFLAGS C++ compiler flags CPP C preprocessor CXXCPP C++ preprocessor + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1634,7 +1651,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ecasound configure 2.9.2 +ecasound configure 2.9.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2330,78 +2347,11 @@ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type - -# ac_fn_cxx_check_func LINENO FUNC VAR -# ------------------------------------ -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_cxx_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case <limits.h> declares $2. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC
View file
ecasound-2.9.2.tar.xz/configure.ac -> ecasound-2.9.3.tar.xz/configure.ac
Changed
@@ -1,5 +1,5 @@ dnl --- -dnl configure.in for ecasound +dnl configure.ac for ecasound dnl dnl Many of the tests and macros in this file have been borrowed from dnl other GPL-licensed packages (Alsaplayer, ALSA, SIP, PyQt, @@ -16,7 +16,7 @@ dnl --- dnl Initialize autoconf and automake dnl --- -AC_INIT(ecasound, 2.9.2) +AC_INIT(ecasound, 2.9.3) AC_PREREQ(2.50) AC_CONFIG_SRCDIR(libecasound/audiofx.h) AM_INIT_AUTOMAKE(1.6.1) @@ -569,14 +569,6 @@ python) pyecasound_support=python ;; - - c) - AC_MSG_ERROR(C python implementation is deprecated. Use --enable-pyecasound=iwantc if you really need and want to use it. Please raise this on ecasound-list to stop the deprecation process.) - ;; - - iwantc) - pyecasound_support=c - ;; *) pyecasound_support=python @@ -596,44 +588,6 @@ fi dnl -- -dnl Python header files - -ECA_S_PYTHON_INCLUDES= -AC_MSG_CHECKING(for Python include files) - -AC_ARG_WITH(python-includes, --with-python-includes=DIR Python include files are in DIR) -if test ! "X$with_python_includes" = "X" -then - python_incdirs=$with_python_includes -else - python_incdirs="/usr/local/include /usr/include" - dnl -- Double-brackets to espace the real brackets - python_incdirsmore=`python -c "import sys; print (sys.prefix + '/include/python' + sys.version:3)"` - python_incdirs="$python_incdirs $python_incdirsmore" -fi - -for d in $python_incdirs -do - if test -r $d/Python.h - then - ECA_S_PYTHON_INCLUDES=$d - break - fi -done - -AC_SUBST(ECA_S_PYTHON_INCLUDES) -if test "X$ECA_S_PYTHON_INCLUDES" = "X" -then - AC_MSG_WARN(Python.h not found) - if test x${pyecasound_support} = xc; then - dnl -- No python headers found, cannot compile C extension - pyecasound_support=python - fi -else - AC_MSG_RESULT($ECA_S_PYTHON_INCLUDES) -fi - -dnl -- dnl Python modules AC_MSG_CHECKING(for Python libraries) @@ -1161,7 +1115,7 @@ case "$enableval" in y | yes) - PKG_CHECK_MODULES(LIBLILV, lv2core lilv-0, HAVE_LIBLILV=yes, HAVE_LIBLILV=no) + PKG_CHECK_MODULES(LIBLILV, lv2 lilv-0, HAVE_LIBLILV=yes, HAVE_LIBLILV=no) if test "x${HAVE_LIBLILV}" = xyes ; then AC_MSG_RESULT(yes) enable_liblilv=yes @@ -1301,6 +1255,7 @@ dnl --- dnl Checks for functions. dnl --- +AC_LANG_C AC_FUNC_MMAP AC_CHECK_FUNCS(execvp gettimeofday pthread_mutexattr_init,, AC_MSG_ERROR(*** not all required library functions were found ***)) @@ -1324,6 +1279,7 @@ AC_CHECK_FUNCS(sigprocmask) AC_CHECK_FUNCS(sigwait) AC_CHECK_FUNCS(usleep) +AC_LANG_CPLUSPLUS dnl ------------------------------------------------------------------
View file
ecasound-2.9.2.tar.xz/depcomp -> ecasound-2.9.3.tar.xz/depcomp
Changed
@@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,9 +783,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End:
View file
ecasound-2.9.2.tar.xz/ecasound/Makefile.in -> ecasound-2.9.3.tar.xz/ecasound/Makefile.in
Changed
@@ -164,7 +164,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -200,6 +199,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -271,6 +271,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/ecasound/ecasound.cpp -> ecasound-2.9.3.tar.xz/ecasound/ecasound.cpp
Changed
@@ -691,7 +691,7 @@ void ecasound_print_version_banner(void) { cout << "ecasound v" << ecasound_library_version << endl; - cout << "Copyright (C) 1997-2019 Kai Vehmanen and others." << endl; + cout << "Copyright (C) 1997-2020 Kai Vehmanen and others." << endl; cout << "Ecasound comes with ABSOLUTELY NO WARRANTY." << endl; cout << "You may redistribute copies of ecasound under the terms of the GNU" << endl; cout << "General Public License. For more information about these matters, see" << endl;
View file
ecasound-2.9.2.tar.xz/ecasound/ecasound.h -> ecasound-2.9.3.tar.xz/ecasound/ecasound.h
Changed
@@ -19,7 +19,7 @@ */ #define ECASOUND_BANNER_ASTERISK_BAR "********************************************************************************\n" -#define ECASOUND_COPYRIGHT " (C) 1997-2019 Kai Vehmanen and others " +#define ECASOUND_COPYRIGHT " (C) 1997-2020 Kai Vehmanen and others " #define ECASOUND_RETVAL_SUCCESS 0 /**< Succesful run */ #define ECASOUND_RETVAL_INIT_FAILURE 1 /**< Unable to initialize */
View file
ecasound-2.9.2.tar.xz/ecatools/Makefile.in -> ecasound-2.9.3.tar.xz/ecatools/Makefile.in
Changed
@@ -233,7 +233,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -269,6 +268,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -340,6 +340,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/ecatools/ecamonitor -> ecasound-2.9.3.tar.xz/ecatools/ecamonitor
Changed
@@ -55,7 +55,7 @@ s.setblocking(1) return(s) - except Exception, e: + except Exception as e: if e0 == 111: # 111 = connection refused time.sleep(1) pass @@ -73,14 +73,14 @@ tm = '' counter = 0 - s.send(cmd + '\r\n') + s.send((cmd + '\r\n').encode()) while counter < 16: count = counter + 1 newdata = s.recv(4096) if len(newdata) == 0: return ('e','') - tm = tm + newdata + tm = str(tm + newdata.decode()) # lets test whether we have received a valid # EIAM command @@ -88,7 +88,7 @@ m = expand_eiam_response(tm) return parse_eiam_response(m, tm) - except Exception, e: + except Exception as e: pass return ('e','') @@ -114,15 +114,15 @@ if not m: m = re.match('256 (0-9{1,5}) (.+)\r\n(.*)', str, re.MULTILINE | re.S) if not m: - raise Exception, 'Regexp failed!' + raise Exception('Regexp failed!') if m and len(m.groups()) == 0: - print "(ecamonitor) Matching groups failed: ", m.groups() + print("(ecamonitor) Matching groups failed: ", m.groups()) if m and len(m.groups()) == 3: #print 'received=', len(m.group(3)), ', expected=', m.group(1) if int(m.group(1)) != len(m.group(3)): - print "(ecamonitor) Response length error." + print("(ecamonitor) Response length error.") if m: return (m.group(2), m.group(3)) @@ -136,8 +136,8 @@ remote_host = ecamonitor_remote_host remote_port = ecamonitor_remote_port - if not hasattr(sys, 'version_info') or (hasattr(sys, 'version_info') and sys.version_info1 <2): - print 'Error! Ecamonitor requires python-2.0 or newer to run!' + if not hasattr(sys, 'hexversion') or sys.hexversion < 0x02070000: + print('Error! Ecamonitor requires python-2.7, python-3 or newer to run!') return 1 if len(sys.argv) > 1: @@ -184,11 +184,11 @@ pad.addstr(" / Length: ") pad.addstr(issue_eiam_command(s, 'cs-get-length')1 + "s", curses.A_BOLD) pad.addstr("\nChains: ") - pad.addstr(str(len(string.split(issue_eiam_command(s, 'c-list')1,','))), curses.A_BOLD) + pad.addstr(str(len(str.split(issue_eiam_command(s, 'c-list')1,','))), curses.A_BOLD) pad.addstr(" / Inputs: ") - pad.addstr(str(len(string.split(issue_eiam_command(s, 'ai-list')1,','))), curses.A_BOLD) + pad.addstr(str(len(str.split(issue_eiam_command(s, 'ai-list')1,','))), curses.A_BOLD) pad.addstr(" / Outputs: ") - pad.addstr(str(len(string.split(issue_eiam_command(s, 'ao-list')1,','))), curses.A_BOLD) + pad.addstr(str(len(str.split(issue_eiam_command(s, 'ao-list')1,','))), curses.A_BOLD) pad.addstr("\n\n------------------------------------------------------------\n") res = issue_eiam_command(s, 'aio-status') @@ -215,13 +215,13 @@ except curses.error: raise - except socket.error, e: + except socket.error as e: if e0 == 32 or e0 == 104 or e0 == 111: s = None pass else: curses.endwin() - print "Exception!" , e + print("Exception!" , e) raise except KeyboardInterrupt:
View file
ecasound-2.9.2.tar.xz/examples/Makefile.in -> ecasound-2.9.3.tar.xz/examples/Makefile.in
Changed
@@ -125,7 +125,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -161,6 +160,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -232,6 +232,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/install-sh -> ecasound-2.9.3.tar.xz/install-sh
Changed
@@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 OPTION... -T SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *''*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *''*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | =\(\)!) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | =\(\)!) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *0-7) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -266,129 +271,113 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails.
View file
ecasound-2.9.2.tar.xz/kvutils/Makefile.in -> ecasound-2.9.3.tar.xz/kvutils/Makefile.in
Changed
@@ -184,7 +184,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -220,6 +219,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -291,6 +291,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/kvutils/kvu_utils.cpp -> ecasound-2.9.3.tar.xz/kvutils/kvu_utils.cpp
Changed
@@ -674,13 +674,14 @@ struct timespec len; len.tv_sec = static_cast<time_t>(seconds); len.tv_nsec = nanoseconds; - ret = nanosleep(&len, NULL); + ret = ::nanosleep(&len, NULL); #elif HAVE_USLEEP - ret = usleep(seconds * 1000000 + nanoseconds / 1000); + ret = ::usleep(seconds * 1000000 + nanoseconds / 1000); #else cerr << "(libkvutils) kvutils:: warning! neither nanosleep() or usleep() found!" << endl; + return -1; #endif return ret;
View file
ecasound-2.9.2.tar.xz/libecasound/Makefile.in -> ecasound-2.9.3.tar.xz/libecasound/Makefile.in
Changed
@@ -312,7 +312,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -348,6 +347,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -419,6 +419,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/libecasound/audiofx_ladspa.cpp -> ecasound-2.9.3.tar.xz/libecasound/audiofx_ladspa.cpp
Changed
@@ -1,6 +1,6 @@ // ------------------------------------------------------------------------ // audiofx_ladspa.cpp: Wrapper class for LADSPA plugins -// Copyright (C) 2000-2004,2011 Kai Vehmanen +// Copyright (C) 2000-2004,2011,2020 Kai Vehmanen // // Attributes: // eca-style-version: 3 @@ -261,7 +261,7 @@ else pd->logarithmic = false; - if ((plugin_desc->PortDescriptorsportnum & LADSPA_PORT_OUTPUT) == LADSPA_PORT_CONTROL) + if ((plugin_desc->PortDescriptorsportnum & LADSPA_PORT_OUTPUT) == LADSPA_PORT_OUTPUT) pd->output = true; else pd->output = false;
View file
ecasound-2.9.2.tar.xz/libecasound/eca-chainsetup.cpp -> ecasound-2.9.3.tar.xz/libecasound/eca-chainsetup.cpp
Changed
@@ -1,6 +1,6 @@ // ------------------------------------------------------------------------ // eca-chainsetup.cpp: Class representing an ecasound chainsetup object. -// Copyright (C) 1999-2006,2008,2009,2011-2013 Kai Vehmanen +// Copyright (C) 1999-2006,2008,2009,2011-2013,2019 Kai Vehmanen // Copyright (C) 2005 Stuart Allie // // Attributes: @@ -1783,11 +1783,10 @@ const std::string act_format = ECA_OBJECT_FACTORY::audio_object_format_to_eos(aobj); if (act_format != req_format) { - DBC_CHECK(aobj->locked_audio_format() == true); ECA_LOG_MSG(ECA_LOGGER::info, - "NOTE: using existing audio parameters " + act_format + - " for object '" + aobj->label() + "' (tried to open with " + - req_format + ")."); + "NOTE: audio parameters modified at open to " + act_format + + " for object '" + aobj->label() + "' (requested " + + req_format + ")."); } } if (aobj->is_open() == true) {
View file
ecasound-2.9.2.tar.xz/libecasound/eca-engine.cpp -> ecasound-2.9.3.tar.xz/libecasound/eca-engine.cpp
Changed
@@ -1,6 +1,6 @@ // ------------------------------------------------------------------------ // eca-engine.cpp: Main processing engine -// Copyright (C) 1999-2009,2012,2015 Kai Vehmanen +// Copyright (C) 1999-2009,2012,2015,2020 Kai Vehmanen // Copyright (C) 2005 Stuart Allie // // Attributes: @@ -531,13 +531,31 @@ } break; } - - case ep_prepare: { if (is_prepared() != true) prepare_operation(); break; } - case ep_start: { if (status() != engine_status_running) request_start(); break; } - case ep_stop: { if (status() == engine_status_running || - status() == engine_status_finished) request_stop(false); break; } - case ep_stop_with_drain: { if (status() == engine_status_running || - status() == engine_status_finished) request_stop(true); break; } + case ep_prepare: + { + if (is_prepared() != true) + prepare_operation(); + break; + } + case ep_start: + { + if (status() != engine_status_running) + request_start(); + break; + } + case ep_stop: + { + if (status() == engine_status_running || + status() == engine_status_finished) request_stop(false); + break; + } + case ep_stop_with_drain: + { + if (status() == engine_status_running || + status() == engine_status_finished) + request_stop(true); + break; + } // --- // Global position
View file
ecasound-2.9.2.tar.xz/libecasound/plugins/Makefile.in -> ecasound-2.9.3.tar.xz/libecasound/plugins/Makefile.in
Changed
@@ -187,7 +187,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -223,6 +222,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -294,6 +294,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/libecasoundc/Makefile.in -> ecasound-2.9.3.tar.xz/libecasoundc/Makefile.in
Changed
@@ -188,7 +188,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -224,6 +223,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -295,6 +295,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/ltmain.sh -> ecasound-2.9.3.tar.xz/ltmain.sh
Changed
@@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2185 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. -# Usage: $progname OPTION... MODE-ARG... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to <bug-libtool@gnu.org>. -# GNU libtool home page: <http://www.gnu.org/software/libtool/>. -# General help using GNU software: <http://www.gnu.org/gethelp/>. PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.11" -TIMESTAMP="" -package_revision=1.3337 +VERSION="2.4.6 Debian-2.4.6-9" +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|^/*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then
View file
ecasound-2.9.2.tar.xz/missing -> ecasound-2.9.3.tar.xz/missing
Changed
@@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End:
View file
ecasound-2.9.2.tar.xz/pyecasound/Makefile.am -> ecasound-2.9.3.tar.xz/pyecasound/Makefile.am
Changed
@@ -13,12 +13,6 @@ # defines # ---------------------------------------------------------------------- -if ECA_AM_DEBUG_MODE -ecasoundc_libs = ${top_builddir}/libecasoundc/libecasoundc_debug.la -else -ecasoundc_libs = ${top_builddir}/libecasoundc/libecasoundc.la -endif - if ECA_AM_PYECASOUND_INSTALL pyecasound_install_list1 = $(srcdir)/eci.py \ $(srcdir)/pyeca.py \ @@ -27,14 +21,6 @@ $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyeca.py \ $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py endif -if ECA_AM_PYECASOUND_CEXT -pyecasound_install_list2 = pyecasound.so -pyecasound_uninstall_list2 = $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so -endif - -AM_CPPFLAGS = -I$(srcdir) \ - -I$(top_srcdir)/libecasoundc \ - -I$(ECA_S_PYTHON_INCLUDES) if ECA_AM_PYECASOUND_INSTALL TESTS = test1_stresstest.py \ @@ -45,48 +31,25 @@ # header files # ---------------------------------------------------------------------- -pyecasound_includes = pyecasound.h -noinst_HEADERS = $(pyecasound_includes) - # ---------------------------------------------------------------------- # source files # ---------------------------------------------------------------------- -if ECA_AM_PYECASOUND_CEXT -noinst_LTLIBRARIES = libpyecasound.la -endif - -libpyecasound_la_SOURCES = pyecasound.c - -# libtool options to build for dlopen -libpyecasound_la_LDFLAGS = -avoid-version -export-dynamic - -if ECA_AM_PYECASOUND_CEXT -all: pyecasound.so - -pyecasound.so: pyecasound.lo - $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) ${libpyecasound_la_LDFLAGS} -shared -nostartfiles -o pyecasound.so pyecasound.lo $(ecasoundc_libs) -endif - # ---------------------------------------------------------------------- # hooks # ---------------------------------------------------------------------- -if ECA_AM_PYECASOUND_CEXT -CLEANFILES=pyecasound.so -endif - if ECA_AM_PYECASOUND_INSTALL -install-exec-hook: $(pyecasound_install_list1) $(pyecasound_install_list2) +install-exec-hook: $(pyecasound_install_list1) $(INSTALL) -d $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) - $(INSTALL) $(pyecasound_install_list1) $(pyecasound_install_list2) $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) + $(INSTALL) $(pyecasound_install_list1) $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) else install-exec-hook: endif if ECA_AM_PYECASOUND_INSTALL uninstall-local: - rm -f $(pyecasound_uninstall_list1) $(pyecasound_uninstall_list2) + rm -f $(pyecasound_uninstall_list1) rmdir $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) || echo "Skipping non-empty directory" else uninstall-local:
View file
ecasound-2.9.2.tar.xz/pyecasound/Makefile.in -> ecasound-2.9.3.tar.xz/pyecasound/Makefile.in
Changed
@@ -19,8 +19,6 @@ # Description: Python implmentation of the Ecasound Control Interface # License: LGPL (see ecasound/{AUTHORS,COPYING}) # ---------------------------------------------------------------------- - - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -44,8 +42,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = pyecasound -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ChangeLog TODO +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \ + TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac @@ -54,37 +52,15 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libpyecasound_la_LIBADD = -am_libpyecasound_la_OBJECTS = pyecasound.lo -libpyecasound_la_OBJECTS = $(am_libpyecasound_la_OBJECTS) -@ECA_AM_PYECASOUND_CEXT_TRUE@am_libpyecasound_la_rpath = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libpyecasound_la_SOURCES) -DIST_SOURCES = $(libpyecasound_la_SOURCES) -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags +SOURCES = +DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ -AM_CPPFLAGS = -I$(srcdir) \ - -I$(top_srcdir)/libecasoundc \ - -I$(ECA_S_PYTHON_INCLUDES) - +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ @@ -150,7 +126,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -186,6 +161,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -257,6 +233,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -266,12 +243,10 @@ test1_stresstest.py \ test2_stresstest.py -@ECA_AM_DEBUG_MODE_FALSE@ecasoundc_libs = ${top_builddir}/libecasoundc/libecasoundc.la # ---------------------------------------------------------------------- # defines # ---------------------------------------------------------------------- -@ECA_AM_DEBUG_MODE_TRUE@ecasoundc_libs = ${top_builddir}/libecasoundc/libecasoundc_debug.la @ECA_AM_PYECASOUND_INSTALL_TRUE@pyecasound_install_list1 = $(srcdir)/eci.py \ @ECA_AM_PYECASOUND_INSTALL_TRUE@ $(srcdir)/pyeca.py \ @ECA_AM_PYECASOUND_INSTALL_TRUE@ $(srcdir)/ecacontrol.py @@ -280,35 +255,12 @@ @ECA_AM_PYECASOUND_INSTALL_TRUE@ $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyeca.py \ @ECA_AM_PYECASOUND_INSTALL_TRUE@ $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py -@ECA_AM_PYECASOUND_CEXT_TRUE@pyecasound_install_list2 = pyecasound.so -@ECA_AM_PYECASOUND_CEXT_TRUE@pyecasound_uninstall_list2 = $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so @ECA_AM_PYECASOUND_INSTALL_TRUE@TESTS = test1_stresstest.py \ @ECA_AM_PYECASOUND_INSTALL_TRUE@ test2_stresstest.py - -# ---------------------------------------------------------------------- -# header files -# ---------------------------------------------------------------------- -pyecasound_includes = pyecasound.h -noinst_HEADERS = $(pyecasound_includes) - -# ---------------------------------------------------------------------- -# source files -# ---------------------------------------------------------------------- -@ECA_AM_PYECASOUND_CEXT_TRUE@noinst_LTLIBRARIES = libpyecasound.la -libpyecasound_la_SOURCES = pyecasound.c - -# libtool options to build for dlopen -libpyecasound_la_LDFLAGS = -avoid-version -export-dynamic - -# ---------------------------------------------------------------------- -# hooks -# ---------------------------------------------------------------------- -@ECA_AM_PYECASOUND_CEXT_TRUE@CLEANFILES = pyecasound.so all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -339,46 +291,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/^/*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libpyecasound.la: $(libpyecasound_la_OBJECTS) $(libpyecasound_la_DEPENDENCIES) - $(LINK) $(am_libpyecasound_la_rpath) $(libpyecasound_la_LDFLAGS) $(libpyecasound_la_OBJECTS) $(libpyecasound_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pyecasound.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - mostlyclean-libtool: -rm -f *.lo @@ -388,54 +300,12 @@ distclean-libtool: -rm -f libtool uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files$$0 = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique tags: TAGS +TAGS: -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \
View file
ecasound-2.9.2.tar.xz/pyecasound/ecacontrol.py -> ecasound-2.9.3.tar.xz/pyecasound/ecacontrol.py
Changed
@@ -1,278 +1,263 @@ -"""Native python ECI (ecasound control interface) implementation - - Can be used to replace the C implementation 'pyecasound.so'. -""" - -authors="""Kai Vehmanen, Eric S. Tiedemann and Janne Halttunen.""" - +"""Native Python ECI (ecasound control interface) implementation""" +from __future__ import print_function import sys -if sys.hexversion < 0x02040000: - print >>sys.stderr, "ERROR: Python 2.4 or newer is required by ecacontrol.py" - sys.exit(-1) - import re import subprocess from select import select import os import signal -import string import time -_ecasound= +AUTHORS = """Kai Vehmanen, Eric S. Tiedemann, Janne Halttunen""" + +if sys.version.split()0 < '2.7': + print("ERROR: Python 2.7 or newer is required by ecacontrol.py", + file=sys.stderr) + sys.exit(-1) -type_override={} -eci_str_sync_lost= 'Connection to the processing engine was lost.\n' class ECA_CONTROL_INTERFACE: - - def __init__(I, verbose=1): + def __init__(self, verbose=1): """Instantiate new ECI session - + verbose: set this false to get rid of startup-messages """ - - I.verbose=verbose - I._cmd='' - I._type='' - I._timeout=5 # in seconds - I._resp={} - I.initialize() - - def __call__(I, cmd, f=None): - if f != None: - val=I.command_float_arg(cmd, f) + self.type_override = {} + self.verbose = verbose + self._cmd = "" + self._type = "" + self._prompt = "ecasound ('h' for help)> " + self._timeout = 1 # in seconds + self._resp = {} + self.initialize() + + def __call__(self, cmd, f=None): + if f is not None: + val = self.command_float_arg(cmd, f) else: - cmds=string.split(cmd, '\n') + cmds = cmd.split("\n") if len(cmds) > 1: - v= + v = for c in cmds: - c=string.strip(c) + c = c.strip() if c: - v.append(I.command(c)) - - if I.error(): + v.append(self.command(c)) + + if self.error(): raise Exception(v-1) - - val=string.join(map(str, v), '\n') + + val = "\n".join(list(map(str, v))) else: - val=I.command(cmd) - - if I.error(): + val = self.command(cmd) + + if self.error(): raise Exception(val) - - return val - - def _readline(I): - return string.strip(I.eca.stdout.readline()) - - def _read_eca(I): - buffer='' - while select(I.eca.stdout.fileno(),,I.eca.stdout.fileno(),0.01)0: - buffer=buffer+I.eca.stdout.read(1) - return buffer - - def _parse_response(I): - tm=''; r=(); failcount=0 - if I.verbose > 2: - print 'c=' + I._cmd - while 1: - - s=I._read_eca() - #print 'read s=' + s - if s: - if I.verbose > 3: - print 's=<', s, '>' - else: - failcount = failcount + 1 - if failcount < I._timeout * 10: - #if failcount < 0: - time.sleep(0.01) - continue - else: - print 'timeout: s=<' + s, '>, cmd=' + I._cmd + '.' - r=('e', eci_str_sync_lost) - break - tm=tm+s - m=expand_eiam_response(tm) - r=parse_eiam_response(tm, m) - if r: - if I.verbose > 2: - print 'r=', r - break + + return val + + def _readline(self): + """Return one line of ECA output""" + return self.eca.stdout.readline().decode().strip() + + def _read_eca(self): + """Return ECA output (or None if timeout)""" + + str_buf = "" + timeout = time.time() + self._timeout + while time.time() < timeout: + in_buf = b"" + while select(self.eca.stdout, , , 0)0: + in_buf += self.eca.stdout.read(1) + str_buf += in_buf.decode() + if str_buf.endswith("> "): + return str_buf + + def _parse_response(self): + r = () + if self.verbose > 2: + print("c=" + self._cmd) + + s = self._read_eca() + + if s is None: + r = ("e", "Connection to the processing engine was lost.\n") + elif s: + if self.verbose > 3: + print("s=<", s, ">") + m = expand_eiam_response(s) + # print('expand_eiam_response', m) + r = parse_eiam_response(s, m) if not r: - I._resp'e'='-' - I._type='e' - r=None + r = ("e", "-") + + if self.verbose > 2: + print("r=", r) + + self._type = r0 + + if self._cmd in self.type_override: + self._type = self.type_overrideself._cmd + + if self._type == "S": + self._respself._type = r1.split(",") + elif self._type == "Sn": + self._respself._type = r1.split("\n") + elif self._type == "f": + self._respself._type = float(r1) + elif self._type == "i": + self._respself._type = int(r1) + elif self._type == "li": + self._respself._type = int(r1) else: - I._type=r0 - - if I._cmd in type_override.keys(): - I._type=type_overrideI._cmd
View file
ecasound-2.9.2.tar.xz/pyecasound/eci.py -> ecasound-2.9.3.tar.xz/pyecasound/eci.py
Changed
@@ -6,8 +6,8 @@ some updates by Janne Halttunen """ -import pyeca as _pyeca -import types as _types +import pyeca + class ECIError(Exception): def __init__(self, what): @@ -15,7 +15,8 @@ self.what = what def __str__(self): - return '<ECIException %s>' % self.what + return "<ECIException %s>" % self.what + class ECI: """An ECI is and ECA Control Interface object. @@ -28,26 +29,26 @@ The value of a command (or of the last command in a sequence) if returned as a value of the appropriate Python type (possibly None). - + On errors, an ECIException is raised that has a `what' member with the exception message. These exceptions also stringify prettily. """ - + def __init__(self, *args): - self.e = apply(_pyeca.ECA_CONTROL_INTERFACE, args) + self.e = pyeca.ECA_CONTROL_INTERFACE(*args) def __call__(self, cmd, f=None): - if f != None: + if f is not None: self.e.command_float_arg(cmd, f) else: - if type(cmd) == _types.ListType or type(cmd) == _types.TupleType: + if type(cmd) in list, tuple: v = None for c in cmd: v = self(c) return v else: - cmds = cmd.split('\n') + cmds = cmd.split("\n") if len(cmds) > 1: v = None for c in cmds: @@ -55,45 +56,49 @@ return v else: self.e.command(cmd) - + t = self.e.last_type() - if not t or t == '-': + if not t or t == "-": return None - elif t == 'S': + elif t == "S": return self.e.last_string_list() - elif t == 's': + elif t == "s": return self.e.last_string() - elif t == 'f': + elif t == "f": return self.e.last_float() - elif t == 'i': + elif t == "i": return self.e.last_integer() - elif t == 'li': + elif t == "li": return self.e.last_long_integer() - elif t == 'e' or self.e.error(): - raise ECIError, '%s: %s' % (self.e.last_error(), cmd) + elif t == "e" or self.e.error(): + raise ECIError("%s: %s" % (self.e.last_error(), cmd)) else: - raise ECIError, "unknown return type '%s'!" % t + raise ECIError("unknown return type '%s'!" % t) + -if __name__ == '__main__': - import time, sys +if __name__ == "__main__": + import time + import sys file = sys.argv1 e = ECI() # uncomment to raise an error :) - #e('foo') - - e(""" + # e('foo') + + e( + """ cs-add play_chainsetup c-add 1st_chain ai-add %s - ao-add /dev/dsp + ao-add-default cop-add -efl:100 cop-select 1 copp-select 1 cs-connect start""" - % file) + % file + ) cutoff_inc = 500.0 @@ -103,7 +108,9 @@ break e("copp-set", cutoff_inc + e("copp-get")) - e("""stop - cs-disconnect""") + e( + """stop + cs-disconnect""" + ) - print "Chain operator status: ", e("cop-status") + print("Chain operator status: ", e("cop-status"))
View file
ecasound-2.9.2.tar.xz/pyecasound/pyeca.py -> ecasound-2.9.3.tar.xz/pyecasound/pyeca.py
Changed
@@ -1,48 +1,5 @@ """Wrapper module which loads pyecasound (python module for Ecasound Control Interface). - -To use C version of pyecasound, you have to enable global share of symbols. - -Quote from python docs: - ---cut-- - - setdlopenflags(n) - - Set the flags used by the interpreter for dlopen() calls, - such as when the interpreter loads extension modules. - Among other things, this will enable a lazy resolving of symbols - when importing a module, if called as sys.setdlopenflags(0). - To share symbols across extension modules, call as - sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL). - Symbolic names for the flag modules can be either found in the dl module, - or in the DLFCN module. If DLFCN is not available, - it can be generated from /usr/include/dlfcn.h using the h2py script. - Availability: Unix. New in version 2.2. ---cut-- - - -Otherwise falling back to native python version (possibly slower float-handling). """ -import sys - -if hasattr(sys, 'version_info'): # attribute available from python 2.0 - if sys.version_info1 >=2: - try: - import dl - sys.setdlopenflags(dl.RTLD_LAZY|dl.RTLD_GLOBAL) - from pyecasound import * - except: - pass - - try: - import DLFCN - sys.setdlopenflags(DLFCN.RTLD_LAZY|DLFCN.RTLD_GLOBAL) - from pyecasound import * - except: - from ecacontrol import * - else: - from ecacontrol import * -else: - from ecacontrol import * +from ecacontrol import *
View file
ecasound-2.9.2.tar.xz/pyecasound/test1_stresstest.py -> ecasound-2.9.3.tar.xz/pyecasound/test1_stresstest.py
Changed
@@ -18,10 +18,10 @@ from pyeca import * # test the native Python implementation -#from ecacontrol import * +# from ecacontrol import * # test the C implementation -#from pyecasound import * +# from pyecasound import * # --- # configuration variables @@ -29,13 +29,13 @@ # run for how many seconds runlen = 5 # debug level (0, 1, 2, ...) -debuglevel = 1 +debuglevel = 0 -if os.path.isfile('../ecasound/ecasound_debug'): - os.environ'ECASOUND' = '../ecasound/ecasound_debug' +if os.path.isfile("../ecasound/ecasound_debug"): + os.environ"ECASOUND" = "../ecasound/ecasound_debug" -if os.path.isfile('../ecasound/ecasound'): - os.environ'ECASOUND' = '../ecasound/ecasound' +if os.path.isfile("../ecasound/ecasound"): + os.environ"ECASOUND" = "../ecasound/ecasound" # if above tests fail, the default ecasound binary # will be used @@ -59,33 +59,36 @@ total_cmds = 0 -while 1 and e.last_type() != 'e': +while 1 and e.last_type() != "e": e.command("get-position") curpos = e.last_float() - if curpos > runlen or e.last_type() == 'e': break + if curpos > runlen or e.last_type() == "e": + break e.command("copp-get") if debuglevel == 2: - #print curpos, e.last_float() - #if curpos == None: + # print curpos, e.last_float() + # if curpos == None: # curpos = 0.0 - sys.stderr.write('%6.2f %6.4f\r' % (curpos,e.last_float())) + sys.stderr.write("%6.2f %6.4f\r" % (curpos, e.last_float())) else: if debuglevel == 1: - sys.stderr.write('.') - + sys.stderr.write(".") + total_cmds = total_cmds + 2 -if e.last_type() == 'e': - print 'Ended to error:', e.last_error() +if e.last_type() == "e": + print("Ended to error:", e.last_error()) result = -1 else: e.command("stop") e.command("cs-disconnect") if debuglevel == 2: - sys.stderr.write('\nprocessing speed: ' + str(total_cmds / runlen) + ' cmds/second.\n') + sys.stderr.write( + "\nprocessing speed: " + str(total_cmds / runlen) + " cmds/second.\n" + ) if debuglevel > 0: - sys.stderr.write('\n') + sys.stderr.write("\n") sys.exit(result)
View file
ecasound-2.9.2.tar.xz/pyecasound/test2_stresstest.py -> ecasound-2.9.3.tar.xz/pyecasound/test2_stresstest.py
Changed
@@ -18,10 +18,10 @@ from pyeca import * # test the native Python implementation -#from ecacontrol import * +# from ecacontrol import * # test the C implementation -#from pyecasound import * +# from pyecasound import * # --- # configuration variables @@ -29,13 +29,13 @@ # run for how many seconds runlen = 5 # debug level (0, 1, 2, ...) -debuglevel = 1 +debuglevel = 0 -if os.path.isfile('../ecasound/ecasound_debug'): - os.environ'ECASOUND' = '../ecasound/ecasound_debug' +if os.path.isfile("../ecasound/ecasound_debug"): + os.environ"ECASOUND" = "../ecasound/ecasound_debug" -if os.path.isfile('../ecasound/ecasound'): - os.environ'ECASOUND' = '../ecasound/ecasound' +if os.path.isfile("../ecasound/ecasound"): + os.environ"ECASOUND" = "../ecasound/ecasound" # if above tests fail, the default ecasound binary # will be used @@ -59,33 +59,36 @@ total_cmds = 0 -while 1 and e.last_type() != 'e': +while 1 and e.last_type() != "e": e.command("get-position") curpos = e.last_float() - if curpos > runlen or e.last_type() == 'e': break + if curpos > runlen or e.last_type() == "e": + break if debuglevel > 0: - sys.stderr.write('.') - + sys.stderr.write(".") + # some commands that return a lot # of return data e.command("cop-register") e.command("aio-register") e.command("int-cmd-list") - + total_cmds = total_cmds + 4 -if e.last_type() == 'e': - print 'Ended to error:', e.last_error() +if e.last_type() == "e": + print("Ended to error:", e.last_error()) result = -1 else: e.command("stop") e.command("cs-disconnect") if debuglevel == 2: - sys.stderr.write('\nprocessing speed: ' + str(total_cmds / runlen) + ' cmds/second.\n') + sys.stderr.write( + "\nprocessing speed: " + str(total_cmds / runlen) + " cmds/second.\n" + ) if debuglevel > 0: - sys.stderr.write('\n') + sys.stderr.write("\n") sys.exit(result)
View file
ecasound-2.9.2.tar.xz/rubyecasound/Makefile.in -> ecasound-2.9.3.tar.xz/rubyecasound/Makefile.in
Changed
@@ -125,7 +125,6 @@ ECA_S_JACK_LIBS = @ECA_S_JACK_LIBS@ ECA_S_PREFIX = @ECA_S_PREFIX@ ECA_S_PYTHON_DLMODULES = @ECA_S_PYTHON_DLMODULES@ -ECA_S_PYTHON_INCLUDES = @ECA_S_PYTHON_INCLUDES@ ECA_S_PYTHON_MODULES = @ECA_S_PYTHON_MODULES@ ECA_S_READLINE_INCLUDES = @ECA_S_READLINE_INCLUDES@ ECA_S_READLINE_LIBS = @ECA_S_READLINE_LIBS@ @@ -161,6 +160,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ NM = @NM@ @@ -232,6 +232,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@
View file
ecasound-2.9.2.tar.xz/rubyecasound/ecasound.rb -> ecasound-2.9.3.tar.xz/rubyecasound/ecasound.rb
Changed
@@ -130,7 +130,7 @@ response = "" begin # TimeoutError is raised unless response is complete - timeout(TIMEOUT) do + Timeout.timeout(TIMEOUT) do loop do response += read() break if response =~ /256 (0-9{1,5}) (\-|i|li|f|s|S|e)\r\n(.*)\r\n\r\n/m
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.