3 files changed, 18 insertions, 75 deletions

diff --git a/multimedia/gstreamer1-plugins-good/Makefile b/multimedia/gstreamer1-plugins-good/Makefile
index 3dd91c6a3af6..509887eb8a2d 100644
--- a/multimedia/gstreamer1-plugins-good/Makefile
+++ b/multimedia/gstreamer1-plugins-good/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer1-plugins-good/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Good gstreamer-plugins
@@ -12,8 +12,6 @@ GST_PLUGIN_SUFFIX=	-good
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-CONFIGURE_ARGS+=--enable-monoscope
-
 BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
 RUN_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
 
diff --git a/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c b/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c
index 6fae8849cfef..c5790c08eb8d 100644
--- a/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c
+++ b/multimedia/gstreamer1-plugins-good/files/patch-sys_oss_gstosshelper.c
@@ -1,22 +1,18 @@
---- sys/oss/gstosshelper.c.orig	2014-01-14 13:03:14.000000000 +0100
-+++ sys/oss/gstosshelper.c	2014-09-11 09:10:55.115013111 +0200
-@@ -95,9 +95,13 @@
-   format_mask = AFMT_U8 | AFMT_S8;
- 
-   if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
--    format_mask |= AFMT_S16_LE | AFMT_U16_LE;
-+    format_mask |= AFMT_S16_LE | AFMT_U16_LE
-+      | AFMT_S24_LE | AFMT_U24_LE
-+      | AFMT_S32_LE | AFMT_U32_LE;
-   else
--    format_mask |= AFMT_S16_BE | AFMT_U16_BE;
-+    format_mask |= AFMT_S16_BE | AFMT_U16_BE
-+      | AFMT_S24_BE | AFMT_U24_BE
-+      | AFMT_S32_BE | AFMT_U32_BE;
- 
-   caps = gst_caps_new_empty ();
- 
-@@ -169,6 +173,9 @@
+--- sys/oss/gstosshelper.c.orig	2014-07-21 10:24:27.000000000 +0200
++++ sys/oss/gstosshelper.c	2014-10-12 18:13:53.847663389 +0200
+@@ -82,9 +82,9 @@
+ gst_oss_helper_probe_caps (gint fd)
+ {
+ #if G_BYTE_ORDER == G_LITTLE_ENDIAN
+-  const guint probe_formats[] = { AFMT_S16_LE, AFMT_U16_LE, AFMT_U8, AFMT_S8 };
++  const guint probe_formats[] = { AFMT_U32_LE, AFMT_S32_LE, AFMT_U24_LE, AFMT_S24_LE, AFMT_S16_LE, AFMT_U16_LE, AFMT_U8, AFMT_S8 };
+ #else
+-  const guint probe_formats[] = { AFMT_S16_BE, AFMT_U16_BE, AFMT_U8, AFMT_S8 };
++  const guint probe_formats[] = { AFMT_U32_BE, AFMT_S32_BE, AFMT_U24_BE, AFMT_S24_BE, AFMT_S16_BE, AFMT_U16_BE, AFMT_U8, AFMT_S8 };
+ #endif
+   GstOssProbe *probe;
+   int i, f;
+@@ -165,6 +165,9 @@
    const gchar *format;
  
    switch (format_bit) {
@@ -26,7 +22,7 @@
      case AFMT_U8:
        format = "U8";
        break;
-@@ -178,15 +185,36 @@
+@@ -174,15 +177,36 @@
      case AFMT_S16_BE:
        format = "S16BE";
        break;
@@ -66,7 +62,7 @@
      default:
        g_assert_not_reached ();
        return NULL;
-@@ -324,13 +352,17 @@
+@@ -320,13 +344,17 @@
    int format;
    int n_channels;
    int ret;
diff --git a/multimedia/gstreamer1-plugins-good/pkg-plist b/multimedia/gstreamer1-plugins-good/pkg-plist
index 926389ec3e75..cd64f69d198e 100644
--- a/multimedia/gstreamer1-plugins-good/pkg-plist
+++ b/multimedia/gstreamer1-plugins-good/pkg-plist
@@ -1,96 +1,49 @@
-lib/gstreamer-%%VERSION%%/libgstalaw.la
 lib/gstreamer-%%VERSION%%/libgstalaw.so
-lib/gstreamer-%%VERSION%%/libgstalpha.la
 lib/gstreamer-%%VERSION%%/libgstalpha.so
-lib/gstreamer-%%VERSION%%/libgstalphacolor.la
 lib/gstreamer-%%VERSION%%/libgstalphacolor.so
-lib/gstreamer-%%VERSION%%/libgstapetag.la
 lib/gstreamer-%%VERSION%%/libgstapetag.so
-lib/gstreamer-%%VERSION%%/libgstaudiofx.la
 lib/gstreamer-%%VERSION%%/libgstaudiofx.so
-lib/gstreamer-%%VERSION%%/libgstaudioparsers.la
 lib/gstreamer-%%VERSION%%/libgstaudioparsers.so
-lib/gstreamer-%%VERSION%%/libgstauparse.la
 lib/gstreamer-%%VERSION%%/libgstauparse.so
-lib/gstreamer-%%VERSION%%/libgstautodetect.la
 lib/gstreamer-%%VERSION%%/libgstautodetect.so
-lib/gstreamer-%%VERSION%%/libgstavi.la
 lib/gstreamer-%%VERSION%%/libgstavi.so
-lib/gstreamer-%%VERSION%%/libgstcutter.la
 lib/gstreamer-%%VERSION%%/libgstcutter.so
-lib/gstreamer-%%VERSION%%/libgstdebug.la
 lib/gstreamer-%%VERSION%%/libgstdebug.so
-lib/gstreamer-%%VERSION%%/libgstdeinterlace.la
 lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
-lib/gstreamer-%%VERSION%%/libgstdtmf.la
 lib/gstreamer-%%VERSION%%/libgstdtmf.so
-lib/gstreamer-%%VERSION%%/libgsteffectv.la
 lib/gstreamer-%%VERSION%%/libgsteffectv.so
-lib/gstreamer-%%VERSION%%/libgstequalizer.la
 lib/gstreamer-%%VERSION%%/libgstequalizer.so
-lib/gstreamer-%%VERSION%%/libgstflv.la
 lib/gstreamer-%%VERSION%%/libgstflv.so
-lib/gstreamer-%%VERSION%%/libgstflxdec.la
 lib/gstreamer-%%VERSION%%/libgstflxdec.so
-lib/gstreamer-%%VERSION%%/libgstgoom.la
 lib/gstreamer-%%VERSION%%/libgstgoom.so
-lib/gstreamer-%%VERSION%%/libgstgoom2k1.la
 lib/gstreamer-%%VERSION%%/libgstgoom2k1.so
-lib/gstreamer-%%VERSION%%/libgsticydemux.la
 lib/gstreamer-%%VERSION%%/libgsticydemux.so
-lib/gstreamer-%%VERSION%%/libgstid3demux.la
 lib/gstreamer-%%VERSION%%/libgstid3demux.so
-lib/gstreamer-%%VERSION%%/libgstimagefreeze.la
 lib/gstreamer-%%VERSION%%/libgstimagefreeze.so
-lib/gstreamer-%%VERSION%%/libgstinterleave.la
 lib/gstreamer-%%VERSION%%/libgstinterleave.so
-lib/gstreamer-%%VERSION%%/libgstlevel.la
 lib/gstreamer-%%VERSION%%/libgstlevel.so
-lib/gstreamer-%%VERSION%%/libgstmatroska.la
 lib/gstreamer-%%VERSION%%/libgstmatroska.so
-lib/gstreamer-%%VERSION%%/libgstmulaw.la
 lib/gstreamer-%%VERSION%%/libgstmulaw.so
-lib/gstreamer-%%VERSION%%/libgstmultifile.la
 lib/gstreamer-%%VERSION%%/libgstmultifile.so
-lib/gstreamer-%%VERSION%%/libgstmultipart.la
 lib/gstreamer-%%VERSION%%/libgstmultipart.so
-lib/gstreamer-%%VERSION%%/libgstnavigationtest.la
 lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
-lib/gstreamer-%%VERSION%%/libgstoss4audio.la
 lib/gstreamer-%%VERSION%%/libgstoss4audio.so
-lib/gstreamer-%%VERSION%%/libgstossaudio.la
 lib/gstreamer-%%VERSION%%/libgstossaudio.so
-lib/gstreamer-%%VERSION%%/libgstisomp4.la
 lib/gstreamer-%%VERSION%%/libgstisomp4.so
-lib/gstreamer-%%VERSION%%/libgstreplaygain.la
 lib/gstreamer-%%VERSION%%/libgstreplaygain.so
-lib/gstreamer-%%VERSION%%/libgstrtp.la
 lib/gstreamer-%%VERSION%%/libgstrtp.so
-lib/gstreamer-%%VERSION%%/libgstrtpmanager.la
 lib/gstreamer-%%VERSION%%/libgstrtpmanager.so
-lib/gstreamer-%%VERSION%%/libgstrtsp.la
 lib/gstreamer-%%VERSION%%/libgstrtsp.so
-lib/gstreamer-%%VERSION%%/libgstshapewipe.la
 lib/gstreamer-%%VERSION%%/libgstshapewipe.so
-lib/gstreamer-%%VERSION%%/libgstsmpte.la
 lib/gstreamer-%%VERSION%%/libgstsmpte.so
-lib/gstreamer-%%VERSION%%/libgstspectrum.la
 lib/gstreamer-%%VERSION%%/libgstspectrum.so
-lib/gstreamer-%%VERSION%%/libgstudp.la
 lib/gstreamer-%%VERSION%%/libgstudp.so
-lib/gstreamer-%%VERSION%%/libgstvideobox.la
 lib/gstreamer-%%VERSION%%/libgstvideobox.so
-lib/gstreamer-%%VERSION%%/libgstvideocrop.la
 lib/gstreamer-%%VERSION%%/libgstvideocrop.so
-lib/gstreamer-%%VERSION%%/libgstvideofilter.la
 lib/gstreamer-%%VERSION%%/libgstvideofilter.so
-lib/gstreamer-%%VERSION%%/libgstvideomixer.la
 lib/gstreamer-%%VERSION%%/libgstvideomixer.so
-lib/gstreamer-%%VERSION%%/libgstwavenc.la
 lib/gstreamer-%%VERSION%%/libgstwavenc.so
-lib/gstreamer-%%VERSION%%/libgstwavparse.la
 lib/gstreamer-%%VERSION%%/libgstwavparse.so
-lib/gstreamer-%%VERSION%%/libgsty4menc.la
 lib/gstreamer-%%VERSION%%/libgsty4menc.so
 share/gstreamer-%%VERSION%%/presets/GstIirEqualizer10Bands.prs
 share/gstreamer-%%VERSION%%/presets/GstIirEqualizer3Bands.prs
@@ -135,7 +88,3 @@ share/locale/vi/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/gstreamer-%%VERSION%%/presets
-@dirrmtry share/gstreamer-%%VERSION%%