--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/clutter/Makefile	Tue Jul 12 13:06:47 2016 +0000
@@ -0,0 +1,113 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =            32_and_64
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		clutter
+COMPONENT_VERSION=	1.24.0
+COMPONENT_PROJECT_URL=	http://www.clutter-project.org/
+COMPONENT_ARCHIVE_HASH=	\
+	sha256:85c87d5745b97af7633776419a47421aae7cea66c1b870f88cc5e06a4c5626e6
+COMPONENT_BUGDB=        library/clutter
+
+TPNO=			24625
+
+# Requires cogl modules - disable till we get the fixed cogl on build servers
+TEST_TARGET = $(SKIP_TEST)
+
+# Needs gobject-introspection, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Uses gcc extensions for void returns.
+CFLAGS.studio += $(studio_FEATURES_EXTENSIONS)
+
+CONFIGURE_OPTIONS += --disable-static
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --enable-shared
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-gdk-backend
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-gdk-pixbuf
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-x11-backend
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-xinput
+CONFIGURE_OPTIONS += --with-pic
+CONFIGURE_OPTIONS += --with-x
+
+# Delete this when build servers are installed with an updated cogl
+COGL_BASE = $(WS_COMPONENTS)/gnome/cogl/build/prototype/$(MACH)
+PKG_CONFIG_PATHS.32 += $(COGL_BASE)/usr/lib/pkgconfig/
+PKG_CONFIG_PATHS.64 += $(COGL_BASE)/usr/lib/$(MACH64)/pkgconfig/
+PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
+
+LD_OPTIONS.32 += -L $(COGL_BASE)/usr/lib 
+LD_OPTIONS.64 += -L $(COGL_BASE)/usr/lib/$(MACH64) 
+LD_OPTIONS += $(LD_OPTIONS.$(BITS))
+
+CPPFLAGS += -I$(COGL_BASE)/usr/include/cogl
+
+COMPONENT_BUILD_ENV  += \
+	XDG_DATA_DIRS="$(COGL_BASE)/usr/share/:/usr/share/" 
+
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_32="$(COGL_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_32)/clutter/.libs"
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_64="$(COGL_BASE)$(USRLIB.$(BITS)):$(BUILD_DIR_64)/clutter/.libs"
+
+# Work around pkgdepend bug which doesn't resolve dependencies from
+# the local workspace repo. - 15708323
+DEPENDED += $(WS_TOP)/components/gnome/cogl/build/manifest-$(MACH)-cogl.depend
+
+# Temporary until dependencies are all on build machines
+REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../cogl/Makefile)
+#end Delete
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/desktop/atk
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/graphics/cogl
+REQUIRED_PACKAGES += library/json-glib
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcomposite
+REQUIRED_PACKAGES += x11/library/libxdamage
+REQUIRED_PACKAGES += x11/library/libxi

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/clutter/clutter.p5m	Tue Jul 12 13:06:47 2016 +0000
@@ -0,0 +1,275 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/library/desktop/clutter@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A software library for creating fast, compelling, portable, and dynamic graphical user interfaces"
+set name=pkg.description \
+    value="Clutter is an open source (LGPL 2.1) software library for creating fast, compelling, portable, and dynamic graphical user interfaces. It is a core part of Gnome3, it is used by the GnomeShell, and is supported by the open source community. Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use on mobile and embedded platforms), but wraps an easy to use, efficient, flexible API around GL's complexity. Clutter enforces no particular user interface style, but provides a rich, generic foundation for higher-level toolkits tailored to specific needs."
+set name=com.oracle.info.description value=$(COMPONENT_NAME)
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    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/396
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/clutter-1.0/cally/cally-actor.h
+file path=usr/include/clutter-1.0/cally/cally-clone.h
+file path=usr/include/clutter-1.0/cally/cally-factory.h
+file path=usr/include/clutter-1.0/cally/cally-group.h
+file path=usr/include/clutter-1.0/cally/cally-main.h
+file path=usr/include/clutter-1.0/cally/cally-rectangle.h
+file path=usr/include/clutter-1.0/cally/cally-root.h
+file path=usr/include/clutter-1.0/cally/cally-stage.h
+file path=usr/include/clutter-1.0/cally/cally-text.h
+file path=usr/include/clutter-1.0/cally/cally-texture.h
+file path=usr/include/clutter-1.0/cally/cally-util.h
+file path=usr/include/clutter-1.0/cally/cally.h
+file path=usr/include/clutter-1.0/clutter/clutter-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-actor-meta.h
+file path=usr/include/clutter-1.0/clutter/clutter-actor.h
+file path=usr/include/clutter-1.0/clutter/clutter-align-constraint.h
+file path=usr/include/clutter-1.0/clutter/clutter-animatable.h
+file path=usr/include/clutter-1.0/clutter/clutter-autocleanups.h
+file path=usr/include/clutter-1.0/clutter/clutter-backend.h
+file path=usr/include/clutter-1.0/clutter/clutter-bin-layout.h
+file path=usr/include/clutter-1.0/clutter/clutter-bind-constraint.h
+file path=usr/include/clutter-1.0/clutter/clutter-binding-pool.h
+file path=usr/include/clutter-1.0/clutter/clutter-blur-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-box-layout.h
+file path=usr/include/clutter-1.0/clutter/clutter-brightness-contrast-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-cairo.h
+file path=usr/include/clutter-1.0/clutter/clutter-canvas.h
+file path=usr/include/clutter-1.0/clutter/clutter-child-meta.h
+file path=usr/include/clutter-1.0/clutter/clutter-click-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-clone.h
+file path=usr/include/clutter-1.0/clutter/clutter-cogl-compat.h
+file path=usr/include/clutter-1.0/clutter/clutter-color-static.h
+file path=usr/include/clutter-1.0/clutter/clutter-color.h
+file path=usr/include/clutter-1.0/clutter/clutter-colorize-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-config.h
+file path=usr/include/clutter-1.0/clutter/clutter-constraint.h
+file path=usr/include/clutter-1.0/clutter/clutter-container.h
+file path=usr/include/clutter-1.0/clutter/clutter-content.h
+file path=usr/include/clutter-1.0/clutter/clutter-deform-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-deprecated.h
+file path=usr/include/clutter-1.0/clutter/clutter-desaturate-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-device-manager.h
+file path=usr/include/clutter-1.0/clutter/clutter-drag-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-drop-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-enum-types.h
+file path=usr/include/clutter-1.0/clutter/clutter-enums.h
+file path=usr/include/clutter-1.0/clutter/clutter-event.h
+file path=usr/include/clutter-1.0/clutter/clutter-feature.h
+file path=usr/include/clutter-1.0/clutter/clutter-fixed-layout.h
+file path=usr/include/clutter-1.0/clutter/clutter-flow-layout.h
+file path=usr/include/clutter-1.0/clutter/clutter-gesture-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-grid-layout.h
+file path=usr/include/clutter-1.0/clutter/clutter-group.h
+file path=usr/include/clutter-1.0/clutter/clutter-image.h
+file path=usr/include/clutter-1.0/clutter/clutter-input-device.h
+file path=usr/include/clutter-1.0/clutter/clutter-interval.h
+file path=usr/include/clutter-1.0/clutter/clutter-keyframe-transition.h
+file path=usr/include/clutter-1.0/clutter/clutter-keysyms.h
+file path=usr/include/clutter-1.0/clutter/clutter-layout-manager.h
+file path=usr/include/clutter-1.0/clutter/clutter-layout-meta.h
+file path=usr/include/clutter-1.0/clutter/clutter-macros.h
+file path=usr/include/clutter-1.0/clutter/clutter-main.h
+file path=usr/include/clutter-1.0/clutter/clutter-marshal.h
+file path=usr/include/clutter-1.0/clutter/clutter-offscreen-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-page-turn-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-paint-node.h
+file path=usr/include/clutter-1.0/clutter/clutter-paint-nodes.h
+file path=usr/include/clutter-1.0/clutter/clutter-pan-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-path-constraint.h
+file path=usr/include/clutter-1.0/clutter/clutter-path.h
+file path=usr/include/clutter-1.0/clutter/clutter-property-transition.h
+file path=usr/include/clutter-1.0/clutter/clutter-rotate-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-script.h
+file path=usr/include/clutter-1.0/clutter/clutter-scriptable.h
+file path=usr/include/clutter-1.0/clutter/clutter-scroll-actor.h
+file path=usr/include/clutter-1.0/clutter/clutter-settings.h
+file path=usr/include/clutter-1.0/clutter/clutter-shader-effect.h
+file path=usr/include/clutter-1.0/clutter/clutter-shader-types.h
+file path=usr/include/clutter-1.0/clutter/clutter-snap-constraint.h
+file path=usr/include/clutter-1.0/clutter/clutter-stage-manager.h
+file path=usr/include/clutter-1.0/clutter/clutter-stage.h
+file path=usr/include/clutter-1.0/clutter/clutter-swipe-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-tap-action.h
+file path=usr/include/clutter-1.0/clutter/clutter-test-utils.h
+file path=usr/include/clutter-1.0/clutter/clutter-text-buffer.h
+file path=usr/include/clutter-1.0/clutter/clutter-text.h
+file path=usr/include/clutter-1.0/clutter/clutter-texture.h
+file path=usr/include/clutter-1.0/clutter/clutter-timeline.h
+file path=usr/include/clutter-1.0/clutter/clutter-transition-group.h
+file path=usr/include/clutter-1.0/clutter/clutter-transition.h
+file path=usr/include/clutter-1.0/clutter/clutter-types.h
+file path=usr/include/clutter-1.0/clutter/clutter-units.h
+file path=usr/include/clutter-1.0/clutter/clutter-version.h
+file path=usr/include/clutter-1.0/clutter/clutter-zoom-action.h
+file path=usr/include/clutter-1.0/clutter/clutter.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-actor.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-alpha.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-animatable.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-animation.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-animator.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-backend.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-behaviour-depth.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-behaviour-ellipse.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-behaviour-opacity.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-behaviour-path.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-behaviour-rotate.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-behaviour-scale.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-behaviour.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-bin-layout.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-box.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-cairo-texture.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-container.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-fixed.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-frame-source.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-group.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-input-device.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-keysyms.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-list-model.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-main.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-media.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-model.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-rectangle.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-score.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-shader.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-stage-manager.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-stage.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-state.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-table-layout.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-texture.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-timeline.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-timeout-pool.h
+file path=usr/include/clutter-1.0/clutter/deprecated/clutter-util.h
+file path=usr/include/clutter-1.0/clutter/gdk/clutter-gdk.h
+file path=usr/include/clutter-1.0/clutter/glx/clutter-glx-texture-pixmap.h
+file path=usr/include/clutter-1.0/clutter/glx/clutter-glx.h
+file path=usr/include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h
+file path=usr/include/clutter-1.0/clutter/x11/clutter-x11.h
+file path=usr/lib/$(MACH64)/girepository-1.0/Cally-1.0.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/Clutter-1.0.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/ClutterGdk-1.0.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/ClutterX11-1.0.typelib
+link path=usr/lib/$(MACH64)/libclutter-1.0.so target=libclutter-1.0.so.0.2400.0
+link path=usr/lib/$(MACH64)/libclutter-1.0.so.0 \
+    target=libclutter-1.0.so.0.2400.0
+file path=usr/lib/$(MACH64)/libclutter-1.0.so.0.2400.0
+link path=usr/lib/$(MACH64)/libclutter-glx-1.0.so \
+    target=libclutter-1.0.so.0.2400.0
+link path=usr/lib/$(MACH64)/libclutter-glx-1.0.so.0 \
+    target=libclutter-1.0.so.0.2400.0
+file path=usr/lib/$(MACH64)/pkgconfig/cally-1.0.pc
+file path=usr/lib/$(MACH64)/pkgconfig/clutter-1.0.pc
+file path=usr/lib/$(MACH64)/pkgconfig/clutter-cogl-1.0.pc
+file path=usr/lib/$(MACH64)/pkgconfig/clutter-gdk-1.0.pc
+file path=usr/lib/$(MACH64)/pkgconfig/clutter-glx-1.0.pc
+file path=usr/lib/$(MACH64)/pkgconfig/clutter-x11-1.0.pc
+file path=usr/lib/girepository-1.0/Cally-1.0.typelib
+file path=usr/lib/girepository-1.0/Clutter-1.0.typelib
+file path=usr/lib/girepository-1.0/ClutterGdk-1.0.typelib
+file path=usr/lib/girepository-1.0/ClutterX11-1.0.typelib
+link path=usr/lib/libclutter-1.0.so target=libclutter-1.0.so.0.2400.0
+link path=usr/lib/libclutter-1.0.so.0 target=libclutter-1.0.so.0.2400.0
+file path=usr/lib/libclutter-1.0.so.0.2400.0
+link path=usr/lib/libclutter-glx-1.0.so target=libclutter-1.0.so.0.2400.0
+link path=usr/lib/libclutter-glx-1.0.so.0 target=libclutter-1.0.so.0.2400.0
+file path=usr/lib/pkgconfig/cally-1.0.pc
+file path=usr/lib/pkgconfig/clutter-1.0.pc
+file path=usr/lib/pkgconfig/clutter-cogl-1.0.pc
+file path=usr/lib/pkgconfig/clutter-gdk-1.0.pc
+file path=usr/lib/pkgconfig/clutter-glx-1.0.pc
+file path=usr/lib/pkgconfig/clutter-x11-1.0.pc
+file path=usr/share/gir-1.0/Cally-1.0.gir
+file path=usr/share/gir-1.0/Clutter-1.0.gir
+file path=usr/share/gir-1.0/ClutterGdk-1.0.gir
+file path=usr/share/gir-1.0/ClutterX11-1.0.gir
+file path=usr/share/locale/an/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ar/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/as/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ast/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/az_IR/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/be/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/bg/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/bs/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ca/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/cs/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/da/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/de/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/el/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/eo/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/es/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/eu/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/fa/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/fi/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/fr/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/gl/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/he/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/hi/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/hu/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/id/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/it/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ja/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/kk/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/km/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/kn/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ko/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/lt/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/lv/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/mk/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ml/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/nb/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/nl/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/or/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/pa/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/pl/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ps/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/pt/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ro/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ru/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/sk/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/sl/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/sr/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/sv/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ta/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/te/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/tr/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ug/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/uk/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/ur/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/yi/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/clutter-1.0.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/clutter-1.0.mo
+license COPYING license=LGPLv2.1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/clutter/depend.mk	Tue Jul 12 13:06:47 2016 +0000
@@ -0,0 +1,1 @@
+gnome/clutter: gnome/cogl

--- a/components/gnome/cogl/Makefile	Fri Jul 08 15:55:02 2016 +0000
+++ b/components/gnome/cogl/Makefile	Tue Jul 12 13:06:47 2016 +0000
@@ -50,23 +50,6 @@
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
-# Delete this when build servers are installed with an updated versions of
-# gst-plugins-base
-GST_BASE = $(WS_COMPONENTS)/desktop/gstreamer1/gst-plugins-base/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(GST_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(GST_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-CPPFLAGS += -I$(GST_BASE)/usr/include/gstreamer-1.0
-LD_OPTIONS.32 += -L $(GST_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(GST_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-DEPENDED += $(WS_TOP)/components/desktop/gstreamer1/gst-plugins-base/build/manifest-$(MACH)-gst-plugins-base.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../../desktop/gstreamer1/gst-plugins-base/Makefile)
-# end Delete
-
 CONFIGURE_OPTION += --disable-static
 # Required for other components.
 CONFIGURE_OPTIONS += --enable-glib

--- a/components/gnome/cogl/cogl.p5m	Fri Jul 08 15:55:02 2016 +0000
+++ b/components/gnome/cogl/cogl.p5m	Tue Jul 12 13:06:47 2016 +0000
@@ -132,7 +132,7 @@
 file path=usr/include/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
 file path=usr/include/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
 file path=usr/include/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
-#file path=usr/lib/$(MACH64)/girepository-1.0/Cogl-1.0.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/Cogl-1.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/Cogl-2.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/CoglGst-2.0.typelib
 file path=usr/lib/$(MACH64)/girepository-1.0/CoglPango-1.0.typelib
@@ -150,16 +150,16 @@
 link path=usr/lib/$(MACH64)/libcogl.so target=libcogl.so.20.4.1
 link path=usr/lib/$(MACH64)/libcogl.so.20 target=libcogl.so.20.4.1
 file path=usr/lib/$(MACH64)/libcogl.so.20.4.1
-#file path=usr/lib/$(MACH64)/pkgconfig/cogl-1.0.pc
+file path=usr/lib/$(MACH64)/pkgconfig/cogl-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/cogl-2.0-experimental.pc
-#file path=usr/lib/$(MACH64)/pkgconfig/cogl-gl-1.0.pc
+file path=usr/lib/$(MACH64)/pkgconfig/cogl-gl-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/cogl-gst-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/cogl-gst-2.0-experimental.pc
 file path=usr/lib/$(MACH64)/pkgconfig/cogl-pango-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/cogl-pango-2.0-experimental.pc
 file path=usr/lib/$(MACH64)/pkgconfig/cogl-path-1.0.pc
 file path=usr/lib/$(MACH64)/pkgconfig/cogl-path-2.0-experimental.pc
-#file path=usr/lib/girepository-1.0/Cogl-1.0.typelib
+file path=usr/lib/girepository-1.0/Cogl-1.0.typelib
 file path=usr/lib/girepository-1.0/Cogl-2.0.typelib
 file path=usr/lib/girepository-1.0/CoglGst-2.0.typelib
 file path=usr/lib/girepository-1.0/CoglPango-1.0.typelib
@@ -177,9 +177,9 @@
 link path=usr/lib/libcogl.so target=libcogl.so.20.4.1
 link path=usr/lib/libcogl.so.20 target=libcogl.so.20.4.1
 file path=usr/lib/libcogl.so.20.4.1
-#file path=usr/lib/pkgconfig/cogl-1.0.pc
+file path=usr/lib/pkgconfig/cogl-1.0.pc
 file path=usr/lib/pkgconfig/cogl-2.0-experimental.pc
-#file path=usr/lib/pkgconfig/cogl-gl-1.0.pc
+file path=usr/lib/pkgconfig/cogl-gl-1.0.pc
 file path=usr/lib/pkgconfig/cogl-gst-1.0.pc
 file path=usr/lib/pkgconfig/cogl-gst-2.0-experimental.pc
 file path=usr/lib/pkgconfig/cogl-pango-1.0.pc
@@ -187,7 +187,7 @@
 file path=usr/lib/pkgconfig/cogl-path-1.0.pc
 file path=usr/lib/pkgconfig/cogl-path-2.0-experimental.pc
 file path=usr/share/cogl/examples-data/crate.jpg
-#file path=usr/share/gir-1.0/Cogl-1.0.gir
+file path=usr/share/gir-1.0/Cogl-1.0.gir
 file path=usr/share/gir-1.0/Cogl-2.0.gir
 file path=usr/share/gir-1.0/CoglGst-2.0.gir
 file path=usr/share/gir-1.0/CoglPango-1.0.gir
@@ -248,3 +248,6 @@
 file path=usr/share/locale/zh_HK/LC_MESSAGES/cogl.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/cogl.mo
 license COPYING license=COGL
+# Avoid collisions with older versions of clutter package which
+# delivered the Cogl-1.0.pc files now found in this package.
+depend type=optional fmri=library/desktop/[email protected]

--- a/components/gnome/cogl/depend.mk	Fri Jul 08 15:55:02 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/cogl: desktop/gstreamer1/gst-plugins-base

--- a/components/meta-packages/incorporation-cache	Fri Jul 08 15:55:02 2016 +0000
+++ b/components/meta-packages/incorporation-cache	Tue Jul 12 13:06:47 2016 +0000
@@ -62,9 +62,6 @@
 consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/clutter/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/clutter/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]