[SCM] audacity/master: Drop disable-dynamic-ffmpeg.patch (accepted upstream).
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Tue Jan 22 00:53:32 UTC 2013
The following commit has been merged in the master branch:
commit 7049d5f948fae25e285e4296c55ab020aa942439
Author: Benjamin Drung <bdrung at debian.org>
Date: Tue Jan 22 00:43:11 2013 +0100
Drop disable-dynamic-ffmpeg.patch (accepted upstream).
diff --git a/debian/patches/disable-dynamic-ffmpeg.patch b/debian/patches/disable-dynamic-ffmpeg.patch
deleted file mode 100644
index 0f8c38d..0000000
--- a/debian/patches/disable-dynamic-ffmpeg.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Description: Add configure option to disable dynamic loading of FFmpeg.
-Author: Benjamin Drung <bdrung at debian.org>
-Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
-
---- a/configure.in
-+++ b/configure.in
-@@ -180,6 +180,12 @@
-
- AC_ARG_ENABLE(universal_binary,[ --enable-universal_binary enable universal binary build: (default: disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
-
-+AC_ARG_ENABLE(dynamic-loading,
-+ [AS_HELP_STRING([--enable-dynamic-loading],
-+ [enable dynamic loading of lame and FFmpeg [default=yes]])],
-+ [dynamic_loading="$enableval"],
-+ [dynamic_loading="yes"])
-+
- dnl AC_ARG_WITH(wx-version,
- dnl [AS_HELP_STRING([--with-wx-version],
- dnl [select wxWidgets version (if both installed) [2.8,]])],
---- a/m4/audacity_checklib_ffmpeg.m4
-+++ b/m4/audacity_checklib_ffmpeg.m4
-@@ -35,6 +35,10 @@
- FFMPEG_SYSTEM_AVAILABLE="yes"
- FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
- FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
-+ if test "x$dynamic_loading" = "xno"; then
-+ FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS"
-+ AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1, [Use system FFmpeg library and disable dynamic loading of it.])
-+ fi
- dnl build the extra object files needed to use FFmpeg. Paths inside
- dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in
- FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
---- a/src/FFmpeg.cpp
-+++ b/src/FFmpeg.cpp
-@@ -483,7 +483,7 @@
- }
-
- sc->m_samplefmt = sc->m_codecCtx->sample_fmt;
-- sc->m_samplesize = av_get_bits_per_sample_fmt(sc->m_samplefmt) / 8;
-+ sc->m_samplesize = av_get_bits_per_sample_format(sc->m_samplefmt) / 8;
-
- unsigned int newsize = FFMAX(sc->m_pkt.size * sc->m_samplesize, AVCODEC_MAX_AUDIO_FRAME_SIZE);
- // Reallocate the audio sample buffer if it's smaller than the frame size.
-@@ -754,6 +754,10 @@
-
- bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
- {
-+#if defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
-+ mLibsLoaded = InitLibs(wxEmptyString, showerr);
-+ return mLibsLoaded;
-+#endif
-
- wxLogMessage(wxT("Trying to load FFmpeg libraries..."));
- if (ValidLibsLoaded()) {
-@@ -837,6 +841,7 @@
-
- bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
- {
-+#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
- FreeLibs();
-
- #if defined(__WXMSW__)
-@@ -1029,9 +1034,8 @@
- FFMPEG_INITDYN(avcodec, avcodec_version);
- FFMPEG_INITDYN(avcodec, av_fast_realloc);
- FFMPEG_INITDYN(avcodec, av_codec_next);
-- FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
-
-- FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
-+ FFMPEG_INITALT(avcodec, av_get_bits_per_sample_format, av_get_bits_per_sample_fmt);
-
- FFMPEG_INITDYN(avutil, av_free);
- FFMPEG_INITDYN(avutil, av_log_set_callback);
-@@ -1051,8 +1055,10 @@
- FFMPEG_INITDYN(avutil, av_rescale_q);
- FFMPEG_INITDYN(avutil, avutil_version);
-
-- //FFmpeg initialization
- wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
-+#endif
-+
-+ //FFmpeg initialization
- avcodec_init();
- avcodec_register_all();
- av_register_all();
-@@ -1091,7 +1097,11 @@
- return false;
- }
-
-+#if defined(DISABLE_DYNAMIC_LOADING_FFMPEG) && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 69, 0))
-+ av_register_protocol(&ufile_protocol);
-+#else
- av_register_protocol2(&ufile_protocol, sizeof(ufile_protocol));
-+#endif
-
- return true;
- }
---- a/src/FFmpeg.h
-+++ b/src/FFmpeg.h
-@@ -368,6 +368,18 @@
-
- int import_ffmpeg_decode_frame(streamContext *sc, bool flushing);
-
-+#if defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
-+ // Use the preprocessor to rename old function names instead of checking the
-+ // function names with FFMPEG_INITALT when loading the library.
-+
-+ #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 60, 0)
-+ #define av_match_ext match_ext
-+ #endif
-+
-+ #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 64, 0)
-+ #define av_guess_format guess_format
-+ #endif
-+#else
- extern "C" {
- // A little explanation of what's going on here.
- //
-@@ -900,6 +912,7 @@
- (protocol, size)
- );
- };
-+#endif
-
- #endif // USE_FFMPEG
- #endif // __AUDACITY_FFMPEG__
---- a/src/configtemplate.h
-+++ b/src/configtemplate.h
-@@ -87,6 +87,9 @@
- /* Use system LAME library and disable dynamic loading of it. */
- #undef DISABLE_DYNAMIC_LOADING_LAME
-
-+/* Use system FFmpeg library and disable dynamic loading of it. */
-+#undef DISABLE_DYNAMIC_LOADING_FFMPEG
-+
- /* Define if LADSPA plug-ins are enabled */
- #undef USE_LADSPA
-
---- a/src/prefs/LibraryPrefs.cpp
-+++ b/src/prefs/LibraryPrefs.cpp
-@@ -133,7 +133,7 @@
- S.Id(ID_FFMPEG_DOWN_BUTTON);
- wxButton *bdwn = S.AddButton(_("Dow&nload"),
- wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
--#if !defined(USE_FFMPEG)
-+#if !defined(USE_FFMPEG) || defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
- bdwn->Enable(FALSE);
- bfnd->Enable(FALSE);
- #endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d7c8142..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable-dynamic-ffmpeg.patch
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list