24817972 libogg & libvorbis need optional dependency on codec/
[email protected]
--- a/components/desktop/libogg/Makefile Fri Oct 07 05:45:06 2016 -0700
+++ b/components/desktop/libogg/Makefile Fri Oct 07 15:05:45 2016 -0700
@@ -37,10 +37,14 @@
TEST_TARGET = $(NO_TESTS)
+# ogg-vorbis is not unlockable in S11 gnome-incorporation
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
include $(WS_MAKE_RULES)/common.mk
CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
+ifneq ($(BUILD_TYPE), evaluation)
# Merge 32-bit & 64-bit versions of config_types.h
install: $(BUILD_DIR)/.merged-header
@@ -51,5 +55,6 @@
> $(PROTO_DIR)/usr/include/ogg/config_types.h; \
diffstatus=$$? ; \
if (( $$diffstatus != 1 )) ; then exit $$diffstatus ; fi
+endif
REQUIRED_PACKAGES += system/library/math
--- a/components/desktop/libogg/libogg.p5m Fri Oct 07 05:45:06 2016 -0700
+++ b/components/desktop/libogg/libogg.p5m Fri Oct 07 15:05:45 2016 -0700
@@ -122,3 +122,5 @@
file path=usr/share/doc/libogg-$(COMPONENT_VERSION)/white-ogg.png
file path=usr/share/doc/libogg-$(COMPONENT_VERSION)/white-xifish.png
license libogg.license license="BSD-like, GPLv2, LGPLv2.1, FDLv1.2"
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=codec/[email protected]
--- a/components/desktop/libvorbis/Makefile Fri Oct 07 05:45:06 2016 -0700
+++ b/components/desktop/libvorbis/Makefile Fri Oct 07 15:05:45 2016 -0700
@@ -39,6 +39,9 @@
# check with results-all.master fails
TEST_TARGET = $(SKIP_TEST)
+# ogg-vorbis is not unlockable in S11 gnome-incorporation
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
include $(WS_MAKE_RULES)/common.mk
CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
--- a/components/desktop/libvorbis/libvorbis.p5m Fri Oct 07 05:45:06 2016 -0700
+++ b/components/desktop/libvorbis/libvorbis.p5m Fri Oct 07 15:05:45 2016 -0700
@@ -206,3 +206,5 @@
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
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=codec/[email protected]