ATOM-16320 Remove PVRTC and ETC compressor (#53)

Reordered the items in .gitignore

Signed-off-by: Qing Tao <[email protected]>

package-system/.gitignore

@@ -1,23 +1,24 @@
-Lua-*
-OpenSSL-*
+astc-encoder-*
 AwsIotDeviceSdkCpp-*
+azslc-*
 Blast-*
 Crashpad-*
-etc2comp-*
+DirectXShaderCompilerDxc-*
 googlebenchmark-*
 googletest-*
+ISPCTexComp-*
 libpng-*
 libsamplerate-*
+Lua-*
+lz4-*
 mcpp-*
+mikkelsen-*
 NvCloth-*
+OpenSSL-*
 PhysX-*
 poly2tri-*
 RapidJSON-*
 SPIRVCross-*
-DirectXShaderCompilerDxc-*
+tiff-*
 v-hacd-*
-mikkelsen-*
-azslc-*
 zlib-*
-lz4-*
-tiff-*

package-system/etc2comp/Findetc2comp.cmake.template

@@ -1,34 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-# this file actually ingests the library and defines targets.
-
-set(TARGET_WITH_NAMESPACE "3rdParty::etc2comp")
-if (TARGET $${TARGET_WITH_NAMESPACE})
-    return()
-endif()
-
-set(ETC2COMP_INCLUDE_DIR $${CMAKE_CURRENT_LIST_DIR}/etc2comp/include)
-set(ETC2COMP_LIBS_DIR $${CMAKE_CURRENT_LIST_DIR}/etc2comp/lib)
-
-set(ETC2COMP_COMPILE_DEFINITIONS
-${CUSTOM_ADDITIONAL_COMPILE_DEFINITIONS})
-
-set(ETC2COMP_LIBRARY
-    "$${ETC2COMP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}EtcLib$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-${CUSTOM_ADDITIONAL_LIBRARIES})
-
-add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
-
-ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${ETC2COMP_INCLUDE_DIR})
-
-target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${ETC2COMP_LIBRARY})
-
-target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${ETC2COMP_COMPILE_DEFINITIONS})
-
-set(ETC2COMP_FOUND TRUE)

package-system/etc2comp/Findetc2comp_windows.cmake.template

@@ -1,37 +0,0 @@
-#
-# Copyright (c) Contributors to the Open 3D Engine Project.
-# For complete copyright and license terms please see the LICENSE at the root of this distribution.
-# 
-# SPDX-License-Identifier: Apache-2.0 OR MIT
-#
-#
-
-# this file actually ingests the library and defines targets.
-
-set(TARGET_WITH_NAMESPACE "3rdParty::etc2comp")
-if (TARGET $${TARGET_WITH_NAMESPACE})
-    return()
-endif()
-
-set(ETC2COMP_INCLUDE_DIR $${CMAKE_CURRENT_LIST_DIR}/etc2comp/include)
-set(ETC2COMP_LIBS_DIR $${CMAKE_CURRENT_LIST_DIR}/etc2comp/lib)
-
-set(ETC2COMP_COMPILE_DEFINITIONS
-${CUSTOM_ADDITIONAL_COMPILE_DEFINITIONS})
-
-set(ETC2COMP_LIBRARY
-    "$${ETC2COMP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}EtcLib$$<$$<CONFIG:debug>:d>$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-${CUSTOM_ADDITIONAL_LIBRARIES})
-
-add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
-
-ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${ETC2COMP_INCLUDE_DIR})
-
-target_link_libraries($${TARGET_WITH_NAMESPACE} INTERFACE $${ETC2COMP_LIBRARY})
-
-target_compile_definitions($${TARGET_WITH_NAMESPACE} INTERFACE $${ETC2COMP_COMPILE_DEFINITIONS})
-
-set(ETC2COMP_LINK_OPTIONS $$<$$<STREQUAL:$${PAL_TRAIT_COMPILER_ID},Clang>:-Wl,>/ignore:4099)
-target_link_options($${TARGET_WITH_NAMESPACE} INTERFACE $${ETC2COMP_LINK_OPTIONS})
-
-set(ETC2COMP_FOUND TRUE)

package-system/etc2comp/add_install_for_etclib.patch

@@ -1,25 +0,0 @@
-diff --git a/EtcLib/CMakeLists.txt b/EtcLib/CMakeLists.txt
-index b584b88..b4ad3f6 100644
---- a/EtcLib/CMakeLists.txt
-+++ b/EtcLib/CMakeLists.txt
-@@ -16,9 +16,17 @@ project(EtcLib)
- include_directories(./Etc)
- include_directories(./EtcCodec)
- 
--file(GLOB SOURCES
-+file(GLOB HEADERS
- 	${PROJECT_SOURCE_DIR}/Etc/*.h
--	${PROJECT_SOURCE_DIR}/EtcCodec/*.h
-+	${PROJECT_SOURCE_DIR}/EtcCodec/*.h)
-+file(GLOB SOURCES
- 	${PROJECT_SOURCE_DIR}/Etc/*.cpp
- 	${PROJECT_SOURCE_DIR}/EtcCodec/*.cpp)
--ADD_LIBRARY(EtcLib ${SOURCES})
-+ADD_LIBRARY(EtcLib ${HEADERS} ${SOURCES})
-+set_target_properties(EtcLib PROPERTIES PUBLIC_HEADER "${HEADERS}")
-+
-+install(TARGETS EtcLib
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+)

package-system/etc2comp/build_config.json

@@ -1,51 +0,0 @@
-{
-    "git_url":"https://github.com/google/etc2comp.git",
-    "git_tag":"master",
-    "git_commit":"9cd0f9cae0f32338943699bb418107db61bb66f2",
-    "package_name":"etc2comp",
-    "package_version":"9cd0f9cae0-rev1",
-    "package_url":"https://github.com/google/etc2comp",
-    "package_license":"Apache-2.0",
-    "package_license_file":"LICENSE",
-    "cmake_find_target":"Findetc2comp.cmake",
-    "patch_file":"add_install_for_etclib.patch",
-    "Platforms":{
-        "Windows":{
-            "Windows":{
-                "cmake_generate_args_debug":[
-                    "-DCMAKE_CXX_STANDARD=17",
-                    "-DCMAKE_DEBUG_POSTFIX=d"
-                ],
-                "cmake_generate_args_release":[
-                    "-DCMAKE_CXX_STANDARD=17"
-                ],
-                "cmake_find_template":"Findetc2comp_windows.cmake.template"
-            }
-        },
-        "Darwin":{
-            "Mac":{
-                "cmake_generate_args_release":[
-                    "-DCMAKE_CXX_STANDARD=17",
-                    "-DCMAKE_BUILD_TYPE=Release"
-                ],
-                "build_configs":[
-                    "Release"
-                ],
-                "cmake_find_template":"Findetc2comp.cmake.template"
-            }
-        },
-        "Linux":{
-            "Linux":{
-                "cmake_generate_args_release":[
-                    "-DCMAKE_CXX_STANDARD=17",
-                    "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
-                    "-DCMAKE_BUILD_TYPE=Release"
-                ],
-                "build_configs":[
-                    "Release"
-                ],
-                "cmake_find_template":"Findetc2comp.cmake.template"
-            }
-        }
-    }
-}

package_build_list_host_darwin.json

@@ -9,7 +9,6 @@
         "Lua-5.3.5-rev6-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system --clean",
         "Lua-5.3.5-rev5-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean",
-        "etc2comp-9cd0f9cae0-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/etc2comp --platform-name Mac --package-root ../../package-system --clean",
         "freetype-2.10.4.16-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Mac --package-root ../../package-system --clean",
         "freetype-2.10.4.16-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name iOS --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name iOS --package-root ../../package-system --clean",
@@ -52,7 +51,6 @@
         "Lua-5.3.5-rev6-mac": "package-system/Lua-mac",
         "Lua-5.3.5-rev5-ios": "package-system/Lua-ios",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-mac": "package-system/AwsIotDeviceSdkCpp-mac",
-        "etc2comp-9cd0f9cae0-rev1-mac": "package-system/etc2comp-mac",
         "freetype-2.10.4.16-mac": "package-system/freetype-mac",
         "freetype-2.10.4.16-ios": "package-system/freetype-ios",
         "googlebenchmark-1.5.0-rev2-ios": "package-system/googlebenchmark-ios",

package_build_list_host_linux.json

@@ -7,7 +7,6 @@
         "AWSNativeSDK-1.7.167-rev6-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --package-root ../../package-system --clean",
         "Lua-5.3.5-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean",
-        "etc2comp-9cd0f9cae0-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/etc2comp --platform-name Linux --package-root ../../package-system --clean",
         "freetype-2.10.4.16-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux --package-root ../../package-system --clean",
         "googletest-1.8.1-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Linux --package-root ../../package-system --clean",
@@ -37,7 +36,6 @@
         "AWSNativeSDK-1.7.167-rev6-linux": "package-system/AWSNativeSDK-linux",
         "Lua-5.3.5-rev5-linux": "package-system/Lua-linux",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux",
-        "etc2comp-9cd0f9cae0-rev1-linux": "package-system/etc2comp-linux",
         "freetype-2.10.4.16-linux": "package-system/freetype-linux",
         "googlebenchmark-1.5.0-rev2-linux": "package-system/googlebenchmark-linux",
         "googletest-1.8.1-rev4-linux": "package-system/googletest-linux",

package_build_list_host_windows.json

@@ -12,7 +12,6 @@
         "Lua-5.3.5-rev5-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Android --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Android --package-root ../../package-system --clean",
-        "etc2comp-9cd0f9cae0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/etc2comp --platform-name Windows --package-root ../../package-system --clean",
         "freetype-2.10.4.16-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Windows --package-root ../../package-system --clean",
         "freetype-2.10.4.16-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Android --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Windows --package-root ../../package-system --clean",
@@ -60,7 +59,6 @@
         "Lua-5.3.5-rev5-android": "package-system/Lua-android",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-android": "package-system/AwsIotDeviceSdkCpp-android",
-        "etc2comp-9cd0f9cae0-rev1-windows": "package-system/etc2comp-windows",
         "freetype-2.10.4.16-windows": "package-system/freetype-windows",
         "freetype-2.10.4.16-android": "package-system/freetype-android",
         "googlebenchmark-1.5.0-rev2-windows": "package-system/googlebenchmark-windows",
@@ -109,7 +107,6 @@
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
         "glad-2.0.0-beta-rev2-multiplatform": "package-system/glad-multiplatform",
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
-        "PVRTexTool-4.24.0-rev4-multiplatform": "package-system/PVRTexTool-multiplatform",
         "ISPCTexComp-36b80aa-rev1-windows": "package-system/ISPCTexComp-windows",
         "qt-5.15.2-rev4-windows": "package-system/qt-windows",
         "Wwise-2021.1.0.7575-rev1-multiplatform": "package-system/Wwise-multiplatform",