[SCM] bs1770gain/upstream: Imported Upstream version 0.4.7

pere at users.alioth.debian.org pere at users.alioth.debian.org
Tue Sep 15 14:46:07 UTC 2015 

The following commit has been merged in the upstream branch:
commit be2166698939fe5071c77c2f7be8302c9b04a2e0
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Sep 15 16:45:50 2015 +0200

    Imported Upstream version 0.4.7

diff --git a/bs1770gain/Makefile.am b/bs1770gain/Makefile.am
index 3323821..cfaf359 100755
--- a/bs1770gain/Makefile.am
+++ b/bs1770gain/Makefile.am
@@ -16,6 +16,11 @@ CPPFLAGS+=-I$(top_srcdir)/libpbutil
 CPPFLAGS+=-I$(top_srcdir)/lib1770-2
 CPPFLAGS+=-I$(top_srcdir)/libffsox-2
 
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
+
 FFMPEG_PREFIX=@FFMPEG_PREFIX@
 SOX_PREFIX=@SOX_PREFIX@
 
diff --git a/bs1770gain/Makefile.in b/bs1770gain/Makefile.in
index f4cb73c..7251838 100755
--- a/bs1770gain/Makefile.in
+++ b/bs1770gain/Makefile.in
@@ -127,6 +127,11 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
 FFMPEG_PREFIX = @FFMPEG_PREFIX@
 FFSOX_AVCODEC_V = @FFSOX_AVCODEC_V@
 FFSOX_AVFORMAT_V = @FFSOX_AVFORMAT_V@
diff --git a/bs1770gain/bs1770gain_print_classic.c b/bs1770gain/bs1770gain_print_classic.c
index 3eeb673..69f1c29 100755
--- a/bs1770gain/bs1770gain_print_classic.c
+++ b/bs1770gain/bs1770gain_print_classic.c
@@ -120,6 +120,7 @@ static void album_head(bs1770gain_print_t *p, bs1770gain_album_t *a,
 
 static void album_tail(bs1770gain_print_t *p)
 {
+  fprintf(p->f,"done.\n");
   p->a=NULL;
 }
 
diff --git a/bs1770gain/bs1770gain_tree.c b/bs1770gain/bs1770gain_tree.c
index 449bf71..127e0d3 100755
--- a/bs1770gain/bs1770gain_tree.c
+++ b/bs1770gain/bs1770gain_tree.c
@@ -118,6 +118,7 @@ int bs1770gain_tree_analyze(tree_t *tree, const char *odirname,
       ac.momentary.ms=options->momentary.ms;
       ac.momentary.partition=options->momentary.partition;
       ac.shortterm.ms=options->shortterm.ms;
+      ac.shortterm.partition=options->shortterm.partition;
       ac.f=f;
       ac.dump=0;
 
@@ -125,11 +126,9 @@ int bs1770gain_tree_analyze(tree_t *tree, const char *odirname,
         fprintf(f,"Error gathering track statistics.\n");
         goto analyze;
       }
-      else {
-        p->vmt->track.body(p,&track->aggregate,options);
-        ffsox_aggregate_merge(&album->aggregate,&track->aggregate);
-      }
 
+      p->vmt->track.body(p,&track->aggregate,options);
+      ffsox_aggregate_merge(&album->aggregate,&track->aggregate);
       p->vmt->track.tail(p);
     }
 
diff --git a/configure b/configure
index b038855..a987c63 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bs1770gain 0.4.6.
+# Generated by GNU Autoconf 2.69 for bs1770gain 0.4.7.
 #
 # Report bugs to <pbelkner at users.sf.net>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bs1770gain'
 PACKAGE_TARNAME='bs1770gain'
-PACKAGE_VERSION='0.4.6'
-PACKAGE_STRING='bs1770gain 0.4.6'
+PACKAGE_VERSION='0.4.7'
+PACKAGE_STRING='bs1770gain 0.4.7'
 PACKAGE_BUGREPORT='pbelkner at users.sf.net'
 PACKAGE_URL='http://bs1770gain.sourceforge.net/'
 
@@ -1278,7 +1278,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bs1770gain 0.4.6 to adapt to many kinds of systems.
+\`configure' configures bs1770gain 0.4.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bs1770gain 0.4.6:";;
+     short | recursive ) echo "Configuration of bs1770gain 0.4.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1440,7 +1440,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bs1770gain configure 0.4.6
+bs1770gain configure 0.4.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1696,7 +1696,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bs1770gain $as_me 0.4.6, which was
+It was created by bs1770gain $as_me 0.4.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2511,7 +2511,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='bs1770gain'
- VERSION='0.4.6'
+ VERSION='0.4.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5167,7 +5167,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bs1770gain $as_me 0.4.6, which was
+This file was extended by bs1770gain $as_me 0.4.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5234,7 +5234,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bs1770gain config.status 0.4.6
+bs1770gain config.status 0.4.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 8f7b22f..500669e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # AC_CHECK_HEADER (header-file, [action-if-found], [action-if-not-found], [includes = `default-includes'])
 # AC_CHECK_LIB (library, function, [action-if-found], [action-if-not-found], [other-libraries])
 
-AC_INIT([bs1770gain], [0.4.6], [pbelkner at users.sf.net], [], [http://bs1770gain.sourceforge.net/])
+AC_INIT([bs1770gain], [0.4.7], [pbelkner at users.sf.net], [], [http://bs1770gain.sourceforge.net/])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
 AC_PROG_RANLIB
diff --git a/lib1770-2/Makefile.am b/lib1770-2/Makefile.am
index 42c45d1..7e79b8b 100755
--- a/lib1770-2/Makefile.am
+++ b/lib1770-2/Makefile.am
@@ -12,6 +12,11 @@ CFLAGS+=-Wstrict-prototypes
 
 CPPFLAGS+=-I$(top_srcdir)/libpbutil
 
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
+
 $(libffsox_2_a_OBJECTS): $(CONFIG_HEADER)
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil.h
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil_priv.h
diff --git a/lib1770-2/Makefile.in b/lib1770-2/Makefile.in
index f161810..10b74c0 100755
--- a/lib1770-2/Makefile.in
+++ b/lib1770-2/Makefile.in
@@ -460,6 +460,11 @@ uninstall-am:
 	uninstall-am
 
 
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
+
 $(libffsox_2_a_OBJECTS): $(CONFIG_HEADER)
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil.h
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil_priv.h
diff --git a/lib1770-2/lib1770_block.c b/lib1770-2/lib1770_block.c
index 5272a34..c169a3f 100755
--- a/lib1770-2/lib1770_block.c
+++ b/lib1770-2/lib1770_block.c
@@ -24,8 +24,9 @@ lib1770_block_t *lib1770_block_new(double samplerate, double ms,
 {
   lib1770_block_t *block;
 
+  LIB1770_GOTO(0==partition,"missing partition",partition);
   block=LIB1770_CALLOC(1,(sizeof *block)+LIB1770_AGG_BLOCK_SIZE(partition));
-  LIB1770_GOTO(NULL==block,"allocation bs.1770 block",block);
+  LIB1770_GOTO(NULL==block,"allocating bs.1770 block",block);
   block->next=NULL;
   block->stats=NULL;
 
@@ -49,6 +50,7 @@ lib1770_block_t *lib1770_block_new(double samplerate, double ms,
   return block;
   //LIB1770_FREE(block);
 block:
+partition:
   return NULL;
 }
 
diff --git a/libffsox-2/Makefile.am b/libffsox-2/Makefile.am
index abd35f3..464a0a1 100755
--- a/libffsox-2/Makefile.am
+++ b/libffsox-2/Makefile.am
@@ -13,6 +13,11 @@ CFLAGS+=-Wstrict-prototypes
 CPPFLAGS+=-I$(top_srcdir)/libpbutil
 CPPFLAGS+=-I$(top_srcdir)/lib1770-2
 
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
+
 $(libffsox_2_a_OBJECTS): $(CONFIG_HEADER)
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil.h
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil_priv.h
diff --git a/libffsox-2/Makefile.in b/libffsox-2/Makefile.in
index 3bd97de..79407cc 100755
--- a/libffsox-2/Makefile.in
+++ b/libffsox-2/Makefile.in
@@ -518,6 +518,11 @@ uninstall-am:
 	uninstall-am
 
 
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
+
 $(libffsox_2_a_OBJECTS): $(CONFIG_HEADER)
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil.h
 $(libffsox_2_a_OBJECTS): $(top_srcdir)/libpbutil/pbutil_priv.h
diff --git a/libffsox-2/ffsox_analyze.c b/libffsox-2/ffsox_analyze.c
index b9b9213..bea764c 100755
--- a/libffsox-2/ffsox_analyze.c
+++ b/libffsox-2/ffsox_analyze.c
@@ -146,7 +146,6 @@ int ffsox_analyze(analyze_config_t *ac)
   // run the SoX chain.
   if (SOX_SUCCESS!=sox_flow_effects(chain,NULL,NULL)
       ||0!=read->sox_errno) {
-
     DMESSAGE("running SoX effects chain");
     goto flow;
   }
diff --git a/libpbutil/Makefile.am b/libpbutil/Makefile.am
index ef380c7..2bf653c 100755
--- a/libpbutil/Makefile.am
+++ b/libpbutil/Makefile.am
@@ -10,6 +10,11 @@ CFLAGS+=-Wstrict-prototypes
 #CFLAGS+=-Wmissing-declarations
 #CFLAGS+=-Wmissing-prototypes
 
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
+
 $(libpbutil_a_OBJECTS): $(CONFIG_HEADER)
 
 noinst_LIBRARIES=libpbutil.a
diff --git a/libpbutil/Makefile.in b/libpbutil/Makefile.in
index 204339f..4eabd9a 100755
--- a/libpbutil/Makefile.in
+++ b/libpbutil/Makefile.in
@@ -476,6 +476,11 @@ uninstall-am:
 #CFLAGS+=-Wmissing-declarations
 #CFLAGS+=-Wmissing-prototypes
 
+#CFLAGS+=-g
+#CFLAGS+=-ggdb
+#LDFLAGS+=-static-libgcc
+#LDFLAGS+=-static-libstdc++
+
 $(libpbutil_a_OBJECTS): $(CONFIG_HEADER)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

-- 
bs1770gain packaging

More information about the pkg-multimedia-commits mailing list