- add a sub-package for the x264 plugin (originally from brad@)

- add a sub-package for the mplex plugin
- tweak DESCR-main accordingly

ok brad@

multimedia/gstreamer-0.10/plugins-bad/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2008/06/30 22:43:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2008/10/01 08:02:58 ajacoutot Exp $
 
 COMMENT-main =		multimedia framework - plugins bad
 COMMENT-tremor =	multimedia framework - tremor plugin
@@ -15,10 +15,12 @@ COMMENT-swf =		multimedia framework - flash plugin
 COMMENT-meta =		multimedia framework - metadata plugin
 COMMENT-sndfile =	multimedia framework - sndfile plugin
 COMMENT-real =		multimedia framework - real plugin
+COMMENT-x264 =		multimedia framework - x264 plugin
+COMMENT-mplex =		multimedia framework - mplex plugin
 
 V =			0.10.7
 DISTNAME =		gst-plugins-bad-$V
-PKGNAME-main =		gstreamer-plugins-bad-${V}p2
+PKGNAME-main =		gstreamer-plugins-bad-${V}p3
 PKGNAME-tremor =	gstreamer-tremor-$Vp1
 PKGNAME-musepack =	gstreamer-musepack-$Vp1
 PKGNAME-faac =		gstreamer-faac-$Vp1
@@ -33,8 +35,11 @@ PKGNAME-swf =		gstreamer-flash-$Vp1
 PKGNAME-meta =		gstreamer-meta-$Vp1
 PKGNAME-sndfile =	gstreamer-sndfile-$Vp1
 PKGNAME-real =		gstreamer-real-$Vp1
+PKGNAME-x264 =		gstreamer-x264-$V
+PKGNAME-mplex =		gstreamer-mplex-$V
+
 MULTI_PACKAGES =	-main -tremor -musepack -faac -faad -xvid -sdl -bz2 \
-			-gsm -ladspa -meta -neon -sndfile
+			-gsm -ladspa -meta -neon -sndfile -x264 -mplex
 
 SHARED_LIBS +=	gstapp-0.10           0.0     # .0.0
 
@@ -140,6 +145,15 @@ LIB_DEPENDS-real =	${LIB_DEPENDS} \
 			gstaudio-0.10,gstinterfaces-0.10::$P/plugins-base
 .endif
 
+WANTLIB-x264 =		${WANTLIB}
+LIB_DEPENDS-x264 =	${LIB_DEPENDS} \
+			x264.>=1::multimedia/x264
+
+WANTLIB-mplex =		${WANTLIB} \
+			gstbase-0.10
+LIB_DEPENDS-mplex =	${LIB_DEPENDS} \
+			mjpegutils.>=4,mplex2.>=5::multimedia/mjpegtools
+
 CONFIGURE_ARGS =	--disable-alsa \
 			--disable-amrwb \
 			--disable-cdaudio \
@@ -164,14 +178,12 @@ CONFIGURE_ARGS =	--disable-alsa \
 			--disable-qtwrapper \
 			--disable-soundtouch \
 			--disable-spc \
-			--disable-swfdec   \
+			--disable-swfdec \
 			--disable-theoradec \
-			--disable-theoraexpdec \
 			--disable-timidity \
-			--disable-vcdsrc   \
+			--disable-vcdsrc \
 			--disable-wavpack \
 			--disable-wildmidi \
-			--disable-wininet \
-			--disable-x264
+			--disable-wininet
 
 .include <bsd.port.mk>

multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac

@@ -0,0 +1,14 @@
+$OpenBSD: patch-configure_ac,v 1.3 2008/10/01 08:02:59 ajacoutot Exp $
+--- configure.ac.orig	Thu Apr 24 01:30:21 2008
++++ configure.ac	Tue Sep 30 13:35:58 2008
+@@ -979,8 +979,8 @@ AG_GST_CHECK_FEATURE(THEORADEC, [ogg theora codec], th
+ dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
+ AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
+-  AG_GST_CHECK_LIBHEADER(X264, x264, x264_nal_encode, -lm, x264.h,
+-      X264_LIBS="$LDFLAGS -lx264 -lm"
++  AG_GST_CHECK_LIBHEADER(X264, x264, x264_nal_encode, -lm -pthread, x264.h,
++      X264_LIBS="$LDFLAGS -lx264 -lm -pthread"
+       X264_CFLAGS="$CFLAGS"
+       AC_SUBST(X264_LIBS)
+       AC_SUBST(X264_CFLAGS))

multimedia/gstreamer-0.10/plugins-bad/pkg/DESCR-main

@@ -24,10 +24,12 @@ The following plugins are in specific packages because of dependencies:
 * faad
 * gsm
 * ladspa
+* mplex
 * musepack 
 * neon
 * real
 * sdl
+* x264
 * xvid
 
 

multimedia/gstreamer-0.10/plugins-bad/pkg/DESCR-mplex

@@ -0,0 +1,4 @@
+This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
+unfinished.
+
+* gstmplex                      MPEG 1/2 stream multiplexer plugin

multimedia/gstreamer-0.10/plugins-bad/pkg/DESCR-x264

@@ -0,0 +1,4 @@
+This is a "bad" plugin for gstreamer-${VERSION}. It might be buggy or
+unfinished.
+
+* x264                      H.264 encoder

multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-mplex

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-mplex,v 1.1 2008/10/01 08:02:59 ajacoutot Exp $
+lib/gstreamer-${VERSION}/libgstmplex.la
+lib/gstreamer-${VERSION}/libgstmplex.so

multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-x264

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST-x264,v 1.1 2008/10/01 08:02:59 ajacoutot Exp $
+lib/gstreamer-${VERSION}/libgstx264.la
+lib/gstreamer-${VERSION}/libgstx264.so