Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23245642 Deliver grilo 0.2.14 in Solaris
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Thu, 30 Jun 2016 12:31:19 +0000
changeset 6338 79adef6ce508
parent 6337 04b0a94159cf
child 6339 4f4066ccad14
23245642 Deliver grilo 0.2.14 in Solaris PSARC/2016/405 GNOME 3 Multi-Media Bundle
components/gnome/grilo/Makefile file | annotate | diff | comparison | revisions
components/gnome/grilo/depend.mk file | annotate | diff | comparison | revisions
components/gnome/grilo/grilo.p5m file | annotate | diff | comparison | revisions
components/gnome/grilo/patches/01-gcc-format-warning.patch file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/grilo/Makefile	Thu Jun 30 12:31:19 2016 +0000
@@ -0,0 +1,96 @@
+#
+# 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 =            64_and_32
+# 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=		grilo
+COMPONENT_VERSION=	0.2.14
+COMPONENT_ARCHIVE_HASH= \
+	sha256:79c82ea1747ae7430a648aa9660e44d88d48c968bcdaeb3b2c5cb97e1c921ccd
+COMPONENT_BUGDB=        gnome/multimedia
+
+TPNO=			25361
+
+# Tests don't seem to do anything - 23712784
+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
+
+# Assumes GNU xgettext in PATH
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+CONFIGURE_OPTIONS += --disable-debug
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --enable-gtk-doc
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --enable-grl-net
+CONFIGURE_OPTIONS += --enable-grl-pls
+CONFIGURE_OPTIONS += --enable-shared
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-vala
+CONFIGURE_OPTIONS += --with-pic
+
+# Delete when build servers are installed with an updated totem-pl-parser
+TPP_BASE = $(WS_COMPONENTS)/gnome/totem-pl-parser/build/prototype/$(MACH)
+PKG_CONFIG_PATHS.32 += $(TPP_BASE)/usr/lib/pkgconfig/
+PKG_CONFIG_PATHS.64 += $(TPP_BASE)/usr/lib/$(MACH64)/pkgconfig/
+PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
+
+LD_OPTIONS.32 += -L $(TPP_BASE)/usr/lib
+LD_OPTIONS.64 += -L $(TPP_BASE)/usr/lib/$(MACH64)
+LD_OPTIONS += $(LD_OPTIONS.$(BITS))
+
+CONFIGURE_ENV += TOTEM_PL_PARSER_CFLAGS="-I$(TPP_BASE)/usr/include/totem-pl-parser/1/plparser"
+
+# Work around pkgdepend bug which doesn't resolve dependencies from
+# the local workspace repo.
+DEPENDED += $(WS_TOP)/components/gnome/totem-pl-parser/build/manifest-$(MACH)-totem-pl-parser.depend
+
+# Temporary until dependencies are all on build machines
+REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../totem-pl-parser/Makefile)
+#end Delete
+
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += developer/vala
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libsoup
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/media-player/totem-pl-parser
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/grilo/depend.mk	Thu Jun 30 12:31:19 2016 +0000
@@ -0,0 +1,1 @@
+gnome/grilo: gnome/totem-pl-parser
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/grilo/grilo.p5m	Thu Jun 30 12:31:19 2016 +0000
@@ -0,0 +1,201 @@
+#
+# 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/grilo@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A framework focused on making media discovery and browsing easy for application developers"
+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/405
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/grl-inspect-0.2
+file path=usr/bin/grl-launch-0.2
+file path=usr/include/grilo-0.2/grilo.h
+file path=usr/include/grilo-0.2/grl-caps.h
+file path=usr/include/grilo-0.2/grl-config.h
+file path=usr/include/grilo-0.2/grl-data.h
+file path=usr/include/grilo-0.2/grl-definitions.h
+file path=usr/include/grilo-0.2/grl-error.h
+file path=usr/include/grilo-0.2/grl-log.h
+file path=usr/include/grilo-0.2/grl-media-audio.h
+file path=usr/include/grilo-0.2/grl-media-box.h
+file path=usr/include/grilo-0.2/grl-media-image.h
+file path=usr/include/grilo-0.2/grl-media-video.h
+file path=usr/include/grilo-0.2/grl-media.h
+file path=usr/include/grilo-0.2/grl-metadata-key.h
+file path=usr/include/grilo-0.2/grl-multiple.h
+file path=usr/include/grilo-0.2/grl-operation-options.h
+file path=usr/include/grilo-0.2/grl-operation.h
+file path=usr/include/grilo-0.2/grl-plugin.h
+file path=usr/include/grilo-0.2/grl-range-value.h
+file path=usr/include/grilo-0.2/grl-registry.h
+file path=usr/include/grilo-0.2/grl-related-keys.h
+file path=usr/include/grilo-0.2/grl-source.h
+file path=usr/include/grilo-0.2/grl-util.h
+file path=usr/include/grilo-0.2/grl-value-helper.h
+file path=usr/include/grilo-0.2/net/grl-net-wc.h
+file path=usr/include/grilo-0.2/net/grl-net.h
+file path=usr/include/grilo-0.2/pls/grl-pls.h
+file path=usr/lib/$(MACH64)/girepository-1.0/Grl-0.2.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/GrlNet-0.2.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/GrlPls-0.2.typelib
+link path=usr/lib/$(MACH64)/libgrilo-0.2.so target=libgrilo-0.2.so.1.9.0
+link path=usr/lib/$(MACH64)/libgrilo-0.2.so.1 target=libgrilo-0.2.so.1.9.0
+file path=usr/lib/$(MACH64)/libgrilo-0.2.so.1.9.0
+link path=usr/lib/$(MACH64)/libgrlnet-0.2.so target=libgrlnet-0.2.so.0.1.9
+link path=usr/lib/$(MACH64)/libgrlnet-0.2.so.0 target=libgrlnet-0.2.so.0.1.9
+file path=usr/lib/$(MACH64)/libgrlnet-0.2.so.0.1.9
+link path=usr/lib/$(MACH64)/libgrlpls-0.2.so target=libgrlpls-0.2.so.0.0.5
+link path=usr/lib/$(MACH64)/libgrlpls-0.2.so.0 target=libgrlpls-0.2.so.0.0.5
+file path=usr/lib/$(MACH64)/libgrlpls-0.2.so.0.0.5
+file path=usr/lib/$(MACH64)/pkgconfig/grilo-0.2.pc
+file path=usr/lib/$(MACH64)/pkgconfig/grilo-net-0.2.pc
+file path=usr/lib/$(MACH64)/pkgconfig/grilo-pls-0.2.pc
+file path=usr/lib/girepository-1.0/Grl-0.2.typelib
+file path=usr/lib/girepository-1.0/GrlNet-0.2.typelib
+file path=usr/lib/girepository-1.0/GrlPls-0.2.typelib
+link path=usr/lib/libgrilo-0.2.so target=libgrilo-0.2.so.1.9.0
+link path=usr/lib/libgrilo-0.2.so.1 target=libgrilo-0.2.so.1.9.0
+file path=usr/lib/libgrilo-0.2.so.1.9.0
+link path=usr/lib/libgrlnet-0.2.so target=libgrlnet-0.2.so.0.1.9
+link path=usr/lib/libgrlnet-0.2.so.0 target=libgrlnet-0.2.so.0.1.9
+file path=usr/lib/libgrlnet-0.2.so.0.1.9
+link path=usr/lib/libgrlpls-0.2.so target=libgrlpls-0.2.so.0.0.5
+link path=usr/lib/libgrlpls-0.2.so.0 target=libgrlpls-0.2.so.0.0.5
+file path=usr/lib/libgrlpls-0.2.so.0.0.5
+file path=usr/lib/pkgconfig/grilo-0.2.pc
+file path=usr/lib/pkgconfig/grilo-net-0.2.pc
+file path=usr/lib/pkgconfig/grilo-pls-0.2.pc
+file path=usr/share/gir-1.0/Grl-0.2.gir
+file path=usr/share/gir-1.0/GrlNet-0.2.gir
+file path=usr/share/gir-1.0/GrlPls-0.2.gir
+file path=usr/share/gtk-doc/html/grilo/GrlCaps.html
+file path=usr/share/gtk-doc/html/grilo/GrlConfig.html
+file path=usr/share/gtk-doc/html/grilo/GrlData.html
+file path=usr/share/gtk-doc/html/grilo/GrlMedia.html
+file path=usr/share/gtk-doc/html/grilo/GrlMediaAudio.html
+file path=usr/share/gtk-doc/html/grilo/GrlMediaBox.html
+file path=usr/share/gtk-doc/html/grilo/GrlMediaImage.html
+file path=usr/share/gtk-doc/html/grilo/GrlMediaVideo.html
+file path=usr/share/gtk-doc/html/grilo/GrlOperationOptions.html
+file path=usr/share/gtk-doc/html/grilo/GrlPlugin.html
+file path=usr/share/gtk-doc/html/grilo/GrlRegistry.html
+file path=usr/share/gtk-doc/html/grilo/GrlRelatedKeys.html
+file path=usr/share/gtk-doc/html/grilo/GrlSource.html
+file path=usr/share/gtk-doc/html/grilo/annotation-glossary.html
+file path=usr/share/gtk-doc/html/grilo/api-index-full.html
+file path=usr/share/gtk-doc/html/grilo/caps-options.html
+file path=usr/share/gtk-doc/html/grilo/ch01.html
+file path=usr/share/gtk-doc/html/grilo/ch02.html
+file path=usr/share/gtk-doc/html/grilo/ch03.html
+file path=usr/share/gtk-doc/html/grilo/ch04.html
+file path=usr/share/gtk-doc/html/grilo/configure.html
+file path=usr/share/gtk-doc/html/grilo/data.html
+file path=usr/share/gtk-doc/html/grilo/deprecated-api-index.html
+file path=usr/share/gtk-doc/html/grilo/grilo-GrlNetWc.html
+file path=usr/share/gtk-doc/html/grilo/grilo-GrlPls.html
+file path=usr/share/gtk-doc/html/grilo/grilo-Multiple.html
+file path=usr/share/gtk-doc/html/grilo/grilo-grilo.html
+file path=usr/share/gtk-doc/html/grilo/grilo-grl-definitions.html
+file path=usr/share/gtk-doc/html/grilo/grilo-grl-error.html
+file path=usr/share/gtk-doc/html/grilo/grilo-grl-log.html
+file path=usr/share/gtk-doc/html/grilo/grilo-grl-metadata-key.html
+file path=usr/share/gtk-doc/html/grilo/grilo-grl-operation.html
+file path=usr/share/gtk-doc/html/grilo/grilo-grl-util.html
+file path=usr/share/gtk-doc/html/grilo/grilo-net.html
+file path=usr/share/gtk-doc/html/grilo/grilo-pls.html
+file path=usr/share/gtk-doc/html/grilo/grilo.devhelp2
+file path=usr/share/gtk-doc/html/grilo/home.png
+file path=usr/share/gtk-doc/html/grilo/index.html
+file path=usr/share/gtk-doc/html/grilo/index.sgml
+file path=usr/share/gtk-doc/html/grilo/left-insensitive.png
+file path=usr/share/gtk-doc/html/grilo/left.png
+file path=usr/share/gtk-doc/html/grilo/misc.html
+file path=usr/share/gtk-doc/html/grilo/multiple.html
+file path=usr/share/gtk-doc/html/grilo/plugin-management.html
+file path=usr/share/gtk-doc/html/grilo/pr01.html
+file path=usr/share/gtk-doc/html/grilo/right-insensitive.png
+file path=usr/share/gtk-doc/html/grilo/right.png
+file path=usr/share/gtk-doc/html/grilo/rn01.html
+file path=usr/share/gtk-doc/html/grilo/rn02.html
+file path=usr/share/gtk-doc/html/grilo/rn03.html
+file path=usr/share/gtk-doc/html/grilo/rn04.html
+file path=usr/share/gtk-doc/html/grilo/sources.html
+file path=usr/share/gtk-doc/html/grilo/style.css
+file path=usr/share/gtk-doc/html/grilo/up-insensitive.png
+file path=usr/share/gtk-doc/html/grilo/up.png
+file path=usr/share/locale/as/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/ca/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/cs/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/da/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/de/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/el/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/eo/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/es/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/eu/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/fr/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/gl/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/he/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/hu/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/id/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/it/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/ja/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/ko/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/lt/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/lv/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/ml/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/nb/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/pa/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/pl/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/pt/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/ru/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/sk/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/sl/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/sr/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/sv/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/tg/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/tr/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/uk/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/grilo.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/grilo.mo
+file path=usr/share/man/man1/grilo-test-ui-0.2.1
+file path=usr/share/man/man1/grl-inspect-0.2.1
+file path=usr/share/man/man1/grl-launch-0.2.1
+file path=usr/share/vala/vapi/grilo-0.2.deps
+file path=usr/share/vala/vapi/grilo-0.2.vapi
+file path=usr/share/vala/vapi/grilo-net-0.2.deps
+file path=usr/share/vala/vapi/grilo-net-0.2.vapi
+license COPYING license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/grilo/patches/01-gcc-format-warning.patch	Thu Jun 30 12:31:19 2016 +0000
@@ -0,0 +1,16 @@
+getpid() returns pid_t; format strings expected unsigned int.  gcc builds
+fail without this change.
+
+XXX file upstream bug; patch may not be correct solution
+
+--- grilo-0.2.12/libs/net/grl-net-wc.c	2014-11-18 10:47:05.000000000 -0800
++++ grilo-0.2.12/libs/net/grl-net-wc.c	2015-07-09 09:39:48.083811259 -0700
+@@ -545,7 +545,7 @@
+ 
+   /* Append record about the just written file to "grl-net-mock-data-%PID.ini"
+    * in the capture directory. */
+-  char *filename = g_strdup_printf ("grl-net-mock-data-%u.ini", getpid());
++  char *filename = g_strdup_printf ("grl-net-mock-data-%u.ini", (unsigned int) getpid());
+   path = g_build_filename (capture_dir, filename, NULL);
+   g_free (filename);
+
upstream/oracle/userland-gate