From b1d87b1ffb2ec1f3ffd918cc8023de0011f0220f Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Wed, 30 Nov 2005 13:20:57 +0000
Subject: Port pango-based textoverlay, timeoverlay and textrender to 0.9 and
 add background shading and text wrapping modes. M...

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/pango/Makefile.am:
* ext/pango/gstclockoverlay.c: (gst_clock_overlay_base_init),
(gst_clock_overlay_render_time), (gst_clock_overlay_get_text),
(gst_clock_overlay_class_init), (gst_clock_overlay_init):
* ext/pango/gstclockoverlay.h:
* ext/pango/gsttextoverlay.c: (gst_text_overlay_base_init),
(gst_text_overlay_get_text), (gst_text_overlay_class_init),
(gst_text_overlay_finalize), (gst_text_overlay_init),
(gst_text_overlay_update_wrap_mode), (gst_text_overlay_setcaps),
(gst_text_overlay_text_pad_linked),
(gst_text_overlay_text_pad_unlinked),
(gst_text_overlay_set_property), (gst_text_overlay_getcaps),
(gst_text_overlay_shade_y), (gst_text_overlay_blit_yuv420),
(gst_text_overlay_resize_bitmap), (gst_text_overlay_render_text),
(gst_text_overlay_push_frame), (gst_text_overlay_pop_video),
(gst_text_overlay_pop_text), (gst_text_overlay_collected),
(gst_text_overlay_change_state), (plugin_init):
* ext/pango/gsttextoverlay.h:
* ext/pango/gsttimeoverlay.c: (gst_time_overlay_base_init),
(gst_time_overlay_render_time), (gst_time_overlay_get_text),
(gst_time_overlay_class_init), (gst_time_overlay_init):
* ext/pango/gsttimeoverlay.h:
Port pango-based textoverlay, timeoverlay and textrender to 0.9
and add background shading and text wrapping modes. Make
timoverlay derive from textoverlay. Also add new clockoverlay
element.
---
 ext/Makefile.am | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'ext/Makefile.am')

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 3b24c9da..af3020bc 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -76,11 +76,11 @@ endif
 MIKMOD_DIR =
 # endif
 
-# if USE_PANGO
-# PANGO_DIR = pango
-# else
+if USE_PANGO
+PANGO_DIR = pango
+else
 PANGO_DIR =
-# endif
+endif
 
 if USE_DV1394
 DV1394_DIR = raw1394
@@ -130,6 +130,7 @@ DIST_SUBDIRS = \
 	ladspa \
 	libcaca \
 	libpng \
+	pango \
 	raw1394 \
 	shout2 \
 	speex
-- 
cgit