[SCM] faac/master: Fix most autotools warnings

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Tue Nov 11 08:53:44 UTC 2014 

The following commit has been merged in the master branch:
commit af66a08b8f8ebf9c0e8fc4553f83207eb3ed97fd
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Nov 11 09:47:24 2014 +0100

    Fix most autotools warnings

diff --git a/debian/patches/autotools-compat.patch b/debian/patches/autotools-compat.patch
new file mode 100644
index 0000000..8c41b26
--- /dev/null
+++ b/debian/patches/autotools-compat.patch
@@ -0,0 +1,53 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Description: Fix most autotools warnings
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1 +1,3 @@
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = include libfaac common frontend
+--- a/common/mp4v2/Makefile.am
++++ b/common/mp4v2/Makefile.am
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ AM_CXXFLAGS = -Wall
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -1,7 +1,8 @@
+ AC_PREREQ(2.50)
+ AC_INIT(FAAC, 1.28, faac-dev at lists.sourceforge.net)
+ AC_CONFIG_AUX_DIR(.)
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_CONFIG_HEADER(config.h)
+ 
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -4,9 +4,9 @@ man_MANS = ../docs/faac.1
+ faac_SOURCES = main.c input.c
+ 
+ if WITH_MP4V2
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
+ else
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
+--- a/libfaac/Makefile.am
++++ b/libfaac/Makefile.am
+@@ -8,6 +8,6 @@ libfaac_la_SOURCES = $(main_SOURCES) $(d
+ libfaac_la_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h psych.h backpred.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h ltp.h util.h
+ libfaac_la_LIBADD = -lm
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ 
diff --git a/debian/patches/build-fix.patch b/debian/patches/build-fix.patch
index 2394ed6..ab67349 100644
--- a/debian/patches/build-fix.patch
+++ b/debian/patches/build-fix.patch
@@ -21,7 +21,7 @@ equality of two strings.
  #define OPEN_RDWR O_RDWR
  #define OPEN_CREAT O_CREAT 
  #define OPEN_RDONLY O_RDONLY
-@@ -135,7 +127,6 @@
+@@ -135,7 +127,6 @@ char *strcasestr(const char *haystack, c
  #define closesocket close
  #define IOSBINARY ios::bin
  
@@ -29,7 +29,7 @@ equality of two strings.
  #define MAX_UINT64 -1LU
  #define D64F "ld"
  #define U64F  "lu"
-@@ -143,15 +134,6 @@
+@@ -143,15 +134,6 @@ char *strcasestr(const char *haystack, c
  
  #define TO_D64(a) (a##L)
  #define TO_U64(a) (a##LU)
@@ -47,8 +47,8 @@ equality of two strings.
  #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos).__pos)
 --- a/configure.in
 +++ b/configure.in
-@@ -4,6 +4,9 @@
- AM_INIT_AUTOMAKE
+@@ -5,6 +5,9 @@ AM_INIT_AUTOMAKE([subdir-objects])
+ AC_CONFIG_MACRO_DIR([m4])
  
  AM_CONFIG_HEADER(config.h)
 +AH_TOP([#ifndef CONFIG_H
@@ -70,7 +70,7 @@ equality of two strings.
    void ReadEntry(MP4File *pFile, u_int32_t index) {
 --- a/common/mp4v2/atom_ohdr.cpp
 +++ b/common/mp4v2/atom_ohdr.cpp
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ public:
        \param useCountedFormat    counted format flag.
        \param useUnicode          unicode flag.
    */
@@ -92,7 +92,7 @@ equality of two strings.
    // The count is half the actual size
 --- a/common/mp4v2/mp4atom.cpp
 +++ b/common/mp4v2/mp4atom.cpp
-@@ -806,7 +806,7 @@
+@@ -806,7 +806,7 @@ void MP4Atom::AddVersionAndFlags()
  	AddProperty(new MP4Integer24Property("flags"));
  }
  
@@ -103,7 +103,7 @@ equality of two strings.
  	pReserved->SetReadOnly();
 --- a/common/mp4v2/mp4atom.h
 +++ b/common/mp4v2/mp4atom.h
-@@ -204,7 +204,7 @@
+@@ -204,7 +204,7 @@ protected:
  
  	void AddVersionAndFlags();
  
@@ -114,7 +114,7 @@ equality of two strings.
  		bool mandatory, bool onlyOne = true);
 --- a/common/mp4v2/mp4file.cpp
 +++ b/common/mp4v2/mp4file.cpp
-@@ -718,7 +718,7 @@
+@@ -718,7 +718,7 @@ void MP4File::Rename(const char* oldFile
  	}
  }
  
@@ -123,7 +123,7 @@ equality of two strings.
  {
  	if (m_mode == 'r') {
  		throw new MP4Error("operation not permitted in read mode", where);
-@@ -1274,7 +1274,7 @@
+@@ -1274,7 +1274,7 @@ MP4TrackId MP4File::AddSceneTrack()
  }
  
  // NULL terminated list of brands which require the IODS atom
@@ -132,7 +132,7 @@ equality of two strings.
                             "isom",
                             NULL};
  
-@@ -2211,11 +2211,11 @@
+@@ -2211,11 +2211,11 @@ u_int32_t MP4File::GetNumberOfTracks(con
  	for (u_int32_t i = 0; i < m_pTracks.Size(); i++) {
  		if (!strcmp(normType, m_pTracks[i]->GetType())) {
  			if (subType) {
@@ -146,7 +146,7 @@ equality of two strings.
  					if (subType != GetTrackEsdsObjectTypeId(m_pTracks[i]->GetId())) {
  						continue;
  					}
-@@ -2278,11 +2278,11 @@
+@@ -2278,11 +2278,11 @@ MP4TrackId MP4File::FindTrackId(u_int16_
    for (u_int32_t i = 0; i < m_pTracks.Size(); i++) {
      if (!strcmp(normType, m_pTracks[i]->GetType())) {
        if (subType) {
@@ -162,7 +162,7 @@ equality of two strings.
  	  }
 --- a/common/mp4v2/mp4file.h
 +++ b/common/mp4v2/mp4file.h
-@@ -700,7 +700,7 @@
+@@ -700,7 +700,7 @@ protected:
  	const char* TempFileName();
  	void Rename(const char* existingFileName, const char* newFileName);
  
@@ -173,7 +173,7 @@ equality of two strings.
  		MP4Property** ppProperty, u_int32_t* pIndex = NULL);
 --- a/common/mp4v2/mp4property.cpp
 +++ b/common/mp4v2/mp4property.cpp
-@@ -313,7 +313,7 @@
+@@ -313,7 +313,7 @@ void MP4Float32Property::Dump(FILE* pFil
  
  // MP4StringProperty
  
@@ -182,7 +182,7 @@ equality of two strings.
  	bool useCountedFormat, bool useUnicode)
  	: MP4Property(name)
  {
-@@ -420,7 +420,7 @@
+@@ -420,7 +420,7 @@ void MP4StringProperty::Dump(FILE* pFile
  
  // MP4BytesProperty
  
@@ -191,7 +191,7 @@ equality of two strings.
                                     u_int32_t defaultValueSize)
  	: MP4Property(name)
  {
-@@ -549,7 +549,7 @@
+@@ -549,7 +549,7 @@ void MP4BytesProperty::Dump(FILE* pFile,
  
  // MP4TableProperty
  
@@ -200,7 +200,7 @@ equality of two strings.
  	: MP4Property(name) 
  {
  	m_pCountProperty = pCountProperty;
-@@ -725,7 +725,7 @@
+@@ -725,7 +725,7 @@ void MP4TableProperty::Dump(FILE* pFile,
  
  // MP4DescriptorProperty
    
@@ -211,7 +211,7 @@ equality of two strings.
  { 
 --- a/common/mp4v2/mp4property.h
 +++ b/common/mp4v2/mp4property.h
-@@ -100,7 +100,7 @@
+@@ -100,7 +100,7 @@ MP4ARRAY_DECL(MP4Property, MP4Property*)
  
  class MP4IntegerProperty : public MP4Property {
  protected:
@@ -220,7 +220,7 @@ equality of two strings.
  		: MP4Property(name) { };
  
  public:
-@@ -118,7 +118,7 @@
+@@ -118,7 +118,7 @@ public:
  #define MP4INTEGER_PROPERTY_DECL2(isize, xsize) \
  	class MP4Integer##xsize##Property : public MP4IntegerProperty { \
  	public: \
@@ -229,7 +229,7 @@ equality of two strings.
  			: MP4IntegerProperty(name) { \
  			SetCount(1); \
  			m_values[0] = 0; \
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ MP4INTEGER_PROPERTY_DECL(64);
  
  class MP4BitfieldProperty : public MP4Integer64Property {
  public:
@@ -238,7 +238,7 @@ equality of two strings.
  		: MP4Integer64Property(name) {
  		ASSERT(numBits != 0);
  		ASSERT(numBits <= 64);
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ protected:
  
  class MP4Float32Property : public MP4Property {
  public:
@@ -247,7 +247,7 @@ equality of two strings.
  		: MP4Property(name) {
  		m_useFixed16Format = false;
  		m_useFixed32Format = false;
-@@ -280,7 +280,7 @@
+@@ -280,7 +280,7 @@ protected:
  
  class MP4StringProperty : public MP4Property {
  public:
@@ -256,7 +256,7 @@ equality of two strings.
  	  bool useCountedFormat = false, bool useUnicode = false);
  
  	~MP4StringProperty();
-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ protected:
  
  class MP4BytesProperty : public MP4Property {
  public:
@@ -265,7 +265,7 @@ equality of two strings.
                           u_int32_t defaultValueSize = 0);
  
  	~MP4BytesProperty();
-@@ -419,7 +419,7 @@
+@@ -419,7 +419,7 @@ protected:
  
  class MP4TableProperty : public MP4Property {
  public:
@@ -274,7 +274,7 @@ equality of two strings.
  
  	~MP4TableProperty();
  
-@@ -469,7 +469,7 @@
+@@ -469,7 +469,7 @@ protected:
  
  class MP4DescriptorProperty : public MP4Property {
  public:
@@ -283,7 +283,7 @@ equality of two strings.
  	  u_int8_t tagsStart = 0, u_int8_t tagsEnd = 0,
  	  bool mandatory = false, bool onlyOne = false);
  
-@@ -531,7 +531,7 @@
+@@ -531,7 +531,7 @@ protected:
  
  class MP4QosQualifierProperty : public MP4DescriptorProperty {
  public:
@@ -294,7 +294,7 @@ equality of two strings.
  	MP4DescriptorProperty(name, tagsStart, tagsEnd, mandatory, onlyOne) { }
 --- a/common/mp4v2/mp4track.cpp
 +++ b/common/mp4v2/mp4track.cpp
-@@ -1360,7 +1360,7 @@
+@@ -1360,7 +1360,7 @@ void MP4Track::UpdateSyncSamples(MP4Samp
    }
  }
  
@@ -305,7 +305,7 @@ equality of two strings.
  
 --- a/common/mp4v2/mp4track.h
 +++ b/common/mp4v2/mp4track.h
-@@ -168,7 +168,7 @@
+@@ -168,7 +168,7 @@ protected:
  	void UpdateSyncSamples(MP4SampleId sampleId, 
  		bool isSyncSample);
  
@@ -316,7 +316,7 @@ equality of two strings.
  	MP4Duration ToMovieDuration(MP4Duration trackDuration);
 --- a/common/mp4v2/ocidescriptors.cpp
 +++ b/common/mp4v2/ocidescriptors.cpp
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ void MP4ExpandedTextDescriptor::Mutate()
  
  class MP4CreatorTableProperty : public MP4TableProperty {
  public:
diff --git a/debian/patches/external-libmp4v2.patch b/debian/patches/external-libmp4v2.patch
index ce92ebb..1ae6c5b 100644
--- a/debian/patches/external-libmp4v2.patch
+++ b/debian/patches/external-libmp4v2.patch
@@ -3,9 +3,9 @@ Origin: http://faac.cvs.sourceforge.net/viewvc/faac/faac/configure.in?r1=1.25&r2
  http://faac.cvs.sourceforge.net/viewvc/faac/faac/frontend/Makefile.am?r1=1.9&r2=1.10&sortby=date,
  http://faac.cvs.sourceforge.net/viewvc/faac/faac/frontend/main.c?r1=1.82&r2=1.83&sortby=date
 
---- faac.orig/configure.in
-+++ faac/configure.in
-@@ -28,14 +28,17 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
+--- a/configure.in
++++ b/configure.in
+@@ -32,14 +32,17 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
  AC_CHECK_LIB(gnugetopt, getopt_long)
  
  AM_CONDITIONAL(WITH_MP4V2, false)
@@ -24,20 +24,20 @@ Origin: http://faac.cvs.sourceforge.net/viewvc/faac/faac/configure.in?r1=1.25&r2
  else
    if test x$WITHMP4V2 = xyes; then
       AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
---- faac.orig/frontend/Makefile.am
-+++ faac/frontend/Makefile.am
-@@ -8,5 +8,9 @@ INCLUDES = -I$(top_srcdir)/include -I$(t
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -8,5 +8,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
  LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
  else
- INCLUDES = -I$(top_srcdir)/include 
+ AM_CPPFLAGS = -I$(top_srcdir)/include
 +if WITH_EXTERNAL_MP4V2
 +LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
 +else
  LDADD = $(top_builddir)/libfaac/libfaac.la -lm
  endif
 +endif
---- faac.orig/frontend/main.c
-+++ faac/frontend/main.c
+--- a/frontend/main.c
++++ b/frontend/main.c
 @@ -18,7 +18,7 @@
   * License along with this library; if not, write to the Free Software
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
diff --git a/debian/patches/external-libmp4v2_r479.patch b/debian/patches/external-libmp4v2_r479.patch
index 38900d7..76adcb0 100644
--- a/debian/patches/external-libmp4v2_r479.patch
+++ b/debian/patches/external-libmp4v2_r479.patch
@@ -8,9 +8,9 @@ Author: Jaakko Perttilä
 Author: Sebastien NOEL <sebastien at twolife.org>
 Author: Fabian Greffrath <fabian+debian at greffrath.com>
 
---- faac.orig/configure.in
-+++ faac/configure.in
-@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long)
+--- a/configure.in
++++ b/configure.in
+@@ -34,8 +34,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long)
  AM_CONDITIONAL(WITH_MP4V2, false)
  AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
  
@@ -21,7 +21,7 @@ Author: Fabian Greffrath <fabian+debian at greffrath.com>
                              external_mp4v2=no, -lstdc++),
                 external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
  
-@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then
+@@ -43,6 +43,7 @@ if test x$external_mp4v2 = xyes; then
    AC_MSG_NOTICE([*** Building with external mp4v2 ***])
    MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2)
    AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
@@ -29,8 +29,8 @@ Author: Fabian Greffrath <fabian+debian at greffrath.com>
  else
    if test x$WITHMP4V2 = xyes; then
       AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
---- faac.orig/frontend/main.c
-+++ faac/frontend/main.c
+--- a/frontend/main.c
++++ b/frontend/main.c
 @@ -873,8 +873,12 @@ int main(int argc, char *argv[])
      if (!faacEncSetConfiguration(hEncoder, myFormat)) {
          fprintf(stderr, "Unsupported output format!\n");
diff --git a/debian/patches/libfaac_drm.patch b/debian/patches/libfaac_drm.patch
index f981e1c..a983683 100644
--- a/debian/patches/libfaac_drm.patch
+++ b/debian/patches/libfaac_drm.patch
@@ -22,6 +22,6 @@ Description: build the DRM version of the library as well as the normal version
 +libfaac_drm_la_LIBADD = ${libfaac_la_LIBADD}
 +libfaac_drm_la_CFLAGS = ${libfaac_la_CFLAGS} -DDRM
 +
- INCLUDES = -I$(top_srcdir)/include
+ AM_CPPFLAGS = -I$(top_srcdir)/include
  
  
diff --git a/debian/patches/series b/debian/patches/series
index 94540e9..fe8da1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+autotools-compat.patch
 build-fix.patch
 symbol-visibility.patch
 format-security.patch
diff --git a/debian/patches/symbol-visibility.patch b/debian/patches/symbol-visibility.patch
index 0f81e71..784f4ec 100644
--- a/debian/patches/symbol-visibility.patch
+++ b/debian/patches/symbol-visibility.patch
@@ -2,8 +2,8 @@ Description: Set appropriate symbol visibility attributes.
 Author: Fabian Greffrath <fabian+debian at greffrath.com>
 Forwarded: http://sourceforge.net/tracker/?func=detail&aid=3485333&group_id=704&atid=100704
 
---- faac.orig/include/faac.h
-+++ faac/include/faac.h
+--- a/include/faac.h
++++ b/include/faac.h
 @@ -30,6 +30,10 @@ extern "C" {
  # ifndef FAACAPI
  #  define FAACAPI __stdcall
@@ -15,13 +15,13 @@ Forwarded: http://sourceforge.net/tracker/?func=detail&aid=3485333&group_id=704&
  #else
  # ifndef FAACAPI
  #  define FAACAPI
---- faac.orig/libfaac/Makefile.am
-+++ faac/libfaac/Makefile.am
+--- a/libfaac/Makefile.am
++++ b/libfaac/Makefile.am
 @@ -7,6 +7,7 @@ endif
  libfaac_la_SOURCES = $(main_SOURCES) $(drm_SOURCES)
  libfaac_la_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h psych.h backpred.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h ltp.h util.h
  libfaac_la_LIBADD = -lm
 +libfaac_la_CFLAGS = -fvisibility=hidden
  
- INCLUDES = -I$(top_srcdir)/include
+ AM_CPPFLAGS = -I$(top_srcdir)/include
  

-- 
faac packaging

More information about the pkg-multimedia-commits mailing list