[SCM] bs1770gain/master: Correct linking and clean up patch to disable dynamic linking.

Mon Jun 1 21:40:10 UTC 2015

The following commit has been merged in the master branch:
commit 692591b546a266aa8835f4f7e5c309d04c75c8a6
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Jun 1 21:39:47 2015 +0000

    Correct linking and clean up patch to disable dynamic linking.

diff --git a/debian/patches/11-autotools.diff b/debian/patches/11-autotools.diff
index bf84fe3..c927dab 100644
--- a/debian/patches/11-autotools.diff
+++ b/debian/patches/11-autotools.diff
@@ -5,21 +5,19 @@ Forwarded: forwarded via email to upstream
 Author: Petter Reinholdtsen <pere at hungry.com>
 Last-Update: 2015-06-01
 
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..85d6a54
---- /dev/null
-+++ b/Makefile.am
+Index: bs1770gain-git/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/Makefile.am	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1,3 @@
 +ACLOCAL_AMFLAGS = -I m4
 +
 +SUBDIRS = libpbutil lib1770-2 libffsox-2  bs1770gain examples
-diff --git a/bs1770gain/Makefile.am b/bs1770gain/Makefile.am
-new file mode 100644
-index 0000000..d83cbf0
---- /dev/null
-+++ b/bs1770gain/Makefile.am
-@@ -0,0 +1,28 @@
+Index: bs1770gain-git/bs1770gain/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/bs1770gain/Makefile.am	2015-06-01 21:33:52.314296949 +0000
+@@ -0,0 +1,30 @@
 +bin_PROGRAMS = \
 +	bs1770gain
 +
@@ -30,7 +28,9 @@ index 0000000..d83cbf0
 +	-l1770-2 \
 +	-lffsox-2 \
 +	-lpbutil \
-+	-lavformat \
++	-lavformat-ffmpeg \
++	-lavutil-ffmpeg \
++	-lsox \
 +	-lm
 +
 +bs1770gain_SOURCES = \
@@ -48,11 +48,10 @@ index 0000000..d83cbf0
 +        -I$(top_srcdir)/libpbutil \
 +        -I$(top_srcdir)/libffsox-2 \
 +        -I$(top_srcdir)/lib1770-2
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..c6f0855
---- /dev/null
-+++ b/configure.ac
+Index: bs1770gain-git/configure.ac
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/configure.ac	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1,41 @@
 +# -*- Autoconf -*-
 +# Process this file with autoconf to produce a configure script.
@@ -95,18 +94,16 @@ index 0000000..c6f0855
 +	examples/Makefile
 +])
 +AC_OUTPUT
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-new file mode 100644
-index 0000000..ee18d29
---- /dev/null
-+++ b/examples/Makefile.am
+Index: bs1770gain-git/examples/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/examples/Makefile.am	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1 @@
 +EXTRA_DISTS = COPYING ffmpeg1770.c  sndfile1770.c
-diff --git a/lib1770-2/Makefile.am b/lib1770-2/Makefile.am
-new file mode 100644
-index 0000000..fe37edf
---- /dev/null
-+++ b/lib1770-2/Makefile.am
+Index: bs1770gain-git/lib1770-2/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/lib1770-2/Makefile.am	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1,11 @@
 +lib_LTLIBRARIES = lib1770-2.la
 +lib1770_2_la_SOURCES = \
@@ -119,11 +116,10 @@ index 0000000..fe37edf
 +AM_CFLAGS= \
 +        -I$(top_srcdir)/libpbutil \
 +        -I$(top_srcdir)/libffsox-2
-diff --git a/libffsox-2/Makefile.am b/libffsox-2/Makefile.am
-new file mode 100644
-index 0000000..d5e69f5
---- /dev/null
-+++ b/libffsox-2/Makefile.am
+Index: bs1770gain-git/libffsox-2/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/libffsox-2/Makefile.am	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1,49 @@
 +lib_LTLIBRARIES = libffsox-2.la
 +
@@ -174,11 +170,10 @@ index 0000000..d5e69f5
 +AM_CFLAGS= \
 +        -I$(top_srcdir)/libpbutil \
 +        -I$(top_srcdir)/lib1770-2
-diff --git a/libpbutil/Makefile.am b/libpbutil/Makefile.am
-new file mode 100644
-index 0000000..34d8b9b
---- /dev/null
-+++ b/libpbutil/Makefile.am
+Index: bs1770gain-git/libpbutil/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/libpbutil/Makefile.am	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1,20 @@
 +lib_LTLIBRARIES = libpbutil.la
 +libpbutil_la_SOURCES = \
@@ -200,11 +195,10 @@ index 0000000..34d8b9b
 +        -I$(top_srcdir)/libpbutil \
 +        -I$(top_srcdir)/libffsox-2 \
 +        -I$(top_srcdir)/lib1770-2
-diff --git a/m4/japhar.m4 b/m4/japhar.m4
-new file mode 100644
-index 0000000..f5fd83f
---- /dev/null
-+++ b/m4/japhar.m4
+Index: bs1770gain-git/m4/japhar.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/m4/japhar.m4	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1,20 @@
 +dnl
 +dnl Add macros
@@ -226,8 +220,10 @@ index 0000000..f5fd83f
 +  ;;
 +esac
 +])
---- /dev/null	2013-06-03 14:59:59.000000000 +0000
-+++ b/README	2015-05-30 11:40:17.575223458 +0000
+Index: bs1770gain-git/README
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ bs1770gain-git/README	2015-06-01 21:25:25.000000000 +0000
 @@ -0,0 +1,14 @@
 +BS1770GAIN
 +==========
diff --git a/debian/patches/22-disable-dynload.diff b/debian/patches/22-disable-dynload.diff
index 591976f..9f874c4 100644
--- a/debian/patches/22-disable-dynload.diff
+++ b/debian/patches/22-disable-dynload.diff
@@ -4,48 +4,42 @@ 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
+Index: bs1770gain-git/libffsox-2/ffsox_dynload.h
+===================================================================
+--- bs1770gain-git.orig/libffsox-2/ffsox_dynload.h	2015-06-01 21:27:30.332781415 +0000
++++ bs1770gain-git/libffsox-2/ffsox_dynload.h	2015-06-01 21:27:30.328781399 +0000
 @@ -24,8 +24,9 @@
  #ifdef __cpluplus
  extern "C" {
  #endif
 -
 -#define FFSOX_DYNLOAD
-+#ifndef DISABLE_DYNLOAD
++#ifdef ENABLE_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;
-   }
+@@ -209,6 +210,8 @@
+ #define sox_close (*ffsox_libsox.sox_close)
+ #define sox_init_encodinginfo (*ffsox_libsox.sox_init_encodinginfo)
+ #endif // }
++#else
++int ffsox_dynload(const char *dirname);
+ #endif // }
  
-+#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:
+ #ifdef __cpluplus
+Index: bs1770gain-git/libffsox-2/ffsox_dynload.c
+===================================================================
+--- bs1770gain-git.orig/libffsox-2/ffsox_dynload.c	2015-06-01 21:25:25.000000000 +0000
++++ bs1770gain-git/libffsox-2/ffsox_dynload.c	2015-06-01 21:31:56.341835595 +0000
+@@ -444,4 +444,9 @@
+ exit:
+   return code;
+ }
++#else
++int ffsox_dynload(const char *dirname)
++{
++  return 0;
++}
+ #endif // }

-- 
bs1770gain packaging

