Port shout2 plugin

Original commit message from CVS:
2005-05-09  Zaheer Abbas Merali  <zaheerabbas at merali dot org>

* PORTED_09:
* configure.ac:
* ext/Makefile.am:
* ext/shout2/Makefile.am:
* ext/shout2/gstshout2.c: (gst_shout2send_get_type),
(gst_shout2send_base_init), (gst_shout2send_class_init),
(gst_shout2send_init), (gst_shout2send_event),
(gst_shout2send_render), (gst_shout2send_set_property),
(gst_shout2send_get_property), (gst_shout2send_setcaps),
(gst_shout2send_change_state):
* ext/shout2/gstshout2.h:

Port shout2 plugin

diff --git a/ChangeLog b/ChangeLog
index 3de6a6feea42f0a7ebacc786aa4d678a8d00ba3e..f2885f2a3ecead9ae33d54def5cd710869b5db31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-05-09  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
+       * PORTED_09:
+       * configure.ac:
+       * ext/Makefile.am:
+       * ext/shout2/Makefile.am:
+       * ext/shout2/gstshout2.c: (gst_shout2send_get_type),
+       (gst_shout2send_base_init), (gst_shout2send_class_init),
+       (gst_shout2send_init), (gst_shout2send_event),
+       (gst_shout2send_render), (gst_shout2send_set_property),
+       (gst_shout2send_get_property), (gst_shout2send_setcaps),
+       (gst_shout2send_change_state):
+       * ext/shout2/gstshout2.h:
+
+       Port shout2 plugin
+
 2005-05-08  Zeeshan Ali   <zeenix@gmail.com>
 
        * configure.ac:

diff --git a/PORTED_09 b/PORTED_09
index 00a30d775a13decb3390bf1e789c38e26194d050..7922bb0dce2574feb5d2c7be5daa06688ad18eef 100644 (file)
--- a/PORTED_09
+++ b/PORTED_09
@@ -7,6 +7,7 @@ videofilter (wim)
 aalib  (wim)
 libcaca        (zeeshan)
 law    (wim)
+shout2  (zaheer) - not fully tested
 
 osssink is partially done in the threaded branch (wim)
 

diff --git a/configure.ac b/configure.ac
index 0616b1b05cf5a1613f761c741e7afa18fff44dd3..81efea0b7462fde3bf24eee2dc9b9393d21384be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -380,6 +380,20 @@ GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [
   AC_SUBST(LIBCACA_LIBS)
 ])
 
+dnl *** shout2 ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true)
+GST_CHECK_FEATURE(SHOUT2, [shout2 plug-in], shout2send, [
+  PKG_CHECK_MODULES(SHOUT2, shout >= 2.0, [
+    HAVE_SHOUT2="yes"
+    AC_SUBST(SHOUT2_CFLAGS)
+    AC_SUBST(SHOUT2_LIBS)
+  ], [
+    AM_PATH_SHOUT2(HAVE_SHOUT2="yes", HAVE_SHOUT2="no")
+    AC_SUBST(SHOUT2_CFLAGS)
+    AC_SUBST(SHOUT2_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, [
@@ -468,6 +482,7 @@ ext/Makefile
 ext/aalib/Makefile
 ext/libcaca/Makefile
 ext/mad/Makefile
+ext/shout2/Makefile
 ext/sidplay/Makefile
 common/Makefile
 common/m4/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index cf98aff51cee79e3861dcb5bf10a42f92756ec00..4dcefb2d641be3b73cbf6264b8eb5fd18875d9c3 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -310,11 +310,11 @@ endif
 # SHOUT_DIR=
 # endif
 
-# if USE_SHOUT2
-# SHOUT2_DIR=shout2
-# else
-# SHOUT2_DIR=
-# endif
+if USE_SHOUT2
+SHOUT2_DIR=shout2
+else
+SHOUT2_DIR=
+endif
 
 if USE_SIDPLAY
 SIDPLAY_DIR=sidplay
@@ -444,6 +444,7 @@ SUBDIRS=\
 
 DIST_SUBDIRS=\
        mad \
+       shout2 \
        sidplay \
        aalib \
        libcaca