From a67de7c9b09c3c078a57fe519e87bc0584762f28 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Mon, 25 Apr 2005 00:30:40 +0000
Subject: [PATCH] Convert gst_main() to g_main_loop_run()

Original commit message from CVS:
Convert gst_main() to g_main_loop_run()
* gst/playback/decodetest.c: (main):
* gst/playback/test2.c: (main):
* gst/playback/test3.c: (main):
* gst/playback/test4.c: (main):
Link plugins against libraries:
* ext/libvisual/Makefile.am:
* sys/xvimage/Makefile.am:
---
 ChangeLog                 | 12 ++++++++++++
 ext/libvisual/Makefile.am |  3 ++-
 gst/playback/decodetest.c |  2 +-
 gst/playback/test2.c      |  2 +-
 gst/playback/test3.c      |  2 +-
 gst/playback/test4.c      |  2 +-
 sys/xvimage/Makefile.am   |  2 +-
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 734e067335..bc71506b0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-24  David Schleef  <ds@schleef.org>
+
+	Convert gst_main() to g_main_loop_run()
+	* gst/playback/decodetest.c: (main):
+	* gst/playback/test2.c: (main):
+	* gst/playback/test3.c: (main):
+	* gst/playback/test4.c: (main):
+
+	Link plugins against libraries:
+	* ext/libvisual/Makefile.am:
+	* sys/xvimage/Makefile.am:
+
 2005-04-24  David Schleef  <ds@schleef.org>
 
 	* configure.ac: Remove idct and resample libs
diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index 510552c6d2..4f362da876 100644
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -2,5 +2,6 @@ plugin_LTLIBRARIES = libgstlibvisual.la
 
 libgstlibvisual_la_SOURCES = visual.c 
 libgstlibvisual_la_CFLAGS = $(GST_CFLAGS) $(LIBVISUAL_CFLAGS)
-libgstlibvisual_la_LIBADD = $(LIBVISUAL_LIBS)
+libgstlibvisual_la_LIBADD = $(LIBVISUAL_LIBS) \
+	libgstbytestream-$(GST_MAJORMINOR).la
 libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/playback/decodetest.c b/gst/playback/decodetest.c
index 23eb7b07ca..eeb82f9bf0 100644
--- a/gst/playback/decodetest.c
+++ b/gst/playback/decodetest.c
@@ -48,7 +48,7 @@ main (gint argc, gchar * argv[])
     return -1;
   }
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, FALSE));
 
   return 0;
 }
diff --git a/gst/playback/test2.c b/gst/playback/test2.c
index 9df35089b7..c636e66d1d 100644
--- a/gst/playback/test2.c
+++ b/gst/playback/test2.c
@@ -37,7 +37,7 @@ main (gint argc, gchar * argv[])
     return -1;
   }
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, TRUE));
 
   return 0;
 }
diff --git a/gst/playback/test3.c b/gst/playback/test3.c
index a50cf7b0e9..4f52e7b09d 100644
--- a/gst/playback/test3.c
+++ b/gst/playback/test3.c
@@ -56,7 +56,7 @@ main (gint argc, gchar * argv[])
 
   g_timeout_add (UPDATE_INTERVAL, (GSourceFunc) update_scale, player);
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, TRUE));
 
   return 0;
 }
diff --git a/gst/playback/test4.c b/gst/playback/test4.c
index 043d1bd0aa..9ee0793412 100644
--- a/gst/playback/test4.c
+++ b/gst/playback/test4.c
@@ -85,7 +85,7 @@ main (gint argc, gchar * argv[])
     return -1;
   }
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, TRUE));
 
   return 0;
 }
diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am
index 7b4611752b..3ee55ace10 100644
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -5,7 +5,7 @@ libgstxvimagesink_la_SOURCES =  xvimagesink.c
 libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
 libgstxvimagesink_la_LIBADD = $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) \
 	$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la \
-	$(top_builddir)/gst-libs/gst/video/libgstvideo.la
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = xvimagesink.h