add gst/videofilter and ext/pango

Original commit message from CVS:
add gst/videofilter and ext/pango

diff --git a/configure.ac b/configure.ac
index 4c953d923c96761deaef951a370d41e8ee50544e..83ca7fa224879ad3d78f0cdfeed11e30af1f9cd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -256,7 +256,7 @@ GST_PLUGINS_ALL="\
         monoscope oneton passthrough playondemand qtdemux \
        realmedia rtp rtjpeg silence sine smooth smpte \
        spectrum speed stereo synaesthesia udp vbidec \
-       videocrop videoflip videoscale videotestsrc \
+       videocrop videofilter videoflip videoscale videotestsrc \
        volenv volume wavenc wavparse y4m"
 
 dnl see if we can build C++ plug-ins
@@ -838,6 +838,15 @@ GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
   AC_SUBST(MPEG2DEC_LIBS)
 ])
 
+dnl *** pango ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true)
+GST_CHECK_FEATURE(PANGO, [pango], pango, [
+  PKG_CHECK_MODULES(PANGO, pango pangoft2,
+      HAVE_PANGO="yes", HAVE_PANGO="no")
+  AC_SUBST(PANGO_CFLAGS)
+  AC_SUBST(PANGO_LIBS)
+])
+
 dnl *** raw1394 ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_RAW1394, true)
 GST_CHECK_FEATURE(RAW1394, [raw1394 library], dv1394src, [
@@ -1170,6 +1179,7 @@ gst/synaesthesia/Makefile
 gst/udp/Makefile
 gst/vbidec/Makefile
 gst/videocrop/Makefile
+gst/videofilter/Makefile
 gst/videoflip/Makefile
 gst/videoscale/Makefile
 gst/videotestsrc/Makefile
@@ -1219,6 +1229,7 @@ ext/mad/Makefile
 ext/mas/Makefile
 ext/mikmod/Makefile
 ext/mpeg2dec/Makefile
+ext/pango/Makefile
 ext/raw1394/Makefile
 ext/sdl/Makefile
 ext/shout/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index c99f71a38eb2f7c69cbc3310604832cc98eade71..6a3b807cb3818096812ffc5b6edb8f286b160548 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -178,6 +178,12 @@ else
 MPEG2DEC_DIR=
 endif
 
+if USE_PANGO
+PANGO_DIR=pango
+else
+PANGO_DIR=
+endif
+
 if USE_RAW1394
 RAW1394_DIR=raw1394
 else
@@ -258,7 +264,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
        $(HERMES_DIR) $(JACK_DIR) $(JPEG_DIR) \
        $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \
        $(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \
-       $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \
+       $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) $(PANGO_DIR) \
        $(RAW1394_DIR) $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
        $(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
        $(VORBIS_DIR) $(XVID_DIR) $(SNAPSHOT_DIR)
@@ -270,7 +276,7 @@ DIST_SUBDIRS=\
        flac gdk_pixbuf gnomevfs gsm \
        hermes ivorbis jack jpeg \
        ladspa lame lcs libfame libpng \
-       mad mikmod mpeg2dec raw1394 \
+       mad mikmod mpeg2dec pango raw1394 \
        sdl snapshot shout shout2 sidplay \
        smoothwave swfdec tarkin vorbis \
        xvid