Re: [OE-core] [hardknott][PATCH 1/1] assimp: Remove it
Since there might be users of this in other layers, this or the move to
meta-oe isn't an appropriate change for a stable branch in my opinion.
Thanks,
Anuj
On Tue, 2021-09-07 at 17:31 +0800, Robert Yang wrote:
> Remove it since it has license issues:
>
> * scripts/StepImporter/schema_ifc2x3.exp
> Copyright by: International Alliance for Interoperability, 1996-2005
> All rights
> reserved. No part of this documentation may be reproduced, stored in
> a
> retrieval system, or transmitted in any form or by any means, without
> the prior
> written permission of the owner
>
> * test/models-nonbsd/X/dwarf-Read-Me.txt
> RESTRICTIONS: This model pack is available for use in freeware,
> shareware,
> commercial games/software with the following restrictions:- **You may
> not
> sell/re-sell this model pack or claim it as your own. ***You may not
> redistribute this pack in some other model pack through a website or
> on a
> compilation CD of any kind, without my written consent. Psi
> http://www.psionic3d.co.uk
>
> * test/models-nonbsd/B3D/turtle.source.txt
> Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk Used
> with
> permission. RESTRICTIONS: This model pack is available for use in
> freeware,
> shareware, commercial games/software with the following
> restrictions:- **You
> may not sell/re-sell this model pack or claim it as your own. ***You
> may not
> redistribute this pack in some other model pack through a website or
> on a
> compilation CD of any kind, without my written consent.
>
> And no recipes depend on it, so remove it.
>
> Signed-off-by: Robert Yang
> ---
> meta/conf/distro/include/maintainers.inc | 1 -
> ...MP_LIB_INSTALL_DIR-to-search-library.patch | 68 -
> ...hub.com-assimp-assimp-issues-2733-up.patch | 1664 ---
> --
> meta/recipes-graphics/vulkan/assimp_5.0.1.bb | 23 -
> 4 files changed, 1756 deletions(-)
> delete mode 100644 meta/recipes-graphics/vulkan/assimp/0001-Use-
> ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
> delete mode 100644 meta/recipes-graphics/vulkan/assimp/0001-closes-
> https-github.com-assimp-assimp-issues-2733-up.patch
> delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index 6276331857..e6b8180731 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -46,7 +46,6 @@ RECIPE_MAINTAINER_pn-apt = "Aníbal Limón
> "
> RECIPE_MAINTAINER_pn-argp-standalone = "Khem Raj
> "
> RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao "
> RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal "
> -RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal "
> RECIPE_MAINTAINER_pn-at = "Chen Qi "
> RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling
> "
> RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling
> "
> diff --git a/meta/recipes-graphics/vulkan/assimp/0001-Use-
> ASSIMP_LIB_INSTALL_DIR-to-search-library.patch b/meta/recipes-
> graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-
> library.patch
> deleted file mode 100644
> index 34c5bfa857..00
> --- a/meta/recipes-graphics/vulkan/assimp/0001-Use-
> ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00
> 2001
> -From: Hongxu Jia
> -Date: Thu, 12 Dec 2019 22:16:15 -0800
> -Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library
> -
> -Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search
> library
> -
> -Upstream-Status: Inappropriate [oe specific]
> -
> -Signed-off-by: Hongxu Jia
> -
>
> - assimpTargets-release.cmake.in | 16
> - 1 file changed, 8 insertions(+), 8 deletions(-)
> -
> -diff --git a/assimpTargets-release.cmake.in b/assimpTargets-
> release.cmake.in
> -index f3db8f1..b8a066a 100644
> a/assimpTargets-release.cmake.in
> -+++ b/assimpTargets-release.cmake.in
> -@@ -42,11 +42,11 @@ if(MSVC)
> - # Import target "assimp::assimp" for configuration "Release"
> - set_property(TARGET assimp::assimp APPEND PROPERTY
> IMPORTED_CONFIGURATIONS RELEASE)
> - set_target_properties(assimp::assimp PROPERTIES
> -- IMPORTED_IMPLIB_RELEASE
> "${_IMPORT_PREFIX}/lib/${importLibraryName}"
> -+ IMPORTED_IMPLIB_RELEASE
> "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}"
> - IMPORTED_LOCATION_RELEASE
> "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
> - )
> - list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
> -- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
> "${_IMPORT_PREFIX}/lib/${importLibraryName}")
> -+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
> "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}")
> - list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
> "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
> - else()
> - set(staticLibraryName
> "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
>
[OE-core] [hardknott][PATCH 1/1] assimp: Remove it
Remove it since it has license issues:
* scripts/StepImporter/schema_ifc2x3.exp
Copyright by: International Alliance for Interoperability, 1996-2005 All rights
reserved. No part of this documentation may be reproduced, stored in a
retrieval system, or transmitted in any form or by any means, without the prior
written permission of the owner
* test/models-nonbsd/X/dwarf-Read-Me.txt
RESTRICTIONS: This model pack is available for use in freeware, shareware,
commercial games/software with the following restrictions:- **You may not
sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent. Psi
http://www.psionic3d.co.uk
* test/models-nonbsd/B3D/turtle.source.txt
Copyright 2004, Psionic Design e-mail: psio...@blueyonder.co.uk Used with
permission. RESTRICTIONS: This model pack is available for use in freeware,
shareware, commercial games/software with the following restrictions:- **You
may not sell/re-sell this model pack or claim it as your own. ***You may not
redistribute this pack in some other model pack through a website or on a
compilation CD of any kind, without my written consent.
And no recipes depend on it, so remove it.
Signed-off-by: Robert Yang
---
meta/conf/distro/include/maintainers.inc |1 -
...MP_LIB_INSTALL_DIR-to-search-library.patch | 68 -
...hub.com-assimp-assimp-issues-2733-up.patch | 1664 -
meta/recipes-graphics/vulkan/assimp_5.0.1.bb | 23 -
4 files changed, 1756 deletions(-)
delete mode 100644
meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
delete mode 100644
meta/recipes-graphics/vulkan/assimp/0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch
delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 6276331857..e6b8180731 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -46,7 +46,6 @@ RECIPE_MAINTAINER_pn-apt = "Aníbal Limón
"
RECIPE_MAINTAINER_pn-argp-standalone = "Khem Raj "
RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao "
RECIPE_MAINTAINER_pn-aspell = "Anuj Mittal "
-RECIPE_MAINTAINER_pn-assimp = "Anuj Mittal "
RECIPE_MAINTAINER_pn-at = "Chen Qi "
RECIPE_MAINTAINER_pn-at-spi2-atk = "Tim Orling
"
RECIPE_MAINTAINER_pn-at-spi2-core = "Tim Orling
"
diff --git
a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
deleted file mode 100644
index 34c5bfa857..00
---
a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001
-From: Hongxu Jia
-Date: Thu, 12 Dec 2019 22:16:15 -0800
-Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library
-
-Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Hongxu Jia
-
- assimpTargets-release.cmake.in | 16
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
-index f3db8f1..b8a066a 100644
a/assimpTargets-release.cmake.in
-+++ b/assimpTargets-release.cmake.in
-@@ -42,11 +42,11 @@ if(MSVC)
- # Import target "assimp::assimp" for configuration "Release"
- set_property(TARGET assimp::assimp APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(assimp::assimp PROPERTIES
-- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
-+ IMPORTED_IMPLIB_RELEASE
"${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}"
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
- )
- list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/lib/${importLibraryName}")
-+list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}")
- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
- else()
- set(staticLibraryName
"assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
-@@ -54,10 +54,10 @@ if(MSVC)
- # Import target "assimp::assimp" for configuration "Release"
- set_property(TARGET assimp::assimp APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(assimp::assimp PROPERTIES
-- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+ IMPORTED_LOCATION_RELEASE
"${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}"
- )
- list(APPEND
