Source: audacity
Version: 2.1.2-2
Tags: patch upstream
User: helm...@debian.org
Usertags: rebootstrap
audacity fails to cross build from source, because it uses AC_CHECK_FILE
to examine the build system. AC_CHECK_FILE should only be used for
examining the host system and thus fails during cross builds. The
attached patch fixes the wrong uses of AC_CHECK_FILE and makes the cross
build continue until it runs into #850461. Please consider applying the
attached patch.
Helmut
diff --minimal -Nru audacity-2.1.2/debian/changelog
audacity-2.1.2/debian/changelog
--- audacity-2.1.2/debian/changelog 2016-11-24 21:20:12.000000000 +0100
+++ audacity-2.1.2/debian/changelog 2017-01-06 13:19:09.000000000 +0100
@@ -1,3 +1,11 @@
+audacity (2.1.2-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: (Coses: #-1)
+ - cross.patch: Fix wrong use of AC_CHECK_FILE
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 06 Jan 2017 13:19:09 +0100
+
audacity (2.1.2-2) unstable; urgency=medium
[ Mateusz Åukasik ]
diff --minimal -Nru audacity-2.1.2/debian/patches/cross.patch
audacity-2.1.2/debian/patches/cross.patch
--- audacity-2.1.2/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ audacity-2.1.2/debian/patches/cross.patch 2017-01-06 13:19:09.000000000
+0100
@@ -0,0 +1,422 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: fix wrong use of AC_CHECK_FILE
+
+AC_CHECK_FILE is meant to examine the host system. For examining the build
+system simply test should be used instead.
+
+Index: audacity-2.1.2/m4/audacity_checklib_libexpat.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libexpat.m4
++++ audacity-2.1.2/m4/audacity_checklib_libexpat.m4
+@@ -42,13 +42,11 @@
+
+ dnl see if expat is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h,
+- EXPAT_LOCAL_AVAILABLE="yes",
+- EXPAT_LOCAL_AVAILABLE="no")
+-
+- if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/expat/lib/expat.h"; then
++ EXPAT_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([Expat libraries are available in the local tree])
+ else
++ EXPAT_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([Expat libraries are NOT available in the local tree])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_ffmpeg.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_ffmpeg.m4
++++ audacity-2.1.2/m4/audacity_checklib_ffmpeg.m4
+@@ -35,13 +35,17 @@
+
+ dnl see if ffmpeg is available locally, or rather that we have some headers
+ dnl in lib-src/ffmpeg/ we can use.
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h,
+- avcodec_h_found="yes",
+- avcodec_h_found="no")
++ if test -f "${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h"; then
++ avcodec_h_found="yes"
++ else
++ avcodec_h_found="no"
++ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavformat/avformat.h,
+- avformat_h_found="yes",
+- avformat_h_found="no")
++ if test -f "${srcdir}/lib-src/ffmpeg/libavformat/avformat.h"; then
++ avformat_h_found="yes"
++ else
++ avformat_h_found="no"
++ fi
+
+ if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then
+ FFMPEG_LOCAL_AVAILABLE="yes"
+Index: audacity-2.1.2/m4/audacity_checklib_lame.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_lame.m4
++++ audacity-2.1.2/m4/audacity_checklib_lame.m4
+@@ -33,13 +33,11 @@
+
+ dnl see if LAME is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lame/lame/lame.h,
+- LAME_LOCAL_AVAILABLE="yes",
+- LAME_LOCAL_AVAILABLE="no")
+-
+- if test "$LAME_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/lame/lame/lame.h"; then
++ LAME_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([LAME headers are available in this source tree.])
+ else
++ LAME_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([LAME headers are NOT available in this source tree.])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_libflac.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libflac.m4
++++ audacity-2.1.2/m4/audacity_checklib_libflac.m4
+@@ -38,13 +38,17 @@
+
+ dnl see if FLAC is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC/format.h,
+- flac_h_available="yes",
+- flac_h_available="no")
++ if test -f "${srcdir}/lib-src/libflac/include/FLAC/format.h"; then
++ flac_h_available="yes"
++ else
++ flac_h_available="no"
++ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libflac/include/FLAC++/decoder.h,
+- flacpp_h_available="yes",
+- flacpp_h_available="no")
++ if test -f "${srcdir}/lib-src/libflac/include/FLAC++/decoder.h"; then
++ flacpp_h_available="yes"
++ else
++ flacpp_h_available="no"
++ fi
+
+ if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then
+ LIBFLAC_LOCAL_AVAILABLE="yes"
+Index: audacity-2.1.2/m4/audacity_checklib_libid3tag.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libid3tag.m4
++++ audacity-2.1.2/m4/audacity_checklib_libid3tag.m4
+@@ -25,13 +25,11 @@
+
+ dnl see if libid3tag is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h,
+- LIBID3TAG_LOCAL_AVAILABLE="yes",
+- LIBID3TAG_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/libid3tag/frame.h"; then
++ LIBID3TAG_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([libid3tag libraries are available in the local tree])
+ else
++ LIBID3TAG_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libid3tag libraries are NOT available in the local tree])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_libmad.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libmad.m4
++++ audacity-2.1.2/m4/audacity_checklib_libmad.m4
+@@ -34,13 +34,11 @@
+
+ dnl see if libmad is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h,
+- LIBMAD_LOCAL_AVAILABLE="yes",
+- LIBMAD_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/libmad/frame.h"; then
++ LIBMAD_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([libmad libraries are available in the local tree])
+ else
++ LIBMAD_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libmad libraries are NOT available in the local tree])
+ fi
+ LIBMAD_MIMETYPES="audio/mpeg;"
+Index: audacity-2.1.2/m4/audacity_checklib_libnyquist.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libnyquist.m4
++++ audacity-2.1.2/m4/audacity_checklib_libnyquist.m4
+@@ -17,13 +17,11 @@
+
+ dnl see if Nyquist is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h,
+- LIBNYQUIST_LOCAL_AVAILABLE="yes",
+- LIBNYQUIST_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then
++ if test -f "${srcdir}/lib-src/libnyquist/nyx.h"; then
++ LIBNYQUIST_USE_LOCAL="yes"
+ AC_MSG_NOTICE([nyquist libraries are available in the local tree])
+ else
++ LIBNYQUIST_USE_LOCAL="no"
+ AC_MSG_NOTICE([nyquist libraries are NOT available in the local tree])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_libsbsms.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libsbsms.m4
++++ audacity-2.1.2/m4/audacity_checklib_libsbsms.m4
+@@ -25,15 +25,13 @@
+
+ dnl see if libsbsms is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h,
+- LIBSBSMS_LOCAL_AVAILABLE="yes",
+- LIBSBSMS_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/sbsms/include/sbsms.h"; then
++ LIBSBSMS_LOCAL_AVAILABLE="yes"
+ dnl do not build programs we don't need
+ LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
+ AC_MSG_NOTICE([libsbsms libraries are available in the local tree])
+ else
++ LIBSBSMS_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libsbsms libraries are NOT available in the local tree])
+ fi
+
+Index: audacity-2.1.2/m4/audacity_checklib_libsndfile.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libsndfile.m4
++++ audacity-2.1.2/m4/audacity_checklib_libsndfile.m4
+@@ -25,11 +25,8 @@
+
+ dnl see if libsndfile is available in the local tree
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in,
+- LIBSNDFILE_LOCAL_AVAILABLE="yes",
+- LIBSNDFILE_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/libsndfile/src/sndfile.h.in"; then
++ LIBSNDFILE_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([libsndfile libraries are available in this source tree])
+
+ dnl These must be visible so libvamp and sbsms can find us
+@@ -39,6 +36,7 @@
+ dnl Temporary fix for bug #248
+ LIBSNDFILE_LOCAL_CONFIGURE_ARGS="--disable-sqlite
--disable-external-libs --disable-alsa"
+ else
++ LIBSNDFILE_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libsndfile libraries are NOT available in this source
tree])
+ fi
+ LIBSNDFILE_MIMETYPES="audio/basic;audio/x-aiff;audio/x-wav;"
+Index: audacity-2.1.2/m4/audacity_checklib_libsoundtouch.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libsoundtouch.m4
++++ audacity-2.1.2/m4/audacity_checklib_libsoundtouch.m4
+@@ -40,13 +40,11 @@
+
+ dnl see if libsoundtouch is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes",
+- LIBSOUNDTOUCH_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/soundtouch/include/SoundTouch.h"; then
++ LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree])
+ else
++ LIBSOUNDTOUCH_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libsoundtouch libraries are NOT available in the local
tree])
+ fi
+
+Index: audacity-2.1.2/m4/audacity_checklib_libsoxr.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libsoxr.m4
++++ audacity-2.1.2/m4/audacity_checklib_libsoxr.m4
+@@ -25,16 +25,14 @@
+
+ dnl see if libsoxr is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h,
+- LIBSOXR_LOCAL_AVAILABLE="yes",
+- LIBSOXR_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/libsoxr/src/soxr.h"; then
++ LIBSOXR_LOCAL_AVAILABLE="yes"
+ # Breaks other other libraries in Audacity tree; but why is ./configure
+ # passing options specific to this library to other libraries?
+ #LIBSOXR_LOCAL_CONFIGURE_ARGS="\"-DBUILD_SHARED_LIBS=OFF
-DWITH_OPENMP=OFF\""
+ AC_MSG_NOTICE([libsoxr libraries are available in the local tree])
+ else
++ LIBSOXR_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libsoxr libraries are NOT available in the local tree])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_libtwolame.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libtwolame.m4
++++ audacity-2.1.2/m4/audacity_checklib_libtwolame.m4
+@@ -25,15 +25,13 @@
+
+ dnl see if libtwolame is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h,
+- LIBTWOLAME_LOCAL_AVAILABLE="yes",
+- LIBTWOLAME_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/twolame/libtwolame/twolame.h"; then
++ LIBTWOLAME_LOCAL_AVAILABLE="yes"
+ dnl disable programs we don't need to build
+ LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
+ AC_MSG_NOTICE([libtwolame library is available in the local tree])
+ else
++ LIBTWOLAME_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libtwolame library is NOT available in the local tree])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_libvamp.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libvamp.m4
++++ audacity-2.1.2/m4/audacity_checklib_libvamp.m4
+@@ -25,14 +25,12 @@
+
+ dnl see if Vamp is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h,
+- LIBVAMP_LOCAL_AVAILABLE="yes",
+- LIBVAMP_LOCAL_AVAILABLE="no")
+-
+- if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h"; then
++ LIBVAMP_LOCAL_AVAILABLE="yes"
+ LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
+ AC_MSG_NOTICE([Vamp libraries are available in the local tree])
+ else
++ LIBVAMP_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([Vamp libraries are NOT available in the local tree])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_libvorbis.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_libvorbis.m4
++++ audacity-2.1.2/m4/audacity_checklib_libvorbis.m4
+@@ -30,13 +30,17 @@
+
+ dnl see if Vorbis is available in the source dir
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h,
+- vorbisenc_h_available="yes",
+- vorbisenc_h_available="no")
++ if test -f "${srcdir}/lib-src/libvorbis/include/vorbis/vorbisenc.h"; then
++ vorbisenc_h_available="yes"
++ else
++ vorbisenc_h_available="no"
++ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/libogg/include/ogg/ogg.h,
+- ogg_h_available="yes",
+- ogg_h_available="no")
++ if test -f "${srcdir}/lib-src/libogg/include/ogg/ogg.h"; then
++ ogg_h_available="yes"
++ else
++ ogg_h_available="no"
++ fi
+
+ if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes";
then
+ LIBVORBIS_LOCAL_AVAILABLE="yes"
+Index: audacity-2.1.2/m4/audacity_checklib_lv2.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_lv2.m4
++++ audacity-2.1.2/m4/audacity_checklib_lv2.m4
+@@ -25,13 +25,11 @@
+
+ dnl see if LV2 is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure,
+- LV2_LOCAL_AVAILABLE="yes",
+- LV2_LOCAL_AVAILABLE="no")
+-
+- if test "$LV2_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/lv2/configure"; then
++ LV2_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([LV2 libraries are available in the local tree])
+ else
++ LV2_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([LV2 libraries are NOT available in the local tree])
+ fi
+
+Index: audacity-2.1.2/m4/audacity_checklib_portaudio.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_portaudio.m4
++++ audacity-2.1.2/m4/audacity_checklib_portaudio.m4
+@@ -31,17 +31,15 @@
+
+ dnl see if portaudio is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h,
+- PORTAUDIO_LOCAL_AVAILABLE="yes",
+- PORTAUDIO_LOCAL_AVAILABLE="no")
+-
+- if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
++ PORTAUDIO_LOCAL_AVAILABLE="yes"
+ dnl We need to override the pkg-config check for portmixer by passing
+ dnl PORTAUDIO_CFLAGS and PORTAUDIO_LIBS to the configure script of
portmixer.
+ pa_dir="$(pwd)/${srcdir}/lib-src/portaudio-v19"
+ PORTAUDIO_LOCAL_CONFIGURE_ARGS="PORTAUDIO_CFLAGS=-I${pa_dir}/include
PORTAUDIO_LIBS=${pa_dir}/lib/libportaudio.la"
+ AC_MSG_NOTICE([portaudio19 library is available in the local tree])
+ else
++ PORTAUDIO_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([portaudio19 library is NOT available in the local tree])
+ fi
+
+Index: audacity-2.1.2/m4/audacity_checklib_portsmf.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_portsmf.m4
++++ audacity-2.1.2/m4/audacity_checklib_portsmf.m4
+@@ -24,13 +24,11 @@
+ AC_MSG_NOTICE([portSMF library is NOT available as system library])
+ fi
+
+- AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
+- PORTSMF_LOCAL_AVAILABLE="yes",
+- PORTSMF_LOCAL_AVAILABLE="no")
+-
+- if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/portsmf/allegro.h"; then
++ PORTSMF_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([portSMF library is available in the local tree])
+ else
++ PORTSMF_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([portSMF library is NOT available in the local tree])
+ fi
+ ])
+Index: audacity-2.1.2/m4/audacity_checklib_widgetextra.m4
+===================================================================
+--- audacity-2.1.2.orig/m4/audacity_checklib_widgetextra.m4
++++ audacity-2.1.2/m4/audacity_checklib_widgetextra.m4
+@@ -28,13 +28,11 @@
+
+ dnl see if libwidgetextra is available locally
+
+- AC_CHECK_FILE(${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h,
+- WIDGETEXTRA_LOCAL_AVAILABLE="yes",
+- WIDGETEXTRA_LOCAL_AVAILABLE="no")
+-
+- if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then
++ if test -f "${srcdir}/lib-src/lib-widget-extra/NonGuiThread.h"; then
++ WIDGETEXTRA_LOCAL_AVAILABLE="yes"
+ AC_MSG_NOTICE([libwidgetextra library is available in the local tree])
+ else
++ WIDGETEXTRA_LOCAL_AVAILABLE="no"
+ AC_MSG_NOTICE([libwidgetextra library is NOT available in the local
tree])
+ fi
+ ])
diff --minimal -Nru audacity-2.1.2/debian/patches/series
audacity-2.1.2/debian/patches/series
--- audacity-2.1.2/debian/patches/series 2016-11-24 16:12:32.000000000
+0100
+++ audacity-2.1.2/debian/patches/series 2017-01-06 13:19:09.000000000
+0100
@@ -1,3 +1,4 @@
fix-minsrc-autoreconf.patch
workaround-wxwidgets-fit-recovery.patch
fix-gcc6-ftbfs.patch
+cross.patch
