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

diff --git a/ChangeLog b/ChangeLog
index b51b3fcca8f5b73c10fe3d243fa340497f63c134..354641b86caef79003a14869703682a0a120ccf9 100644 (file)
--- 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 6e6d3f154c84195e9d505e114ea4a2df216f7277..cf0828313f7cea4d5840c0959e9113f13309a56f 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 6e6d3f154c84195e9d505e114ea4a2df216f7277
+Subproject commit cf0828313f7cea4d5840c0959e9113f13309a56f

diff --git a/configure.ac b/configure.ac
index 9ea9098910c1efff7b3ebed46f3f3c764a4a12e0..0fb8376ac8d462cc1aefef6504dd1a3acd6f8f1d 100644 (file)
--- 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)