Dave Plater
2017-03-12 11:50:54 UTC
Hi, I maintain audacity for openSUSE and I'm testing packaging
Audacity-2.1.3rc3 taken from:
revision 0efe931df26da43198b03972ed50b4c3c88b2662 and although it
found system ffmpeg it tried to use a non existent local ffmpeg.
I fixed it with this patch:
Index: m4/audacity_checklib_ffmpeg.m4
===================================================================
--- m4/audacity_checklib_ffmpeg.m4.orig 2017-03-03 21:27:17.000000000 +0200
+++ m4/audacity_checklib_ffmpeg.m4 2017-03-12 11:19:27.699800789 +0200
@@ -33,6 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
AC_MSG_NOTICE([FFmpeg library NOT available as system library])
fi
+
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,
@@ -61,6 +62,7 @@ AC_DEFUN([AUDACITY_CONFIG_FFMPEG], [
fi
if test "$FFMPEG_USE_SYSTEM" = yes; then
FFMPEG_CFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
+ FFMPEG_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
if test "$dynamic_loading" = "no"; then
FFMPEG_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1,
Index: configure.ac
===================================================================
--- configure.ac.orig 2017-03-03 21:27:17.000000000 +0200
+++ configure.ac 2017-03-12 11:24:11.110996939 +0200
@@ -374,8 +374,8 @@ AUDACITY_CHECKLIB_PORTAUDIO
AUDACITY_CHECKLIB_PORTSMF
AUDACITY_CHECKLIB_WIDGETEXTRA
-FFMPEG_ARGUMENT=local
-LIBFLAC_ARGUMENT=local
+FFMPEG_ARGUMENT=system
+LIBFLAC_ARGUMENT=system
dnl Decide what libraries to build with, and whether to use system or
local libraries
dnl Set variables based on choices.
Sorry about posting it, most mls don't like attachments and I don't know
how to open a bugzilla account.
Best regards
Dave Plater
Audacity-2.1.3rc3 taken from:
revision 0efe931df26da43198b03972ed50b4c3c88b2662 and although it
found system ffmpeg it tried to use a non existent local ffmpeg.
I fixed it with this patch:
Index: m4/audacity_checklib_ffmpeg.m4
===================================================================
--- m4/audacity_checklib_ffmpeg.m4.orig 2017-03-03 21:27:17.000000000 +0200
+++ m4/audacity_checklib_ffmpeg.m4 2017-03-12 11:19:27.699800789 +0200
@@ -33,6 +33,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
AC_MSG_NOTICE([FFmpeg library NOT available as system library])
fi
+
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,
@@ -61,6 +62,7 @@ AC_DEFUN([AUDACITY_CONFIG_FFMPEG], [
fi
if test "$FFMPEG_USE_SYSTEM" = yes; then
FFMPEG_CFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
+ FFMPEG_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
if test "$dynamic_loading" = "no"; then
FFMPEG_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1,
Index: configure.ac
===================================================================
--- configure.ac.orig 2017-03-03 21:27:17.000000000 +0200
+++ configure.ac 2017-03-12 11:24:11.110996939 +0200
@@ -374,8 +374,8 @@ AUDACITY_CHECKLIB_PORTAUDIO
AUDACITY_CHECKLIB_PORTSMF
AUDACITY_CHECKLIB_WIDGETEXTRA
-FFMPEG_ARGUMENT=local
-LIBFLAC_ARGUMENT=local
+FFMPEG_ARGUMENT=system
+LIBFLAC_ARGUMENT=system
dnl Decide what libraries to build with, and whether to use system or
local libraries
dnl Set variables based on choices.
Sorry about posting it, most mls don't like attachments and I don't know
how to open a bugzilla account.
Best regards
Dave Plater