# HG changeset patch # User Jay Cotton # Date 1473212100 25200 # Node ID b9a930b724d23d72adb5915bbea1eef047da29a7 # Parent 8e4786e2191049ac6fd0566405915c8091a41824 23245483 Move libvorbis 1.3.3 to Userland PSARC/2010/143 GNOME 2.30 PSARC/2016/514 ogg-vorbis package split diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/firefox/Makefile --- a/components/desktop/firefox/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/desktop/firefox/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -183,6 +183,9 @@ system-test: $(NO_TESTS) +REQUIRED_PACKAGES += codec/libogg +REQUIRED_PACKAGES += codec/libvorbis +REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += database/sqlite-3 REQUIRED_PACKAGES += library/desktop/atk REQUIRED_PACKAGES += library/desktop/cairo diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/firefox/firefox.p5m --- a/components/desktop/firefox/firefox.p5m Sat Sep 03 22:01:54 2016 -0700 +++ b/components/desktop/firefox/firefox.p5m Tue Sep 06 18:35:00 2016 -0700 @@ -165,6 +165,7 @@ license firefox.license license="Mozilla Public License v2.0" depend type=group fmri=system/font/truetype/dejavu depend type=group fmri=system/font/truetype/fonts-core +depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/libogg.so.0 +depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/libvorbis.so.0 depend type=require fmri=codec/libtheora -depend type=require fmri=codec/ogg-vorbis depend type=require fmri=service/gnome/desktop-cache diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/flac/Makefile --- a/components/desktop/flac/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/desktop/flac/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -44,6 +44,8 @@ CONFIGURE_OPTIONS += --enable-ogg +REQUIRED_PACKAGES += codec/libogg +REQUIRED_PACKAGES += codec/libvorbis REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/gstreamer1/gst-plugins-base/Makefile --- a/components/desktop/gstreamer1/gst-plugins-base/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/desktop/gstreamer1/gst-plugins-base/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -88,7 +88,9 @@ '-e "/FAIL:/p" ' \ '-e "/ERROR:/p" ' +REQUIRED_PACKAGES += codec/libogg REQUIRED_PACKAGES += codec/libtheora +REQUIRED_PACKAGES += codec/libvorbis REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += library/desktop/cairo REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/gstreamer1/gst-plugins-good/Makefile --- a/components/desktop/gstreamer1/gst-plugins-good/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/desktop/gstreamer1/gst-plugins-good/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -132,7 +132,9 @@ COMPONENT_PREP_ACTION += ( cd $(@D) ; NOCONFIGURE=1 $(CONFIG_SHELL) autogen.sh ); REQUIRED_PACKAGES += codec/flac +REQUIRED_PACKAGES += codec/libogg REQUIRED_PACKAGES += codec/libtheora +REQUIRED_PACKAGES += codec/libvorbis REQUIRED_PACKAGES += codec/libvpx REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += codec/speex diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/libcanberra/Makefile --- a/components/desktop/libcanberra/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/desktop/libcanberra/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -63,6 +63,8 @@ CONFIGURE_OPTIONS += --enable-gtk3 CONFIGURE_OPTIONS += --with-pic +REQUIRED_PACKAGES += codec/libogg +REQUIRED_PACKAGES += codec/libvorbis REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc REQUIRED_PACKAGES += developer/vala @@ -72,5 +74,6 @@ REQUIRED_PACKAGES += library/desktop/gtk3 REQUIRED_PACKAGES += library/glib2 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime +REQUIRED_PACKAGES += system/library/math REQUIRED_PACKAGES += web/browser/lynx REQUIRED_PACKAGES += x11/library/libx11 diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/libvorbis/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/desktop/libvorbis/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -0,0 +1,54 @@ +# +# 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) 2016, Oracle and/or its affiliates. All rights reserved. +# + +BUILD_BITS= 32_and_64 +COMPILER= gcc +include ../../../make-rules/shared-macros.mk + +COMPONENT_NAME= libvorbis +COMPONENT_VERSION= 1.3.3 +COMPONENT_PROJECT_URL= http://downloads.xiph.org/releases/vorbis/ +COMPONENT_ARCHIVE_HASH= \ + sha256:6d747efe7ac4ad249bf711527882cef79fb61d9194c45b5ca5498aa60f290762 +COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/$(COMPONENT_ARCHIVE) +COMPONENT_BUGDB= gnome/multimedia + +TPNO= 9575 + +# gmake check works and all test pass but because of hard-coded paths +# check with results-all.master fails +TEST_TARGET = $(SKIP_TEST) + +include $(WS_MAKE_RULES)/common.mk + +CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)" + +# Replace the following with REQUIRED_PACKAGES += codec/libogg when +# the build server is updated +# The dependency isn't installed, so add it manually since pkgdepend +# can't resolve them yet: 15708323 +DEPENDED += $(WS_TOP)/components/desktop/libogg/build/manifest-$(MACH)-libogg.depend +REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../libogg/Makefile) + +REQUIRED_PACKAGES += developer/documentation-tool/doxygen +REQUIRED_PACKAGES += system/library/math diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/libvorbis/depend.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/desktop/libvorbis/depend.mk Tue Sep 06 18:35:00 2016 -0700 @@ -0,0 +1,1 @@ +desktop/libvorbis: desktop/libogg diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/libvorbis/libvorbis.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/desktop/libvorbis/libvorbis.p5m Tue Sep 06 18:35:00 2016 -0700 @@ -0,0 +1,208 @@ +# +# 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) 2016, Oracle and/or its affiliates. All rights reserved. +# + +set name=pkg.fmri \ + value=pkg:/codec/libvorbis@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Vorbis audio codec libraries" +set name=com.oracle.info.description value=Vorbis +set name=com.oracle.info.tpno value=$(TPNO) +set name=info.classification \ + 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/2010/143 value=PSARC/2016/514 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/include/vorbis/codec.h +file path=usr/include/vorbis/vorbisenc.h +file path=usr/include/vorbis/vorbisfile.h +link path=usr/lib/$(MACH64)/libvorbis.so target=libvorbis.so.0.4.6 +link path=usr/lib/$(MACH64)/libvorbis.so.0 target=libvorbis.so.0.4.6 +file path=usr/lib/$(MACH64)/libvorbis.so.0.4.6 +link path=usr/lib/$(MACH64)/libvorbisenc.so target=libvorbisenc.so.2.0.9 +link path=usr/lib/$(MACH64)/libvorbisenc.so.2 target=libvorbisenc.so.2.0.9 +file path=usr/lib/$(MACH64)/libvorbisenc.so.2.0.9 +link path=usr/lib/$(MACH64)/libvorbisfile.so target=libvorbisfile.so.3.3.5 +link path=usr/lib/$(MACH64)/libvorbisfile.so.3 target=libvorbisfile.so.3.3.5 +file path=usr/lib/$(MACH64)/libvorbisfile.so.3.3.5 +file path=usr/lib/$(MACH64)/pkgconfig/vorbis.pc +file path=usr/lib/$(MACH64)/pkgconfig/vorbisenc.pc +file path=usr/lib/$(MACH64)/pkgconfig/vorbisfile.pc +link path=usr/lib/libvorbis.so target=libvorbis.so.0.4.6 +link path=usr/lib/libvorbis.so.0 target=libvorbis.so.0.4.6 +file path=usr/lib/libvorbis.so.0.4.6 +link path=usr/lib/libvorbisenc.so target=libvorbisenc.so.2.0.9 +link path=usr/lib/libvorbisenc.so.2 target=libvorbisenc.so.2.0.9 +file path=usr/lib/libvorbisenc.so.2.0.9 +link path=usr/lib/libvorbisfile.so target=libvorbisfile.so.3.3.5 +link path=usr/lib/libvorbisfile.so.3 target=libvorbisfile.so.3.3.5 +file path=usr/lib/libvorbisfile.so.3.3.5 +file path=usr/lib/pkgconfig/vorbis.pc +file path=usr/lib/pkgconfig/vorbisenc.pc +file path=usr/lib/pkgconfig/vorbisfile.pc +file path=usr/share/aclocal/vorbis.m4 +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/doxygen-build.stamp +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/eightphase.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/evenlsp.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/fish_xiph_org.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/floor1_inverse_dB_table.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/floorval.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/fourphase.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/framing.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/helper.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/index.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/index.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/overview.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/reference.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/return.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/style.css +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_analysis.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_analysis_blockout.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_analysis_buffer.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_analysis_headerout.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_analysis_init.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_analysis_wrote.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_bitrate_addblock.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_bitrate_flushpacket.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_block.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_block_clear.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_block_init.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_comment.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_comment_add.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_comment_add_tag.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_comment_clear.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_comment_init.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_comment_query.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_comment_query_count.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_commentheader_out.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_dsp_clear.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_dsp_state.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_granule_time.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_info.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_info_blocksize.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_info_clear.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_info_init.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_packet_blocksize.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_blockin.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_halfrate.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_halfrate_p.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_headerin.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_idheader.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_init.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_lapout.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_pcmout.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_read.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_restart.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_synthesis_trackonly.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/libvorbis/vorbis_version_string.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/lspmap.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/oddlsp.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/oggstream.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/programming.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/rfc5215.txt +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/rfc5215.xml +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/squarepolar.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/stereo.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/stream.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/v-comment.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbis-clip.txt +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbis-errors.txt +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbis-fidelity.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbis.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/changes.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/examples.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/index.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/ovectl_ratemanage2_arg.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/ovectl_ratemanage_arg.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/overview.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/reference.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/style.css +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/vorbis_encode_ctl.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/vorbis_encode_init.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/vorbis_encode_init_vbr.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/vorbis_encode_setup_init.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/vorbis_encode_setup_managed.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisenc/vorbis_encode_setup_vbr.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/OggVorbis_File.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/callbacks.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/chaining_example_c.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/chainingexample.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/crosslap.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/datastructures.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/decoding.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/example.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/exampleindex.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/fileinfo.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/index.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/initialization.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_bitrate.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_bitrate_instant.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_callbacks.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_clear.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_comment.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_crosslap.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_fopen.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_info.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_open.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_open_callbacks.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_pcm_seek.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_pcm_seek_lap.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_pcm_seek_page.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_pcm_seek_page_lap.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_pcm_tell.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_pcm_total.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_raw_seek.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_raw_seek_lap.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_raw_tell.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_raw_total.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_read.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_read_filter.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_read_float.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_seekable.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_serialnumber.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_streams.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_test.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_test_callbacks.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_test_open.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_time_seek.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_time_seek_lap.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_time_seek_page.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_time_seek_page_lap.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_time_tell.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/ov_time_total.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/overview.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/reference.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/seekexample.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/seeking.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/seeking_example_c.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/seeking_test_c.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/seekingexample.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/style.css +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/threads.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisfile/vorbisfile_example_c.html +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/vorbisword2.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/wait.png +file path=usr/share/doc/libvorbis-$(COMPONENT_VERSION)/white-xifish.png +license COPYING license=BSD-like diff -r 8e4786e21910 -r b9a930b724d2 components/desktop/speex/Makefile --- a/components/desktop/speex/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/desktop/speex/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -43,5 +43,7 @@ CONFIGURE_OPTIONS += --disable-static +REQUIRED_PACKAGES += codec/libogg +REQUIRED_PACKAGES += codec/libvorbis REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += system/library/math diff -r 8e4786e21910 -r b9a930b724d2 components/libsndfile/Makefile --- a/components/libsndfile/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/libsndfile/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -71,6 +71,8 @@ '-e "/^XXX_REMOVE_XXX$$/d" ' REQUIRED_PACKAGES += codec/flac +REQUIRED_PACKAGES += codec/libogg +REQUIRED_PACKAGES += codec/libvorbis REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += database/sqlite-3 REQUIRED_PACKAGES += system/library/math diff -r 8e4786e21910 -r b9a930b724d2 components/meta-packages/history/ogg-vorbis.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/ogg-vorbis.p5m Tue Sep 06 18:35:00 2016 -0700 @@ -0,0 +1,31 @@ +# +# 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) 2016, Oracle and/or its affiliates. All rights reserved. +# + +# Package split to individual packages +set name=pkg.fmri value=pkg:/codec/ogg-vorbis@2.30.0,5.12-5.12.0.0.0.108.0 +set name=pkg.renamed value=true +set name=org.opensolaris.consolidation \ + incorporate=consolidation/desktop/gnome-incorporation \ + value=$(CONSOLIDATION) +depend type=require fmri=pkg:/codec/libogg +depend type=require fmri=pkg:/codec/libvorbis diff -r 8e4786e21910 -r b9a930b724d2 components/sox/Makefile --- a/components/sox/Makefile Sat Sep 03 22:01:54 2016 -0700 +++ b/components/sox/Makefile Tue Sep 06 18:35:00 2016 -0700 @@ -41,6 +41,8 @@ CONFIGURE_OPTIONS += --disable-openmp REQUIRED_PACKAGES += codec/flac +REQUIRED_PACKAGES += codec/libogg +REQUIRED_PACKAGES += codec/libvorbis REQUIRED_PACKAGES += codec/ogg-vorbis REQUIRED_PACKAGES += image/library/libpng REQUIRED_PACKAGES += library/audio/pulseaudio