From c21c322864347601a354b9a5d8605a72d330d7eb Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Mon, 29 Nov 2021 10:31:17 -0600 Subject: [PATCH] build: Build aom CW-Bug-Id: #19516 --- build/makefile_base.mak | 20 ++++++++++++++++++++ dist.LICENSE | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 36675fe8..cf5ec451 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -184,6 +184,7 @@ CARGO_BUILD_ARG := --release COMPAT_MANIFEST_TEMPLATE := $(SRCDIR)/compatibilitytool.vdf.template LICENSE := $(SRCDIR)/dist.LICENSE OFL_LICENSE := $(SRCDIR)/fonts/liberation-fonts/LICENSE +AOM_PATENTS := $(SRCDIR)/aom/PATENTS GECKO_VER := 2.47.2 GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.xz @@ -257,6 +258,7 @@ DIST_COMPAT_MANIFEST := $(DST_BASE)/compatibilitytool.vdf DIST_LICENSE := $(DST_BASE)/LICENSE DIST_TOOLMANIFEST := $(addprefix $(DST_BASE)/,toolmanifest.vdf) DIST_OFL_LICENSE := $(DST_BASE)/LICENSE.OFL +DIST_AOM_PATENTS := $(DST_BASE)/PATENTS.AOM DIST_GECKO_DIR := $(DST_DIR)/share/wine/gecko DIST_GECKO32 := $(DIST_GECKO_DIR)/wine-gecko-$(GECKO_VER)-x86 DIST_GECKO64 := $(DIST_GECKO_DIR)/wine-gecko-$(GECKO_VER)-x86_64 @@ -282,6 +284,9 @@ $(DIST_TOOLMANIFEST): $(addprefix $(SRCDIR)/,$(TOOLMANIFEST_VDF_SRC)) $(DIST_OFL_LICENSE): $(OFL_LICENSE) cp -a $< $@ +$(DIST_AOM_PATENTS): $(AOM_PATENTS) + cp -a $< $@ + $(DIST_OVR32): $(SRCDIR)/openvr/bin/win32/openvr_api.dll | $(DST_DIR) mkdir -p $(DST_LIBDIR32)/wine/dxvk cp -a $< $@ @@ -500,6 +505,21 @@ $(eval $(call rules-meson,gst_good,32)) $(eval $(call rules-meson,gst_good,64)) +## +## aom +## + +AOM_CMAKE_ARGS = -DENABLE_TESTS=0 -DBUILD_SHARED_LIBS=1 +AOM_CMAKE_ARGS64 = -DAOM_INSTALL_LIB_DIR=lib64 + +AOM_INCDIR32 = $(AOM_DST32)/include/aom +AOM_INCDIR64 = $(AOM_DST64)/include/aom + +$(eval $(call rules-source,aom,$(SRCDIR)/aom)) +$(eval $(call rules-cmake,aom,32)) +$(eval $(call rules-cmake,aom,64)) + + ## ## Vulkan-Headers ## diff --git a/dist.LICENSE b/dist.LICENSE index 4965718b..d7201fa0 100644 --- a/dist.LICENSE +++ b/dist.LICENSE @@ -443,3 +443,36 @@ This software contains the jxrlib library, which is STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +---- ---- ---- ---- + +This software contains libaom, which is + + Copyright (c) 2016, Alliance for Open Media. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +Distribution of libaom is also covered by the Alliance for Open Media Patent License 1.0, available at PATENTS.AOM.