Move mimic to -bad

diff --git a/configure.ac b/configure.ac
index e7541e5..7384a7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -860,6 +860,16 @@ AG_GST_CHECK_FEATURE(MODPLUG, modplug, modplug, [
   AC_SUBST(MODPLUG_LIBS)
 ])
 
+dnl check for libmimic
+translit(dnm, m, l) AM_CONDITIONAL(USE_MIMIC, true)
+AG_GST_CHECK_FEATURE(MIMIC, [libmimic library], mimic, [
+  MIMDEC_REQUIRED=1.0
+  PKG_CHECK_MODULES(MIMIC, libmimic >= $MIMDEC_REQUIRED,
+      HAVE_MIMIC=yes, HAVE_MIMIC=no)
+  AC_SUBST(MIMIC_CFLAGS)
+  AC_SUBST(MIMIC_LIBS)
+])
+
 dnl *** mjpegtools version info ***
 dnl some may prefer older version (given quirks above)
 dnl hm, no version info seems available within mjpegtools headers
@@ -1344,6 +1354,7 @@ AM_CONDITIONAL(USE_LIBMMS, false)
 AM_CONDITIONAL(USE_MODPLUG, false)
 AM_CONDITIONAL(USE_METADATA, false)
 AM_CONDITIONAL(USE_MPEG2ENC, false)
+AM_CONDITIONAL(USE_MIMIC, false)
 AM_CONDITIONAL(USE_MPLEX, false)
 AM_CONDITIONAL(USE_MUSEPACK, false)
 AM_CONDITIONAL(USE_MUSICBRAINZ, false)
@@ -1527,6 +1538,7 @@ ext/Makefile
 ext/nas/Makefile
 ext/modplug/Makefile
 ext/mpeg2enc/Makefile
+ext/mimic/Makefile
 ext/mplex/Makefile
 ext/musepack/Makefile
 ext/musicbrainz/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 23b7bf8..23c2a00 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -190,6 +190,12 @@ else
 METADATA_DIR=
 endif
 
+if USE_MIMIC
+MIMIC_DIR=mimic
+else
+MIMIC_DIR=
+endif
+
 if USE_MPLEX
 MPLEX_DIR=mplex
 else
@@ -363,6 +369,7 @@ SUBDIRS=\
        $(MODPLUG_DIR) \
        $(MPEG2ENC_DIR) \
        $(METADATA_DIR) \
+       $(MIMIC_DIR) \
        $(MPLEX_DIR) \
        $(MUSEPACK_DIR) \
        $(MUSICBRAINZ_DIR) \
@@ -409,6 +416,7 @@ DIST_SUBDIRS = \
        divx \
        modplug \
        metadata \
+       mimic \
        mpeg2enc \
        mplex \
        musepack \

diff --git a/ext/mimic/gstmimic.c b/ext/mimic/gstmimic.c
index 7ed63bb..20a4cfb 100644 (file)
--- a/ext/mimic/gstmimic.c
+++ b/ext/mimic/gstmimic.c
@@ -43,4 +43,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "mimic",
     "Mimic codec",
-    plugin_init, VERSION, "GPL", "Farsight", "http://farsight.sf.net/")
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)