From 02b15263bcea09304a59ca898b092dd242d737df Mon Sep 17 00:00:00 2001 From: Good Guy Date: Tue, 5 Jul 2016 09:54:14 -0600 Subject: [PATCH] remove faac libmp4v2 from build --- cinelerra-5.1/configure.ac | 3 +-- cinelerra-5.1/thirdparty/Makefile | 2 +- cinelerra-5.1/thirdparty/src/faac.patch2 | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 cinelerra-5.1/thirdparty/src/faac.patch2 diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 3d3faab6..8ca50be0 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -119,8 +119,7 @@ PKG_3RD([esound],[no], PKG_3RD([faac],[auto], [faac-1.28], - [ libfaac/.libs/libfaac.a \ - common/mp4v2/libmp4v2.a ], + [ libfaac/.libs/libfaac.a ], [ include ]) PKG_3RD([faad2],[auto], diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index ee33fe8c..9a1ceee5 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -103,7 +103,7 @@ esound.cfg_vars+= AUDIOFILE_LIBS="$(call ld_path,audiofile,libaudiofile/.libs)" esound.cfg_params= --enable-shared=no --with-pic esound.mak_vars+= CFLAGS="" esound.ldflags=" -lm -lstdc++" -faac.cfg_params= --enable-shared=no +faac.cfg_params= --enable-shared=no --without-mp4v2 faad2.cfg_params= --enable-shared=no fdk.cfg_vars= ./autogen.sh ; fdk.cfg_params= --enable-shared=no diff --git a/cinelerra-5.1/thirdparty/src/faac.patch2 b/cinelerra-5.1/thirdparty/src/faac.patch2 new file mode 100644 index 00000000..5b8ec76b --- /dev/null +++ b/cinelerra-5.1/thirdparty/src/faac.patch2 @@ -0,0 +1,24 @@ +--- faac-1.28.orig/configure.in 2009-02-04 17:55:38.000000000 -0700 ++++ faac-1.28/configure.in 2016-07-05 09:30:08.119772898 -0600 +@@ -34,9 +34,9 @@ + external_mp4v2=no, -lstdc++), + external_mp4v2=no, [#include ]) + +-if test x$external_mp4v2 = xyes; then +- AC_MSG_NOTICE([*** Building with external mp4v2 ***]) +-else ++# if test x$external_mp4v2 = xyes; then ++# AC_MSG_NOTICE([*** Building with external mp4v2 ***]) ++# else + if test x$WITHMP4V2 = xyes; then + AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) + AM_CONDITIONAL(WITH_MP4V2, true) +@@ -44,7 +44,7 @@ + MY_DEFINE(HAVE_LIBMP4V2) + else + AC_MSG_NOTICE([*** Building WITHOUT mp4v2 ***]) +- fi ++# fi + fi + + dnl Check for DRM mode -- 2.26.2