From a236a2df36c16bbb05d4479047ef437f1356f841 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Wed, 17 Sep 2008 13:49:04 +0000
Subject: [PATCH] gst/: Fix build flags order.

Original commit message from CVS:
* gst/interleave/Makefile.am:
* gst/matroska/Makefile.am:
Fix build flags order.
* tests/check/elements/audioamplify.c: (GST_START_TEST):
* tests/check/elements/audiodynamic.c: (GST_START_TEST):
* tests/check/elements/audioinvert.c: (GST_START_TEST):
* tests/check/elements/audiopanorama.c: (GST_START_TEST):
Format fixes.
* tests/check/elements/multifile.c:
Pull in unistd.h
---
 ChangeLog                            | 15 +++++++++++++++
 gst/interleave/Makefile.am           |  2 +-
 gst/matroska/Makefile.am             |  6 +++---
 tests/check/elements/audioamplify.c  | 16 ++++++++--------
 tests/check/elements/audiodynamic.c  |  2 +-
 tests/check/elements/audioinvert.c   |  8 ++++----
 tests/check/elements/audiopanorama.c | 24 ++++++++++++------------
 tests/check/elements/multifile.c     |  2 ++
 8 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6671d4d142..6882ca6d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-09-17  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* gst/interleave/Makefile.am:
+	* gst/matroska/Makefile.am:
+	Fix build flags order.
+
+	* tests/check/elements/audioamplify.c: (GST_START_TEST):
+	* tests/check/elements/audiodynamic.c: (GST_START_TEST):
+	* tests/check/elements/audioinvert.c: (GST_START_TEST):
+	* tests/check/elements/audiopanorama.c: (GST_START_TEST):
+	Format fixes.
+
+	* tests/check/elements/multifile.c:
+	Pull in unistd.h
+
 2008-09-15  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/rtp/gstrtpmp4gdepay.c: (gst_rtp_mp4g_depay_init),
diff --git a/gst/interleave/Makefile.am b/gst/interleave/Makefile.am
index 3477933c7b..f82286b9a3 100644
--- a/gst/interleave/Makefile.am
+++ b/gst/interleave/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstinterleave.la
 
 libgstinterleave_la_SOURCES = plugin.c interleave.c deinterleave.c
 libgstinterleave_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstinterleave_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR)
+libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_LIBS) $(GST_BASE_LIBS)
 libgstinterleave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = plugin.h interleave.h deinterleave.h
diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index 6ce6b10d3a..8befff946c 100644
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -19,16 +19,16 @@ noinst_HEADERS = \
 	lzo.h
 
 libgstmatroska_la_CFLAGS = \
-	$(GST_BASE_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
 	-I$(top_srcdir)/gst-libs
 libgstmatroska_la_LIBADD = \
-	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
-	$(GST_LIBS) \
 	-lgstriff-@GST_MAJORMINOR@ \
 	-lgsttag-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS) \
 	$(ZLIB_LIBS) \
 	$(BZ2_LIBS) \
 	$(LIBM)
diff --git a/tests/check/elements/audioamplify.c b/tests/check/elements/audioamplify.c
index a1899c3aa8..a17649afa0 100644
--- a/tests/check/elements/audioamplify.c
+++ b/tests/check/elements/audioamplify.c
@@ -124,7 +124,7 @@ GST_START_TEST (test_passthrough)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       in[0], in[1], in[2], in[3], in[4], in[5], res[0], res[1], res[2], res[3],
       res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 12) == 0);
@@ -166,7 +166,7 @@ GST_START_TEST (test_zero)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
       res[3], res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
@@ -208,7 +208,7 @@ GST_START_TEST (test_050_clip)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
       res[3], res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
@@ -250,7 +250,7 @@ GST_START_TEST (test_200_clip)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
       res[3], res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
@@ -293,7 +293,7 @@ GST_START_TEST (test_050_wrap_negative)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
       res[3], res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
@@ -336,7 +336,7 @@ GST_START_TEST (test_200_wrap_negative)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
       res[3], res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
@@ -379,7 +379,7 @@ GST_START_TEST (test_050_wrap_positive)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
       res[3], res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
@@ -422,7 +422,7 @@ GST_START_TEST (test_200_wrap_positive)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], out[4], out[5], res[0], res[1], res[2],
       res[3], res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 12) == 0);
diff --git a/tests/check/elements/audiodynamic.c b/tests/check/elements/audiodynamic.c
index eead6b9d5e..75ecc369d4 100644
--- a/tests/check/elements/audiodynamic.c
+++ b/tests/check/elements/audiodynamic.c
@@ -124,7 +124,7 @@ GST_START_TEST (test_passthrough)
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
   GST_INFO
-      ("expected %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld %+5ld %+5ld",
+      ("expected %+5d %+5d %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d %+5d %+5d",
       in[0], in[1], in[2], in[3], in[4], in[5], res[0], res[1], res[2], res[3],
       res[4], res[5]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 12) == 0);
diff --git a/tests/check/elements/audioinvert.c b/tests/check/elements/audioinvert.c
index ae40ea93ac..4150a848bd 100644
--- a/tests/check/elements/audioinvert.c
+++ b/tests/check/elements/audioinvert.c
@@ -123,7 +123,7 @@ GST_START_TEST (test_passthrough)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       in[0], in[1], in[2], in[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 8) == 0);
 
@@ -163,7 +163,7 @@ GST_START_TEST (test_zero)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -203,7 +203,7 @@ GST_START_TEST (test_full_inverse)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -243,7 +243,7 @@ GST_START_TEST (test_25_inverse)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
diff --git a/tests/check/elements/audiopanorama.c b/tests/check/elements/audiopanorama.c
index 2307ac4aac..e8d7c92b2f 100644
--- a/tests/check/elements/audiopanorama.c
+++ b/tests/check/elements/audiopanorama.c
@@ -163,7 +163,7 @@ GST_START_TEST (test_mono_middle)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -203,7 +203,7 @@ GST_START_TEST (test_mono_left)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -243,7 +243,7 @@ GST_START_TEST (test_mono_right)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -282,7 +282,7 @@ GST_START_TEST (test_stereo_middle)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (inbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       in[0], in[1], in[2], in[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 8) == 0);
 
@@ -323,7 +323,7 @@ GST_START_TEST (test_stereo_left)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -363,7 +363,7 @@ GST_START_TEST (test_stereo_right)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -402,7 +402,7 @@ GST_START_TEST (test_mono_middle_simple)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -443,7 +443,7 @@ GST_START_TEST (test_mono_left_simple)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -484,7 +484,7 @@ GST_START_TEST (test_mono_right_simple)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -524,7 +524,7 @@ GST_START_TEST (test_stereo_middle_simple)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (inbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       in[0], in[1], in[2], in[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), in, 8) == 0);
 
@@ -566,7 +566,7 @@ GST_START_TEST (test_stereo_left_simple)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
@@ -607,7 +607,7 @@ GST_START_TEST (test_stereo_right_simple)
   fail_if ((outbuffer = (GstBuffer *) buffers->data) == NULL);
 
   res = (gint16 *) GST_BUFFER_DATA (outbuffer);
-  GST_INFO ("expected %+5ld %+5ld %+5ld %+5ld real %+5ld %+5ld %+5ld %+5ld",
+  GST_INFO ("expected %+5d %+5d %+5d %+5d real %+5d %+5d %+5d %+5d",
       out[0], out[1], out[2], out[3], res[0], res[1], res[2], res[3]);
   fail_unless (memcmp (GST_BUFFER_DATA (outbuffer), out, 8) == 0);
 
diff --git a/tests/check/elements/multifile.c b/tests/check/elements/multifile.c
index 0e15c08695..ef935558aa 100644
--- a/tests/check/elements/multifile.c
+++ b/tests/check/elements/multifile.c
@@ -23,6 +23,8 @@
 #endif
 
 #include <glib/gstdio.h>
+#include <unistd.h>
+
 #include <gst/check/gstcheck.h>
 #include <stdlib.h>
 #include <unistd.h>