From 7fc0c37a083d1fa988d9b7baaae0128343fbb496 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Tue, 1 Jun 2004 12:10:37 +0000
Subject: [PATCH] leniate musicbrainz check; check for v4l-conf before calling
 it

Original commit message from CVS:
leniate musicbrainz check; check for v4l-conf before calling it
---
 ChangeLog                   |  5 +++++
 common                      |  2 +-
 configure.ac                |  3 ++-
 sys/v4l/v4l-overlay_calls.c | 10 ++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b51b3fcca8..354641b86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay):
+          check if v4l-conf is in path
+
 2004-06-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst-libs/gst/media-info/media-info-priv.c: (gmi_set_mime):
diff --git a/common b/common
index 6e6d3f154c..cf0828313f 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 6e6d3f154c84195e9d505e114ea4a2df216f7277
+Subproject commit cf0828313f7cea4d5840c0959e9113f13309a56f
diff --git a/configure.ac b/configure.ac
index 9ea9098910..0fb8376ac8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1340,9 +1340,10 @@ main (int   argc,
 
 dnl *** musicbrainz ***
 dnl libmusicbrainz <= 2.0.2 has symbol clashes with ffmpeg
+dnl however, our ffmpeg patch was accepted upstream
 translit(dnm, m, l) AM_CONDITIONAL(USE_MUSICBRAINZ, true)
 GST_CHECK_FEATURE(MUSICBRAINZ, [musicbrainz], musicbrainz, [
-  PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz > 2.0.2,
+  PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.0.2,
       HAVE_MUSICBRAINZ="yes", HAVE_MUSICBRAINZ="no")
   AC_SUBST(MUSICBRAINZ_CFLAGS)
   AC_SUBST(MUSICBRAINZ_LIBS)
diff --git a/sys/v4l/v4l-overlay_calls.c b/sys/v4l/v4l-overlay_calls.c
index 8b417343ef..2736018e0d 100644
--- a/sys/v4l/v4l-overlay_calls.c
+++ b/sys/v4l/v4l-overlay_calls.c
@@ -47,6 +47,7 @@ gboolean
 gst_v4l_set_overlay (GstV4lElement * v4lelement)
 {
   gchar *buff;
+  gchar *path;
 
   if (v4lelement->display)
     g_free (v4lelement->display);
@@ -59,6 +60,15 @@ gst_v4l_set_overlay (GstV4lElement * v4lelement)
     return FALSE;
 
   /* start v4l-conf */
+  path = g_find_program_in_path ("v4l-conf");
+  if (!path) {
+    GST_ELEMENT_ERROR (v4lelement, RESOURCE, FAILED,
+        (_("Program 'v4l-conf' missing from path.")),
+        ("Cannot set XVideo overlay mode."));
+    return FALSE;
+  }
+  g_free (path);
+
   buff = g_strdup_printf ("v4l-conf -q -c %s -d %s 2> /dev/null",
       v4lelement->videodev, v4lelement->display);