PSARC/2017/033 gstreamer 1.10.3
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Mon, 17 Apr 2017 16:05:36 -0700
changeset 7894 0c22900562ad
parent 7887 2143681d78e2
child 7895 db578176fc80
PSARC/2017/033 gstreamer 1.10.3 25689528 Update gstreamer to 1.10.3 25493221 problem in GNOME/MULTIMEDIA
components/desktop/gstreamer1/files/exec_attr
components/desktop/gstreamer1/gst-plugins-base/Makefile
components/desktop/gstreamer1/gst-plugins-base/depend.mk
components/desktop/gstreamer1/gst-plugins-base/gst-plugins-base.p5m
components/desktop/gstreamer1/gst-plugins-base/patches/02-gobject-introspection.patch
components/desktop/gstreamer1/gst-plugins-good/Makefile
components/desktop/gstreamer1/gst-plugins-good/depend.mk
components/desktop/gstreamer1/gst-plugins-good/gst-plugins-good.p5m
components/desktop/gstreamer1/gst-plugins-good/patches/01-grep.patch
components/desktop/gstreamer1/gst-plugins-good/patches/03-ioctl.patch
components/desktop/gstreamer1/gst-python/Makefile
components/desktop/gstreamer1/gst-python/depend.mk
components/desktop/gstreamer1/gst-python/gst-python-1-PYVER.p5m
components/desktop/gstreamer1/gstreamer/Makefile
components/desktop/gstreamer1/gstreamer/gstreamer-1.p5m
components/desktop/gstreamer1/gstreamer/patches/02-syntax-errors.patch
components/desktop/gstreamer1/gstreamer/patches/03-gobject-introspection.patch
components/desktop/gstreamer1/gstreamer/test/results-all.master
components/desktop/gstreamer1/orc/Makefile
components/desktop/gstreamer1/orc/orc.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/gstreamer1/files/exec_attr	Mon Apr 17 16:05:36 2017 -0700
@@ -0,0 +1,2 @@
+Forced Privilege:solaris:cmd:RO::/usr/lib/64/gstreamer-1.0/gst-ptp-helper:privs=net_privaddr
+Forced Privilege:solaris:cmd:RO::/usr/lib/gstreamer-1.0/gst-ptp-helper:privs=net_privaddr 
--- a/components/desktop/gstreamer1/gst-plugins-base/Makefile	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-plugins-base/Makefile	Mon Apr 17 16:05:36 2017 -0700
@@ -30,16 +30,16 @@
 include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gst-plugins-base
-COMPONENT_VERSION=	1.4.5
+COMPONENT_VERSION=	1.10.3
 COMPONENT_PROJECT_URL=	http://gstreamer.freedesktop.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH= \
-	sha256:77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d
+	sha256:e6299617d705a0cbfb535107c1d3a8fc0f0967f14193a8c5c7583f46a88b1710
 COMPONENT_ARCHIVE_URL=	http://gstreamer.freedesktop.org/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	gnome/multimedia
 COMPONENT_ANITYA_ID=	1263
 
-TPNO=			25636
+TPNO=			33708
 
 # Only build for 2.7 for now as we need 32-bit and 64-bit support; all of the
 # GNOME and desktop components must be built for Python 2.7 for now.
@@ -58,6 +58,16 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
+# Use the build area of gstreamer
+GST_BASE = $(WS_COMPONENTS)/desktop/gstreamer1/gstreamer/build/prototype/$(MACH)
+PKG_CONFIG_PATHS += $(GST_BASE)$(USRLIB)/pkgconfig/ 
+
+CPPFLAGS += -I$(GST_BASE)/usr/include/gstreamer-1.0
+LD_OPTIONS += -L $(GST_BASE)$(USRLIB)
+
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(GST_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_32)/gst-libs/gst/audio/.libs:$(BUILD_DIR_32)/gst-libs/gst/video/.libs:$(BUILD_DIR_32)/gst-libs/gst/rtp/.libs:$(BUILD_DIR_32)/gst-libs/gst/rtsp/.libs:$(BUILD_DIR_32)/gst-libs/gst/pbutils/.libs:$(BUILD_DIR_32)/gst-libs/gst/allocators/.libs"
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(GST_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_64)/gst-libs/gst/audio/.libs:$(BUILD_DIR_64)/gst-libs/gst/video/.libs:$(BUILD_DIR_64)/gst-libs/gst/rtp/.libs:$(BUILD_DIR_64)/gst-libs/gst/rtsp/.libs:$(BUILD_DIR_64)/gst-libs/gst/pbutils/.libs:$(BUILD_DIR_64)/gst-libs/gst/allocators/.libs"
+
 CFLAGS += -DHAVE_FIONREAD_IN_SYS_FILIO
 
 CONFIGURE_OPTIONS += --disable-static
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/gstreamer1/gst-plugins-base/depend.mk	Mon Apr 17 16:05:36 2017 -0700
@@ -0,0 +1,1 @@
+desktop/gstreamer1/gst-plugins-base: desktop/gstreamer1/gstreamer
--- a/components/desktop/gstreamer1/gst-plugins-base/gst-plugins-base.p5m	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-plugins-base/gst-plugins-base.p5m	Mon Apr 17 16:05:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> \
@@ -36,7 +36,7 @@
     value="org.opensolaris.category.2008:System/Multimedia Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/338
+set name=org.opensolaris.arc-caseid value=PSARC/2016/338 value=PSARC/2017/033
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/$(MACH64)/gst-device-monitor-1.0
 file path=usr/bin/$(MACH64)/gst-discoverer-1.0
@@ -46,13 +46,18 @@
 file path=usr/bin/gst-play-1.0
 file path=usr/include/gstreamer-1.0/gst/allocators/allocators.h
 file path=usr/include/gstreamer-1.0/gst/allocators/gstdmabuf.h
+file path=usr/include/gstreamer-1.0/gst/allocators/gstfdmemory.h
 file path=usr/include/gstreamer-1.0/gst/app/app.h
 file path=usr/include/gstreamer-1.0/gst/app/gstappsink.h
 file path=usr/include/gstreamer-1.0/gst/app/gstappsrc.h
+file path=usr/include/gstreamer-1.0/gst/audio/audio-channel-mixer.h
 file path=usr/include/gstreamer-1.0/gst/audio/audio-channels.h
+file path=usr/include/gstreamer-1.0/gst/audio/audio-converter.h
 file path=usr/include/gstreamer-1.0/gst/audio/audio-enumtypes.h
 file path=usr/include/gstreamer-1.0/gst/audio/audio-format.h
 file path=usr/include/gstreamer-1.0/gst/audio/audio-info.h
+file path=usr/include/gstreamer-1.0/gst/audio/audio-quantize.h
+file path=usr/include/gstreamer-1.0/gst/audio/audio-resampler.h
 file path=usr/include/gstreamer-1.0/gst/audio/audio.h
 file path=usr/include/gstreamer-1.0/gst/audio/gstaudiobasesink.h
 file path=usr/include/gstreamer-1.0/gst/audio/gstaudiobasesrc.h
@@ -77,6 +82,7 @@
 file path=usr/include/gstreamer-1.0/gst/pbutils/descriptions.h
 file path=usr/include/gstreamer-1.0/gst/pbutils/encoding-profile.h
 file path=usr/include/gstreamer-1.0/gst/pbutils/encoding-target.h
+file path=usr/include/gstreamer-1.0/gst/pbutils/gstaudiovisualizer.h
 file path=usr/include/gstreamer-1.0/gst/pbutils/gstdiscoverer.h
 file path=usr/include/gstreamer-1.0/gst/pbutils/gstpluginsbaseversion.h
 file path=usr/include/gstreamer-1.0/gst/pbutils/install-plugins.h
@@ -88,10 +94,12 @@
 file path=usr/include/gstreamer-1.0/gst/riff/riff-read.h
 file path=usr/include/gstreamer-1.0/gst/riff/riff.h
 file path=usr/include/gstreamer-1.0/gst/rtp/gstrtcpbuffer.h
+file path=usr/include/gstreamer-1.0/gst/rtp/gstrtp-enumtypes.h
 file path=usr/include/gstreamer-1.0/gst/rtp/gstrtpbaseaudiopayload.h
 file path=usr/include/gstreamer-1.0/gst/rtp/gstrtpbasedepayload.h
 file path=usr/include/gstreamer-1.0/gst/rtp/gstrtpbasepayload.h
 file path=usr/include/gstreamer-1.0/gst/rtp/gstrtpbuffer.h
+file path=usr/include/gstreamer-1.0/gst/rtp/gstrtpdefs.h
 file path=usr/include/gstreamer-1.0/gst/rtp/gstrtphdrext.h
 file path=usr/include/gstreamer-1.0/gst/rtp/gstrtppayloads.h
 file path=usr/include/gstreamer-1.0/gst/rtp/rtp.h
@@ -115,25 +123,33 @@
 file path=usr/include/gstreamer-1.0/gst/tag/xmpwriter.h
 file path=usr/include/gstreamer-1.0/gst/video/colorbalance.h
 file path=usr/include/gstreamer-1.0/gst/video/colorbalancechannel.h
+file path=usr/include/gstreamer-1.0/gst/video/gstvideoaffinetransformationmeta.h
 file path=usr/include/gstreamer-1.0/gst/video/gstvideodecoder.h
 file path=usr/include/gstreamer-1.0/gst/video/gstvideoencoder.h
 file path=usr/include/gstreamer-1.0/gst/video/gstvideofilter.h
 file path=usr/include/gstreamer-1.0/gst/video/gstvideometa.h
 file path=usr/include/gstreamer-1.0/gst/video/gstvideopool.h
 file path=usr/include/gstreamer-1.0/gst/video/gstvideosink.h
+file path=usr/include/gstreamer-1.0/gst/video/gstvideotimecode.h
 file path=usr/include/gstreamer-1.0/gst/video/gstvideoutils.h
 file path=usr/include/gstreamer-1.0/gst/video/navigation.h
 file path=usr/include/gstreamer-1.0/gst/video/video-blend.h
 file path=usr/include/gstreamer-1.0/gst/video/video-chroma.h
 file path=usr/include/gstreamer-1.0/gst/video/video-color.h
+file path=usr/include/gstreamer-1.0/gst/video/video-converter.h
+file path=usr/include/gstreamer-1.0/gst/video/video-dither.h
 file path=usr/include/gstreamer-1.0/gst/video/video-enumtypes.h
 file path=usr/include/gstreamer-1.0/gst/video/video-event.h
 file path=usr/include/gstreamer-1.0/gst/video/video-format.h
 file path=usr/include/gstreamer-1.0/gst/video/video-frame.h
 file path=usr/include/gstreamer-1.0/gst/video/video-info.h
+file path=usr/include/gstreamer-1.0/gst/video/video-multiview.h
 file path=usr/include/gstreamer-1.0/gst/video/video-overlay-composition.h
+file path=usr/include/gstreamer-1.0/gst/video/video-resampler.h
+file path=usr/include/gstreamer-1.0/gst/video/video-scaler.h
 file path=usr/include/gstreamer-1.0/gst/video/video-tile.h
 file path=usr/include/gstreamer-1.0/gst/video/video.h
+file path=usr/include/gstreamer-1.0/gst/video/videodirection.h
 file path=usr/include/gstreamer-1.0/gst/video/videoorientation.h
 file path=usr/include/gstreamer-1.0/gst/video/videooverlay.h
 file path=usr/lib/$(MACH64)/girepository-1.0/GstAllocators-1.0.typelib
@@ -141,7 +157,6 @@
 file path=usr/lib/$(MACH64)/girepository-1.0/GstAudio-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/GstFft-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/GstPbutils-1.0.typelib
-file path=usr/lib/$(MACH64)/girepository-1.0/GstRiff-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/GstRtp-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/GstRtsp-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/GstSdp-1.0.typelib
@@ -172,44 +187,48 @@
 file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstximagesink.so
 file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstxvimagesink.so
 link path=usr/lib/$(MACH64)/libgstallocators-1.0.so \
-    target=libgstallocators-1.0.so.0.405.0
+    target=libgstallocators-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstallocators-1.0.so.0 \
-    target=libgstallocators-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstallocators-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstapp-1.0.so target=libgstapp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstapp-1.0.so.0 target=libgstapp-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstapp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstaudio-1.0.so target=libgstaudio-1.0.so.0.405.0
+    target=libgstallocators-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstallocators-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstapp-1.0.so target=libgstapp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstapp-1.0.so.0 target=libgstapp-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstapp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstaudio-1.0.so \
+    target=libgstaudio-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstaudio-1.0.so.0 \
-    target=libgstaudio-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstaudio-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstfft-1.0.so target=libgstfft-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstfft-1.0.so.0 target=libgstfft-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstfft-1.0.so.0.405.0
+    target=libgstaudio-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstaudio-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstfft-1.0.so target=libgstfft-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstfft-1.0.so.0 target=libgstfft-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstfft-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstpbutils-1.0.so \
-    target=libgstpbutils-1.0.so.0.405.0
+    target=libgstpbutils-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstpbutils-1.0.so.0 \
-    target=libgstpbutils-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstpbutils-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstriff-1.0.so target=libgstriff-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstriff-1.0.so.0 target=libgstriff-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstriff-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstrtp-1.0.so target=libgstrtp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstrtp-1.0.so.0 target=libgstrtp-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstrtp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstrtsp-1.0.so target=libgstrtsp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstrtsp-1.0.so.0 target=libgstrtsp-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstrtsp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstsdp-1.0.so target=libgstsdp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstsdp-1.0.so.0 target=libgstsdp-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstsdp-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgsttag-1.0.so target=libgsttag-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgsttag-1.0.so.0 target=libgsttag-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgsttag-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstvideo-1.0.so target=libgstvideo-1.0.so.0.405.0
+    target=libgstpbutils-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstpbutils-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstriff-1.0.so target=libgstriff-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstriff-1.0.so.0 \
+    target=libgstriff-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstriff-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstrtp-1.0.so target=libgstrtp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstrtp-1.0.so.0 target=libgstrtp-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstrtp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstrtsp-1.0.so target=libgstrtsp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstrtsp-1.0.so.0 \
+    target=libgstrtsp-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstrtsp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstsdp-1.0.so target=libgstsdp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstsdp-1.0.so.0 target=libgstsdp-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstsdp-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgsttag-1.0.so target=libgsttag-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgsttag-1.0.so.0 target=libgsttag-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgsttag-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstvideo-1.0.so \
+    target=libgstvideo-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstvideo-1.0.so.0 \
-    target=libgstvideo-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstvideo-1.0.so.0.405.0
+    target=libgstvideo-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstvideo-1.0.so.0.1003.0
 file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-allocators-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-app-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-audio-1.0.pc
@@ -227,7 +246,6 @@
 file path=usr/lib/girepository-1.0/GstAudio-1.0.typelib
 file path=usr/lib/girepository-1.0/GstFft-1.0.typelib
 file path=usr/lib/girepository-1.0/GstPbutils-1.0.typelib
-file path=usr/lib/girepository-1.0/GstRiff-1.0.typelib
 file path=usr/lib/girepository-1.0/GstRtp-1.0.typelib
 file path=usr/lib/girepository-1.0/GstRtsp-1.0.typelib
 file path=usr/lib/girepository-1.0/GstSdp-1.0.typelib
@@ -257,40 +275,41 @@
 file path=usr/lib/gstreamer-1.0/libgstvorbis.so
 file path=usr/lib/gstreamer-1.0/libgstximagesink.so
 file path=usr/lib/gstreamer-1.0/libgstxvimagesink.so
-link path=usr/lib/libgstallocators-1.0.so target=libgstallocators-1.0.so.0.405.0
+link path=usr/lib/libgstallocators-1.0.so \
+    target=libgstallocators-1.0.so.0.1003.0
 link path=usr/lib/libgstallocators-1.0.so.0 \
-    target=libgstallocators-1.0.so.0.405.0
-file path=usr/lib/libgstallocators-1.0.so.0.405.0
-link path=usr/lib/libgstapp-1.0.so target=libgstapp-1.0.so.0.405.0
-link path=usr/lib/libgstapp-1.0.so.0 target=libgstapp-1.0.so.0.405.0
-file path=usr/lib/libgstapp-1.0.so.0.405.0
-link path=usr/lib/libgstaudio-1.0.so target=libgstaudio-1.0.so.0.405.0
-link path=usr/lib/libgstaudio-1.0.so.0 target=libgstaudio-1.0.so.0.405.0
-file path=usr/lib/libgstaudio-1.0.so.0.405.0
-link path=usr/lib/libgstfft-1.0.so target=libgstfft-1.0.so.0.405.0
-link path=usr/lib/libgstfft-1.0.so.0 target=libgstfft-1.0.so.0.405.0
-file path=usr/lib/libgstfft-1.0.so.0.405.0
-link path=usr/lib/libgstpbutils-1.0.so target=libgstpbutils-1.0.so.0.405.0
-link path=usr/lib/libgstpbutils-1.0.so.0 target=libgstpbutils-1.0.so.0.405.0
-file path=usr/lib/libgstpbutils-1.0.so.0.405.0
-link path=usr/lib/libgstriff-1.0.so target=libgstriff-1.0.so.0.405.0
-link path=usr/lib/libgstriff-1.0.so.0 target=libgstriff-1.0.so.0.405.0
-file path=usr/lib/libgstriff-1.0.so.0.405.0
-link path=usr/lib/libgstrtp-1.0.so target=libgstrtp-1.0.so.0.405.0
-link path=usr/lib/libgstrtp-1.0.so.0 target=libgstrtp-1.0.so.0.405.0
-file path=usr/lib/libgstrtp-1.0.so.0.405.0
-link path=usr/lib/libgstrtsp-1.0.so target=libgstrtsp-1.0.so.0.405.0
-link path=usr/lib/libgstrtsp-1.0.so.0 target=libgstrtsp-1.0.so.0.405.0
-file path=usr/lib/libgstrtsp-1.0.so.0.405.0
-link path=usr/lib/libgstsdp-1.0.so target=libgstsdp-1.0.so.0.405.0
-link path=usr/lib/libgstsdp-1.0.so.0 target=libgstsdp-1.0.so.0.405.0
-file path=usr/lib/libgstsdp-1.0.so.0.405.0
-link path=usr/lib/libgsttag-1.0.so target=libgsttag-1.0.so.0.405.0
-link path=usr/lib/libgsttag-1.0.so.0 target=libgsttag-1.0.so.0.405.0
-file path=usr/lib/libgsttag-1.0.so.0.405.0
-link path=usr/lib/libgstvideo-1.0.so target=libgstvideo-1.0.so.0.405.0
-link path=usr/lib/libgstvideo-1.0.so.0 target=libgstvideo-1.0.so.0.405.0
-file path=usr/lib/libgstvideo-1.0.so.0.405.0
+    target=libgstallocators-1.0.so.0.1003.0
+file path=usr/lib/libgstallocators-1.0.so.0.1003.0
+link path=usr/lib/libgstapp-1.0.so target=libgstapp-1.0.so.0.1003.0
+link path=usr/lib/libgstapp-1.0.so.0 target=libgstapp-1.0.so.0.1003.0
+file path=usr/lib/libgstapp-1.0.so.0.1003.0
+link path=usr/lib/libgstaudio-1.0.so target=libgstaudio-1.0.so.0.1003.0
+link path=usr/lib/libgstaudio-1.0.so.0 target=libgstaudio-1.0.so.0.1003.0
+file path=usr/lib/libgstaudio-1.0.so.0.1003.0
+link path=usr/lib/libgstfft-1.0.so target=libgstfft-1.0.so.0.1003.0
+link path=usr/lib/libgstfft-1.0.so.0 target=libgstfft-1.0.so.0.1003.0
+file path=usr/lib/libgstfft-1.0.so.0.1003.0
+link path=usr/lib/libgstpbutils-1.0.so target=libgstpbutils-1.0.so.0.1003.0
+link path=usr/lib/libgstpbutils-1.0.so.0 target=libgstpbutils-1.0.so.0.1003.0
+file path=usr/lib/libgstpbutils-1.0.so.0.1003.0
+link path=usr/lib/libgstriff-1.0.so target=libgstriff-1.0.so.0.1003.0
+link path=usr/lib/libgstriff-1.0.so.0 target=libgstriff-1.0.so.0.1003.0
+file path=usr/lib/libgstriff-1.0.so.0.1003.0
+link path=usr/lib/libgstrtp-1.0.so target=libgstrtp-1.0.so.0.1003.0
+link path=usr/lib/libgstrtp-1.0.so.0 target=libgstrtp-1.0.so.0.1003.0
+file path=usr/lib/libgstrtp-1.0.so.0.1003.0
+link path=usr/lib/libgstrtsp-1.0.so target=libgstrtsp-1.0.so.0.1003.0
+link path=usr/lib/libgstrtsp-1.0.so.0 target=libgstrtsp-1.0.so.0.1003.0
+file path=usr/lib/libgstrtsp-1.0.so.0.1003.0
+link path=usr/lib/libgstsdp-1.0.so target=libgstsdp-1.0.so.0.1003.0
+link path=usr/lib/libgstsdp-1.0.so.0 target=libgstsdp-1.0.so.0.1003.0
+file path=usr/lib/libgstsdp-1.0.so.0.1003.0
+link path=usr/lib/libgsttag-1.0.so target=libgsttag-1.0.so.0.1003.0
+link path=usr/lib/libgsttag-1.0.so.0 target=libgsttag-1.0.so.0.1003.0
+file path=usr/lib/libgsttag-1.0.so.0.1003.0
+link path=usr/lib/libgstvideo-1.0.so target=libgstvideo-1.0.so.0.1003.0
+link path=usr/lib/libgstvideo-1.0.so.0 target=libgstvideo-1.0.so.0.1003.0
+file path=usr/lib/libgstvideo-1.0.so.0.1003.0
 file path=usr/lib/pkgconfig/gstreamer-allocators-1.0.pc
 file path=usr/lib/pkgconfig/gstreamer-app-1.0.pc
 file path=usr/lib/pkgconfig/gstreamer-audio-1.0.pc
@@ -308,7 +327,6 @@
 file path=usr/share/gir-1.0/GstAudio-1.0.gir
 file path=usr/share/gir-1.0/GstFft-1.0.gir
 file path=usr/share/gir-1.0/GstPbutils-1.0.gir
-file path=usr/share/gir-1.0/GstRiff-1.0.gir
 file path=usr/share/gir-1.0/GstRtp-1.0.gir
 file path=usr/share/gir-1.0/GstRtsp-1.0.gir
 file path=usr/share/gir-1.0/GstSdp-1.0.gir
--- a/components/desktop/gstreamer1/gst-plugins-base/patches/02-gobject-introspection.patch	Mon Apr 17 16:38:34 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-Ultimately, this should be resolved by a proper fix for this upstream bug:
-
-  726571 should use Makefile.introspection 
-
-The patch below a simpler fix that does the minimum necessary to make
-introspection builds work.
-
---- gstreamer-1.4.5/common/m4/introspection.m4	2014-10-19 04:41:57.000000000 -0700
-+++ gstreamer-1.4.5/common/m4/introspection.m4	2015-06-02 12:37:14.807600738 -0700
[email protected]@ -49,12 +49,14 @@
-     AC_MSG_RESULT([$found_introspection])
- 
-     INTROSPECTION_SCANNER=
-+    INTROSPECTION_SCANNER_ENV=
-     INTROSPECTION_COMPILER=
-     INTROSPECTION_GENERATE=
-     INTROSPECTION_GIRDIR=
-     INTROSPECTION_TYPELIBDIR=
-     if test "x$found_introspection" = "xyes"; then
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+       INTROSPECTION_SCANNER_ENV='CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"'
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
[email protected]@ -64,6 +66,7 @@
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-     fi
-     AC_SUBST(INTROSPECTION_SCANNER)
-+    AC_SUBST(INTROSPECTION_SCANNER_ENV)
-     AC_SUBST(INTROSPECTION_COMPILER)
-     AC_SUBST(INTROSPECTION_GENERATE)
-     AC_SUBST(INTROSPECTION_GIRDIR)
---- gst-plugins-base-1.4.5/gst-libs/gst/allocators/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/allocators/Makefile.am	2015-06-04 17:12:54.478315566 -0700
[email protected]@ -25,6 +25,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstAllocators \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/app/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/app/Makefile.am	2015-06-04 17:13:35.116624781 -0700
[email protected]@ -40,6 +40,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstApp \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/audio/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/audio/Makefile.am	2015-06-04 17:12:46.980135146 -0700
[email protected]@ -86,6 +86,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstAudio \
- 		[email protected][email protected] \
- 		--warn-all \
---- gst-plugins-base-1.4.5/gst-libs/gst/fft/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/fft/Makefile.am	2015-06-04 17:12:59.675367891 -0700
[email protected]@ -54,6 +54,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstFft \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/pbutils/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/pbutils/Makefile.am	2015-06-04 17:13:07.699023960 -0700
[email protected]@ -72,6 +72,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstPbutils \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/riff/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/riff/Makefile.am	2015-06-04 17:13:21.587895211 -0700
[email protected]@ -29,6 +29,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstRiff \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/rtp/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/rtp/Makefile.am	2015-06-04 17:13:24.116265594 -0700
[email protected]@ -33,6 +33,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstRtp \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/rtsp/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/rtsp/Makefile.am	2015-06-04 17:13:31.284296511 -0700
[email protected]@ -59,6 +59,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstRtsp \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/sdp/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/sdp/Makefile.am	2015-06-04 17:13:12.307563102 -0700
[email protected]@ -22,6 +22,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstSdp \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/tag/Makefile.am	2014-10-19 04:41:04.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/tag/Makefile.am	2015-06-04 17:13:42.713830718 -0700
[email protected]@ -32,6 +32,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstTag \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gst-plugins-base-1.4.5/gst-libs/gst/video/Makefile.am	2014-10-19 04:42:54.000000000 -0700
-+++ gst-plugins-base-1.4.5/gst-libs/gst/video/Makefile.am	2015-06-04 17:13:17.312722219 -0700
[email protected]@ -88,6 +88,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstVideo \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
-
--- a/components/desktop/gstreamer1/gst-plugins-good/Makefile	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-plugins-good/Makefile	Mon Apr 17 16:05:36 2017 -0700
@@ -30,16 +30,16 @@
 include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gst-plugins-good
-COMPONENT_VERSION=	1.4.5
+COMPONENT_VERSION=	1.10.3
 COMPONENT_PROJECT_URL=	http://gstreamer.freedesktop.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH= \
-	sha256:79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641
+	sha256:4e07e93e34d4b93208f1579c21e7d91a236577b36f128a5332ffee85b4465955
 COMPONENT_ARCHIVE_URL=	http://gstreamer.freedesktop.org/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	gnome/multimedia
 COMPONENT_ANITYA_ID=	1263
 
-TPNO=			25637
+TPNO=			33710
 
 # Hook up tests after build servers are installed with dependencies
 TEST_TARGET= $(SKIP_TEST)
@@ -53,6 +53,14 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
+# Use the build area of gstreamer and gst-plugins-base
+GST_BASE = $(WS_COMPONENTS)/desktop/gstreamer1/gstreamer/build/prototype/$(MACH)
+GST_PL_BASE = $(WS_COMPONENTS)/desktop/gstreamer1/gst-plugins-base/build/prototype/$(MACH)
+PKG_CONFIG_PATHS += $(GST_BASE)$(USRLIB)/pkgconfig:$(GST_PL_BASE)$(USRLIB)/pkgconfig
+ 
+CPPFLAGS += -I$(GST_BASE)/usr/include/gstreamer-1.0 -I$(GST_PL_BASE)/usr/include/gstreamer-1.0/
+LD_OPTIONS += -L $(GST_BASE)$(USRLIB) -L $(GST_PL_BASE)$(USRLIB)
+
 CXXFLAGS += -std=c++11
 
 # configure script uses AC_CHECK_PROG erroneously; AC_CHECK_PROG looks for a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/gstreamer1/gst-plugins-good/depend.mk	Mon Apr 17 16:05:36 2017 -0700
@@ -0,0 +1,1 @@
+desktop/gstreamer1/gst-plugins-good: desktop/gstreamer1/gstreamer desktop/gstreamer1/gst-plugins-base
--- a/components/desktop/gstreamer1/gst-plugins-good/gst-plugins-good.p5m	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-plugins-good/gst-plugins-good.p5m	Mon Apr 17 16:05:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> \
@@ -36,7 +36,7 @@
     value="org.opensolaris.category.2008:System/Multimedia Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/338
+set name=org.opensolaris.arc-caseid value=PSARC/2016/338 value=PSARC/2017/033
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstaasink.so
 file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstalaw.so
--- a/components/desktop/gstreamer1/gst-plugins-good/patches/01-grep.patch	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-plugins-good/patches/01-grep.patch	Mon Apr 17 16:05:36 2017 -0700
@@ -1,7 +1,7 @@
 patched for building on Solaris.  Potentially send upstream
 
---- gst-plugins-base-1.4.5/common/m4/gst-gettext.m4	2014-07-21 01:36:35.000000000 -0700
-+++ gst-plugins-base-1.4.5/common/m4/gst-gettext.m4	2015-06-02 11:14:05.097478233 -0700
+--- gst-plugins-good-1.4.5/common/m4/gst-gettext.m4	2014-07-21 01:36:35.000000000 -0700
++++ gst-plugins-good-1.4.5/common/m4/gst-gettext.m4	2015-06-02 11:14:05.097478233 -0700
 @@ -16,7 +16,7 @@
  
    dnl make sure po/Makevars is kept in sync with GETTEXT_PACKAGE
--- a/components/desktop/gstreamer1/gst-plugins-good/patches/03-ioctl.patch	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-plugins-good/patches/03-ioctl.patch	Mon Apr 17 16:05:36 2017 -0700
@@ -78,3 +78,16 @@
  #include "gst/video/gstvideometa.h"
  
  #include "gstv4l2colorbalance.h"
+--- gst-plugins-good-1.10.3/sys/v4l2/gstv4l2videodec.c	2017-02-03 13:28:13.070331319 -0800
++++ gst-plugins-good-1.10.3/sys/v4l2/gstv4l2videodec.c	2017-02-03 13:28:36.038939534 -0800
[email protected]@ -35,6 +35,10 @@
+ #include <string.h>
+ #include <gst/gst-i18n-plugin.h>
+ 
++#ifdef HAVE_FIONREAD_IN_SYS_FILIO
++#include <sys/filio.h>
++#endif
++
+ GST_DEBUG_CATEGORY_STATIC (gst_v4l2_video_dec_debug);
+ #define GST_CAT_DEFAULT gst_v4l2_video_dec_debug
+ 
--- a/components/desktop/gstreamer1/gst-python/Makefile	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-python/Makefile	Mon Apr 17 16:05:36 2017 -0700
@@ -30,16 +30,16 @@
 include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gst-python
-COMPONENT_VERSION=	1.4.0
+COMPONENT_VERSION=	1.10.3
 COMPONENT_PROJECT_URL=	http://gstreamer.freedesktop.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH= \
-	sha256:b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e
+	sha256:bdfa2d06dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8
 COMPONENT_ARCHIVE_URL=	http://gstreamer.freedesktop.org/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	gnome/multimedia
 COMPONENT_ANITYA_ID=	3881
 
-TPNO=			24910
+TPNO=			33712
 
 # Requires pygobject-3 which is currently only built for Python 2.7
 PYTHON_VERSIONS= 2.7
@@ -53,6 +53,10 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
+# Use the build area of gstreamer
+GST_BASE = $(WS_COMPONENTS)/desktop/gstreamer1/gstreamer/build/prototype/$(MACH)
+PKG_CONFIG_PATHS += $(GST_BASE)$(USRLIB)/pkgconfig/
+
 CONFIGURE_OPTIONS += --disable-static
 
 # The build process modifies the shebang line to use the version of Python
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/gstreamer1/gst-python/depend.mk	Mon Apr 17 16:05:36 2017 -0700
@@ -0,0 +1,1 @@
+desktop/gstreamer1/gst-python: desktop/gstreamer1/gstreamer
--- a/components/desktop/gstreamer1/gst-python/gst-python-1-PYVER.p5m	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gst-python/gst-python-1-PYVER.p5m	Mon Apr 17 16:05:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -35,7 +35,7 @@
     value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/338
+set name=org.opensolaris.arc-caseid value=PSARC/2016/338 value=PSARC/2017/033
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstpythonplugin.so
 file path=usr/lib/gstreamer-1.0/libgstpythonplugin.so
--- a/components/desktop/gstreamer1/gstreamer/Makefile	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gstreamer/Makefile	Mon Apr 17 16:05:36 2017 -0700
@@ -33,17 +33,17 @@
 # newest version which has no backwards API compatibility and we likely need to
 # ship both, hence the odd name.
 COMPONENT_NAME=		gstreamer
-COMPONENT_VERSION=	1.4.5
+COMPONENT_VERSION=	1.10.3
 COMPONENT_PROJECT_URL=	http://gstreamer.freedesktop.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH= \
-	sha256:40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae
+	sha256:85b9dc1b2991f224fa90d534ec57014896c479e061dc9fa1bc16ae17cbebb63d
 COMPONENT_ARCHIVE_URL=	http://gstreamer.freedesktop.org/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	gnome/multimedia
 COMPONENT_ANITYA_ID=	1263
 
-TPNO=			25634
+TPNO=			33707
 
 # Needs gobject-introspection, not available on S11.
 ifeq ($(BUILD_TYPE), evaluation)
@@ -67,6 +67,7 @@
 # Required for other components.
 CONFIGURE_OPTIONS += --enable-introspection
 CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
+CONFIGURE_OPTIONS += --with-bash-completion-dir=/etc/bash_completion.d
 
 # The build process modifies the shebang line to use the version of Python
 # automatically found; to avoid using the current system default, one is
--- a/components/desktop/gstreamer1/gstreamer/gstreamer-1.p5m	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gstreamer/gstreamer-1.p5m	Mon Apr 17 16:05:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> \
@@ -36,13 +36,20 @@
     value="org.opensolaris.category.2008:System/Multimedia Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/338
+set name=org.opensolaris.arc-caseid value=PSARC/2016/338 value=PSARC/2017/033
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=etc/bash_completion.d/completions/gst-inspect-1.0
+file path=etc/bash_completion.d/completions/gst-launch-1.0
+file path=etc/bash_completion.d/helpers/gst
+file path=etc/bash_completion.d/helpers/gst-completion-helper-1.0
+file files/exec_attr path=etc/security/exec_attr.d/library:desktop:gstreamer-1
 file path=usr/bin/$(MACH64)/gst-inspect-1.0
 file path=usr/bin/$(MACH64)/gst-launch-1.0
+file path=usr/bin/$(MACH64)/gst-stats-1.0
 file path=usr/bin/$(MACH64)/gst-typefind-1.0
 file path=usr/bin/gst-inspect-1.0
 file path=usr/bin/gst-launch-1.0
+file path=usr/bin/gst-stats-1.0
 file path=usr/bin/gst-typefind-1.0
 file path=usr/include/gstreamer-1.0/gst/base/base.h
 file path=usr/include/gstreamer-1.0/gst/base/gstadapter.h
@@ -63,6 +70,7 @@
 file path=usr/include/gstreamer-1.0/gst/check/gstbufferstraw.h
 file path=usr/include/gstreamer-1.0/gst/check/gstcheck.h
 file path=usr/include/gstreamer-1.0/gst/check/gstconsistencychecker.h
+file path=usr/include/gstreamer-1.0/gst/check/gstharness.h
 file path=usr/include/gstreamer-1.0/gst/check/gsttestclock.h
 file path=usr/include/gstreamer-1.0/gst/check/internal-check.h
 file path=usr/include/gstreamer-1.0/gst/controller/controller.h
@@ -121,10 +129,13 @@
 file path=usr/include/gstreamer-1.0/gst/gstpluginfeature.h
 file path=usr/include/gstreamer-1.0/gst/gstpoll.h
 file path=usr/include/gstreamer-1.0/gst/gstpreset.h
+file path=usr/include/gstreamer-1.0/gst/gstprotection.h
 file path=usr/include/gstreamer-1.0/gst/gstquery.h
 file path=usr/include/gstreamer-1.0/gst/gstregistry.h
 file path=usr/include/gstreamer-1.0/gst/gstsample.h
 file path=usr/include/gstreamer-1.0/gst/gstsegment.h
+file path=usr/include/gstreamer-1.0/gst/gststreamcollection.h
+file path=usr/include/gstreamer-1.0/gst/gststreams.h
 file path=usr/include/gstreamer-1.0/gst/gststructure.h
 file path=usr/include/gstreamer-1.0/gst/gstsystemclock.h
 file path=usr/include/gstreamer-1.0/gst/gsttaglist.h
@@ -133,6 +144,9 @@
 file path=usr/include/gstreamer-1.0/gst/gsttaskpool.h
 file path=usr/include/gstreamer-1.0/gst/gsttoc.h
 file path=usr/include/gstreamer-1.0/gst/gsttocsetter.h
+file path=usr/include/gstreamer-1.0/gst/gsttracer.h
+file path=usr/include/gstreamer-1.0/gst/gsttracerfactory.h
+file path=usr/include/gstreamer-1.0/gst/gsttracerrecord.h
 file path=usr/include/gstreamer-1.0/gst/gsttypefind.h
 file path=usr/include/gstreamer-1.0/gst/gsttypefindfactory.h
 file path=usr/include/gstreamer-1.0/gst/gsturi.h
@@ -143,8 +157,10 @@
 file path=usr/include/gstreamer-1.0/gst/net/gstnet.h
 file path=usr/include/gstreamer-1.0/gst/net/gstnetaddressmeta.h
 file path=usr/include/gstreamer-1.0/gst/net/gstnetclientclock.h
+file path=usr/include/gstreamer-1.0/gst/net/gstnetcontrolmessagemeta.h
 file path=usr/include/gstreamer-1.0/gst/net/gstnettimepacket.h
 file path=usr/include/gstreamer-1.0/gst/net/gstnettimeprovider.h
+file path=usr/include/gstreamer-1.0/gst/net/gstptpclock.h
 file path=usr/include/gstreamer-1.0/gst/net/net.h
 file path=usr/lib/$(MACH64)/girepository-1.0/Gst-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/GstBase-1.0.typelib
@@ -152,27 +168,31 @@
 file path=usr/lib/$(MACH64)/girepository-1.0/GstController-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/GstNet-1.0.typelib
 file path=usr/lib/$(MACH64)/gstreamer-1.0/gst-plugin-scanner mode=0555
+file path=usr/lib/$(MACH64)/gstreamer-1.0/gst-ptp-helper mode=0555
 file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstcoreelements.so
-link path=usr/lib/$(MACH64)/libgstbase-1.0.so target=libgstbase-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstbase-1.0.so.0 target=libgstbase-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstbase-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstcheck-1.0.so target=libgstcheck-1.0.so.0.405.0
+file path=usr/lib/$(MACH64)/gstreamer-1.0/libgstcoretracers.so
+link path=usr/lib/$(MACH64)/libgstbase-1.0.so target=libgstbase-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstbase-1.0.so.0 \
+    target=libgstbase-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstbase-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstcheck-1.0.so \
+    target=libgstcheck-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstcheck-1.0.so.0 \
-    target=libgstcheck-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstcheck-1.0.so.0.405.0
+    target=libgstcheck-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstcheck-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstcontroller-1.0.so \
-    target=libgstcontroller-1.0.so.0.405.0
+    target=libgstcontroller-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstcontroller-1.0.so.0 \
-    target=libgstcontroller-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstcontroller-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstnet-1.0.so target=libgstnet-1.0.so.0.405.0
-link path=usr/lib/$(MACH64)/libgstnet-1.0.so.0 target=libgstnet-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstnet-1.0.so.0.405.0
+    target=libgstcontroller-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstcontroller-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstnet-1.0.so target=libgstnet-1.0.so.0.1003.0
+link path=usr/lib/$(MACH64)/libgstnet-1.0.so.0 target=libgstnet-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstnet-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstreamer-1.0.so \
-    target=libgstreamer-1.0.so.0.405.0
+    target=libgstreamer-1.0.so.0.1003.0
 link path=usr/lib/$(MACH64)/libgstreamer-1.0.so.0 \
-    target=libgstreamer-1.0.so.0.405.0
-file path=usr/lib/$(MACH64)/libgstreamer-1.0.so.0.405.0
+    target=libgstreamer-1.0.so.0.1003.0
+file path=usr/lib/$(MACH64)/libgstreamer-1.0.so.0.1003.0
 file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-base-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/gstreamer-check-1.0.pc
@@ -184,23 +204,26 @@
 file path=usr/lib/girepository-1.0/GstController-1.0.typelib
 file path=usr/lib/girepository-1.0/GstNet-1.0.typelib
 file path=usr/lib/gstreamer-1.0/gst-plugin-scanner mode=0555
+file path=usr/lib/gstreamer-1.0/gst-ptp-helper mode=0555
 file path=usr/lib/gstreamer-1.0/libgstcoreelements.so
-link path=usr/lib/libgstbase-1.0.so target=libgstbase-1.0.so.0.405.0
-link path=usr/lib/libgstbase-1.0.so.0 target=libgstbase-1.0.so.0.405.0
-file path=usr/lib/libgstbase-1.0.so.0.405.0
-link path=usr/lib/libgstcheck-1.0.so target=libgstcheck-1.0.so.0.405.0
-link path=usr/lib/libgstcheck-1.0.so.0 target=libgstcheck-1.0.so.0.405.0
-file path=usr/lib/libgstcheck-1.0.so.0.405.0
-link path=usr/lib/libgstcontroller-1.0.so target=libgstcontroller-1.0.so.0.405.0
+file path=usr/lib/gstreamer-1.0/libgstcoretracers.so
+link path=usr/lib/libgstbase-1.0.so target=libgstbase-1.0.so.0.1003.0
+link path=usr/lib/libgstbase-1.0.so.0 target=libgstbase-1.0.so.0.1003.0
+file path=usr/lib/libgstbase-1.0.so.0.1003.0
+link path=usr/lib/libgstcheck-1.0.so target=libgstcheck-1.0.so.0.1003.0
+link path=usr/lib/libgstcheck-1.0.so.0 target=libgstcheck-1.0.so.0.1003.0
+file path=usr/lib/libgstcheck-1.0.so.0.1003.0
+link path=usr/lib/libgstcontroller-1.0.so \
+    target=libgstcontroller-1.0.so.0.1003.0
 link path=usr/lib/libgstcontroller-1.0.so.0 \
-    target=libgstcontroller-1.0.so.0.405.0
-file path=usr/lib/libgstcontroller-1.0.so.0.405.0
-link path=usr/lib/libgstnet-1.0.so target=libgstnet-1.0.so.0.405.0
-link path=usr/lib/libgstnet-1.0.so.0 target=libgstnet-1.0.so.0.405.0
-file path=usr/lib/libgstnet-1.0.so.0.405.0
-link path=usr/lib/libgstreamer-1.0.so target=libgstreamer-1.0.so.0.405.0
-link path=usr/lib/libgstreamer-1.0.so.0 target=libgstreamer-1.0.so.0.405.0
-file path=usr/lib/libgstreamer-1.0.so.0.405.0
+    target=libgstcontroller-1.0.so.0.1003.0
+file path=usr/lib/libgstcontroller-1.0.so.0.1003.0
+link path=usr/lib/libgstnet-1.0.so target=libgstnet-1.0.so.0.1003.0
+link path=usr/lib/libgstnet-1.0.so.0 target=libgstnet-1.0.so.0.1003.0
+file path=usr/lib/libgstnet-1.0.so.0.1003.0
+link path=usr/lib/libgstreamer-1.0.so target=libgstreamer-1.0.so.0.1003.0
+link path=usr/lib/libgstreamer-1.0.so.0 target=libgstreamer-1.0.so.0.1003.0
+file path=usr/lib/libgstreamer-1.0.so.0.1003.0
 file path=usr/lib/pkgconfig/gstreamer-1.0.pc
 file path=usr/lib/pkgconfig/gstreamer-base-1.0.pc
 file path=usr/lib/pkgconfig/gstreamer-check-1.0.pc
--- a/components/desktop/gstreamer1/gstreamer/patches/02-syntax-errors.patch	Mon Apr 17 16:38:34 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-patched for building on Solaris.  Potentially applicable to be sent upstream
-
---- gstreamer-1.4.5/gst/gsturi.c	2014-07-21 01:20:56.000000000 -0700
-+++ gstreamer-1.4.5/gst/gsturi.c	2015-06-02 12:13:19.084628371 -0700
[email protected]@ -639,11 +639,11 @@
-  * Returns: the #GstURIType of the URI handler.
-  * Returns #GST_URI_UNKNOWN if the @handler isn't implemented correctly.
-  */
--guint
-+GstURIType
- gst_uri_handler_get_uri_type (GstURIHandler * handler)
- {
-   GstURIHandlerInterface *iface;
--  guint ret;
-+  GstURIType ret;
- 
-   g_return_val_if_fail (GST_IS_URI_HANDLER (handler), GST_URI_UNKNOWN);
- 
--- a/components/desktop/gstreamer1/gstreamer/patches/03-gobject-introspection.patch	Mon Apr 17 16:38:34 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-Ultimately, this should be resolved by a proper fix for this upstream bug:
-
-  726571 should use Makefile.introspection 
-
-The patch below a simpler fix that does the minimum necessary to make
-introspection builds work.
-
---- gstreamer-1.4.5/common/m4/introspection.m4	2014-10-19 04:41:57.000000000 -0700
-+++ gstreamer-1.4.5/common/m4/introspection.m4	2015-06-02 12:37:14.807600738 -0700
[email protected]@ -49,12 +49,14 @@
-     AC_MSG_RESULT([$found_introspection])
- 
-     INTROSPECTION_SCANNER=
-+    INTROSPECTION_SCANNER_ENV=
-     INTROSPECTION_COMPILER=
-     INTROSPECTION_GENERATE=
-     INTROSPECTION_GIRDIR=
-     INTROSPECTION_TYPELIBDIR=
-     if test "x$found_introspection" = "xyes"; then
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+       INTROSPECTION_SCANNER_ENV='CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"'
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
[email protected]@ -64,6 +66,7 @@
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-     fi
-     AC_SUBST(INTROSPECTION_SCANNER)
-+    AC_SUBST(INTROSPECTION_SCANNER_ENV)
-     AC_SUBST(INTROSPECTION_COMPILER)
-     AC_SUBST(INTROSPECTION_GENERATE)
-     AC_SUBST(INTROSPECTION_GIRDIR)
---- gstreamer-1.4.5/gst/Makefile.am	2014-10-19 04:41:00.000000000 -0700
-+++ gstreamer-1.4.5/gst/Makefile.am	2015-06-02 12:56:24.258153713 -0700
[email protected]@ -288,6 +288,7 @@
- 
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace Gst \
- 		[email protected][email protected] \
- 		--warn-all \
---- gstreamer-1.4.5/libs/gst/base/Makefile.am	2014-10-19 04:41:00.000000000 -0700
-+++ gstreamer-1.4.5/libs/gst/base/Makefile.am	2015-06-02 12:57:13.922191032 -0700
[email protected]@ -78,6 +78,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstBase \
- 		[email protected][email protected] \
- 		--warn-all \
---- gstreamer-1.4.5/libs/gst/check/Makefile.am	2014-10-19 04:41:47.000000000 -0700
-+++ gstreamer-1.4.5/libs/gst/check/Makefile.am	2015-06-02 12:56:45.804941977 -0700
[email protected]@ -141,6 +141,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstCheck \
- 		[email protected][email protected] \
- 		--strip-prefix=Gst \
---- gstreamer-1.4.5/libs/gst/controller/Makefile.am	2014-10-19 04:41:00.000000000 -0700
-+++ gstreamer-1.4.5/libs/gst/controller/Makefile.am	2015-06-02 12:56:54.306083740 -0700
[email protected]@ -50,6 +50,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstController \
- 		[email protected][email protected] \
- 		--warn-all \
---- gstreamer-1.4.5/libs/gst/net/Makefile.am	2014-10-19 04:41:00.000000000 -0700
-+++ gstreamer-1.4.5/libs/gst/net/Makefile.am	2015-06-02 12:57:07.788011768 -0700
[email protected]@ -49,6 +49,7 @@
- [email protected][email protected]: $(INTROSPECTION_SCANNER) [email protected][email protected]
- 	$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
- 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-+		$(INTROSPECTION_SCANNER_ENV) \
- 		$(INTROSPECTION_SCANNER) -v --namespace GstNet \
- 		--strip-prefix=Gst \
- 		--warn-all \
--- a/components/desktop/gstreamer1/gstreamer/test/results-all.master	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/gstreamer/test/results-all.master	Mon Apr 17 16:05:36 2017 -0700
@@ -10,7 +10,7 @@
 PASS: gst/gstcapsfeatures
 PASS: gst/gstcpp
 PASS: libs/gstlibscpp
-FAIL: gst/gstdatetime
+PASS: gst/gstdatetime
 PASS: gst/gstdevice
 PASS: gst/gstinfo
 PASS: gst/gstiterator
@@ -21,11 +21,15 @@
 PASS: gst/gstparamspecs
 PASS: gst/gstpipeline
 PASS: gst/gstpoll
+PASS: gst/gstprotection
+PASS: gst/gstprintf
 PASS: gst/gstsegment
 PASS: gst/gstsystemclock
 PASS: gst/gstclock
+PASS: gst/gststream
 PASS: gst/gststructure
 PASS: gst/gsttag
+PASS: gst/gsttracerrecord
 PASS: gst/gsttagsetter
 PASS: gst/gsttask
 PASS: gst/gsttoc
@@ -52,6 +56,7 @@
 PASS: gst/gstutils
 PASS: generic/sinks
 PASS: elements/capsfilter
+PASS: elements/concat
 PASS: elements/fakesink
 PASS: elements/fakesrc
 PASS: elements/fdsrc
@@ -65,6 +70,7 @@
 PASS: elements/queue
 PASS: elements/queue2
 PASS: elements/valve
+PASS: elements/streamiddemux
 PASS: libs/baseparse
 PASS: libs/basesrc
 PASS: libs/basesink
@@ -85,16 +91,18 @@
 PASS: libs/bytewriter-noinline
 PASS: libs/flowcombiner
 PASS: libs/collectpads
+PASS: libs/gstharness
 PASS: libs/gstnetclientclock
 PASS: libs/gstnettimeprovider
 PASS: libs/gsttestclock
 PASS: libs/transform1
+PASS: libs/transform2
 PASS: tools/gstinspect
-# TOTAL: 93
-# PASS:  91
+# TOTAL: 102
+# PASS:  101
 # SKIP:  0
 # XFAIL: 0
-# FAIL:  2
+# FAIL:  1
 # XPASS: 0
 # ERROR: 0
 PASS: bin
--- a/components/desktop/gstreamer1/orc/Makefile	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/orc/Makefile	Mon Apr 17 16:05:36 2017 -0700
@@ -27,16 +27,16 @@
 include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		orc
-COMPONENT_VERSION=	0.4.23
+COMPONENT_VERSION=	0.4.26
 COMPONENT_PROJECT_URL=	http://gstreamer.freedesktop.org/projects/orc.html
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH= \
-	sha256:767eaebce2941737b43368225ec54598b3055ca78b4dc50c4092f5fcdc0bdfe7
+	sha256:7d52fa80ef84988359c3434e1eea302d077a08987abdde6905678ebcad4fa649
 COMPONENT_ARCHIVE_URL=	http://gstreamer.freedesktop.org/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	gnome/multimedia
 COMPONENT_ANITYA_ID=	2573
 
-TPNO=			25774
+TPNO=			33711
 
 include $(WS_MAKE_RULES)/common.mk
 
--- a/components/desktop/gstreamer1/orc/orc.p5m	Mon Apr 17 16:38:34 2017 -0700
+++ b/components/desktop/gstreamer1/orc/orc.p5m	Mon Apr 17 16:05:36 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> \
@@ -36,7 +36,7 @@
     value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2016/338
+set name=org.opensolaris.arc-caseid value=PSARC/2016/338 value=PSARC/2017/033
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/$(MACH64)/orc-bugreport
 file path=usr/bin/$(MACH64)/orcc
@@ -78,20 +78,20 @@
 file path=usr/include/orc-0.4/orc/orcvariable.h
 file path=usr/include/orc-0.4/orc/orcx86.h
 file path=usr/include/orc-0.4/orc/orcx86insn.h
-link path=usr/lib/$(MACH64)/liborc-0.4.so target=liborc-0.4.so.0.23.0
-link path=usr/lib/$(MACH64)/liborc-0.4.so.0 target=liborc-0.4.so.0.23.0
-file path=usr/lib/$(MACH64)/liborc-0.4.so.0.23.0
-link path=usr/lib/$(MACH64)/liborc-test-0.4.so target=liborc-test-0.4.so.0.23.0
+link path=usr/lib/$(MACH64)/liborc-0.4.so target=liborc-0.4.so.0.25.0
+link path=usr/lib/$(MACH64)/liborc-0.4.so.0 target=liborc-0.4.so.0.25.0
+file path=usr/lib/$(MACH64)/liborc-0.4.so.0.25.0
+link path=usr/lib/$(MACH64)/liborc-test-0.4.so target=liborc-test-0.4.so.0.25.0
 link path=usr/lib/$(MACH64)/liborc-test-0.4.so.0 \
-    target=liborc-test-0.4.so.0.23.0
-file path=usr/lib/$(MACH64)/liborc-test-0.4.so.0.23.0
+    target=liborc-test-0.4.so.0.25.0
+file path=usr/lib/$(MACH64)/liborc-test-0.4.so.0.25.0
 file path=usr/lib/$(MACH64)/pkgconfig/orc-0.4.pc
-link path=usr/lib/liborc-0.4.so target=liborc-0.4.so.0.23.0
-link path=usr/lib/liborc-0.4.so.0 target=liborc-0.4.so.0.23.0
-file path=usr/lib/liborc-0.4.so.0.23.0
-link path=usr/lib/liborc-test-0.4.so target=liborc-test-0.4.so.0.23.0
-link path=usr/lib/liborc-test-0.4.so.0 target=liborc-test-0.4.so.0.23.0
-file path=usr/lib/liborc-test-0.4.so.0.23.0
+link path=usr/lib/liborc-0.4.so target=liborc-0.4.so.0.25.0
+link path=usr/lib/liborc-0.4.so.0 target=liborc-0.4.so.0.25.0
+file path=usr/lib/liborc-0.4.so.0.25.0
+link path=usr/lib/liborc-test-0.4.so target=liborc-test-0.4.so.0.25.0
+link path=usr/lib/liborc-test-0.4.so.0 target=liborc-test-0.4.so.0.25.0
+file path=usr/lib/liborc-test-0.4.so.0.25.0
 file path=usr/lib/pkgconfig/orc-0.4.pc
 file path=usr/share/aclocal/orc.m4
 license COPYING license="BSD-like (Orc)"