move to own git serverHEADmaster

4 files changed, 113 insertions, 0 deletions

diff --git a/vcpkg/ports/aom/aom-rename-static.diff b/vcpkg/ports/aom/aom-rename-static.diff
new file mode 100644
index 0000000..f53502e
--- /dev/null
+++ b/vcpkg/ports/aom/aom-rename-static.diff
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e5b623..bed61da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -314,6 +314,15 @@ if(BUILD_SHARED_LIBS)
+     set_target_properties(aom PROPERTIES SOVERSION ${SO_VERSION})
+     set_target_properties(aom PROPERTIES VERSION ${SO_FILE_VERSION})
+   endif()
++
++  # override conditional changes
++  set_target_properties(aom PROPERTIES
++      ARCHIVE_OUTPUT_NAME aom
++  )
++  set_target_properties(aom_static PROPERTIES
++      ARCHIVE_OUTPUT_NAME aom_static
++      EXCLUDE_FROM_ALL 1
++  )
+ endif()
+ 
+ if(NOT WIN32 AND NOT APPLE)
+diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake
+index b02c7b9..c219841 100644
+--- a/build/cmake/aom_install.cmake
++++ b/build/cmake/aom_install.cmake
+@@ -79,7 +79,7 @@ macro(setup_aom_install_targets)
+     endif()
+ 
+     if(BUILD_SHARED_LIBS)
+-      set(AOM_INSTALL_LIBS aom aom_static)
++      set(AOM_INSTALL_LIBS aom)
+     else()
+       set(AOM_INSTALL_LIBS aom)
+     endif()
diff --git a/vcpkg/ports/aom/aom-uninitialized-pointer.diff b/vcpkg/ports/aom/aom-uninitialized-pointer.diff
new file mode 100644
index 0000000..37a7166
--- /dev/null
+++ b/vcpkg/ports/aom/aom-uninitialized-pointer.diff
@@ -0,0 +1,13 @@
+diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
+index aaef2c310..5500ad4a3 100644
+--- a/build/cmake/aom_configure.cmake
++++ b/build/cmake/aom_configure.cmake
+@@ -309,6 +309,8 @@ if(MSVC)
+ 
+   # Disable MSVC warnings that suggest making code non-portable.
+   add_compiler_flag_if_supported("/wd4996")
++  # Disable MSVC warnings for potentially uninitialized local pointer variable.
++  add_compiler_flag_if_supported("/wd4703")
+   if(ENABLE_WERROR)
+     add_compiler_flag_if_supported("/WX")
+   endif()
diff --git a/vcpkg/ports/aom/portfile.cmake b/vcpkg/ports/aom/portfile.cmake
new file mode 100644
index 0000000..dad9f4f
--- /dev/null
+++ b/vcpkg/ports/aom/portfile.cmake
@@ -0,0 +1,49 @@
+vcpkg_from_git(

+    OUT_SOURCE_PATH SOURCE_PATH

+    URL "https://aomedia.googlesource.com/aom"

+    REF d772e334cc724105040382a977ebb10dfd393293

+    HEAD_REF main

+    PATCHES

+        aom-rename-static.diff

+        aom-uninitialized-pointer.diff

+)

+

+vcpkg_find_acquire_program(NASM)

+vcpkg_find_acquire_program(PERL)

+

+set(aom_target_cpu "")

+if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm"))

+    # UWP + aom's assembler files result in weirdness and build failures

+    # Also, disable assembly on ARM and ARM64 Windows to fix compilation issues.

+    set(aom_target_cpu "-DAOM_TARGET_CPU=generic")

+endif()

+

+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_TARGET_IS_LINUX)

+    set(aom_target_cpu "-DENABLE_NEON=OFF")

+endif()

+

+vcpkg_cmake_configure(

+    SOURCE_PATH ${SOURCE_PATH}

+    OPTIONS

+        ${aom_target_cpu}

+        -DENABLE_DOCS=OFF

+        -DENABLE_EXAMPLES=OFF

+        -DENABLE_TESTDATA=OFF

+        -DENABLE_TESTS=OFF

+        -DENABLE_TOOLS=OFF

+        -DTHREADS_PREFER_PTHREAD_FLAG=ON

+        "-DCMAKE_ASM_NASM_COMPILER=${NASM}"

+        "-DPERL_EXECUTABLE=${PERL}"

+)

+

+vcpkg_cmake_install()

+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/AOM)

+vcpkg_copy_pdbs()

+vcpkg_fixup_pkgconfig()

+

+file(REMOVE_RECURSE

+    "${CURRENT_PACKAGES_DIR}/debug/include"

+    "${CURRENT_PACKAGES_DIR}/debug/share"

+)

+

+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

diff --git a/vcpkg/ports/aom/vcpkg.json b/vcpkg/ports/aom/vcpkg.json
new file mode 100644
index 0000000..90d648a
--- /dev/null
+++ b/vcpkg/ports/aom/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "aom",
+  "version-semver": "3.13.1",
+  "description": "AV1 codec library",
+  "homepage": "https://aomedia.googlesource.com/aom",
+  "license": "BSD-2-Clause",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}