- 2.3.0, updated link patch

- new bconds: arts (default off), jack (default on)
- -devel R: libsamplerate-devel, libstdc++-devel

Changed files:
    ecasound-link.patch -> 1.5
    ecasound.spec -> 1.73

diff --git a/ecasound-link.patch b/ecasound-link.patch
index bc17114a80d195f0430e13f439a189170defaaf0..8d8b43db9922ed232c65d1b9c3cf82e923ea93de 100644 (file)
--- a/ecasound-link.patch
+++ b/ecasound-link.patch
@@ -1,43 +1,28 @@
-diff -Nur ecasound-2.2.0.orig/configure.in ecasound-2.2.0/configure.in
---- ecasound-2.2.0.orig/configure.in   Thu Jan  9 21:24:30 2003
-+++ ecasound-2.2.0/configure.in        Sat Feb 15 11:10:34 2003
-@@ -629,8 +629,8 @@
-      [AC_CHECK_HEADER(readline/history.h,,
-        AC_MSG_ERROR([*** readline history headers not installed ***]))])
- 
--  AC_CHECK_LIB(readline, main,, AC_MSG_ERROR([*** readline support not installed ***]))
--  AC_CHECK_LIB(history, main,, AC_MSG_ERROR([*** readline history support not installed ***]))
-+  AC_CHECK_LIB(readline, main, true, AC_MSG_ERROR([*** readline support not installed ***]))
-+  AC_CHECK_LIB(history, main, true, AC_MSG_ERROR([*** readline history support not installed ***]))
-   AC_SUBST(ECA_S_READLINE_INCLUDES)
- else
-   AC_CONFIG_SUBDIRS(readline-4.0)
-diff -Nur ecasound-2.2.0.orig/ecasound/Makefile.am ecasound-2.2.0/ecasound/Makefile.am
---- ecasound-2.2.0.orig/ecasound/Makefile.am   Wed Oct 30 19:39:32 2002
-+++ ecasound-2.2.0/ecasound/Makefile.am        Sat Feb 15 11:11:34 2003
-@@ -43,11 +43,11 @@
- 
+--- ecasound-2.3.0/ecasound/Makefile.am.orig   2003-05-30 02:15:49.000000000 +0200
++++ ecasound-2.3.0/ecasound/Makefile.am        2003-09-07 14:39:50.724992384 +0200
+@@ -44,12 +44,12 @@
  if ECA_AM_SYSTEM_READLINE
  ecasound_LDFLAGS = -export-dynamic
--ecasound_LDADD = $(termcap_library) \
-+ecasound_LDADD = $(termcap_library) -lreadline -lhistory \
+ ecasound_LDADD = $(termcap_library) \
+-              $(readline_library} -lreadline -lhistory \
++              $(readline_library) -lreadline -lhistory \
                $(top_builddir)/libecasound/libecasound.la \
                $(top_builddir)/kvutils/libkvutils.la
  ecasound_debug_LDFLAGS = $(ecasound_LDFLAGS)
--ecasound_debug_LDADD = $(termcap_library) \
-+ecasound_debug_LDADD = $(termcap_library) -lreadline -lhistory \
+ ecasound_debug_LDADD = $(termcap_library) \
+-              $(readline_library} -lreadline -lhistory \
++              $(readline_library) -lreadline -lhistory \
                $(top_builddir)/libecasound/libecasound_debug.la \
                $(top_builddir)/kvutils/libkvutils_debug.la
  
-diff -Nur ecasound-2.2.3.orig/kvutils/Makefile.am ecasound-2.2.3/kvutils/Makefile.am
---- ecasound-2.2.3.orig/kvutils/Makefile.am    Tue Nov  5 02:05:17 2002
-+++ ecasound-2.2.3/kvutils/Makefile.am Sat Feb 15 11:07:24 2003
+--- ecasound-2.3.0.orig/kvutils/Makefile.am    Tue Nov  5 02:05:17 2002
++++ ecasound-2.3.0/kvutils/Makefile.am Sat Feb 15 11:07:24 2003
 @@ -41,13 +41,13 @@
                        kvu_inttypes.h
  
  libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
--libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:0 -static
-+libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:0
+-libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
++libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@
  
  libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
  libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
@@ -74,18 +59,17 @@ diff -Nur ecasound-2.2.3.orig/libecasound/plugins/Makefile.am ecasound-2.2.3/lib
  
  libecasound_plugins_debug_la_SOURCES  = $(libecasound_plugins_la_SOURCES)
  EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
-diff -Nur ecasound-2.2.0.orig/libecasoundc/Makefile.am ecasound-2.2.0/libecasoundc/Makefile.am
---- ecasound-2.2.0.orig/libecasoundc/Makefile.am       Mon Dec 16 05:20:39 2002
-+++ ecasound-2.2.0/libecasoundc/Makefile.am    Sat Feb 15 11:07:07 2003
+--- ecasound-2.3.0.orig/libecasoundc/Makefile.am       Mon Dec 16 05:20:39 2002
++++ ecasound-2.3.0/libecasoundc/Makefile.am    Sat Feb 15 11:07:07 2003
 @@ -8,9 +8,9 @@
  # !!!
  # remember to update eca-version.cpp
  if ECA_AM_DEBUG_MODE
--eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:0 -static
-+eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:0
+-eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
++eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
  else
--eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:0 -static
-+eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:0
+-eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
++eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
  endif
  
  INCLUDES = -I$(srcdir)

diff --git a/ecasound.spec b/ecasound.spec
index 4085fdb10baedb8987721e99de6704362ae63b23..5f6ec150a0e9fd490a4e1dbc009902f54bcad3da 100644 (file)
--- a/ecasound.spec
+++ b/ecasound.spec
@@ -1,25 +1,28 @@
-# todo:
-# - jack-audio-connection-kit support
 #
 # Conditional build:
-# _without_alsa        - without ALSA support
+%{?_without_alsa:%global _without_jack 1}
+%bcond_without alsa            # without ALSA support (implies without JACK)
+%bcond_without jack            # without JACK support
+%bcond_with    arts            # with aRts support
 #
 %include       /usr/lib/rpm/macros.python
 Summary:       Software package for multitrack audio processing
 Summary(pl):   Oprogramowanie do wielo¶cie¿kowego przetwarzania d¼wiêku
 Name:          ecasound
-Version:       2.2.3
+Version:       2.3.0
 Release:       1
 License:       GPL
 Group:         Applications/Sound
 Source0:       http://ecasound.seul.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 40a3f0213c30b18e1b4e7879faa6b454
+# Source0-md5: fb440a68466c8bd6f7bc8a14adf46ef7
 Patch0:                %{name}-link.patch
 %ifnarch sparc sparc64
-%{!?_without_alsa:BuildRequires:       alsa-lib-devel}
+%{?with_alsa:BuildRequires:    alsa-lib-devel}
 %endif
+%{?with_arts:BuildRequires:    arts-devel}
 BuildRequires: autoconf
 BuildRequires: automake
+%{?with_jack:BuildRequires:    jack-audio-connection-kit-devel}
 BuildRequires: ladspa-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libstdc++-devel
@@ -69,6 +72,8 @@ Summary:      Header files for ecasound libraries
 Summary(pl):   Pliki nag³ówkowe bibliotek ecasound
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      libsamplerate-devel
+Requires:      libstdc++-devel
 Obsoletes:     libecasound-devel
 
 %description devel
@@ -107,7 +112,6 @@ Modu
 %patch0 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -119,10 +123,11 @@ CXXFLAGS="%{rpmcflags} -D_REENTRANT %{!?debug:-DNDEBUG} -I/usr/include/ncurses"
 #                     be enabled
 # disable arts      - 'not really useful' as said by ecasound author
 %configure \
-       %{?_without_alsa:--disable-alsa} \
-       --disable-arts \
+       %{!?with_alsa:--disable-alsa} \
+       %{!?with_arts:--disable-arts} \
        --disable-audiofile \
-       %{!?_without_alsa:--disable-oss} \
+       %{!?with_jack:--disable-jack} \
+       %{?with_alsa:--disable-oss} \
        --enable-samplerate \
        --enable-sys-readline \
        --enable-pyecasound \