- Add output plugins for speex and xvid to Makefile/pkg-plist magic

- Add missing header file needed for xvid plugin to build


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1338 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 136 insertions, 0 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 0597f45c7..6ef327300 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -277,6 +277,11 @@ WITH_VORBIS=yes
 #WITH_XMMS=yes
 .endif
 
+# xvid
+.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
+WITH_XVID=yes
+.endif
+
 ##
 ## control CONFIGURE options
 ##
@@ -589,6 +594,15 @@ CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
 PLIST_SUB+=	SDL=""
 .endif
 
+# speex
+.ifndef(WITH_SPEEX)
+CONFIGURE_ARGS+=	--disable-speex
+PLIST_SUB+=	SPEEX="@comment "
+.else
+LIB_DEPENDS+=	speex.2:${PORTSDIR}/audio/speex
+PLIST_SUB+=	SPEEX=""
+.endif
+
 # swfdec
 .ifndef(WITH_SWFDEC)
 CONFIGURE_ARGS+=	--disable-swfdec
@@ -627,6 +641,15 @@ CONFIGURE_ENV+=		XMMS_CONFIG=${XMMS_CONFIG}
 PLIST_SUB+=	XMMS=""
 .endif
 
+# xvid
+.ifndef(WITH_XVID)
+CONFIGURE_ARGS+=	--disable-xvid
+PLIST_SUB+=	XVID="@comment "
+.else
+LIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
+PLIST_SUB+=	XVID=""
+.endif
+
 pre-everything::
 .ifndef(WITH_AALIB)
 	@${ECHO_MSG} '===>'
@@ -756,5 +779,9 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin'
 .endif
+.ifndef(WITH_XVID)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plgin'
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h
new file mode 100644
index 000000000..970e99fa1
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h
@@ -0,0 +1,39 @@
+--- /dev/null	Sun Nov 16 22:55:00 2003
++++ ext/xvid/gstxvid.h	Sun Nov 16 22:32:25 2003
+@@ -0,0 +1,36 @@
++/* GStreamer xvid decoder plugin
++ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __GST_XVID_H__
++#define __GST_XVID_H__
++
++#include <gst/gst.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++extern gchar *	gst_xvid_error (int errorcode);
++extern gboolean	gst_xvid_init  (void);
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif /* __GST_XVID_H__ */
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index 78e9ad54f..e6327f599 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -120,6 +120,7 @@ lib/gstreamer-%%VERSION%%/libgstsmpte.so
 %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
 lib/gstreamer-%%VERSION%%/libgstspectrum.so
 lib/gstreamer-%%VERSION%%/libgstspeed.so
+%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
 lib/gstreamer-%%VERSION%%/libgststereo.so
 %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so
 lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
@@ -141,6 +142,7 @@ lib/gstreamer-%%VERSION%%/libgstvolume.so
 %%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so
 lib/gstreamer-%%VERSION%%/libgstwavenc.so
 lib/gstreamer-%%VERSION%%/libgstwavparse.so
+%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so
 lib/gstreamer-%%VERSION%%/libgstxvideosink.so
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.a
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 0597f45c7..6ef327300 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -277,6 +277,11 @@ WITH_VORBIS=yes
 #WITH_XMMS=yes
 .endif
 
+# xvid
+.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
+WITH_XVID=yes
+.endif
+
 ##
 ## control CONFIGURE options
 ##
@@ -589,6 +594,15 @@ CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
 PLIST_SUB+=	SDL=""
 .endif
 
+# speex
+.ifndef(WITH_SPEEX)
+CONFIGURE_ARGS+=	--disable-speex
+PLIST_SUB+=	SPEEX="@comment "
+.else
+LIB_DEPENDS+=	speex.2:${PORTSDIR}/audio/speex
+PLIST_SUB+=	SPEEX=""
+.endif
+
 # swfdec
 .ifndef(WITH_SWFDEC)
 CONFIGURE_ARGS+=	--disable-swfdec
@@ -627,6 +641,15 @@ CONFIGURE_ENV+=		XMMS_CONFIG=${XMMS_CONFIG}
 PLIST_SUB+=	XMMS=""
 .endif
 
+# xvid
+.ifndef(WITH_XVID)
+CONFIGURE_ARGS+=	--disable-xvid
+PLIST_SUB+=	XVID="@comment "
+.else
+LIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
+PLIST_SUB+=	XVID=""
+.endif
+
 pre-everything::
 .ifndef(WITH_AALIB)
 	@${ECHO_MSG} '===>'
@@ -756,5 +779,9 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_XMMS to enable xmms Audio plugin'
 .endif
+.ifndef(WITH_XVID)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plgin'
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h b/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h
new file mode 100644
index 000000000..970e99fa1
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_xvid_gstxvid.h
@@ -0,0 +1,39 @@
+--- /dev/null	Sun Nov 16 22:55:00 2003
++++ ext/xvid/gstxvid.h	Sun Nov 16 22:32:25 2003
+@@ -0,0 +1,36 @@
++/* GStreamer xvid decoder plugin
++ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __GST_XVID_H__
++#define __GST_XVID_H__
++
++#include <gst/gst.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++extern gchar *	gst_xvid_error (int errorcode);
++extern gboolean	gst_xvid_init  (void);
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif /* __GST_XVID_H__ */
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index 78e9ad54f..e6327f599 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -120,6 +120,7 @@ lib/gstreamer-%%VERSION%%/libgstsmpte.so
 %%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
 lib/gstreamer-%%VERSION%%/libgstspectrum.so
 lib/gstreamer-%%VERSION%%/libgstspeed.so
+%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
 lib/gstreamer-%%VERSION%%/libgststereo.so
 %%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so
 lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
@@ -141,6 +142,7 @@ lib/gstreamer-%%VERSION%%/libgstvolume.so
 %%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so
 lib/gstreamer-%%VERSION%%/libgstwavenc.so
 lib/gstreamer-%%VERSION%%/libgstwavparse.so
+%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so
 lib/gstreamer-%%VERSION%%/libgstxvideosink.so
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.a
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so