summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2006-12-18 16:47:23 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2006-12-18 16:47:23 +0000
commit75f32c38c5aa3470604b9f4d4c7be35bb53a53ad (patch)
tree3f8aa4b346c905318f029d6c8302028d3ad9617e
parent446a05bb1d07d60887369a64d4a39c67a6103eab (diff)
downloadgst-plugins-bad-75f32c38c5aa3470604b9f4d4c7be35bb53a53ad.tar.gz
gst-plugins-bad-75f32c38c5aa3470604b9f4d4c7be35bb53a53ad.tar.bz2
gst-plugins-bad-75f32c38c5aa3470604b9f4d4c7be35bb53a53ad.zip
Move LADPSA plugin from -good for the release, as it's not quite ready to be enabled by default in the -good module yet.
Original commit message from CVS: * configure.ac: * ext/Makefile.am: * ext/ladspa/*: Move LADPSA plugin from -good for the release, as it's not quite ready to be enabled by default in the -good module yet.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac8
-rw-r--r--ext/Makefile.am8
3 files changed, 24 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 257c0757..530d763b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-12-18 Jan Schmidt <thaytan@mad.scientist.com>
+ * configure.ac:
+ * ext/Makefile.am:
+ * ext/ladspa/*:
+ Move LADPSA plugin from -good for the release, as it's not quite
+ ready to be enabled by default in the -good module yet.
+
+2006-12-18 Jan Schmidt <thaytan@mad.scientist.com>
+
* gst/qtdemux/qtdemux.c: (gst_qtdemux_chain),
(gst_qtdemux_add_stream):
Don't output g_warning for an unsupported format, just send a
diff --git a/configure.ac b/configure.ac
index 0dc3294c..df6b0494 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,6 +498,12 @@ GST_CHECK_FEATURE(JACK, Jack, jack, [
AC_SUBST(JACK_LIBS)
])
+dnl *** ladspa ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LADSPA, true)
+GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [
+ AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA="yes", HAVE_LADSPA="no")
+])
+
dnl *** libmms ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBMMS, true)
GST_CHECK_FEATURE(LIBMMS, [mms protocol library], libmms, [
@@ -747,6 +753,7 @@ AM_CONDITIONAL(USE_FAAC, false)
AM_CONDITIONAL(USE_FAAD, false)
AM_CONDITIONAL(USE_GSM, false)
AM_CONDITIONAL(USE_IVORBIS, false)
+AM_CONDITIONAL(USE_LADSPA, false)
AM_CONDITIONAL(USE_LIBMMS, false)
AM_CONDITIONAL(USE_MUSEPACK, false)
AM_CONDITIONAL(USE_MUSICBRAINZ, false)
@@ -851,6 +858,7 @@ ext/faad/Makefile
ext/gsm/Makefile
ext/ivorbis/Makefile
ext/jack/Makefile
+ext/ladspa/Makefile
ext/libmms/Makefile
ext/Makefile
ext/mpeg2enc/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 252a06f3..5179df8b 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -112,6 +112,12 @@ else
JACK_DIR=
endif
+if USE_LADSPA
+LADSPA_DIR = ladspa
+else
+LADSPA_DIR =
+endif
+
# if USE_LCS
# LCS_DIR=lcs
# else
@@ -258,6 +264,7 @@ SUBDIRS=\
$(HERMES_DIR) \
$(IVORBIS_DIR) \
$(JACK_DIR) \
+ $(LADSPA_DIR) \
$(LCS_DIR) \
$(LIBFAME_DIR) \
$(LIBMMS_DIR) \
@@ -291,6 +298,7 @@ DIST_SUBDIRS= \
faad \
gsm \
ivorbis \
+ ladspa \
jack \
libmms \
dts \