summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeeshan Ali <zeenix@gmail.com>2005-05-08 12:22:04 +0000
committerZeeshan Ali <zeenix@gmail.com>2005-05-08 12:22:04 +0000
commitd67d140c31126f967ca560399ab7b47d01fbc469 (patch)
treecba29dbc939df5fa48d952f2ff72f8cb0a74ee96
parent6122a966958bf1e782b67bca54264911d25edad5 (diff)
downloadgst-plugins-bad-d67d140c31126f967ca560399ab7b47d01fbc469.tar.gz
gst-plugins-bad-d67d140c31126f967ca560399ab7b47d01fbc469.tar.bz2
gst-plugins-bad-d67d140c31126f967ca560399ab7b47d01fbc469.zip
Ported the libcaca plugin.
Original commit message from CVS: Ported the libcaca plugin.
-rw-r--r--ChangeLog12
-rw-r--r--configure.ac9
-rw-r--r--ext/Makefile.am10
3 files changed, 26 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c6c17f68..3de6a6fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-08 Zeeshan Ali <zeenix@gmail.com>
+
+ * configure.ac:
+ * ext/Makefile.am:
+ * ext/libcaca/Makefile.am:
+ * ext/libcaca/gstcacasink.c: (gst_cacasink_get_type),
+ (gst_cacasink_class_init), (gst_cacasink_get_times),
+ (gst_cacasink_setcaps), (gst_cacasink_init), (gst_cacasink_render),
+ (plugin_init):
+ * ext/libcaca/gstcacasink.h:
+ Ported the libcaca plugin.
+
2005-05-08 Zeeshan Ali <zeenix@gmail.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 1939c4c5..0616b1b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -372,6 +372,14 @@ GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [
AS_SCRUB_INCLUDE(AALIB_CFLAGS)
])
+dnl *** libcaca ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
+GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
+ GST_CHECK_CONFIGPROG(LIBCACA, caca-config)
+ AC_SUBST(LIBCACA_CFLAGS)
+ AC_SUBST(LIBCACA_LIBS)
+])
+
dnl *** sidplay : works with libsidplay 1.36.x (not 2.x.x) ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
GST_CHECK_FEATURE(SIDPLAY, [sidplay plug-in], sidplay, [
@@ -458,6 +466,7 @@ gst/videofilter/Makefile
sys/Makefile
ext/Makefile
ext/aalib/Makefile
+ext/libcaca/Makefile
ext/mad/Makefile
ext/sidplay/Makefile
common/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 8225604c..1e0a249a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -178,11 +178,11 @@ endif
# LCS_DIR=
# endif
-# if USE_LIBCACA
-# LIBCACA_DIR=libcaca
-# else
-# LIBCACA_DIR=
-# endif
+if USE_LIBCACA
+LIBCACA_DIR=libcaca
+else
+LIBCACA_DIR=
+endif
# if USE_LIBDV
# LIBDV_DIR=dv