[140659] trunk/dports/gnome

29 Sep 2015

Revision: 140659
          https://trac.macports.org/changeset/140659
Author:   devans@macports.org
Date:     2015-09-28 19:22:07 -0700 (Mon, 28 Sep 2015)
Log Message:
-----------
gstreamer1*: update to version 1.6.0.

Modified Paths:
--------------
    trunk/dports/gnome/gstreamer1/Portfile
    trunk/dports/gnome/gstreamer1-gst-libav/Portfile
    trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile
    trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile
    trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile
    trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/avsamplevideosink.h
    trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/corevideotexturecache.h

Property Changed:
----------------
    trunk/dports/gnome/gstreamer1/
    trunk/dports/gnome/gstreamer1-gst-libav/
    trunk/dports/gnome/gstreamer1-gst-plugins-bad/
    trunk/dports/gnome/gstreamer1-gst-plugins-base/
    trunk/dports/gnome/gstreamer1-gst-plugins-good/
    trunk/dports/gnome/gstreamer1-gst-plugins-ugly/


Property changes on: trunk/dports/gnome/gstreamer1
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gstreamer1:125799-131950
   + /users/devans/GNOME-3/stable/dports/gnome/gstreamer1:125799-140658
/users/devans/GNOME-3/unstable/dports/gnome/gstreamer1:137759-138024,138026-140596

Modified: trunk/dports/gnome/gstreamer1/Portfile
===================================================================

--- trunk/dports/gnome/gstreamer1/Portfile	2015-09-29 01:55:27 UTC (rev 140658)
+++ trunk/dports/gnome/gstreamer1/Portfile	2015-09-29 02:22:07 UTC (rev 140659)
@@ -10,7 +10,7 @@
 
 name                gstreamer1
 set my_name         gstreamer
-version             1.4.5
+version             1.6.0
 description         GStreamer is a library for constructing graphs of media-handling components.
 long_description    The applications it supports range from simple Ogg/Vorbis playback, audio/video \
                     streaming to complex audio (mixing) and video (non-linear editing) processing.
@@ -25,8 +25,8 @@
 
 use_xz              yes
 
-checksums           rmd160  8e4717b6a824fb029dea344264a304e05adb9aba \
-                    sha256  40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae
+checksums           rmd160  0aff0f57a48fad29c6c40ce51ec8b32240fc31f6 \
+                    sha256  52ef885647afef11c8b7645a9afefe04aa09e8971c4b932e7717872ab8a30fcc
 
 depends_build       port:gzip \
                     port:m4 \
@@ -50,6 +50,10 @@
 configure.env-append    PERL_PATH=${prefix}/bin/perl
 configure.cflags-append -funroll-loops -fstrict-aliasing -fno-common
 
+configure.args-append \
+                    --disable-fatal-warnings \
+                    --disable-silent-rules
+
 if {[variant_isset universal]} {
     set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
     set merger_host(i386) i686-apple-${os.platform}${os.major}


Property changes on: trunk/dports/gnome/gstreamer1-gst-libav
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-libav:125799-131950
   + /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-libav:125799-140658
/users/devans/GNOME-3/unstable/dports/gnome/gstreamer1-gst-libav:137783-138024,138026-140596

Modified: trunk/dports/gnome/gstreamer1-gst-libav/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-libav/Portfile	2015-09-29 01:55:27 UTC (rev 140658)
+++ trunk/dports/gnome/gstreamer1-gst-libav/Portfile	2015-09-29 02:22:07 UTC (rev 140659)
@@ -10,7 +10,7 @@
 
 name                gstreamer1-gst-libav
 set my_name         gst-libav
-version             1.4.5
+version             1.6.0
 description         This is gst-libav, a set of plug-ins for GStreamer.
 long_description    ${description}
 maintainers         nomaintainer
@@ -22,8 +22,8 @@
 distname            ${my_name}-${version}
 use_xz              yes
 
-checksums           rmd160  6422a1c47eac2a98735443e77182f48da453051c \
-                    sha256  605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc
+checksums           rmd160  ebe0792def1459cede7d1abb8b940b88de8352f4 \
+                    sha256  6cca6cf73182a882768ef0c860af88c2fd2c77e2c81ce464a998ab4e6baa604c
 
 depends_build       port:pkgconfig \
                     port:yasm
@@ -42,6 +42,10 @@
     compiler.blacklist-append gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
 }
 
+configure.args-append \
+                    --disable-fatal-warnings \
+                    --disable-silent-rules
+
 if {[variant_isset universal]} {
     set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
     set merger_host(i386) i686-apple-${os.platform}${os.major}


Property changes on: trunk/dports/gnome/gstreamer1-gst-plugins-bad
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad:125799-138609
   + /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad:125799-140658
/users/devans/GNOME-3/unstable/dports/gnome/gstreamer1-gst-plugins-bad:137764-138024,138026-140596

Modified: trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile	2015-09-29 01:55:27 UTC (rev 140658)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile	2015-09-29 02:22:07 UTC (rev 140659)
@@ -9,8 +9,7 @@
 
 name                gstreamer1-gst-plugins-bad
 set my_name         gst-plugins-bad
-version             1.4.5
-revision            4
+version             1.6.0
 description         A set of plug-ins for GStreamer that need more quality.
 long_description    GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared \
                     to the rest. They might be close to being good quality, but they're missing \
@@ -25,8 +24,8 @@
 distname            ${my_name}-${version}
 use_xz              yes
 
-checksums           rmd160  e3f594636e0b3bd9d3e70c779d4878ce4b06a587 \
-                    sha256  152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c
+checksums           rmd160  8c9c053c2bef3455367aadf0704cb39eada8c8a3 \
+                    sha256  d8ff26128d4ecd2ffeb28e14843808d2d971b09056b7cee6f08afcae01fc0f49
 
 depends_build       port:pkgconfig
 depends_lib         port:gstreamer1-gst-plugins-base \
@@ -71,6 +70,14 @@
 patchfiles          modplug.patch \
                     openal.patch
 
+# applemedia: restore upstream files missing from 1.6.0 tarball
+post-patch {
+    xinstall -m 644 ${filespath}/avsamplevideosink.h \
+                    ${filespath}/corevideotexturecache.h \
+                    ${worksrcpath}/sys/applemedia
+}
+
+
 #
 # could depend on tons for multimedia stuff +variants
 # the following ports are available but don't configure
@@ -87,9 +94,9 @@
 #
 
 configure.args      --disable-silent-rules \
+                    --disable-fatal-warnings \
                     --disable-dc1394 \
                     --disable-frei0r \
-                    --disable-quicktime \
                     --disable-lv2 \
                     --disable-mpeg2enc \
                     --disable-mplex \

Copied: trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/avsamplevideosink.h (from rev 140658, users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/files/avsamplevideosink.h)
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/avsamplevideosink.h	                        (rev 0)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/avsamplevideosink.h	2015-09-29 02:22:07 UTC (rev 140659)
@@ -0,0 +1,77 @@
+/*
+ * GStreamer
+ * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _AV_SINK_H_
+#define _AV_SINK_H_
+
+#include <gst/gst.h>
+#include <gst/video/gstvideosink.h>
+#include <gst/video/video.h>
+
+#include <QuartzCore/QuartzCore.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreMedia/CoreMedia.h>
+#include <AVFoundation/AVFoundation.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_AV_SAMPLE_VIDEO_SINK \
+    (gst_av_sample_video_sink_get_type())
+#define GST_AV_SAMPLE_VIDEO_SINK(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AV_SAMPLE_VIDEO_SINK,GstAVSampleVideoSink))
+#define GST_AV_SAMPLE_VIDEO_SINK_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AV_SAMPLE_VIDEO_SINK,GstAVSampleVideoSinkClass))
+#define GST_IS_AV_SAMPLE_VIDEO_SINK(obj) \
+    (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AV_SAMPLE_VIDEO_SINK))
+#define GST_IS_AV_SAMPLE_VIDEO_SINK_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AV_SAMPLE_VIDEO_SINK))
+
+typedef struct _GstAVSampleVideoSink GstAVSampleVideoSink;
+typedef struct _GstAVSampleVideoSinkClass GstAVSampleVideoSinkClass;
+
+struct _GstAVSampleVideoSink
+{
+    GstVideoSink video_sink;
+
+    AVSampleBufferDisplayLayer *layer;
+
+    GstVideoInfo info;
+
+    gboolean keep_aspect_ratio;
+
+    GstBufferPool *pool;
+
+    gboolean layer_requesting_data;
+
+    GMutex render_lock;
+    GstBuffer *buffer;
+    GstFlowReturn render_flow_return;
+};
+
+struct _GstAVSampleVideoSinkClass
+{
+    GstVideoSinkClass video_sink_class;
+};
+
+GType gst_av_sample_video_sink_get_type(void);
+
+G_END_DECLS
+
+#endif

Copied: trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/corevideotexturecache.h (from rev 140658, users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-bad/files/corevideotexturecache.h)
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/corevideotexturecache.h	                        (rev 0)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-bad/files/corevideotexturecache.h	2015-09-29 02:22:07 UTC (rev 140659)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2015 Alessandro Decina <twi@centricular.com>
+ *
+ * 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_CORE_VIDEO_TEXTURE_CACHE_H__
+#define __GST_CORE_VIDEO_TEXTURE_CACHE_H__
+
+#include <gst/video/gstvideometa.h>
+#include <gst/gl/gstglcontext.h>
+#include "CoreVideo/CoreVideo.h"
+
+G_BEGIN_DECLS
+
+typedef struct _GstCoreVideoTextureCache
+{
+  GstGLContext *ctx;
+#if !HAVE_IOS
+  CVOpenGLTextureCacheRef cache;
+#else
+  CVOpenGLESTextureCacheRef cache;
+#endif
+  GstVideoInfo input_info;
+  GstVideoInfo output_info;
+  GstGLColorConvert *convert;
+} GstCoreVideoTextureCache;
+
+GstCoreVideoTextureCache *gst_core_video_texture_cache_new (GstGLContext * ctx);
+void gst_core_video_texture_cache_free (GstCoreVideoTextureCache * cache);
+void gst_core_video_texture_cache_set_format (GstCoreVideoTextureCache * cache,
+    GstVideoFormat in_format, GstCaps * out_caps);
+gboolean gst_core_video_texture_cache_upload (GstVideoGLTextureUploadMeta * meta, guint texture_id[4]);
+GstBuffer * gst_core_video_texture_cache_get_gl_buffer (GstCoreVideoTextureCache * cache,
+        GstBuffer * cv_buffer);
+
+G_END_DECLS
+
+#endif /* __GST_CORE_VIDEO_TEXTURE_CACHE_H__ */


Property changes on: trunk/dports/gnome/gstreamer1-gst-plugins-base
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-base:125799-131950
   + /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-base:125799-140658
/users/devans/GNOME-3/unstable/dports/gnome/gstreamer1-gst-plugins-base:137760-138024,138026-140596

Modified: trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile	2015-09-29 01:55:27 UTC (rev 140658)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile	2015-09-29 02:22:07 UTC (rev 140659)
@@ -9,7 +9,7 @@
 
 name                gstreamer1-gst-plugins-base
 set my_name         gst-plugins-base
-version             1.4.5
+version             1.6.0
 description         This is gst-plugins, a set of plug-ins for GStreamer.
 long_description    ${description}
 maintainers         nomaintainer
@@ -23,8 +23,8 @@
 
 use_xz              yes
 
-checksums           rmd160  5e1348015eba7be8b5492f3746040418367676d6 \
-                    sha256  77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d
+checksums           rmd160  67e69dac70bc6bd08334faa1e91adc9665954ac3 \
+                    sha256  314fd1b707f65caf8eb6164d9422fc51e2b220a890ccd2de6ec03a2883d77231
 
 depends_build       port:pkgconfig
 depends_lib         port:gstreamer1 \
@@ -35,6 +35,8 @@
 gobject_introspection yes
 
 configure.args-append \
+                    --disable-fatal-warnings \
+                    --disable-silent-rules \
                     --enable-experimental \
                     --disable-examples \
                     --disable-libvisual \


Property changes on: trunk/dports/gnome/gstreamer1-gst-plugins-good
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-good:125799-139492
   + /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-good:125799-140658
/users/devans/GNOME-3/unstable/dports/gnome/gstreamer1-gst-plugins-good:137762-138024,138026-140596

Modified: trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile	2015-09-29 01:55:27 UTC (rev 140658)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile	2015-09-29 02:22:07 UTC (rev 140659)
@@ -6,12 +6,10 @@
 # https://bugzilla.gnome.org/show_bug.cgi?id=636134
 PortGroup           muniversal 1.0
 PortGroup           compiler_blacklist_versions 1.0
-PortGroup           gobject_introspection 1.0
 
 name                gstreamer1-gst-plugins-good
 set my_name         gst-plugins-good
-version             1.4.5
-revision            3
+version             1.6.0
 description         A set of good-quality plug-ins for GStreamer under GStreamer's preferred \
                     license, LGPL.
 long_description    GStreamer Good Plug-ins is a set of plug-ins that GStreamer's developers \
@@ -27,8 +25,8 @@
 use_xz              yes
 distname            ${my_name}-${version}
 
-checksums           rmd160  2938db9238330b851a80d21e5f32a23e88f4eac7 \
-                    sha256  79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641
+checksums           rmd160  42499340d5e660899167d20bbff9f12af233042f \
+                    sha256  a0915639595305e48884656e22b16fda7c6892aa02cdb3eb43e23dab6e6b81fa
 
 depends_build       port:pkgconfig
 
@@ -43,7 +41,6 @@
                     port:gdk-pixbuf2 \
                     port:jack \
                     port:jpeg \
-                    port:libgnome-keyring \
                     port:libcaca \
                     port:libdv \
                     port:libpng \
@@ -53,8 +50,6 @@
                     port:taglib \
                     port:wavpack
 
-gobject_introspection yes
-
 post-patch {
     # gst/goom is the only thing using this, and its mmx code is buggy (as of 0.10.31)
     reinplace "s|-DBUILD_MMX|-UBUILD_MMX|" ${worksrcpath}/gst/goom/Makefile.am
@@ -64,7 +59,13 @@
 use_autoreconf      yes
 autoreconf.args     -fvi
 
-configure.args-append   --disable-gtk-doc --with-default-videosink=ximagesink --disable-pulse
+configure.args-append \
+                    --disable-fatal-warnings \
+                    --disable-silent-rules \
+                    --disable-gtk-doc \
+                    --with-default-videosink=ximagesink \
+                    --disable-pulse
+
 configure.env-append    "HAVE_CXX=yes"
 
 variant pulseaudio description {Enable PulseAudio plugin} {


Property changes on: trunk/dports/gnome/gstreamer1-gst-plugins-ugly
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly:125799-131950
   + /users/devans/GNOME-3/stable/dports/gnome/gstreamer1-gst-plugins-ugly:125799-140658
/users/devans/GNOME-3/unstable/dports/gnome/gstreamer1-gst-plugins-ugly:137781-138024,138026-140596

Modified: trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile	2015-09-29 01:55:27 UTC (rev 140658)
+++ trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile	2015-09-29 02:22:07 UTC (rev 140659)
@@ -8,7 +8,7 @@
 
 name                gstreamer1-gst-plugins-ugly
 set my_name         gst-plugins-ugly
-version             1.4.5
+version             1.6.0
 description         A set of good-quality plug-ins for GStreamer that might pose distribution \
                     problems.
 long_description    GStreamer Ugly Plug-ins is a set of plug-ins that have good quality and \
@@ -24,8 +24,8 @@
 license             GPL-2+ LGPL-2+
 use_xz              yes
 
-checksums           rmd160  56305e80bc185b969ba6c104735ad86918740cd3 \
-                    sha256  5cd5e81cf618944f4dc935f1669b2125e8bb2fe9cc7dc8dc15b72237aca49067
+checksums           rmd160  e191f40b6bdbf90a02ee9aadd27ae48b9cb72232 \
+                    sha256  91178dc0d687a83c083190a905681d3a66901374b1004fc52cd300b7802e5f06
 
 depends_build       port:pkgconfig
 depends_lib         port:gstreamer1-gst-plugins-base \
@@ -40,18 +40,18 @@
                     port:twolame \
                     port:x264
 
-configure.args-append       mandir=${prefix}/share/man --enable-static
-configure.cppflags-append   "-L${prefix}/lib"
+configure.args-append \
+                    --disable-fatal-warnings \
+                    --disable-silent-rules \
+                    --enable-static
+
 configure.cflags-append     -funroll-loops -fstrict-aliasing
 
-# I'm not sure if the pkg-config data is wrong or if gst-plugin is wrong, meh.
-configure.cppflags-append -I${prefix}/include/opencore-amrnb -I${prefix}/include/opencore-amrwb
+# pkg-config --cflags opencore-amr* incorrectly returns just -I${prefix}/include
+configure.env-append \
+                    AMRNB_CFLAGS=-I${prefix}/include/opencore-amrnb \
+                    AMRWB_CFLAGS=-I${prefix}/include/opencore-amrwb
 
-post-extract {
-    reinplace "s|-flat_namespace -undefined suppress|-undefined define_a_way|g" \
-    ${worksrcpath}/configure
-}
-
 if {[variant_isset universal]} {
     set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
     set merger_host(i386) i686-apple-${os.platform}${os.major}

    

devans＠macports.org

tags

participants (1)