From bfd9df6685d00c085d4c044cbd19939b5a9bc0af3d63b35f31b816fec20e204e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 15 Mar 2010 16:13:59 +0000 Subject: [PATCH] Accepting request 34784 from home:dimstar:branches:multimedia:apps Copy from home:dimstar:branches:multimedia:apps/audacity via accept of submit request 34784 revision 2. Request was accepted with message: I'll try to find a solution without autoreconf before forwarding OBS-URL: https://build.opensuse.org/request/show/34784 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=32 --- audacity-nomac.patch | 15 +++++++++++++++ audacity.changes | 8 ++++++++ audacity.spec | 9 +++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 audacity-nomac.patch diff --git a/audacity-nomac.patch b/audacity-nomac.patch new file mode 100644 index 0000000..85d8a7f --- /dev/null +++ b/audacity-nomac.patch @@ -0,0 +1,15 @@ +Index: audacity-src-1.3.11-beta/lib-src/portmixer/configure.ac +=================================================================== +--- audacity-src-1.3.11-beta.orig/lib-src/portmixer/configure.ac ++++ audacity-src-1.3.11-beta/lib-src/portmixer/configure.ac +@@ -64,10 +64,6 @@ AC_EGREP_HEADER([PaWinMME_GetStreamInput + if [[ $have_support = "no" ]] ; then + AC_MSG_WARN("Missing support in pa_win_wmme.h"); + fi +-AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no]) +-if [[ $have_support = "no" ]] ; then +- AC_MSG_WARN("Missing support in pa_mac_core.h"); +-fi + AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no]) + if [[ $have_support = "no" ]] ; then + AC_MSG_WARN("Missing support in pa_unix_oss.h"); diff --git a/audacity.changes b/audacity.changes index c732bc9..564117c 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 15 11:43:14 UTC 2010 - dimstar@opensuse.org + +- Add audacity-nomac.patch: remove the mac checks from configure. + The check is actually build a test program which fails due to + missing headers. As consequence: start autoreconf in + lib-src/portmixer. + ------------------------------------------------------------------- Mon Jan 25 21:28:17 UTC 2010 - mseben@novell.com diff --git a/audacity.spec b/audacity.spec index 6ed3131..1575d1e 100644 --- a/audacity.spec +++ b/audacity.spec @@ -53,6 +53,7 @@ Source1: %{name}.png Patch0: %{name}-no_buildstamp.patch Patch5: %{name}-retval.patch Patch12: %{name}-audiodevdefaults.patch +Patch13: audacity-nomac.patch %description Audacity is a program that manipulates digital audio wave forms. In @@ -84,10 +85,14 @@ Authors: %patch0 %patch5 %patch12 -p1 +%patch13 -p1 %build -%{?suse_update_config:%{suse_update_config -f . lib-src/*/.}} -export AUTOMAKE="automake --foreign" +#%{?suse_update_config:%{suse_update_config -f . lib-src/*/.}} +#export AUTOMAKE="automake --foreign" +pushd lib-src/portmixer +autoreconf +popd %configure \ --enable-unicode \ --with-libvorbis=system \