Sync with recent commit.

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

3 files changed, 77 insertions, 1 deletions

diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 74077cc56..61810b086 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -122,13 +122,23 @@ post-patch:
 # speex fix -- speex.h has moved to include/speex/speex.h
 	@${REINPLACE_CMD} -e 's|-I.|-I. -I${LOCALBASE}/include/speex|' \
 		${WRKSRC}/ext/speex/Makefile.in
+.if ${CXXFLAGS:M*=athlon-4} || ${CXXFLAGS:M*=athlon-mp} || ${CXXFLAGS:M*=athlon-xp}
 # Fix gst-register when using -O -march=athlon-xp
 	@${REINPLACE_CMD} -e 's|@CXXF|-fgcse @CXXF|g' \
 		${WRKSRC}/gst/modplug/Makefile.in \
 		${WRKSRC}/gst/modplug/libmodplug/Makefile.in
+.endif
 # tell configure where the musepack includes live
 	@${REINPLACE_CMD} -e 's|/usr/include/musepack|${LOCALBASE}/include/musepack|g' \
 		${WRKSRC}/configure
+# This port cannot be CFLAGS safe, when using p4 optimizations
+# because it breaks the mod plugin
+	@${REINPLACE_CMD} -E \
+		-e 's|(-march=pentiu)m4|\1m3|g' \
+		-e 's|(-mcpu=pentiu)m4|\1m3|g' \
+		-e 's|(-mtune=pentiu)m)4|\1m3|g' \
+		${WRKSRC}/gst/modplug/Makefile \
+		${WRKSRC}/gst/modplug/libmodplug/Makefile
 
 post-build:
 .ifdef(EXTRA_BUILD_DIR)
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index bef8ded7a..fb6d36e23 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -183,6 +183,11 @@ LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 .endif
 
+# libcdaudio
+.if ${GST_PLUGIN}=="libcdaudio"
+LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
+.endif
+
 # libvisual
 .if ${GST_PLUGIN}=="libvisual"
 LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
@@ -376,7 +381,7 @@ LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
 
 # swfdec
 .if ${GST_PLUGIN}=="swfdec"
-LIB_DEPENDS+=	swfdec.0:${PORTSDIR}/graphics/swfdec
+LIB_DEPENDS+=	swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
 .endif
 
 # vorbis
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_musepack_gstmusepackdec.cpp b/multimedia/gstreamer-plugins80/files/patch-ext_musepack_gstmusepackdec.cpp
new file mode 100644
index 000000000..1b1799ca9
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_musepack_gstmusepackdec.cpp
@@ -0,0 +1,61 @@
+--- ext/musepack/gstmusepackdec.cpp.orig	Sun Nov  7 19:30:06 2004
++++ ext/musepack/gstmusepackdec.cpp	Thu Dec 16 16:31:42 2004
+@@ -30,14 +30,24 @@
+     GST_STATIC_CAPS ("audio/x-musepack")
+     );
+ 
++#ifdef MPC_FIXED_POINT
++#define BASE_CAPS \
++  "audio/x-raw-int, " \
++    "signed = (bool) TRUE, " \
++    "width = (int) 32, " \
++    "depth = (int) 32"
++#else
++#define BASE_CAPS \
++  "audio/x-raw-float, " \
++    "width = (int) 32, " \
++    "buffer-frames = (int) 0"
++#endif
++
+ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+     GST_PAD_SRC,
+     GST_PAD_ALWAYS,
+-    GST_STATIC_CAPS ("audio/x-raw-int, "
++    GST_STATIC_CAPS (BASE_CAPS ", "
+         "endianness = (int) BYTE_ORDER, "
+-        "signed = (bool) TRUE, "
+-        "width = (int) 32, "
+-        "depth = (int) 32, "
+         "rate = (int) [ 8000, 96000 ], "
+         "channels = (int) [ 1, 2 ]")
+     );
+@@ -352,6 +362,7 @@
+ gst_musepack_stream_init (GstMusepackDec * musepackdec)
+ {
+   StreamInfo si = StreamInfo ();
++  GstCaps *caps;
+ 
+   if (musepackdec->dec)
+     delete musepackdec->dec;
+@@ -379,15 +390,12 @@
+     return FALSE;
+   }
+ 
+-  if (!gst_pad_set_explicit_caps (musepackdec->srcpad,
+-           gst_caps_new_simple ("audio/x-raw-int",
+-               "width", G_TYPE_INT, 32,
+-               "depth", G_TYPE_INT, 32,
+-               "endianness", G_TYPE_INT, G_BYTE_ORDER,
+-               "channels", G_TYPE_INT, si.simple.Channels,
+-               "rate", G_TYPE_INT, si.simple.SampleFreq,
+-               "signed", G_TYPE_BOOLEAN, TRUE,
+-               NULL))) {
++  caps = gst_caps_from_string (BASE_CAPS);
++  gst_caps_set_simple (caps,
++      "endianness", G_TYPE_INT, G_BYTE_ORDER,
++      "channels", G_TYPE_INT, si.simple.Channels,
++      "rate", G_TYPE_INT, si.simple.SampleFreq, NULL);
++  if (!gst_pad_set_explicit_caps (musepackdec->srcpad, caps)) {
+     GST_ELEMENT_ERROR (musepackdec, CORE, NEGOTIATION, (NULL), (NULL));
+     delete musepackdec->dec;
+     musepackdec->dec = NULL;