From f07d39912ffacdbf85d7479ca93356cb99737d36 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aur=C3=A9lien=20Larcher?= Date: Wed, 15 Feb 2017 02:32:13 +0100 Subject: [PATCH] Bump orc to 0.4.26 --- components/library/orc/Makefile | 52 ++++++++++++ .../orc/manifests/sample-manifest.p5m} | 96 +++++++++++----------- components/{ => library}/orc/orc.license | 0 .../sample-manifest.p5m => library/orc/orc.p5m} | 64 ++++----------- components/orc/Makefile | 46 ----------- 5 files changed, 113 insertions(+), 145 deletions(-) create mode 100644 components/library/orc/Makefile rename components/{orc/orc.p5m => library/orc/manifests/sample-manifest.p5m} (65%) rename components/{ => library}/orc/orc.license (100%) rename components/{orc/manifests/sample-manifest.p5m => library/orc/orc.p5m} (57%) delete mode 100644 components/orc/Makefile diff --git a/components/library/orc/Makefile b/components/library/orc/Makefile new file mode 100644 index 000000000..0f9466b56 --- /dev/null +++ b/components/library/orc/Makefile @@ -0,0 +1,52 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"). You may +# only use this file in accordance with the terms of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2012 EveryCity Ltd. All rights reserved. +# +include ../../../make-rules/shared-macros.mk + +COMPONENT_NAME= orc +COMPONENT_VERSION= 0.4.26 +IPS_COMPONENT_VERSION= 0.5.11 +HUMAN_VERSION= $(COMPONENT_VERSION) +COMPONENT_FMRI= system/library/orc +COMPONENT_PROJECT_URL= http://code.entropywave.com/projects/orc/ +COMPONENT_SUMMARY= The Oil Runtime Compiler for SIMD array operations +COMPONENT_CLASSIFICATION= System/Libraries +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz +COMPONENT_ARCHIVE_HASH= \ + sha256:7d52fa80ef84988359c3434e1eea302d077a08987abdde6905678ebcad4fa649 +COMPONENT_ARCHIVE_URL= \ + http://gstreamer.freedesktop.org/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) +COMPONENT_LICENSE= BSD + +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk + +# Heals libgstvideoscale core dump +gcc_OPT = -O2 + +CONFIGURE_OPTIONS += --with-pic +CONFIGURE_OPTIONS += --enable-shared +CONFIGURE_OPTIONS += --disable-static + +ENV = /usr/bin/env -i + +build: $(BUILD_32_and_64) + +install: $(INSTALL_32_and_64) + +test: $(TEST_32_and_64) + +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/math diff --git a/components/orc/orc.p5m b/components/library/orc/manifests/sample-manifest.p5m similarity index 65% rename from components/orc/orc.p5m rename to components/library/orc/manifests/sample-manifest.p5m index ee7a0cc7f..ded48b25a 100644 --- a/components/orc/orc.p5m +++ b/components/library/orc/manifests/sample-manifest.p5m @@ -1,23 +1,26 @@ # # This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"). You may -# only use this file in accordance with the terms of the CDDL. +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. # # A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at +# source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. # # -# Copyright 2012 EveryCity Ltd. All rights reserved. +# Copyright 2017 # -set name=pkg.fmri value=pkg:/system/library/orc@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="The Oil Runtime Compiler for SIMD array operations" -set name=info.upstream-url value="http://code.entropywave.com/projects/orc/" +set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="$(COMPONENT_SUMMARY)" +set name=info.classification value="$(COMPONENT_CLASSIFICATION)" +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -license orc.license license="BSD" +license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/bin/$(MACH64)/orc-bugreport file path=usr/bin/$(MACH64)/orcc @@ -27,56 +30,51 @@ file path=usr/include/orc-0.4/orc-test/orcarray.h file path=usr/include/orc-0.4/orc-test/orcprofile.h file path=usr/include/orc-0.4/orc-test/orcrandom.h file path=usr/include/orc-0.4/orc-test/orctest.h -file path=usr/include/orc-0.4/orc/orcexecutor.h -file path=usr/include/orc-0.4/orc/orctarget.h -file path=usr/include/orc-0.4/orc/orcx86insn.h -file path=usr/include/orc-0.4/orc/orcmips.h +file path=usr/include/orc-0.4/orc/orc-stdint.h +file path=usr/include/orc-0.4/orc/orc.h +file path=usr/include/orc-0.4/orc/orcarm.h +file path=usr/include/orc-0.4/orc/orcbytecode.h file path=usr/include/orc-0.4/orc/orcbytecodes.h -file path=usr/include/orc-0.4/orc/orcpowerpc.h +file path=usr/include/orc-0.4/orc/orccode.h +file path=usr/include/orc-0.4/orc/orccompiler.h +file path=usr/include/orc-0.4/orc/orcconstant.h +file path=usr/include/orc-0.4/orc/orccpu.h +file path=usr/include/orc-0.4/orc/orccpuinsn.h file path=usr/include/orc-0.4/orc/orcdebug.h +file path=usr/include/orc-0.4/orc/orcemulateopcodes.h +file path=usr/include/orc-0.4/orc/orcexecutor.h +file path=usr/include/orc-0.4/orc/orcfunctions.h file path=usr/include/orc-0.4/orc/orcinstruction.h -file path=usr/include/orc-0.4/orc/orcrule.h -file path=usr/include/orc-0.4/orc/orcprogram.h -file path=usr/include/orc-0.4/orc/orccpuinsn.h +file path=usr/include/orc-0.4/orc/orcinternal.h file path=usr/include/orc-0.4/orc/orclimits.h -file path=usr/include/orc-0.4/orc/orcsse.h +file path=usr/include/orc-0.4/orc/orcmips.h file path=usr/include/orc-0.4/orc/orcmmx.h file path=usr/include/orc-0.4/orc/orcneon.h -file path=usr/include/orc-0.4/orc/orcx86.h file path=usr/include/orc-0.4/orc/orconce.h -file path=usr/include/orc-0.4/orc/orcparse.h -file path=usr/include/orc-0.4/orc/orccpu.h -file path=usr/include/orc-0.4/orc/orcconstant.h -file path=usr/include/orc-0.4/orc/orcbytecode.h -file path=usr/include/orc-0.4/orc/orcfunctions.h -file path=usr/include/orc-0.4/orc/orcinternal.h -file path=usr/include/orc-0.4/orc/orcvariable.h file path=usr/include/orc-0.4/orc/orcopcode.h -file path=usr/include/orc-0.4/orc/orcarm.h -file path=usr/include/orc-0.4/orc/orccode.h +file path=usr/include/orc-0.4/orc/orcparse.h +file path=usr/include/orc-0.4/orc/orcpowerpc.h +file path=usr/include/orc-0.4/orc/orcprogram.h +file path=usr/include/orc-0.4/orc/orcrule.h +file path=usr/include/orc-0.4/orc/orcsse.h +file path=usr/include/orc-0.4/orc/orctarget.h file path=usr/include/orc-0.4/orc/orcutils.h -file path=usr/include/orc-0.4/orc/orc.h -file path=usr/include/orc-0.4/orc/orcemulateopcodes.h -file path=usr/include/orc-0.4/orc/orccompiler.h -file path=usr/include/orc-0.4/orc/orc-stdint.h - -file path=usr/lib/$(MACH64)/liborc-0.4.so.0.23.0 -file path=usr/lib/$(MACH64)/liborc-test-0.4.so.0.23.0 +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.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.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 -file path=usr/lib/liborc-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 - -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 -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-test-0.4.so.0 \ - target=liborc-test-0.4.so.0.23.0 -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 -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 diff --git a/components/orc/orc.license b/components/library/orc/orc.license similarity index 100% rename from components/orc/orc.license rename to components/library/orc/orc.license diff --git a/components/orc/manifests/sample-manifest.p5m b/components/library/orc/orc.p5m similarity index 57% rename from components/orc/manifests/sample-manifest.p5m rename to components/library/orc/orc.p5m index 9092bacd9..de45d5366 100644 --- a/components/orc/manifests/sample-manifest.p5m +++ b/components/library/orc/orc.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2016 +# Copyright 2017 Aurelien Larcher # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -19,6 +19,7 @@ set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +set name=pkg.human-version value=$(HUMAN_VERSION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' @@ -62,56 +63,19 @@ file path=usr/include/orc-0.4/orc/orcutils.h 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.18.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.18.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.18.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.18.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 -file path=usr/share/gtk-doc/html/orc/ch01.html -file path=usr/share/gtk-doc/html/orc/ch02.html -file path=usr/share/gtk-doc/html/orc/ch03.html -file path=usr/share/gtk-doc/html/orc/ch04.html -file path=usr/share/gtk-doc/html/orc/ch05.html -file path=usr/share/gtk-doc/html/orc/home.png -file path=usr/share/gtk-doc/html/orc/index.html -file path=usr/share/gtk-doc/html/orc/index.sgml -file path=usr/share/gtk-doc/html/orc/left.png -file path=usr/share/gtk-doc/html/orc/orc-ARM.html -file path=usr/share/gtk-doc/html/orc/orc-MMX.html -file path=usr/share/gtk-doc/html/orc/orc-Orc.html -file path=usr/share/gtk-doc/html/orc/orc-OrcCompiler.html -file path=usr/share/gtk-doc/html/orc/orc-OrcDebug.html -file path=usr/share/gtk-doc/html/orc/orc-OrcExecutor.html -file path=usr/share/gtk-doc/html/orc/orc-OrcOpcode.html -file path=usr/share/gtk-doc/html/orc/orc-OrcProgram.html -file path=usr/share/gtk-doc/html/orc/orc-OrcRule.html -file path=usr/share/gtk-doc/html/orc/orc-PowerPC.html -file path=usr/share/gtk-doc/html/orc/orc-SSE.html -file path=usr/share/gtk-doc/html/orc/orc-Utility-functions.html -file path=usr/share/gtk-doc/html/orc/orc-building.html -file path=usr/share/gtk-doc/html/orc/orc-concepts.html -file path=usr/share/gtk-doc/html/orc/orc-misc.html -file path=usr/share/gtk-doc/html/orc/orc-opcodes.html -file path=usr/share/gtk-doc/html/orc/orc-program.html -file path=usr/share/gtk-doc/html/orc/orc-runninging.html -file path=usr/share/gtk-doc/html/orc/orc-tutorial.html -file path=usr/share/gtk-doc/html/orc/orc-x86.html -file path=usr/share/gtk-doc/html/orc/orc.devhelp2 -file path=usr/share/gtk-doc/html/orc/right.png -file path=usr/share/gtk-doc/html/orc/style.css -file path=usr/share/gtk-doc/html/orc/up.png diff --git a/components/orc/Makefile b/components/orc/Makefile deleted file mode 100644 index 89b6c6568..000000000 --- a/components/orc/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"). You may -# only use this file in accordance with the terms of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2012 EveryCity Ltd. All rights reserved. -# -include ../../make-rules/shared-macros.mk - -COMPONENT_NAME= orc -COMPONENT_VERSION= 0.4.23 -IPS_COMPONENT_VERSION= 0.5.11 -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz -COMPONENT_ARCHIVE_HASH= \ - sha256:767eaebce2941737b43368225ec54598b3055ca78b4dc50c4092f5fcdc0bdfe7 -COMPONENT_ARCHIVE_URL= http://gstreamer.freedesktop.org/src/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) - -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -# Heals libgstvideoscale core dump -gcc_OPT = -O2 - -CONFIGURE_OPTIONS += --with-pic -CONFIGURE_OPTIONS += --enable-shared -CONFIGURE_OPTIONS += --disable-static - -ENV = /usr/bin/env -i - -build: $(BUILD_32_and_64) - -install: $(INSTALL_32_and_64) - -test: $(TEST_32_and_64) - -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include ../../make-rules/depend.mk -- 2.11.4.GIT