summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac11
-rw-r--r--ext/Makefile.am8
3 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 17e26373..0332aaf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-10 David Schleef <ds@schleef.org>
+
+ * configure.ac: Add prototype Dirac support.
+ * ext/Makefile.am:
+ * ext/dirac/Makefile.am:
+ * ext/dirac/gstdirac.cc:
+ * ext/dirac/gstdiracdec.cc:
+
2004-05-10 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/auparse/gstauparse.c: (gst_auparse_class_init),
diff --git a/configure.ac b/configure.ac
index 7027639d..d904f932 100644
--- a/configure.ac
+++ b/configure.ac
@@ -329,7 +329,7 @@ dnl ===========================================================================
plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
AC_SUBST(plugindir)
-GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*'
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '[_]*(gst_|Gst|GST_).*' $GST_LIBS"
AC_SUBST(GST_PLUGIN_LDFLAGS)
dnl these are all the gst plug-ins, compilable without additional libs
@@ -751,6 +751,14 @@ dnl FIXME : add second check somehow if that is necessary
dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface )
dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
+dnl *** dirac ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_DIRAC, true)
+GST_CHECK_FEATURE(DIRAC, [dirac plug-ins], dirac, [
+ PKG_CHECK_MODULES(DIRAC, dirac, HAVE_DIRAC="yes", HAVE_DIRAC="no")
+ AC_SUBST(DIRAC_CFLAGS)
+ AC_SUBST(DIRAC_LIBS)
+])
+
dnl *** DIVX ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DIVX, true)
GST_CHECK_FEATURE(DIVX, [divx plugins], divx, [
@@ -1793,6 +1801,7 @@ ext/arts/Makefile
ext/artsd/Makefile
ext/audiofile/Makefile
ext/cdparanoia/Makefile
+ext/dirac/Makefile
ext/divx/Makefile
ext/dts/Makefile
ext/dv/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 4ce5cc86..821f87e6 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -40,6 +40,12 @@ else
CDPARANOIA_DIR=
endif
+if USE_DIRAC
+DIRAC_DIR=dirac
+else
+DIRAC_DIR=
+endif
+
if USE_DIVX
DIVX_DIR=divx
else
@@ -342,6 +348,7 @@ SUBDIRS=\
$(ARTSC_DIR) \
$(AUDIOFILE_DIR) \
$(CDPARANOIA_DIR) \
+ $(DIRAC_DIR) \
$(DIVX_DIR) \
$(DTS_DIR) \
$(DVDREAD_DIR) \
@@ -399,6 +406,7 @@ DIST_SUBDIRS=\
artsd \
audiofile \
cdparanoia \
+ dirac \
divx \
dts \
dv \