From 6738538bf8b1db8ddc3df0f59eaab999af622fc6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:23:46 +0000 Subject: [PATCH 1/8] Initialize branch F-11 for alsa-plugins --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From bb792d8829c5df2fb7bd81375feba268e2fc8fef Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Thu, 18 Jun 2009 07:18:00 +0000 Subject: [PATCH 2/8] Update F-11 to alsa-plugins-1.0.20-1 --- .cvsignore | 2 +- alsa-plugins.spec | 47 +++++++++++++++++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index deef702..e1f7eff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alsa-plugins-1.0.18.tar.bz2 +alsa-plugins-1.0.20.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index c3b6ebe..fa7ac06 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins -Version: 1.0.18 -Release: 3%{?dist} +Version: 1.0.20 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ @@ -13,6 +13,7 @@ Source4: samplerate.conf Source5: upmix.conf Source6: vdownmix.conf Source7: pulse-default.conf +Source8: arcamav.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -24,7 +25,7 @@ functionality to the Linux operating system. This package includes plugins for ALSA. %package jack -Requires: jack-audio-connection-kit +Requires: jack-audio-connection-kit, alsa-utils BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA Group: System Environment/Libraries @@ -40,6 +41,7 @@ transparently together with jackd for both playback and capture. This plugin provides the PCM type "jack" %package oss +Requires: alsa-utils BuildRequires: alsa-lib-devel Summary: Oss PCM output plugin for ALSA Group: System Environment/Libraries @@ -51,8 +53,8 @@ ALSA native apps can run on OSS drivers. This plugin provides the PCM type "oss". %package pulseaudio +Requires: pulseaudio, alsa-utils BuildRequires: pulseaudio-lib-devel -Requires: pulseaudio Summary: Alsa to PulseAudio backend Group: System Environment/Libraries License: LGPLv2+ @@ -63,6 +65,7 @@ sound across a network. There are two plugins in the suite, one for PCM and one for mixer control. %package samplerate +Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: External rate converter plugin for ALSA Group: System Environment/Libraries @@ -72,6 +75,7 @@ This plugin is an external rate converter using libsamplerate by Erik de Castro Lopo. %package upmix +Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Upmixer channel expander plugin for ALSA Group: System Environment/Libraries @@ -82,6 +86,7 @@ The upmix plugin is an easy-to-use plugin for upmixing to 4 or by the slave PCM or explicitly via channel option. %package vdownmix +Requires: alsa-utils BuildRequires: libsamplerate-devel Summary: Downmixer to stereo plugin for ALSA Group: System Environment/Libraries @@ -100,6 +105,14 @@ License: LGPLv2+ The usbstream plugin is for snd-usb-us122l driver. It converts PCM stream to USB specific stream. +%package arcamav +Summary: Arcam AV amplifier plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description arcamav +This plugin exposes the controls for an Arcam AV amplifier +(see: http://www.arcam.co.uk/) as an ALSA mixer device. + %prep %setup -q -n %{name}-%{version}%{?prever} @@ -114,8 +127,9 @@ make install DESTDIR=$RPM_BUILD_ROOT install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm install -m 644 %SOURCE1 %SOURCE2 \ - %SOURCE4 %SOURCE5 %SOURCE6 \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm + %SOURCE4 %SOURCE5 \ + %SOURCE6 %SOURCE8 \ + ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm install -m 644 %SOURCE7 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa @@ -135,12 +149,14 @@ rm -rf $RPM_BUILD_ROOT %files jack %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/README-jack +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/jack.conf %{_libdir}/alsa-lib/libasound_module_pcm_jack.so %files oss %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/README-pcm-oss +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/pcm-oss.conf %{_libdir}/alsa-lib/libasound_module_ctl_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_oss.so @@ -156,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT %files samplerate %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/samplerate.txt +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/samplerate.conf %{_libdir}/alsa-lib/libasound_module_rate_samplerate.so %{_libdir}/alsa-lib/libasound_module_rate_samplerate_best.so @@ -166,12 +183,14 @@ rm -rf $RPM_BUILD_ROOT %files upmix %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/upmix.txt +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/upmix.conf %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %files vdownmix %defattr(-,root,root,-) %doc COPYING COPYING.GPL doc/vdownmix.txt +%dir %{_sysconfdir}/alsa/pcm %config(noreplace) %{_sysconfdir}/alsa/pcm/vdownmix.conf %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so @@ -180,7 +199,23 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING COPYING.GPL %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so +%files arcamav +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/README-arcam-av +%config(noreplace) %{_sysconfdir}/alsa/pcm/arcamav.conf +%{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so + + %changelog +* Fri May 8 2009 Eric Moret - 1.0.20-1 +- Updated to 1.0.20 +- Added arcam-av subpackage + +* Fri Apr 24 2009 Eric Moret - 1.0.19-1 +- Updated to 1.0.19 +- Added Requires: alsa-utils to address #483322 +- Added dir {_sysconfdir}/alsa/pcm to address #483322 + * Mon Feb 23 2009 Fedora Release Engineering - 1.0.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 7438920..0bce8c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a798b47ba10c17aed66dff234d31b24 alsa-plugins-1.0.18.tar.bz2 +819c4f21e3e913eacefd32993a8fbed7 alsa-plugins-1.0.20.tar.bz2 From 3d0c3e3084039a84e6e4bfde7c651d8da575fc63 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Thu, 18 Jun 2009 07:22:39 +0000 Subject: [PATCH 3/8] Adding missing arcamav.conf configuration file --- arcamav.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 arcamav.conf diff --git a/arcamav.conf b/arcamav.conf new file mode 100644 index 0000000..534663a --- /dev/null +++ b/arcamav.conf @@ -0,0 +1,10 @@ +# arcam-av plugin configuration +# $Id$ + +ctl.arcam_av { + type arcam_av + port /dev/ttyS0 + hint { + description "Arcam-AV Amplifier" + } +} From c7ad72116577dbf40cc73756cae6de84b676ac9a Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Fri, 3 Jul 2009 00:50:10 +0000 Subject: [PATCH 4/8] Adding speex plugin --- alsa-plugins.spec | 40 +++++++++++++++++++++++++++++++--------- speex.conf | 11 +++++++++++ 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 speex.conf diff --git a/alsa-plugins.spec b/alsa-plugins.spec index fa7ac06..5512a77 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins Version: 1.0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ @@ -9,6 +9,7 @@ URL: http://www.alsa-project.org/ Source0: ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2 Source1: jack.conf Source2: pcm-oss.conf +Source3: speex.conf Source4: samplerate.conf Source5: upmix.conf Source6: vdownmix.conf @@ -34,10 +35,6 @@ License: LGPLv2+ This plugin converts the ALSA API over JACK (Jack Audio Connection Kit, http://jackit.sf.net) API. ALSA native applications can work transparently together with jackd for both playback and capture. - - ALSA apps (playback) -> ALSA-lib -> JACK plugin -> JACK daemon - ALSA apps (capture) <- ALSA-lib <- JACK plugin <- JACK daemon - This plugin provides the PCM type "jack" %package oss @@ -113,12 +110,23 @@ License: LGPLv2+ This plugin exposes the controls for an Arcam AV amplifier (see: http://www.arcam.co.uk/) as an ALSA mixer device. +%package speex +Requires: speex +BuildRequires: speex-devel +Summary: Rate Converter Plugin Using Speex Resampler +Group: System Environment/Libraries +License: LGPLv2+ +%description speex +The rate plugin is an external rate converter using the Speex resampler +(aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides +pre-processing of a mono stream like denoise using libspeex DSP API. + %prep %setup -q -n %{name}-%{version}%{?prever} %build %configure --disable-static \ - --without-speex + --with-speex=lib make %{?_smp_mflags} %install @@ -127,11 +135,12 @@ make install DESTDIR=$RPM_BUILD_ROOT install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm install -m 644 %SOURCE1 %SOURCE2 \ - %SOURCE4 %SOURCE5 \ - %SOURCE6 %SOURCE8 \ + %SOURCE3 %SOURCE4 \ + %SOURCE5 %SOURCE6 \ + %SOURCE8 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm install -m 644 %SOURCE7 \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa + ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; @@ -205,8 +214,21 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/alsa/pcm/arcamav.conf %{_libdir}/alsa-lib/libasound_module_ctl_arcam_av.so +%files speex +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/speexdsp.txt doc/speexrate.txt +%config(noreplace) %{_sysconfdir}/alsa/pcm/speex.conf +%{_libdir}/alsa-lib/libasound_module_pcm_speex.so +%{_libdir}/alsa-lib/libasound_module_rate_speexrate.so +%{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so +%{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so + %changelog +* Wed Jun 24 2009 Eric Moret - 1.0.20-2 +- Added speex subpackage +- Removed ascii-art from jack's plugin description + * Fri May 8 2009 Eric Moret - 1.0.20-1 - Updated to 1.0.20 - Added arcam-av subpackage diff --git a/speex.conf b/speex.conf new file mode 100644 index 0000000..c4f23e3 --- /dev/null +++ b/speex.conf @@ -0,0 +1,11 @@ +# samplerate plugin configuration +# $Id$ + +pcm.my_rate { + type rate + slave.pcm "hw" + converter "speexrate" + hint { + description "Rate Converter Plugin Using Speex Resampler" + } +} From af4b99fd525b8d5ae916fb281e20ab7e6ddb68e6 Mon Sep 17 00:00:00 2001 From: Eric Moret Date: Tue, 8 Sep 2009 03:05:09 +0000 Subject: [PATCH 5/8] Updated to 1.0.21 Added maemo subpackage --- .cvsignore | 2 +- alsa-plugins.spec | 62 ++++++++++++++++++++++++++++++++++++++--------- maemo.conf | 13 ++++++++++ sources | 2 +- 4 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 maemo.conf diff --git a/.cvsignore b/.cvsignore index e1f7eff..d4ca659 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alsa-plugins-1.0.20.tar.bz2 +alsa-plugins-1.0.21.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 5512a77..28ee1fe 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,5 +1,5 @@ Name: alsa-plugins -Version: 1.0.20 +Version: 1.0.21 Release: 2%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ @@ -15,6 +15,7 @@ Source5: upmix.conf Source6: vdownmix.conf Source7: pulse-default.conf Source8: arcamav.conf +Source9: maemo.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -26,7 +27,8 @@ functionality to the Linux operating system. This package includes plugins for ALSA. %package jack -Requires: jack-audio-connection-kit, alsa-utils +Requires: alsa-utils +Requires: jack-audio-connection-kit BuildRequires: jack-audio-connection-kit-devel Summary: Jack PCM output plugin for ALSA Group: System Environment/Libraries @@ -50,7 +52,8 @@ ALSA native apps can run on OSS drivers. This plugin provides the PCM type "oss". %package pulseaudio -Requires: pulseaudio, alsa-utils +Requires: alsa-utils +Requires: pulseaudio BuildRequires: pulseaudio-lib-devel Summary: Alsa to PulseAudio backend Group: System Environment/Libraries @@ -121,12 +124,24 @@ The rate plugin is an external rate converter using the Speex resampler (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides pre-processing of a mono stream like denoise using libspeex DSP API. +%package maemo +BuildRequires: alsa-lib-devel = %{version} +BuildRequires: dbus-devel +Summary: Maemo plugin for ALSA +Group: System Environment/Libraries +License: LGPLv2+ +%description maemo +This plugin converts the ALSA API over PCM task nodes protocol. In this way, +ALSA native applications can run over DSP Gateway and use DSP PCM task nodes. + %prep %setup -q -n %{name}-%{version}%{?prever} %build %configure --disable-static \ - --with-speex=lib + --with-speex=lib \ + --enable-maemo-plugin \ + --enable-maemo-resource-manager make %{?_smp_mflags} %install @@ -134,20 +149,21 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm -install -m 644 %SOURCE1 %SOURCE2 \ - %SOURCE3 %SOURCE4 \ - %SOURCE5 %SOURCE6 \ +install -m 644 %SOURCE1 \ + %SOURCE2 \ + %SOURCE3 \ + %SOURCE4 \ + %SOURCE5 \ + %SOURCE6 \ %SOURCE8 \ + %SOURCE9 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm +# pulseaudio configuration file install -m 644 %SOURCE7 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; -# Removing the maemo plugins -find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \ - -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \; - %clean rm -rf $RPM_BUILD_ROOT @@ -223,8 +239,32 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so +%files maemo +%defattr(-,root,root,-) +%doc COPYING COPYING.GPL doc/README-maemo +%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf +%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so +%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so + %changelog +* Mon Sep 7 2009 Eric Moret - 1.0.21-2 +- Added missing dbus-devel dependency to maemo subpackage + +* Mon Sep 7 2009 Eric Moret - 1.0.21-1 +- Updated to 1.0.21 +- Patch clean up +- Added maemo subpackage + +* Tue Aug 4 2009 Lennart Poettering - 1.0.20-5 +- Add a couple of more clean up patches for the pulse plugin + +* Fri Jul 31 2009 Lennart Poettering - 1.0.20-4 +- Add a couple of clean up patches for the pulse plugin + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Jun 24 2009 Eric Moret - 1.0.20-2 - Added speex subpackage - Removed ascii-art from jack's plugin description diff --git a/maemo.conf b/maemo.conf new file mode 100644 index 0000000..737890f --- /dev/null +++ b/maemo.conf @@ -0,0 +1,13 @@ +# PCM +pcm.!default { + type alsa_dsp + playback_device_file ["/dev/dsptask/pcm2"] + recording_device_file ["/dev/dsptask/pcm_rec"] +} + +# Mixer +ctl.!default { + type dsp_ctl + playback_devices ["/dev/dsptask/pcm2"] + recording_devices ["/dev/dsptask/pcm_rec"] +} diff --git a/sources b/sources index 0bce8c2..c947667 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -819c4f21e3e913eacefd32993a8fbed7 alsa-plugins-1.0.20.tar.bz2 +392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2 From 42e02f09b5febd4b8c21c0e543187d4377754608 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:52 +0000 Subject: [PATCH 6/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 36d8f08..b654d76 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alsa-plugins -# $Id$ +# $Id: Makefile,v 1.1 2007/08/07 23:46:58 kevin Exp $ NAME := alsa-plugins SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From bd91661aa464342ecf58974cd5ed8705096c19ee Mon Sep 17 00:00:00 2001 From: perex Date: Thu, 14 Jan 2010 16:43:02 +0000 Subject: [PATCH 7/8] updated to 1.0.22 --- .cvsignore | 1 + alsa-plugins.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d4ca659..ec4c0c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ alsa-plugins-1.0.21.tar.bz2 +alsa-plugins-1.0.22.tar.bz2 diff --git a/alsa-plugins.spec b/alsa-plugins.spec index 28ee1fe..997242d 100644 --- a/alsa-plugins.spec +++ b/alsa-plugins.spec @@ -1,6 +1,6 @@ Name: alsa-plugins -Version: 1.0.21 -Release: 2%{?dist} +Version: 1.0.22 +Release: 1%{?dist} Summary: The Advanced Linux Sound Architecture (ALSA) Plugins # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: GPLv2+ and LGPLv2+ @@ -248,6 +248,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 14 2010 Jaroslav Kysela - 1.0.22-1 +- Updated to 1.0.22 + * Mon Sep 7 2009 Eric Moret - 1.0.21-2 - Added missing dbus-devel dependency to maemo subpackage diff --git a/sources b/sources index c947667..017e10b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2 +a482cce4007b7c75e1c0a677f7f0fe07 alsa-plugins-1.0.22.tar.bz2 From 9817d8678c7365539417c85c9cdef68bf3d78eb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:45:29 +0000 Subject: [PATCH 8/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b654d76..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alsa-plugins -# $Id: Makefile,v 1.1 2007/08/07 23:46:58 kevin Exp $ -NAME := alsa-plugins -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11