Skip to content
Snippets Groups Projects
Commit b56de944 authored by Stefan Schmidt's avatar Stefan Schmidt
Browse files

intel-media-driver: backport upstream patch for license grant clarification


This upstream backport is purely for license clarification, no code
changes. I have no intention to push this to meta-intel, but instead
wait until they update their recipe version and we bump the used layer
revision.

Signed-off-by: default avatarStefan Schmidt <stefan.schmidt@huawei.com>
parent da5a5b6a
No related branches found
No related tags found
1 merge request!364intel-media backport upstream patch for license grant clarification
commit 54b02018d21cdddd998d0fd66189f5a4fff90558
Author: Gu, Lihao <lihao.gu@intel.com>
Date: Mon Aug 1 09:46:36 2022 +0800
[License]Add explicit grant of license
Fixed #1460
Add Licenses for some files
Signed-off-by: Gu, Lihao <lihao.gu@intel.com>
Upstream-Status: Backport [https://github.com/intel/media-driver/commit/54b02018d21cdddd998d0fd66189f5a4fff90558]
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp b/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp
index 0caa2c794..dc6a71499 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp
+++ b/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp
@@ -1,27 +1,23 @@
/*
+* Copyright (c) 2018-2022, Intel Corporation
*
-* Copyright (c) Intel Corporation (2018 - 2019).
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
*
-* INTEL MAKES NO WARRANTY OF ANY KIND REGARDING THE CODE. THIS CODE IS
-* LICENSED ON AN "AS IS" BASIS AND INTEL WILL NOT PROVIDE ANY SUPPORT,
-* ASSISTANCE, INSTALLATION, TRAINING OR OTHER SERVICES. INTEL DOES NOT
-* PROVIDE ANY UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY
-* DISCLAIMS ANY WARRANTY OF MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR ANY
-* PARTICULAR PURPOSE, OR ANY OTHER WARRANTY. Intel disclaims all liability,
-* including liability for infringement of any proprietary rights, relating to
-* use of the code. No license, express or implied, by estoppel or otherwise,
-* to any intellectual property rights is granted herein.
-*
-*
-* File Name : vphal_render_16alignment.cpp
-*
-* Abstract : Video Surface 16 bytes alignment for Video Processing
-*
-* Environment: ubuntu
-*
-* Notes : This module contains video surface 16 bytes alignment definitions
-* for VPHAL
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
*/
//!
//! \file vphal_render_16alignment.cpp
diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.h b/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.h
index e937b7141..8d7fd0616 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.h
+++ b/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.h
@@ -1,27 +1,23 @@
/*
+* Copyright (c) 2018-2022, Intel Corporation
*
-* Copyright (c) Intel Corporation 2018.
+* Permission is hereby granted, free of charge, to any person obtaining a
+* copy of this software and associated documentation files (the "Software"),
+* to deal in the Software without restriction, including without limitation
+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
+* and/or sell copies of the Software, and to permit persons to whom the
+* Software is furnished to do so, subject to the following conditions:
*
-* INTEL MAKES NO WARRANTY OF ANY KIND REGARDING THE CODE. THIS CODE IS
-* LICENSED ON AN "AS IS" BASIS AND INTEL WILL NOT PROVIDE ANY SUPPORT,
-* ASSISTANCE, INSTALLATION, TRAINING OR OTHER SERVICES. INTEL DOES NOT
-* PROVIDE ANY UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY
-* DISCLAIMS ANY WARRANTY OF MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR ANY
-* PARTICULAR PURPOSE, OR ANY OTHER WARRANTY. Intel disclaims all liability,
-* including liability for infringement of any proprietary rights, relating to
-* use of the code. No license, express or implied, by estoppel or otherwise,
-* to any intellectual property rights is granted herein.
-*
-*
-* File Name : vphal_render_16alignment.h
-*
-* Abstract : Video surface 16 bytes alignment definitions for Video Processing
-*
-* Environment: Linux
-*
-* Notes : This module contains video surface 16 bytes alignment definitions
-* for VPHAL
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+* OTHER DEALINGS IN THE SOFTWARE.
*/
//!
//! \file vphal_render_16alignment.h
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: MIT
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI += "file://explicit-license-grant-backport.patch"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment