[SCM] bs1770gain/master: Add patch to directly link to shared libraries instead of dynamically linking to them at runtime.

[pere at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 50d2a239778297421bbd7369e4d23eb0513f689c
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Jun 1 14:22:36 2015 +0000

    Add patch to directly link to shared libraries instead of dynamically linking to them at runtime.

diff --git a/debian/patches/22-disable-dynload.diff b/debian/patches/22-disable-dynload.diff
new file mode 100644
index 0000000..591976f
--- /dev/null
+++ b/debian/patches/22-disable-dynload.diff
@@ -0,0 +1,51 @@
+Description: Disable dynamic loading and link directly to shared libraries
+ No need to dynamically load libraries.
+Author: Petter Reinholdtsen <pere at debian.org>
+Forwarded: no
+Last-Update: 2015-06-01
+
+diff --git a/libffsox-2/ffsox_dynload.h b/libffsox-2/ffsox_dynload.h
+index 7b00801..b9784f0 100644
+--- a/libffsox-2/ffsox_dynload.h
++++ b/libffsox-2/ffsox_dynload.h
+@@ -24,8 +24,9 @@
+ #ifdef __cpluplus
+ extern "C" {
+ #endif
+-
+-#define FFSOX_DYNLOAD
++#ifndef DISABLE_DYNLOAD
++#  define FFSOX_DYNLOAD
++#endif
+ #if defined (FFSOX_DYNLOAD) // {
+ ///////////////////////////////////////////////////////////////////////////////
+ typedef struct ffsox_avutil ffsox_avutil_t;
+diff --git a/bs1770gain/bs1770gain.c b/bs1770gain/bs1770gain.c
+index f79cc47..eaaf461 100644
+--- a/bs1770gain/bs1770gain.c
++++ b/bs1770gain/bs1770gain.c
+@@ -578,12 +578,13 @@ int main(int argc, char **argv)
+       options.flags|=AGGREGATE_MOMENTARY_MEAN;
+   }
+ 
++#ifdef DISABLE_DYNLOAD
+   // load the FFmpeg and SoX libraries from "bs1770gain-tools".
+   if (ffsox_dynload("bs1770gain-tools")<0) {
+     MESSAGE("loading shared libraries");
+     goto dynload;
+   }
+-
++#endif
+   av_register_all();
+   sox_init();
+ 
+@@ -605,7 +606,9 @@ int main(int argc, char **argv)
+ 
+   if (options.time)
+     fprintf(stderr, "Duration: %ld ms.\n",(t2-t1)/CLOCKS_PER_MILLIS);
++#ifdef DISABLE_DYNLOAD
+ dynload:
++#endif
+   if (NULL!=fpath)
+     fclose(options.f);
+ file:
diff --git a/debian/patches/series b/debian/patches/series
index c6b39b2..fcf3658 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 12-ffmpeg-av-lib.diff
 20-memleak-album.diff
 21-accesss-freed-mem.diff
+22-disable-dynload.diff

-- 
bs1770gain packaging